Macports

Changed files (4)

• modified NEWS
• modified scripts/macport_build.py
• modified scripts/macport_install.py
• modified scripts/version.py

Diff

diff --git a/NEWS b/NEWSindex e131010..39f8f3b 100644--- a/NEWS+++ b/NEWS@@ -1,3 +1,27 @@+birdfont (0.17) stable;++  * Macports validation++ -- Johan Mattsson <johan.mattsson.m@gmail.com>  Sun Feb 25 23:46:00 CET 2013++birdfont (0.16) stable;++  * Correct location in ID loadcommand for Macports++ -- Johan Mattsson <johan.mattsson.m@gmail.com>  Sun Feb 25 23:46:00 CET 2013++birdfont (0.14) stable;++  * Macports file++ -- Johan Mattsson <johan.mattsson.m@gmail.com>  Sun Feb 25 23:46:00 CET 2013++birdfont (0.14) stable;++  * Build on Linux++ -- Johan Mattsson <johan.mattsson.m@gmail.com>  Sun Feb 25 23:46:00 CET 2013+ birdfont (0.13) stable;    * Bugfixesdiff --git a/scripts/macport_build.py b/scripts/macport_build.pyindex 7f621c8..d4d0085 100755--- a/scripts/macport_build.py+++ b/scripts/macport_build.py@@ -15,7 +15,7 @@ def run(cmd): 		print("Error: " + cmd) 		exit(1) -def build ():+def build (prefix): 	#libbirdfont 	run("rm -rf build") 	run("mkdir -p build/libbirdfont")@@ -29,6 +29,7 @@ def build ():  	run("gcc -dynamiclib -Wl,-headerpad_max_install_names,-undefined,dynamic_lookup,-compatibility_version,1.0,-current_version,1.0,-install_name,/usr/local/lib/libbirdfont.dylib -shared build/libbirdfont/*.o $(pkg-config --cflags --libs libxml-2.0) $(pkg-config --cflags --libs gio-2.0) $(pkg-config --cflags --libs cairo) $(pkg-config --cflags --libs glib-2.0) $(pkg-config --cflags --libs gdk-pixbuf-2.0) $(pkg-config --cflags --libs webkit-1.0) -shared -o libbirdfont.dylib") 	run("mv libbirdfont.dylib build/bin/")+	run ("install_name_tool -id " + prefix + "/lib/libbirdfont.dylib build/bin/libbirdfont.dylib")  	# birdfont 	run("mkdir -p build/birdfont")@@ -67,17 +68,15 @@ def build_app (): 	run("cp resources/mac/birdfont.icns build/BirdFont.app/Contents/Resources")  parser = OptionParser()-parser.add_option ("-a", "--application-launcher", dest="app", help="create application launcher in /Applications, set to no to skip it.", metavar="APP")+parser.add_option ("-p", "--prefix", dest="prefix", help="install prefix", metavar="PREFIX")  (options, args) = parser.parse_args() -if not options.app:-	options.prefix = "yes"+if not options.prefix:+	options.prefix = "/opt/local" -build ()+build (options.prefix) -if not options.app == "no":-	build_app ()   diff --git a/scripts/macport_install.py b/scripts/macport_install.pyindex 070b747..efb0186 100755--- a/scripts/macport_install.py+++ b/scripts/macport_install.py@@ -20,6 +20,7 @@ def install (file, dir): 	subprocess.check_call ('install ' + file + ' ' + dest + prefix + dir + '/', shell=True)  parser = OptionParser()+parser.add_option ("-a", "--application-launcher", dest="app", help="create application launcher in /Applications", metavar="APP") 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") @@ -39,7 +40,8 @@ install ('build/bin/birdfont-export', '/bin') install ('build/bin/libbirdfont.dylib', '/lib')  # install application launcher-subprocess.check_call ('mkdir -p ' + dest + '/Applications/', shell=True)-subprocess.check_call ('cp -r build/BirdFont.app ' + dest + '/Applications/', shell=True)+if options.app:+	subprocess.check_call ('mkdir -p ' + dest + '/Applications/', shell=True)+	subprocess.check_call ('cp -r build/BirdFont.app ' + dest + '/Applications/', shell=True)  diff --git a/scripts/version.py b/scripts/version.pyindex 5fa45da..855f04d 100644--- a/scripts/version.py+++ b/scripts/version.py@@ -1,2 +1,2 @@ #!/usr/bin/python-VERSION = '0.15'+VERSION = '0.17'