CVSROOT: /cvsroot/lilypond
Module name: installers
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/07/24 08:26:12
Modified files:
windows/bin : cyg-apt
windows : GNUmakefile ChangeLog
Log message:
* GNUmakefile ($(src-dir)/.%-stamp): Copy tarball from download cache.
* bin/cyg-apt (source): Respect --download.
* GNUmakefile (default): Remove setup.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/bin/cyg-apt.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/GNUmakefile.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/ChangeLog.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
Patches:
Index: installers/windows/ChangeLog
diff -u installers/windows/ChangeLog:1.30 installers/windows/ChangeLog:1.31
--- installers/windows/ChangeLog:1.30 Sun Jul 24 06:21:44 2005
+++ installers/windows/ChangeLog Sun Jul 24 08:26:12 2005
@@ -1,5 +1,9 @@
2005-07-24 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+ * GNUmakefile ($(src-dir)/.%-stamp): Copy tarball from download cache.
+
+ * bin/cyg-apt (source): Respect --download.
+
* GNUmakefile (default): Remove setup.
* extra/guile (build_depends): Autoupdate is for pristine tarball
Index: installers/windows/GNUmakefile
diff -u installers/windows/GNUmakefile:1.25 installers/windows/GNUmakefile:1.26
--- installers/windows/GNUmakefile:1.25 Sun Jul 24 06:21:44 2005
+++ installers/windows/GNUmakefile Sun Jul 24 08:26:12 2005
@@ -155,11 +155,15 @@
$(src-dir)/.%-stamp:
ifeq ($(short-circuit),)
- echo $(notdir $@)
name=$(shell expr $(notdir $@) : '.\(.*\)-stamp');\
ball=$(upload-dir)/$$name/$$name-*[0-9]-src.tar.bz2;\
+
cache=$(target-download-cache)/uploads/$$name/$$name-*[0-9]-src.tar.bz2;\
if ! test -e $$ball; then\
- $(APT) --root=$(target-root) --download source $$name ;\
+ if ! test -e $$cache; then\
+ $(APT) --root=$(target-root) --download source $$name;\
+ fi;\
+ mkdir -p $(upload-dir)/$$name;\
+ cp -pv $$cache $(upload-dir)/$$name;\
ball=$(upload-dir)/$$name/$$name-*[0-9]-src.tar.bz2;\
fi;\
tar -C $(src-dir) -jxf $$ball
@@ -223,9 +227,6 @@
###$(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
Index: installers/windows/bin/cyg-apt
diff -u installers/windows/bin/cyg-apt:1.10 installers/windows/bin/cyg-apt:1.11
--- installers/windows/bin/cyg-apt:1.10 Sat Jul 23 09:03:56 2005
+++ installers/windows/bin/cyg-apt Sun Jul 24 08:26:11 2005
@@ -863,9 +863,11 @@
download ()
for packagename in files[1:]:
do_unpack ()
- do_build ()
- if 1 or download_p:
+ if download_p:
sys.exit (0)
+ for packagename in files[1:]:
+ do_build ()
+ sys.exit (0)
def find ():
'''package containing file'''
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
