Waf update

NEWS

@@ -1,6 +1,11 @@
 ===============
 Changes since v2.2.2
 ===============
+* Fixed installation process (PR 421)
+  - Updated waf.
+    No longer need python2.
+  - Default to --prefix=/usr.
+  - gconf schemas are now correctly registered.
 * Removed trophies code (PR 410)
 * Used GLib.MainLoop instead of GObject.MainLoop (PR 404)
 * Fixed update activity window to be resizable (PR 403)

README.md

@@ -40,11 +40,29 @@ pgrep -af hamster
 
 #### Dependencies
 
-openSUSE Leap-15: `zypper install intltool python3-pyxdg python3-cairo python3-gobject-Gdk`
 
-Debian-based: [detailed instructions](https://github.com/projecthamster/hamster/wiki/Hamster-2.x-on-Xubuntu-18.04).
+##### Debian-based
 
-RPM-based: `yum install gettext intltool gnome-python2-gconf dbus-python`
+ubuntu (tested in 19.04 and 18.04):
+```bash
+sudo apt install gettext intltool gconf2 gir1.2-gconf-2.0 python3-gi-cairo
+sudo apt install gnome-doc-utils yelp
+```
+
+
+##### openSUSE
+
+Leap-15.0 and Leap-15.1: 
+```bash
+sudo zypper install intltool python3-pyxdg python3-cairo python3-gobject-Gdk
+sudo zypper install gnome-doc-utils xml2po yelp
+```
+
+##### RPM-based
+
+*RPM-based instructions below should be updated for python3 (issue [#369](https://github.com/projecthamster/hamster/issues/369)).*
+
+`yum install gettext intltool gnome-python2-gconf dbus-python`
 
 If the hamster help pages are not accessible ("unable to open `help:hamster-time-tracker`"),
 then a [Mallard](https://en.wikipedia.org/wiki/Mallard_(documentation))-capable help reader is required,
@@ -68,18 +86,25 @@ src/hamster-cli
 
 #### Building and installing
 
-To install, python2 is still necessary (for waf).
-[Adapt](https://github.com/projecthamster/hamster/issues/221#issuecomment-462094920) the paths below to your system,
-`sudo rm/mv` commands, beware !
-```
-./waf configure && ./waf clean && ./waf distclean  # important for the help pages
-./waf configure build --prefix=/usr && sudo ./waf install
-sudo rm -rf /usr/lib/python3.6/site-packages/hamster
-sudo mv /usr/lib/python2.7/site-packages/hamster /usr/lib/python3.6/site-packages/
+```bash
+./waf configure build
+# thanks to the parentheses the umask of your shell will not be changed
+( umask 0022 && sudo ./waf install; )
 ```
+The `umask 0022` is safe for all, but important for users with more restrictive umask,
+as discussed [here](https://github.com/projecthamster/hamster/pull/421#issuecomment-520167143).
 
 Now restart your panels/docks and you should be able to add Hamster!
 
+
+#### Uninstall
+
+```bash
+./waf configure
+sudo ./waf uninstall
+```
+
+
 #### Migrating from hamster-applet
 
 Previously Hamster was installed everywhere under `hamster-applet`. As

data/wscript_build

@@ -1,9 +1,10 @@
-#!/usr/bin/env python2
-# encoding: utf-8
+# This file is meant to be included in the root wscript,
+# through the recurse("data") command
 
-bld.install_files('${DATADIR}/hamster-time-tracker', '*.ui')
+start_dir = bld.path.find_dir('.')
+bld.install_files('${DATADIR}/hamster-time-tracker', start_dir.ant_glob('*.ui'))
 bld.install_files('${DATADIR}/hamster-time-tracker', 'hamster.db')
-bld.install_files('${DATADIR}/hamster-time-tracker/art', 'art/*.png')
+bld.install_files('${DATADIR}/hamster-time-tracker/art', start_dir.ant_glob('art/*.png'))
 bld.install_files('${DATADIR}/hamster-time-tracker', 'report_template.html')
 
 bld.install_files('${DATADIR}/icons/hicolor/16x16/apps',   'art/16x16/hamster-time-tracker.png')
@@ -28,14 +29,15 @@ bld.add_group()
 # process .in files with intl_tool
 bld(features = 'intltool_in',
     source   = 'hamster-time-tracker.schemas.in',
-    install_path = '${SYSCONFDIR}/gconf/schemas',
+    target = 'hamster-time-tracker.schemas',
+    install_path = bld.env.schemas_destination,
     podir    = '../po',
-    flags    = ['-s', '-u', '-c'])
+    flags    = ['-s', '-u'])
 
 bld(features = 'intltool_in',
     source   = """hamster-time-tracker-overview.desktop.in
                   hamster-time-tracker.desktop.in
                   hamster-windows-service.desktop.in""",
     install_path = '${DATADIR}/applications',
     podir    = '../po',
-    flags    = ['-d', '-q', '-u', '-c'])
+    flags    = ['-d', '-q', '-u'])

help/wscript

@@ -1,12 +1,12 @@
-#!/usr/bin/env python2
+# waf script called from the root wscript, by
+# conf.recurse("help")
 
 # Mallard waf adaptor written by Ulrik Sverdrup
 # may be distributed, changed, used, etc freely for any purpose
 
 ## Mallard functionality definitions ##
 import os
-import Task
-import TaskGen
+from waflib import Logs, TaskGen
 
 def _read_makefile_am(filename):
 	"read a Makefile.am file for DOC_* variable definitions, return a dict"
@@ -23,8 +23,8 @@ def init_mallard(self):
 	have_vars = set(var for var in DOC_VAR if DOC_VAR[var])
 	missing_vars = set(require_vars).difference(have_vars)
 	if missing_vars:
-		print "Missing DOC variable declarations in %s:" % (mf_am.abspath())
-		print "\n".join(missing_vars)
+		print("Missing DOC variable declarations in {}:".format(mf_am.abspath()))
+		print("\n".join(missing_vars))
 
 	self.bld.env.update(DOC_VAR)
 	self.default_install_path='${PREFIX}/share/help'
@@ -33,35 +33,35 @@ def apply_mallard(self):
 	bld = self.bld
 	lst = self.to_list(bld.env["DOC_LINGUAS"])
 	cnode = self.path.find_dir("C")
-	self.bld.rescan(cnode)
 
-	pages = [p for p in self.bld.cache_dir_contents[cnode.id]
-			if (os.path.splitext(p)[-1].lower()) == ".page"]
+	pages = [p.name for p in cnode.ant_glob("*.page")]
 
 	# Check if the declared page list is consistent
 	declared_pages = self.to_list(bld.env["DOC_PAGES"])
 	missing_pages = set(pages).difference(declared_pages)
 	if missing_pages:
-		print "Warning: Some pages not declared:"
-		print "\n".join(missing_pages)
+		print("Warning: Some pages not declared:")
+		print("\n".join(missing_pages))
+
+	install_path = lambda lang: os.path.join(bld.env.DATADIR, "help", lang, "${DOC_ID}")
 
 	for lang in lst:
 		node = self.path.find_resource("%s/%s.po" % (lang, lang))
 		for page in pages:
-			tsk = self.create_task('xml2po')
 			out = self.path.find_or_declare('%s/%s' % (lang, page))
 			src = self.path.find_resource('C/%s' % page)
-			tsk.set_inputs([node,src])
-			tsk.set_outputs(out)
-			tsk.install_path = os.path.join(self.install_path, lang, "${DOC_ID}")
+			bld(name='xml2po', color='BLUE',
+			    rule='${XML2PO} ${XML2POFLAGS} ${SRC} > ${TGT}',
+			    source=[node, src],
+			    target=out,
+			    install_path=install_path(lang)
+			    )
+
 	if bld.is_install:
-		for page in pages:
-			out = "%s/%s" % (cnode.abspath(), page)
-			instdir = os.path.join(self.install_path, "C", "${DOC_ID}")
-			bld.install_files(instdir, out)
+		page_nodes = [cnode.find_resource(page) for page in pages]
+		instdir = install_path("C")
+		bld.install_files(instdir, page_nodes)
 
-Task.simple_task_type('xml2po', '${XML2PO} ${XML2POFLAGS} ${SRC} > ${TGT}',
-		color='BLUE')
 
 TaskGen.feature("mallard")(init_mallard)
 TaskGen.feature("mallard")(apply_mallard)
@@ -72,16 +72,20 @@ TaskGen.after('init_mallard')(apply_mallard)
 
 # Build Configuration
 
-def set_options(opt):
-	pass
 
-def configure(conf):
-	xml2po = conf.find_program('xml2po', var='XML2PO')
-	conf.env['XML2POFLAGS'] = '-mmallard -p'
+def configure(ctx):
+	lookfor = "xml2po"
+	try:
+		ctx.find_program(lookfor, var='XML2PO')
+		ctx.env.docs = True
+		ctx.env.XML2POFLAGS = '-mmallard -p'
+	except ctx.errors.ConfigurationError:
+		Logs.warn("'{}' not found; documentation build disabled".format(lookfor))
+		ctx.env.docs = False
 
-def build(bld):
-	if bld.env["XML2PO"]:
-		task = bld.new_task_gen(
+def build(ctx):
+	if ctx.env.docs:
+		task = ctx(
 			features="mallard",
 			variable_definitions="Makefile.am",
 		)

src/hamster/defs.py.in

@@ -2,4 +2,4 @@ DATA_DIR = "@DATADIR@"
 LIB_DIR = "@LIBDIR@"
 VERSION = "@VERSION@"
 PACKAGE = "@PACKAGE@"
-PYTHONDIR = "@PYEXECDIR@"
+PYTHONDIR = "@PYTHONDIR@"