CVSROOT: /cvsroot/lilypond
Module name: installers
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/10/14 08:42:52
Modified files:
windows/mknetrel: doc
windows/extra : tetex-texmf tetex-bin lilypond gs ghostscript
windows : GNUmakefile
Log message:
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/mknetrel/doc.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/extra/tetex-texmf.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/extra/tetex-bin.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/extra/lilypond.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/extra/gs.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/extra/ghostscript.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/GNUmakefile.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
Patches:
Index: installers/windows/GNUmakefile
diff -u installers/windows/GNUmakefile:1.33 installers/windows/GNUmakefile:1.34
--- installers/windows/GNUmakefile:1.33 Tue Oct 11 09:58:58 2005
+++ installers/windows/GNUmakefile Fri Oct 14 08:42:52 2005
@@ -28,6 +28,9 @@
lilypad\
lilypond\
+regex-version = 2.3.90-1
+lilypad-version = 0.0.7-1
+
bin-dir = $(depth)/bin
build-dir = $(depth)/$(target)
src-dir = $(build-dir)/src
@@ -35,6 +38,8 @@
ROOT = root
nsis-root = $(shell cd $(depth)/nsis && pwd)/$(ROOT)
upload-dir = $(build-dir)/uploads
+pub-dir = /home/ftp/pub/$(target)
+lily-dir = $(HOME)/cvs/savannah/lilypond/lilypond
MKNETREL = $(depth)/bin/mknetrel
MKNETREL_FLAGS = -b
@@ -52,11 +57,6 @@
target-packages = $(packages:%=$(target-root)/etc/setup/%.lst.gz)
-ifneq ($(short-circuit),)
-target-packages :=
-upload-dir := $(target-download-cache)
-endif
-
escaped-upload-dir := $(subst %,\\%, $(upload-dir))
installer = $(build-dir)/setup.exe
@@ -83,19 +83,10 @@
$(bin-dir)/min-apt: $(bin-dir)/cyg-apt
ln -s $< $@
-
-# Refreshing setup.ini only works when the local uploads dir is
-# complete otherwise setup.ini gets overwritten with a partial package
-# list
-complete = $(wildcard $(upload-dir)/lilypond/lilypond*-src.tar.bz2)
upset:
-ifneq ($(complete),)
cd $(dir $(upload-dir)) && $(UPSET) --nosetup-version uploads >
uploads/../setup.ini
$(APT) --root=$(target-root) update
$(APT) --root=$(nsis-root) update
-else
- [ -w $(target-root)/etc/setup/setup.ini ] && touch
$(target-root)/etc/setup/setup.ini || :
-endif
all-bin-balls = $$(find $(upload-dir)/$* -name '*bz2'\
| grep -v '\-src'\
@@ -103,8 +94,10 @@
.setup-stamp:
ln -sf cyg-apt $(bin-dir)/min-apt
- mkdir -p $(upload-dir) $(src-dir) $(build-dir)/build
- $(MAKE) short-circuit= upset
+# mkdir -p $(upload-dir) $(src-dir) $(build-dir)/build
+ mkdir -p $(target-dir) $(src-dir) $(build-dir)/build
+ ln -sf $(pub-dir)/uploads $(upload-dir)
+ $(MAKE) upset
$(ASSUME_OLD)
$(target-root)/.stamp: .setup-stamp
@@ -125,13 +118,6 @@
-$(APT) --root=$(nsis-root) remove $(all-bin-balls)
$(APT) --root=$(nsis-root) $(APT_INSTALL_FLAGS) install $*
-# setup build tree with binary packages from lilypond.org.
-short-circuit: $(target-root)/.stamp
- $(MAKE) short-circuit= upset
- $(APT) --root=$(target-root) install $$($(APT) --root=$(target-root)
search | awk '{ print $$1 }')
- $(MAKE) short-circuit=1 all
- touch $(target-root)/etc/setup/*.lst.gz $(upload-dir)/*/setup.hint
-
$(installer): nsis/lilypond.nsi nsis/substitute.nsh
$(MAKENSIS) $<
mv nsis/$(notdir $@) $@
@@ -154,7 +140,6 @@
endif
$(src-dir)/.%-stamp: $(target-root)/.stamp
-ifeq ($(short-circuit),)
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;\
@@ -167,16 +152,26 @@
ball=$(upload-dir)/$$name/$$name-*[0-9]-src.tar.bz2;\
fi;\
tar -C $(src-dir) -jxf $$ball
-endif
$(ASSUME_OLD)
$(escaped-upload-dir)/%/setup.hint: extra/%
-ifeq ($(short-circuit),)
$(MKNETREL) $(MKNETREL_FLAGS) $*
-endif
touch $@
-## HUH?
- $(MAKE) short-circuit= upset
+ $(MAKE) upset
+
+include $(lily-dir)/VERSION
+lilypond-version=$(MAJOR_VERSION).$(MINOR_VERSION).$(PATCH_LEVEL)
+
+$(src-dir)/.lilypond-stamp:
+ ln -sf $(lily-dir) $(src-dir)/lilypond-$(LILYPOND_VERSION_BUILD)
+ $(ASSUME_OLD)
+
+$(src-dir)/.regex:
+ ln -sf regex $(src-dir)/regex-$(regex-version)
+ $(ASSUME_OLD)
+$(src-dir)/.lilypad:
+ ln -sf regex $(src-dir)/lilypad-$(lilypad-version)
+ $(ASSUME_OLD)
DATE = $(shell date '+%d%b%y' | tr '[a-z]' '[A-Z]')
sed-atvariables = -e '\#' $(foreach i, $(ATVARIABLES), -e '[EMAIL
PROTECTED]@!$($i)!g')
Index: installers/windows/extra/ghostscript
diff -u installers/windows/extra/ghostscript:1.5
installers/windows/extra/ghostscript:1.6
--- installers/windows/extra/ghostscript:1.5 Thu May 26 10:29:54 2005
+++ installers/windows/extra/ghostscript Fri Oct 14 08:42:52 2005
@@ -209,7 +209,7 @@
mv $inst/$prefix/$base-$ver/fonts $inst/$GS_PREFIX
mkdir -p $inst/$prefix/share/doc
- mv $inst/$prefix/$base-$ver/doc $inst/$prefix/share/doc/$base-$version
+ mv $inst/$prefix/$base-$ver/doc $inst/$packagedocdir
}
fonts_split () {
@@ -222,7 +222,7 @@
doc_split () {
v=$(expr "$ver" : "\(.*\)-[0-9]*")
mkdir -p ./$prefix/share/doc
- mv $inst/$prefix/share/doc/$base-$ver ./$prefix/share/doc
- mv $inst/$prefix/examples ./$prefix/share/doc/$base-$ver
+ mv $inst/$packagedocdir ./$prefix/share/doc
+ mv $inst/$prefix/examples ./$packagedocdir
:
}
Index: installers/windows/extra/gs
diff -u installers/windows/extra/gs:1.7 installers/windows/extra/gs:1.8
--- installers/windows/extra/gs:1.7 Fri Jun 3 12:13:07 2005
+++ installers/windows/extra/gs Fri Oct 14 08:42:52 2005
@@ -25,8 +25,8 @@
all: default
# old
prefix-install:
- mkdir -p $inst/$prefix/$base-$ver
- tar -C $src -cf- --exclude=configure --exclude=config.h.in
--exclude=mingw . | tar -C $inst/$prefix/$base-$ver -xvf-
+ mkdir -p $inst/$packagedocdir
+ tar -C $src -cf- --exclude=configure --exclude=config.h.in
--exclude=mingw . | tar -C $inst/$packagedocdir -xvf-
fc-cache $inst/$prefix/$base-$ver/fonts
install:
mkdir -p $inst/$prefix
@@ -34,9 +34,9 @@
mkdir -p $inst/$GS_PREFIX
tar -C $src -cf- fonts lib Resource | tar -C $inst/$GS_PREFIX -xvf-
fc-cache $inst/$GS_PREFIX/fonts
- mkdir -p $inst/$prefix/share/doc/gs-$ver/html
- tar -C $src/doc -cf- --exclude='[A-Z]*[A-Z]' . | tar -C
$inst/$prefix/share/doc/gs-$ver/html -xvf-
- tar -C $src/doc -cf- --exclude='*.htm*' . | tar -C
$inst/$prefix/share/doc/gs-$ver -xvf-
+ mkdir -p $inst/$packagedocdir/html
+ tar -C $src/doc -cf- --exclude='[A-Z]*[A-Z]' . | tar -C
$inst/$packagedocdir/html -xvf-
+ tar -C $src/doc -cf- --exclude='*.htm*' . | tar -C
$inst/$packagedocdir/html -xvf-
EOF2
EOF
chmod +x configure
@@ -65,7 +65,7 @@
doc_split () {
v=$(expr "$ver" : "\(.*\)-[0-9]*")
mkdir -p ./$prefix/share/doc
- mv $inst/$prefix/share/doc/$base-$ver ./$prefix/share/doc
+ mv $inst/$packagedocdir ./$prefix/share/doc
}
ncsb_split () {
Index: installers/windows/extra/lilypond
diff -u installers/windows/extra/lilypond:1.13
installers/windows/extra/lilypond:1.14
--- installers/windows/extra/lilypond:1.13 Sun Oct 2 15:26:13 2005
+++ installers/windows/extra/lilypond Fri Oct 14 08:42:52 2005
@@ -11,6 +11,10 @@
save_PATH="$PATH"
+needinstall_info () {
+ iscygwin
+}
+
# copy and include extra mknetrel stuff
. $src/$cygwin/mknetrel.extras || . $mknetrel/extras
@@ -207,7 +211,13 @@
install -d -m755 $inst-doc/$infodir/lilypond
if doc; then
- cd $inst-doc/$infodir/lilypond && ln -sf
../../doc/$base-$ver/Documentation/user/out-www/*png .
+ cd $inst-doc/$infodir/lilypond && ln -sf
../../doc/$docdirname/Documentation/user/out-www/*png .
+ if ! iscygwin; then
+ install -d -m755 $inst/$infodir/lilypond
+ install-info --info-dir=$inst/$infodir/lilypond
$build/Documentation/user/out-www/lilypond.info
+ install-info --info-dir=$inst/$infodir/lilypond
$build/Documentation/user/out-www/lilypond-internals.info
+ install-info --info-dir=$inst/$infodir/lilypond
$build/Documentation/user/out-www/music-glossary.info
+ fi
fi
}
Index: installers/windows/extra/tetex-bin
diff -u installers/windows/extra/tetex-bin:1.2
installers/windows/extra/tetex-bin:1.3
--- installers/windows/extra/tetex-bin:1.2 Mon May 16 20:03:40 2005
+++ installers/windows/extra/tetex-bin Fri Oct 14 08:42:52 2005
@@ -200,9 +200,10 @@
install -d -m755 $inst/$sysconfdir/profile.d
install -m644 cygwin/tetex-profile.sh $inst/$sysconfdir/profile.d
+ v=$(expr "$ver" : "\(.*\)-[0-9]*")
for ibase in $base; do
#packagedocdir=$docdir/$base-$ver
- idocdir=$docdir/$ibase-$ver
+ idocdir=$docdir/$ibase
iinst=$inst
[ $ibase != $base ] && iinst=$iinst-$ibase
Index: installers/windows/extra/tetex-texmf
diff -u installers/windows/extra/tetex-texmf:1.2
installers/windows/extra/tetex-texmf:1.3
--- installers/windows/extra/tetex-texmf:1.2 Mon May 16 20:03:40 2005
+++ installers/windows/extra/tetex-texmf Fri Oct 14 08:42:52 2005
@@ -78,9 +78,10 @@
cd $src || exit 1
+ v=$(expr "$ver" : "\(.*\)-[0-9]*")
for ibase in $base tetex; do
#packagedocdir=$docdir/$base-$ver
- idocdir=$docdir/$ibase-$ver
+ idocdir=$docdir/$ibase
iinst=$inst
[ $ibase != $base ] && iinst=$iinst-$ibase
@@ -110,7 +111,7 @@
# tetex-texmf-20020530-3-src.tar.bz2 would be a fine name
# but setup.exe cannot handle source-only packages
# mv $uploads/$base-$ver-src.tar.bz2
$uploads/tetex-base/tetex-base-$ver.tar.bz2
- mv $uploads/$base-$ver-src.tar.bz2 $uploads/tetex-$ver-src.tar.bz2
+ mv $uploads/$basex-$ver-src.tar.bz2 $uploads/tetex-$ver-src.tar.bz2
for i in $sub_packages; do
subname=$(${i}_name)
Index: installers/windows/mknetrel/doc
diff -u installers/windows/mknetrel/doc:1.2 installers/windows/mknetrel/doc:1.3
--- installers/windows/mknetrel/doc:1.2 Fri Oct 7 13:34:59 2005
+++ installers/windows/mknetrel/doc Fri Oct 14 08:42:52 2005
@@ -10,7 +10,10 @@
cygdocdir=$docdir/$Cygwin
infodir=$docprefix/info
mandir=$docprefix/man
-packagedocdir=$docdir/$base
+v=$(expr "$ver" : "\(.*\)-[0-9]*")
+#docdirname=$base-$v
+docdirname=$base
+packagedocdir=$docdir/$docdirname
fixdoc () {
#
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
