CVSROOT: /cvsroot/lilypond
Module name: installers
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/07/23 09:03:56
Modified files:
windows/bin : cyg-apt
windows : GNUmakefile ChangeLog
Log message:
Bugfixes and cleanup.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/bin/cyg-apt.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/GNUmakefile.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/ChangeLog.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
Patches:
Index: installers/windows/ChangeLog
diff -u installers/windows/ChangeLog:1.28 installers/windows/ChangeLog:1.29
--- installers/windows/ChangeLog:1.28 Wed Jul 20 21:05:13 2005
+++ installers/windows/ChangeLog Sat Jul 23 09:03:56 2005
@@ -1,3 +1,7 @@
+2005-07-23 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+
+ * GNUmakefile: Bugfixes and cleanup.
+
2005-07-20 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
* GNUmakefile: Remove cruft from upgrade.
Index: installers/windows/GNUmakefile
diff -u installers/windows/GNUmakefile:1.19 installers/windows/GNUmakefile:1.20
--- installers/windows/GNUmakefile:1.19 Wed Jul 20 21:05:13 2005
+++ installers/windows/GNUmakefile Sat Jul 23 09:03:56 2005
@@ -62,22 +62,28 @@
installer = $(build-dir)/setup.exe
upgrader = $(build-dir)/upgrade.exe
-.PHONY: all clean nsis-root target-root upset $(packages)
+.PHONY: all clean nsis-root setup target-root upset $(packages)
.PRECIOUS: $(packages:%=$(escaped-upload-dir)/%/setup.hint) nsis/upgrade.nsi
.PRECIOUS: $(packages:%=$(src-dir)/.%-stamp) nsis/upgrade.nsi
-default: all
+default: setup all
+
+setup: .setup-stamp $(target-root)/.stamp $(nsis-root)/.stamp
+ mkdir -p $(src-dir) $(build-dir)/build $(upload-dir)
+ $(MAKE) short-circuit= upset
+ $(ASSUME_OLD)
all: $(installer) $(upgrader)
$(installer): $(nsis-packages:%=$(nsis-root)/etc/setup/%.lst.gz)
nsis/lilypond.nsi
$(upgrader): $(nsis-packages-upgrade:%=$(nsis-root)/etc/setup/%.lst.gz)
-clean: upset
+clean:## upset
rm -rf $(target-root)/var/cache/setup $(nsis-root) $(nsis-root)-upgrade
$(installer) $(upgrader) nsis/lilypond.nsi nsis/upgrade.nsi
realclean: clean
+ rm -f ~/.mknetrel ~/.min-apt .min-apt .setup-stamp
$(upload-dir)/../setup.ini
rm -rf $(target-root)
$(bin-dir)/min-apt: $(bin-dir)/cyg-apt
@@ -92,25 +98,21 @@
| grep -v '\-src'\
| sed -e '[EMAIL PROTECTED]/@@' -e
's/-\([-.0-9]\|-[-.0-9][a-z]\)*.tar.bz2$$//')
-include .setup-stamp
.setup-stamp:
ln -sf cyg-apt $(bin-dir)/min-apt
mkdir -p $(upload-dir) $(src-dir)
mkdir -p mingw/uploads
$(ASSUME_OLD)
-include $(target-root)/.stamp
$(target-root)/.stamp:
mkdir -p $(dir $@)
$(ASSUME_OLD)
$(APT) --root=$(dir $@) setup
- $(MAKE) short-circuit= upset
-include $(nsis-root)/.stamp
+
$(nsis-root)/.stamp:
mkdir -p $(dir $@)
$(ASSUME_OLD)
$(APT) --root=$(dir $@) setup
- $(MAKE) short-circuit= upset
$(target-root)/etc/setup/%.lst.gz: $(escaped-upload-dir)/%/setup.hint
-$(APT) --root=$(target-root) remove $(all-bin-balls)
@@ -160,7 +162,7 @@
endif
$(ASSUME_OLD)
-$(escaped-upload-dir)/%/setup.hint: extra/% $(src-dir)/.%-stamp
+$(escaped-upload-dir)/%/setup.hint: extra/%
ifeq ($(short-circuit),)
$(MKNETREL) $(MKNETREL_FLAGS) $*
endif
@@ -214,7 +216,12 @@
$(foreach i, $(packages), $(eval $(i)-install =
$(target-root)/etc/setup/$(i).lst.gz))
# All except target depend on the target.
+###$(foreach i, $(filter-out $(target), $(packages)), $(eval $($(i)-build):
$($(target)-install)))
$(foreach i, $(filter-out $(target), $(packages)), $(eval $($(i)-build):
$($(target)-install)))
+$(foreach i, $(filter-out $(target), $(packages)), $(eval $($(i)-install):
$($(target)-install)))
+
+foe:
+ echo $(foreach i, $(filter-out $(target), $(packages)),
$($(i)-install): $($(target)-install))
# Most depend on libtool
nolibtool = $(target) ghostscript gs libpng libtool lilypad lilypond
@@ -240,6 +247,9 @@
$(pango-build): $(fontconfig-install) $(freetype-install) $(glib-install)
$(libiconv-install)
$(ghostscript-build): $(jpeg-install) $(libpng-install) $(zlib-install)
-
gs-ncsb: $(gs-build)
@echo done
+
+# Building a package depends on an unpacked source tree
+$(foreach i, $(packages), $(eval $($(i)-build): $(src-dir)/.$(i)-stamp))
+
Index: installers/windows/bin/cyg-apt
diff -u installers/windows/bin/cyg-apt:1.9 installers/windows/bin/cyg-apt:1.10
--- installers/windows/bin/cyg-apt:1.9 Fri Jun 10 08:20:19 2005
+++ installers/windows/bin/cyg-apt Sat Jul 23 09:03:56 2005
@@ -117,7 +117,8 @@
if target == 'mingw':
official_mirror = 'http://lilypond.org/mingw'
mirror = local_mirror
-if not os.path.exists (local_mirror[7:]):
+#if not os.path.exists (local_mirror[7:]):
+if not os.path.exists (local_mirror[7:] + "/setup.ini"):
mirror = official_mirror
cache = ROOT + '/var/cache/setup'
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
