Merge branch 'master' into build-refactoring

Changed files (4)

• modified TRANSLATORS
• modified dodo.py
• modified install
• added uninstall

Diff

diff --git a/TRANSLATORS b/TRANSLATORSindex d513a2e..1d6f06a 100644--- a/TRANSLATORS+++ b/TRANSLATORS@@ -1 +1,2 @@ Sven Santegoeds+Robert Kabingerdiff --git a/dodo.py b/dodo.pyindex 859f8d2..17dc081 100644--- a/dodo.py+++ b/dodo.py@@ -43,6 +43,9 @@ def task_build ():         print ("Project is not configured")         exit (1) +    subprocess.check_output ('mkdir -p build', shell=True)+    subprocess.check_output ('touch build/installed', shell=True)+     return  {         'actions': ['echo "Build"'],         }diff --git a/install b/installindex 43aaa79..b6f46fc 100755--- a/install+++ b/install@@ -3,13 +3,25 @@ import os import subprocess from optparse import OptionParser +def install (file, dir):+	f = dest + prefix + dir + '/'+	s = file.rfind ('/')+	if s > -1:+		f += file[s + 1:]+	else:+		f += file+	print ("install: " + f)+	subprocess.check_output ('install -d ' + dest + prefix + dir, shell=True)+	subprocess.check_output ('install ' + file + ' ' + dest + prefix + dir + '/', shell=True)+	installed.write (f + "\n")+ if not os.path.exists ("build/configured"): 	print ("Project is not configured") 	exit (1)  parser = OptionParser()-parser.add_option("-p", "--prefix", dest="prefix", help="install prefix", metavar="PREFIX")-parser.add_option("-d", "--dest", dest="dest", help="install to this directory", metavar="DEST")+parser.add_option ("-p", "--prefix", dest="prefix", help="install prefix", metavar="PREFIX")+parser.add_option ("-d", "--dest", dest="dest", help="install to this directory", metavar="DEST")  (options, args) = parser.parse_args() @@ -22,29 +34,23 @@ if not options.dest: prefix = options.prefix dest = options.dest -subprocess.check_output ('install -d ' + dest + prefix + '/share/birdfont/layout', shell=True)+# create uninstall file+installed = open ('build/installed', 'w')+installed.write ('build/installed\n')++# install it: for file in os.listdir('./layout'):-	subprocess.check_output ('install layout/' + file + ' ' + dest + prefix + '/share/birdfont/layout/', shell=True)+	install ('layout/' + file, '/share/birdfont/layout') -subprocess.check_output ('install -d ' + dest + prefix + '/share/birdfont/icons', shell=True) for file in os.listdir('./icons'):-	subprocess.check_output ('install icons/' + file + ' ' + dest + prefix + '/share/birdfont/icons/', shell=True)--subprocess.check_output ('install -d ' + dest + prefix + '/share/applications/', shell=True)-subprocess.check_output ('install linux/birdfont.desktop ' + dest + prefix + '/share/applications/', shell=True)--subprocess.check_output ('install -d ' + dest + prefix + '/share/icons/hicolor/48x48/apps/', shell=True)-subprocess.check_output ('install linux/birdfont.png ' + dest + prefix + '/share/icons/hicolor/48x48/apps/', shell=True)--subprocess.check_output ('install -d ' + dest + prefix + '/bin/', shell=True)-subprocess.check_output ('install build/birdfont ' + dest + prefix + '/bin/', shell=True)--subprocess.check_output ('install -d ' + dest + prefix + '/bin/', shell=True)-subprocess.check_output ('install build/birdfont-export ' + dest + prefix + '/bin/', shell=True)+	install ('icons/' + file, '/share/birdfont/icons') -subprocess.check_output ('install -d ' + dest + prefix + '/lib/', shell=True)-subprocess.check_output ('install build/libbirdfont.so ' + dest + prefix + '/lib/', shell=True)+install ('linux/birdfont.desktop', '/share/birdfont/applications')+install ('linux/birdfont.png', '/share/icons/hicolor/48x48/apps')+install ('build/birdfont', '/bin')+install ('build/birdfont-export', '/bin')+install ('build/libbirdfont.so', '/lib')+install ('build/birdfont.1.gz', '/share/man/man1')+install ('build/birdfont-export.1.gz', '/share/man/man1') -subprocess.check_output ('install -d ' + dest + prefix + '/share/man/man1/', shell=True)-subprocess.check_output ('install build/birdfont.1.gz ' + dest + prefix + '/share/man/man1/', shell=True)-subprocess.check_output ('install build/birdfont-export.1.gz ' + dest + prefix + '/share/man/man1/', shell=True)+installed.close ()diff --git a/uninstall b/uninstallnew file mode 100755index 0000000..ab532b1--- /dev/null+++ b/uninstall@@ -0,0 +1,17 @@+#!/usr/bin/python +import os+import subprocess++if not os.path.exists ("build/configured"):+	print ("Project is not configured")+	exit (1)++if not os.path.exists ("build/installed"):+	print ("Project is not installed")+	exit (1)+		+f = open('build/installed')+for file in iter(f):+	print ('Removing ' + file.replace ('\n', ''))+	subprocess.check_output ('rm ' + file, shell=True)+f.close()