CVSROOT: /cvsroot/lilypond
Module name: installers
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/10/11 09:58:58
Modified files:
windows : ChangeLog GNUmakefile README
Added files:
windows : update-version.sh
Log message:
* GNUmakefile: remove ifdef(ugh) section.
* update-version.sh: new file.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/update-version.sh?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/ChangeLog.diff?tr1=1.42&tr2=1.43&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/GNUmakefile.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/README.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
Patches:
Index: installers/windows/ChangeLog
diff -u installers/windows/ChangeLog:1.42 installers/windows/ChangeLog:1.43
--- installers/windows/ChangeLog:1.42 Mon Oct 10 18:36:56 2005
+++ installers/windows/ChangeLog Tue Oct 11 09:58:58 2005
@@ -1,3 +1,9 @@
+2005-10-11 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * GNUmakefile: remove ifdef(ugh) section.
+
+ * update-version.sh: new file.
+
2005-10-10 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
* bin/cyg-apt (download): Remove cached file on md5 clash.
@@ -28,6 +34,8 @@
* mknetrel/doc: gzip info files.
2005-10-07 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * GNUmakefile: include local.make
* bin/mknetrel (AM_MAKEFLAGS): deal with different File versions.
Index: installers/windows/GNUmakefile
diff -u installers/windows/GNUmakefile:1.32 installers/windows/GNUmakefile:1.33
--- installers/windows/GNUmakefile:1.32 Fri Oct 7 13:34:59 2005
+++ installers/windows/GNUmakefile Tue Oct 11 09:58:58 2005
@@ -178,20 +178,6 @@
## HUH?
$(MAKE) short-circuit= upset
-# kuch
-ifneq ($(ugh),)
-LILYPOND_SRCDIR = $(HOME)/cvs/savannah/lilypond/lilypond
-include $(LILYPOND_SRCDIR)/VERSION
-lilypond-version=$(MAJOR_VERSION).$(MINOR_VERSION).$(PATCH_LEVEL)
-lily-ball = $(LILYPOND_SRCDIR)/out/lilypond-$(lilypond-version).tar.gz
-$(lily-ball):
- cd $(LILYPOND_SRCDIR) && make dist
-$(src-dir)/.lilypond-stamp: $(lily-ball)
- tar -C $(src-dir) -zxf $(lily-ball)
- mv $(src-dir)/lilypond-$(lilypond-version)
$(src-dir)/lilypond-$(lilypond-version)-1
- $(ASSUME_OLD)
-endif
-
DATE = $(shell date '+%d%b%y' | tr '[a-z]' '[A-Z]')
sed-atvariables = -e '\#' $(foreach i, $(ATVARIABLES), -e '[EMAIL
PROTECTED]@!$($i)!g')
LILYPOND_VERSION_BUILD = $(shell $(APT) --root=$(nsis-root) version lilypond)
Index: installers/windows/README
diff -u installers/windows/README:1.7 installers/windows/README:1.8
--- installers/windows/README:1.7 Fri Oct 7 12:01:45 2005
+++ installers/windows/README Tue Oct 11 09:58:58 2005
@@ -1,6 +1,8 @@
INSTALLER FOR MICROSOFT WINDOWS
*******************************
+
+
USAGE
make
@@ -12,8 +14,24 @@
to fetch binaries, setup ./mingw cross build root
+UPGRADING
+
+Run
+
+ update-version.sh
+
+
+
+
PREREQUISITES
+* edit local.make, containing the CVS dir to build for.
+
+ LILYPOND_SRCDIR=${HOME}/vc/savannah/lily/lilypond
+
+(This file is sourced by both Make and SH. Note the absence of spaces
+and the ${} )
+
* mingw cross development suite (binutils, crosscompiler, runtime)
* nsis installer (nsis.sf.net)
@@ -39,8 +57,6 @@
-
-
The windows packaging uses mknetrel, redistributed here. Original
CVS at
@@ -72,6 +88,9 @@
http://mirrors.rcn.net/pub/sourceware/cygwin/release/libtool/libtool-devel/libtool-devel-1.5.10-1-src.tar.bz2
http://mirrors.rcn.net/pub/sourceware/cygwin/release/zlib/zlib-1.2.2-1-src.tar.bz2
http://www.fontconfig.org/release/fontconfig-2.3.2.tar.gz
+
+
+
UPGRADING
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
