diff --git a/.gitignore b/.gitignore index 3e4ec795e..18047fe39 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,4 @@ build build-stamp configure-stamp MANIFEST -po/gourmet.pot +gourmet/po/gourmet.pot diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index a907aba73..000000000 --- a/MANIFEST.in +++ /dev/null @@ -1,6 +0,0 @@ -include ChangeLog CHANGES CODING.md CONTRIBUTING.md FAQ gourmet.1 gourmet.appdata.xml.in gourmet.desktop.in INSTALL.md LICENSE MANIFEST.in README.md TODO.md TESTS setup.cfg setup.py test_deb.sh test_tarball.sh -include bin/gourmet -recursive-include data * -recursive-include gourmet *.py *.ui *.mk *.mx2 *.mmf *.kreml *.db *.sh *.html *.css *.js *.grmt *.gourmet-plugin.in guiprefs -recursive-include po POTFILES.in *.pot *.po -recursive-include ui *.ui diff --git a/gourmet.1 b/gourmet.1 deleted file mode 100644 index 8f2ae5786..000000000 --- a/gourmet.1 +++ /dev/null @@ -1,70 +0,0 @@ -.TH "gourmet" "1" "September 2008" -.SH NAME -gourmet \- A Gtk-based recipe organizer and shopping list generator -.SH SYNOPSIS -.B gourmet -[\fIoptions\fR] -.SH DESCRIPTION -.PP -This manual page describes briefly the \fBgourmet\fR command. -.PP -Gourmet Recipe Manager is a Gtk-based recipe organizer and shopping list -generator intended for the GNOME desktop environment (though it does not need -all the GNOME libraries). Gourmet can import Mealmaster(tm) files and can -export recipes in a number of formats, including text, RTF and web pages. -Gourmet also can calculate nutritional information for recipes. -.SH OPTIONS -.TP -\fB\-\-database\-url\fR=\fIDB_URL\fR -Custom url for database of form driver://args/location -.TP -\fB\-\-plugin\-directory\fR=\fIHTML_PLUGIN_DIR\fR -Directory for webpage import filter plugins. -.TP -\fB\-\-use\-threads\fR -Enable threading support. -.TP -\fB\-\-disable\-threads\fR -Disable threading support. -.TP -\fB\-\-gourmet\-directory\fR=\fIGOURMETDIR\fR -Gourmet configuration directory. -.TP -\fB\-\-debug\-threading\-interval\fR=\fITHREAD_DEBUG_INTERVAL\fR -Interval for threading debug calls. -.TP -\fB\-\-debug\-threading\fR -Print debugging information about threading. -.TP -\fB\-\-debug\-file\fR=\fIDEBUG_FILE\fR -Regular expression that matches filename(s) whose code -we want to display debug messages from. -.TP -\fB\-q\fR -Don't print \fBgourmet\fR error messages. -.TP -\fB\-\-showtimes\fR -Print timestamps on debug statements. -.TP -\fB\-v\fR -Be verbose (extra v's will increase the verbosity -level. -.TP -\fB\-\-gourmet\-base\fR=\fIDATAD\fR -Root directory for \fBgourmet\fR data files. -.TP -\fB\-\-disable\-psyco\fR -Do not use psyco if it is installed. -.TP -\fB\-\-version\fR -show version number and exit. -.TP -\fB\-h\fR, \fB\-\-help\fR -show this help message and exit -.SH AUTHORS -Thomas Hinkle - -.PP -This manual page was written by Francois Wendling for the -Debian GNU/Linux system (but may be used by others). - diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index f01813560..000000000 --- a/setup.cfg +++ /dev/null @@ -1,25 +0,0 @@ -[sdist] -formats = bztar -force_manifest = 1 - -# Note that we're adding our *.gourmet-plugin files to the desktop_files parameter -# of the [build_i18n] section, as they're structured like *.desktop files. -# This requires tricking DistUtilsExtra into installing them into the python -# modules location (given by install_lib) instead of a subdirectory of data_dir, -# as it would normally. We also need to check if setup.py was actually invoked with -# the `install` command in order not to break things when only building gourmet -# (or just *.mo and *.gourmet-plugin files by running `python setup.py build_i18n -m`). -[build_i18n] -domain=gourmet -desktop_files=[ - ("share/applications", ("gourmet/gourmet.desktop.in",)), - ("share/gourmet/plugins", glob.glob("gourmet/plugins/*.gourmet-plugin.in")), - ("share/gourmet/plugins/import_export", glob.glob("gourmet/plugins/import_export/*.gourmet-plugin.in")) - ] -xml_files=[ - ("share/appdata", ("gourmet/gourmet.appdata.xml.in",)), - ] - -[build_icons] -icon_dir=gourmet/data/icons - diff --git a/setup.py b/setup.py index 96a83664d..cb4fdbf80 100644 --- a/setup.py +++ b/setup.py @@ -40,11 +40,6 @@ def has_help(command): ("build_help" in self.distribution.cmdclass and not self.help == "False") - def has_icons(command): - return self.icons == "True" or \ - ("build_icons" in self.distribution.cmdclass and not - self.help == "False") - def has_i18n(command): return self.i18n == "True" or \ ("build_i18n" in self.distribution.cmdclass and not @@ -57,7 +52,6 @@ def has_kdeui(command): distutils.command.build.build.finalize_options(self) self.sub_commands.append(("build_i18n", has_i18n)) - self.sub_commands.append(("build_icons", has_icons)) self.sub_commands.append(("build_help", has_help)) # must be run before build_py @@ -204,58 +198,6 @@ def run(self): distutils.command.build.build.sub_commands.append(("build_i18n", None)) -class build_py(distutils.command.build_py.build_py): - """build_py command - - This specific build_py command will modify module 'build_config' so that it - contains information on installation prefixes afterwards. - """ - - def build_module(self, module, module_file, package): - distutils.command.build_py.build_py.build_module(self, module, - module_file, package) - - if isinstance(package, str): - package = package.split('.') - elif not isinstance(package, (list, tuple)): - msg = "'package' must be a string (dot-separated), list, or tuple" - raise TypeError(msg) - - if (module == 'settings' and len(package) == 1 - and package[0] == 'gourmet' - and 'install' in self.distribution.command_obj): - outfile = self.get_module_outfile(self.build_lib, package, module) - - iobj = self.distribution.command_obj['install'] - lib_dir = iobj.install_lib - base = iobj.install_data - if (iobj.root): - lib_dir = lib_dir[len(iobj.root):] - base = base[len(iobj.root):] - base = op.join(base, 'share') - data_dir = op.join(base, 'gourmet') - - # abuse fileinput to replace two lines in bin/gourmet - for line in fileinput.input(outfile, inplace=True): - if "base_dir = " in line: - line = "base_dir = '%s'\n" % base - elif "lib_dir = " in line: - line = "lib_dir = '%s'\n" % lib_dir - elif "data_dir = " in line: - line = "data_dir = '%s'\n" % data_dir - elif "doc_base = " in line: - line = "doc_base = '%s'\n" % \ - op.join(base, 'doc', 'gourmet') - elif "icon_base = " in line: - line = "icon_base = '%s'\n" % \ - op.join(base, 'icons', 'hicolor') - elif "locale_base = " in line: - line = "locale_base = '%s'\n" % \ - op.join(base, 'locale') - elif "plugin_base = " in line: - line = "plugin_base = data_dir\n" - print(line, end='') - class build_scripts(distutils.command.build_scripts.build_scripts): """build_scripts command @@ -490,7 +432,6 @@ def crawl_plugins(base, basename): include_package_data=True, cmdclass={'build': build_extra, 'build_i18n': build_i18n, - 'build_py': build_py, 'build_scripts': build_scripts, }, diff --git a/test_deb.sh b/test_deb.sh deleted file mode 100755 index a24d9722f..000000000 --- a/test_deb.sh +++ /dev/null @@ -1,11 +0,0 @@ -echo Run dpkg-buildpackage -sudo dpkg-buildpackage -S -k5DCF5DF9 -IVM -Ifoo -Ipyc -Idist -sudo dpkg-buildpackage -k5DCF5DF9 -IVM -Ifoo -Ipyc -Idist -echo dpkg-buildpackage done -LATEST_DEB=`ls -t ../*.deb | head -1` -echo REMOVE OLD STUFF -sudo rm -rf /usr/share/gourmet/ /usr/local/share/gourmet/ /usr/local/lib/python2.*/*-packages/gourmet/ /usr/lib/python2.*/*-packages/gourmet/ /tmp/foobar -echo Install our new package -sudo dpkg -i $LATEST_DEB -echo 'Test gourmet' -/usr/bin/gourmet --gourmet-directory=/tmp/foobar diff --git a/test_tarball.sh b/test_tarball.sh deleted file mode 100755 index 6d13c36f5..000000000 --- a/test_tarball.sh +++ /dev/null @@ -1,23 +0,0 @@ -python create_manifest.py -echo Clear out previous tests from tmp/ to avoid confusion -sudo rm -rf /tmp/gourmet-* -echo Run python setup.py sdist -python setup.py sdist -echo setup.py done -LATEST_TARBALL=`ls -t dist/ | head -1` -TOP_DIR=$PWD -UNTAR_DIR=`python -c "print \"$LATEST_TARBALL\"[0:-7]"` -echo Move to tmp -cd /tmp/ -echo Untar our latest package -tar -zxf $TOP_DIR/dist/$LATEST_TARBALL -cd $UNTAR_DIR -echo REMOVE OLD STUFF -sudo rm -rf /usr/share/gourmet/ /usr/lib/python2.5/site-packages/gourmet/ /tmp/foobaz -echo Install our new tarball -sudo python setup.py install -echo 'Testing gourmet' -echo "Don't forget to run through the standard tests before releasing!" -echo -cat TESTS -gourmet --gourmet-directory=/tmp/foobaz