macports build script cleanup

Changed files (1)

• modified scripts/macport_build.py

Diff

diff --git a/scripts/macport_build.py b/scripts/macport_build.pyindex af45f8f..245046f 100755--- a/scripts/macport_build.py+++ b/scripts/macport_build.py@@ -15,41 +15,145 @@ def run(cmd): 		print("Error: " + cmd) 		exit(1) -def build (prefix, cc, cflags, ldflags):+def build(prefix, cc, cflags, ldflags): 	#libbirdfont 	run("mkdir -p build/libbirdfont") 	run("mkdir -p build/bin") -	run("valac -C --basedir build/libbirdfont/ --enable-experimental-non-null --enable-experimental --define=MAC --library libbirdfont -H build/libbirdfont/birdfont.h libbirdfont/* --pkg libxml-2.0 --pkg gio-2.0  --pkg cairo --pkg libsoup-2.4 --pkg gdk-pixbuf-2.0 --pkg webkit-1.0")+	run("""valac \+		-C \+		--basedir build/libbirdfont/ \+		--enable-experimental-non-null \+		--enable-experimental \+		--define=MAC \+		--library libbirdfont \+		-H build/libbirdfont/birdfont.h \+		libbirdfont/* \+		--pkg libxml-2.0 \+		--pkg gio-2.0 \+		--pkg cairo \+		--pkg libsoup-2.4 \+		--pkg gdk-pixbuf-2.0 \+		--pkg webkit-1.0""") 	run("cp libbirdfont/*.c build/libbirdfont/") -	run(cc + " " + cflags + """ -c build/libbirdfont/*.c -fno-common -fPIC -D 'GETTEXT_PACKAGE="birdfont"' $(pkg-config --cflags libxml-2.0) $(pkg-config --cflags gio-2.0) $(pkg-config --cflags cairo) $(pkg-config --cflags glib-2.0) $(pkg-config --cflags gdk-pixbuf-2.0) $(pkg-config --cflags webkit-1.0) -I ./build/mac/birdfont""")+	run(cc + " " + cflags + """ \+		-c build/libbirdfont/*.c \+		-fno-common \+		-fPIC \+		-D 'GETTEXT_PACKAGE="birdfont"' \+		$(pkg-config --cflags libxml-2.0) \+		$(pkg-config --cflags gio-2.0) \+		$(pkg-config --cflags cairo) \+		$(pkg-config --cflags glib-2.0) \+		$(pkg-config --cflags gdk-pixbuf-2.0) \+		$(pkg-config --cflags webkit-1.0) \+		-I ./build/mac/birdfont""") 	run("mv ./*.o build/libbirdfont/ ") -	run(cc + " " + ldflags + " -dynamiclib -Wl,-headerpad_max_install_names,-undefined,dynamic_lookup,-compatibility_version,1.0,-current_version,1.0,-install_name," + prefix + "/lib/libbirdfont.dylib -shared build/libbirdfont/*.o $(pkg-config --libs libxml-2.0) $(pkg-config --libs gio-2.0) $(pkg-config --libs cairo) $(pkg-config --libs glib-2.0) $(pkg-config --libs gdk-pixbuf-2.0) $(pkg-config --libs webkit-1.0) -shared -o libbirdfont.dylib")+	run(cc + " " + ldflags + """ \+		-dynamiclib \+		-Wl,\+		-headerpad_max_install_names,\+		-undefined,\+		-dynamic_lookup,\+		-compatibility_version,1.0,\+		-current_version,1.0,\+		-install_name," + prefix + "/lib/libbirdfont.dylib\+		 -shared build/libbirdfont/*.o \+		 $(pkg-config --libs libxml-2.0) \+		 $(pkg-config --libs gio-2.0) \+		 $(pkg-config --libs cairo) \+		 $(pkg-config --libs glib-2.0) \+		 $(pkg-config --libs gdk-pixbuf-2.0) \+		 $(pkg-config --libs webkit-1.0) \+		 -shared -o libbirdfont.dylib""") 	run("mv libbirdfont.dylib build/bin/")  	# birdfont 	run("mkdir -p build/birdfont") 	-	run("valac -C --enable-experimental-non-null --enable-experimental --define=MAC birdfont/* --vapidir=./ --pkg libxml-2.0 --pkg gio-2.0  --pkg cairo --pkg libsoup-2.4 --pkg gdk-pixbuf-2.0 --pkg webkit-1.0 --pkg gtk+-2.0 --pkg libbirdfont")+	run("""valac \+		-C \+		--enable-experimental-non-null \+		--enable-experimental \+		--define=MAC birdfont/* \+		--vapidir=./ \+		--pkg libxml-2.0 \+		--pkg gio-2.0  \+		--pkg cairo \+		--pkg libsoup-2.4 \+		--pkg gdk-pixbuf-2.0 \+		--pkg webkit-1.0 +		--pkg gtk+-2.0 \+		--pkg libbirdfont""") 	run("mv birdfont/*.c build/birdfont/") -	run(cc + " " + cflags + """ -c ./build/libbirdfont/birdfont.h build/birdfont/*.c -D 'GETTEXT_PACKAGE="birdfont"' $(pkg-config --cflags libxml-2.0) $(pkg-config --cflags gio-2.0) $(pkg-config --cflags cairo) $(pkg-config --cflags glib-2.0) $(pkg-config --cflags gdk-pixbuf-2.0) $(pkg-config --cflags webkit-1.0) -I ./build/libbirdfont/""")+	run(cc + " " + cflags + """\+		-c ./build/libbirdfont/birdfont.h build/birdfont/*.c \+		-D 'GETTEXT_PACKAGE="birdfont"' \+		$(pkg-config --cflags libxml-2.0) \+		$(pkg-config --cflags gio-2.0) \+		$(pkg-config --cflags cairo) \+		$(pkg-config --cflags glib-2.0) \+		$(pkg-config --cflags gdk-pixbuf-2.0) \+		$(pkg-config --cflags webkit-1.0) \+		-I ./build/libbirdfont/""") 	run("mv ./*.o build/birdfont/") -	run(cc + " " + ldflags + " build/birdfont/*.o ./build/bin/libbirdfont.dylib $(pkg-config --libs libxml-2.0) $(pkg-config --libs gio-2.0) $(pkg-config --libs cairo) $(pkg-config --libs glib-2.0) $(pkg-config --libs gdk-pixbuf-2.0) $(pkg-config --libs webkit-1.0) $(pkg-config --libs gtk+-2.0) -o ./build/bin/birdfont")+	run(cc + " " + ldflags + """ \+		build/birdfont/*.o ./build/bin/libbirdfont.dylib \+		$(pkg-config --libs libxml-2.0) \+		$(pkg-config --libs gio-2.0) \+		$(pkg-config --libs cairo) \+		$(pkg-config --libs glib-2.0) \+		$(pkg-config --libs gdk-pixbuf-2.0) \+		$(pkg-config --libs webkit-1.0) \+		$(pkg-config --libs gtk+-2.0) \+		-o ./build/bin/birdfont""")  	# birdfont-export 	run("mkdir -p build/birdfont-export") 	-	run("valac -C --enable-experimental-non-null --enable-experimental --define=MAC birdfont-export/* --vapidir=./ --pkg libxml-2.0 --pkg gio-2.0  --pkg cairo --pkg libsoup-2.4 --pkg gdk-pixbuf-2.0 --pkg webkit-1.0 --pkg gtk+-2.0 --pkg libbirdfont")+	run("valac \+		-C \+		--enable-experimental-non-null \+		--enable-experimental \+		--define=MAC birdfont-export/* \+		--vapidir=./ \+		--pkg libxml-2.0 \+		--pkg gio-2.0  \+		--pkg cairo \+		--pkg libsoup-2.4 \+		--pkg gdk-pixbuf-2.0 \+		--pkg webkit-1.0 \+		--pkg gtk+-2.0 \+		--pkg libbirdfont") 	run("mv birdfont-export/*.c build/birdfont-export/") -	run(cc + " " + cflags + """ -c ./build/libbirdfont/birdfont.h build/birdfont-export/*.c -D 'GETTEXT_PACKAGE="birdfont"' $(pkg-config --cflags libxml-2.0) $(pkg-config --cflags gio-2.0) $(pkg-config --cflags cairo) $(pkg-config --cflags glib-2.0) $(pkg-config --cflags gdk-pixbuf-2.0) $(pkg-config --cflags webkit-1.0) -I ./build/libbirdfont/""")+	run(cc + " " + cflags + """ \+		-c ./build/libbirdfont/birdfont.h build/birdfont-export/*.c \+		-D 'GETTEXT_PACKAGE="birdfont"' \+		$(pkg-config --cflags libxml-2.0) \+		$(pkg-config --cflags gio-2.0) \+		$(pkg-config --cflags cairo) \+		$(pkg-config --cflags glib-2.0) \+		$(pkg-config --cflags gdk-pixbuf-2.0) \+		$(pkg-config --cflags webkit-1.0) \+		-I ./build/libbirdfont/""") 	run("mv ./*.o build/birdfont-export/") -	run(cc + " " + ldflags + " build/birdfont-export/*.o ./build/bin/libbirdfont.dylib $(pkg-config --libs libxml-2.0) $(pkg-config --libs gio-2.0) $(pkg-config --libs cairo) $(pkg-config --libs glib-2.0) $(pkg-config --libs gdk-pixbuf-2.0) $(pkg-config --libs webkit-1.0) $(pkg-config --libs gtk+-2.0) -o ./build/bin/birdfont-export")+	run(cc + " " + ldflags + " \+		build/birdfont-export/*.o \+		./build/bin/libbirdfont.dylib \+		$(pkg-config --libs libxml-2.0) \+		$(pkg-config --libs gio-2.0) \+		$(pkg-config --libs cairo) \+		$(pkg-config --libs glib-2.0) \+		$(pkg-config --libs gdk-pixbuf-2.0) \+		$(pkg-config --libs webkit-1.0) \+		$(pkg-config --libs gtk+-2.0) \+		-o ./build/bin/birdfont-export")  	run("touch build/installed") 	run("touch build/configured")@@ -69,11 +173,11 @@ def build_app (): 	run("cp resources/mac/birdfont.icns build/BirdFont.app/Contents/Resources")  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 ("-c", "--cc", dest="cc", help="select the C compiler", metavar="CC")-parser.add_option ("-f", "--cflags", dest="cflags", help="set compiler flags", metavar="CFLAGS")-parser.add_option ("-l", "--ldflags", dest="ldflags", help="set linker flags", metavar="LDFLAGS")+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("-c", "--cc", dest="cc", help="select the C compiler", metavar="CC")+parser.add_option("-f", "--cflags", dest="cflags", help="set compiler flags", metavar="CFLAGS")+parser.add_option("-l", "--ldflags", dest="ldflags", help="set linker flags", metavar="LDFLAGS")  (options, args) = parser.parse_args() @@ -81,7 +185,11 @@ if not options.prefix: 	options.prefix = "/opt/local" if not options.cc: 	options.cc = "gcc"-+if not options.cflags:+	options.cflags = ""+if not options.ldflags:+	options.ldflags = ""+	 build (options.prefix, options.cc, options.cflags, options.ldflags) build_app ()