Mercurial > gub

changeset 2466:6796250455ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Switch off nsis build if mingw not in platforms. Nsis does not build on linux-64.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Tue, 24 Oct 2006 06:47:22 +0100
parents a35366de5b76
children fe43f6a7e6d0
files GNUmakefile lilypondorg.py
diffstat 2 files changed, 12 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/GNUmakefile	Tue Oct 24 06:09:30 2006 +0100
+++ b/GNUmakefile	Tue Oct 24 06:47:22 2006 +0100
@@ -222,22 +222,27 @@
 		$(addprefix --allow ,$(GUB_DISTCC_ALLOW_HOSTS)) \
 		--port 3634 --pid-file $(CWD)/log/$@.pid \
 		--log-file $(CWD)/log/$@.log  --log-level info
-bootstrap:
+
+bootstrap: boostrap-git download-local local cross-compilers download
+
+bootstrap-git:
 	$(PYTHON) gub-builder.py $(LOCAL_GUB_BUILDER_OPTIONS) -p local download git
 	$(PYTHON) gub-builder.py $(LOCAL_GUB_BUILDER_OPTIONS) -p local build git
+
+download-local:
 	$(PYTHON) gub-builder.py $(LOCAL_GUB_BUILDER_OPTIONS) -p local download \
-		flex mftrace potrace fontforge glib pango \
+		flex mftrace potrace fontforge \
 		guile pkg-config nsis icoutils expat gettext \
 		distcc texinfo automake
+
+local:
 	$(PYTHON) gub-builder.py $(LOCAL_GUB_BUILDER_OPTIONS) -p local build \
 		flex mftrace potrace fontforge \
 		guile pkg-config expat icoutils \
 		distcc texinfo automake 
-	$(MAKE) cross-compilers
-
-## TODO: switch off if mingw not in platforms.
+ifneq ($(filter mingw, $(PLATFORMS)),)
 	$(PYTHON) gub-builder.py $(LOCAL_DRIVER_OPTIONS) -p local build nsis 
-	$(MAKE) download
+endif
 
 
 ################################################################
@@ -267,7 +272,6 @@
 	    LILYPOND_EXTERNAL_BINARY="$(NATIVE_ROOT)/usr/bin/lilypond"\
 	    PATH=$(CWD)/target/local/system/usr/bin/:$(PATH) \
 	    LD_LIBRARY_PATH=$(NATIVE_ROOT)/usr/lib:$(LD_LIBRARY_PATH) \
-	    LD_LIBRARY_PATH=$(CWD)/target/local/system/usr/lib:$(LD_LIBRARY_PATH) \
 	    DOCUMENTATION=yes do-top-doc
 	unset LILYPONDPREFIX \
 	    && ulimit -m 256000 \
@@ -276,7 +280,6 @@
 	    MALLOC_CHECK_=2 \
 	    PATH=$(CWD)/target/local/system/usr/bin/:$(PATH) \
 	    LD_LIBRARY_PATH=$(NATIVE_ROOT)/usr/lib:$(LD_LIBRARY_PATH) \
-	    LD_LIBRARY_PATH=$(CWD)/target/local/system/usr/lib:$(LD_LIBRARY_PATH) \
 	    DOCUMENTATION=yes web
 	tar -C $(NATIVE_LILY_BUILD)/out-www/web-root/ \
 	    -cjf $(CWD)/uploads/lilypond-$(LILYPOND_VERSION)-$(INSTALLER_BUILD).documentation.tar.bz2 . 
--- a/lilypondorg.py	Tue Oct 24 06:09:30 2006 +0100
+++ b/lilypondorg.py	Tue Oct 24 06:47:22 2006 +0100
@@ -56,7 +56,7 @@
 
 def get_url_versions (url):
     opener = urllib.URLopener ()
-    index = opener.open (url).read()
+    index = opener.open (url).read ()
 
     versions = []
     def note_version (m):