CVSROOT: /cvsroot/lilypond
Module name: installers
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/09/07 21:41:05
Modified files:
linux/autopackage/specs/pango: default.apspec.in
linux/autopackage/specs/guile: default.apspec.in
linux/autopackage/specs/glib: default.apspec.in
linux/autopackage/skeletons/@gtk.org/pango: skeleton.1
linux/autopackage: GNUmakefile ChangeLog
Added files:
linux/autopackage/specs/libtool: default.apspec.in
linux/autopackage/specs/gmp: default.apspec.in
linux/autopackage/skeletons/@gtk.org/glib: skeleton.1
linux/autopackage/skeletons/@gnu.org/libtool: skeleton.1
linux/autopackage/skeletons/@gnu.org/gmp: skeleton.1
Log message:
* specs/gmp/default.apspec.in:
* specs/glib/default.apspec.in:
* specs/libtool/default.apspec.in:
* skeletons/@gtk.org/glib/skeleton.1:
* skeletons/@gnu.org/libtool/skeleton.1:
* skeletons/@gnu.org/gmp/skeleton.1: New file.
* GNUmakefile: Add libtool, gmp.
* skeletons/@gtk.org/pango/skeleton.1: Update.
* specs/guile/default.apspec.in: Add gmp, libtool @REQUIREs.
* specs/pango/default.apspec.in: Add glib, libtool @REQUIREs.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/specs/pango/default.apspec.in.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/specs/libtool/default.apspec.in?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/specs/guile/default.apspec.in.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/specs/gmp/default.apspec.in?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/specs/glib/default.apspec.in.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/skeletons/@gtk.org/pango/skeleton.1.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/skeletons/@gtk.org/glib/skeleton.1?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/skeletons/@gnu.org/libtool/skeleton.1?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/skeletons/@gnu.org/gmp/skeleton.1?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/GNUmakefile.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/ChangeLog.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
Patches:
Index: installers/linux/autopackage/ChangeLog
diff -u installers/linux/autopackage/ChangeLog:1.23
installers/linux/autopackage/ChangeLog:1.24
--- installers/linux/autopackage/ChangeLog:1.23 Mon Aug 29 22:41:46 2005
+++ installers/linux/autopackage/ChangeLog Wed Sep 7 21:41:05 2005
@@ -1,3 +1,20 @@
+2005-09-07 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+
+ * specs/gmp/default.apspec.in:
+ * specs/glib/default.apspec.in:
+ * specs/libtool/default.apspec.in:
+ * skeletons/@gtk.org/glib/skeleton.1:
+ * skeletons/@gnu.org/libtool/skeleton.1:
+ * skeletons/@gnu.org/gmp/skeleton.1: New file.
+
+ * GNUmakefile: Add libtool, gmp.
+
+ * skeletons/@gtk.org/pango/skeleton.1: Update.
+
+ * specs/guile/default.apspec.in: Add gmp, libtool @REQUIREs.
+
+ * specs/pango/default.apspec.in: Add glib, libtool @REQUIREs.
+
2005-08-29 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
* GNUmakefile: disable libpng, the version warning is a warning
Index: installers/linux/autopackage/GNUmakefile
diff -u installers/linux/autopackage/GNUmakefile:1.22
installers/linux/autopackage/GNUmakefile:1.23
--- installers/linux/autopackage/GNUmakefile:1.22 Tue Aug 30 08:46:48 2005
+++ installers/linux/autopackage/GNUmakefile Wed Sep 7 21:41:05 2005
@@ -1,7 +1,7 @@
# -*-makefile-*-
ARCH = x86
-ASSUME_OLD = touch -d '1970-1-1 01:00:00' $@
+ASSUME_OLD = touch -d '1970-1-1 01:00:00'
# 1.0.3 has a regression leading to 1.0.4; with sudo installs unasked in
# /usr, clobbering system packages.
@@ -11,7 +11,7 @@
autopackage-gtk-support =
downloads/autopackage-gtk-$(autopackage-version).$(ARCH).package
-packages = pango glib ghostscript libpng guile lilypond
+packages = pango glib ghostscript libpng libtool gmp guile lilypond
# FIXME: autopackage only installs in ~/.local
#target-root = ./root
@@ -25,6 +25,8 @@
ghostscript-version = 8.15
libpng-version = 1.2.8
guile-version = 1.6.7.reloc
+gmp-version = 4.1.4
+libtool-version = 1.5.20
PATH := $(target-root)/bin:$(PATH)
LD_LIBRARY_PATH := $(target-root)/lib:$(LD_LIBRARY_PATH)
@@ -43,7 +45,8 @@
include $(LILYPOND_SRCDIR)/VERSION
-lilypond-version=$(MAJOR_VERSION).$(MINOR_VERSION).$(PATCH_LEVEL)
+lilypond-version=$(MAJOR_VERSION).$(MINOR_VERSION).$(PATCH_LEVEL)$(MY_PATCH_LEVEL:%=.%)
+
# FIXME: Dependencies of included packages, ie ghostscript.x86.package
# that requires libpng.x86.package, are not found if present in
@@ -70,7 +73,7 @@
rm -rf $(target-root)/etc/autopackage $(src-dir)/*/autopackage
$(upload-dir)/*package
clean-target:
- $(target-root)/bin/package remove lilypond pango glib ghostscript libpng
+ $(target-root)/bin/package remove lilypond guile pango glib ghostscript
rm -rf $(target-root)/etc/autopackage
.setup-stamp:
@@ -78,11 +81,12 @@
$(target-root)/.stamp: .setup-stamp
mkdir -p $(dir $@)
- $(ASSUME_OLD)
+ $(ASSUME_OLD) $@
$(target-root)/etc/autopackage/%.stamp: $(upload-dir)/%.$(ARCH).package
mkdir -p $(dir $@)
- $< -t -p$(root)
+ $< -t -p$(target-root)
+ find $(target-root)/include -exec $(ASSUME_OLD) '{}' ';'
touch $@
$(src-dir)/%/.stamp: $(target-root)/.stamp $(download-dir)/%.tar.gz
@@ -122,6 +126,10 @@
downloads/lilypond-$(lilypond-version).tar.gz:
$(LILYPOND_SRCDIR)/out/lilypond-$(lilypond-version).tar.gz
cp $< $@
+downloads/libtool-$(libtool-version).tar.gz:
+ wget -P downloads ftp://ftp.gnu.org/pub/gnu/libtool/$(notdir $@)
+downloads/gmp-$(gmp-version).tar.gz:
+ wget -P downloads ftp://ftp.gnu.org/pub/gnu/gmp/$(notdir $@)
downloads/glib-$(glib-version).tar.gz:
wget -P downloads ftp://ftp.gtk.org/pub/gtk/v2.6/$(notdir $@)
downloads/pango-$(pango-version).tar.gz:
@@ -147,7 +155,7 @@
$(upload-dir)/.stamp:
mkdir -p $(upload-dir)/
- $(ASSUME_OLD)
+ $(ASSUME_OLD) $@
# Dependencies
iv = $(i)-$($(i)-version)
@@ -169,6 +177,10 @@
# Installing a package depends on install root
$(foreach i, $(packages), $(eval $($(i)-install): $(target-root)/.stamp))
+# Most depend on libtool
+nolibtool = $(target) ghostscript gs libpng libtool lilypond
+$(foreach i, $(filter-out $(nolibtool),$(packages)), $(eval $($(i)-build):
$(libtool-install)))
+
# FULL Explicit dependencies -- from windows
#$(fontconfig-build): $(expat-install) $(freetype-install)
#$(freetype-build): $(zlib-install)
@@ -185,13 +197,15 @@
# @echo done
# PARTLY Explicit dependencies -- for autopackage
-$(guile-build): $(gettext-install)
+$(guile-build): $(gettext-install) $(gmp-install)
$(pango-build): $(glib-install)
#$(ghostscript-build): $(libpng-install)
$(lilypond-build): $(pango-install) $(ghostscript-install) $(guile-install)
# kugh
#ghostscript-dependencies = libpng
-pango-dependencies = glib
+pango-dependencies = glib libtool
lilypond-dependencies = pango ghostscript guile
-
+guile-dependencies = gmp libtool
+gmp-dependencies = libtool
+glib-dependencies = libtool
Index: installers/linux/autopackage/skeletons/@gtk.org/pango/skeleton.1
diff -u installers/linux/autopackage/skeletons/@gtk.org/pango/skeleton.1:1.1
installers/linux/autopackage/skeletons/@gtk.org/pango/skeleton.1:1.2
--- installers/linux/autopackage/skeletons/@gtk.org/pango/skeleton.1:1.1
Wed Jun 1 21:30:36 2005
+++ installers/linux/autopackage/skeletons/@gtk.org/pango/skeleton.1 Wed Sep
7 21:41:05 2005
@@ -11,11 +11,13 @@
Pango.
[Test]
-testForLib libpango-1.0.so.0 && INTERFACE_VERSIONS=" 1.0"
-pango1versions=`testForLib -v libpango-1.0.so.0`
-for v in $pango1versions; do
+name=pango
+major=1
+testForLib lib$name-$major.0.so.0 && INTERFACE_VERSIONS=" $major.0"
+libversions=`testForLib -v lib$name-$major.0.so.0`
+for v in $libversions; do
minor=$( IFS=.; v=( $v ); echo ${v[1]} )
minor=$[ $minor / 100 ]
- INTERFACE_VERSIONS="1.$minor $INTERFACE_VERSIONS"
+ INTERFACE_VERSIONS="$major.$minor $INTERFACE_VERSIONS"
done
-SOFTWARE_VERSIONS="$INTERFACE_VERSIONS" # this time......
+SOFTWARE_VERSIONS="$INTERFACE_VERSIONS"
Index: installers/linux/autopackage/specs/glib/default.apspec.in
diff -u installers/linux/autopackage/specs/glib/default.apspec.in:1.5
installers/linux/autopackage/specs/glib/default.apspec.in:1.6
--- installers/linux/autopackage/specs/glib/default.apspec.in:1.5 Mon Aug
29 11:47:57 2005
+++ installers/linux/autopackage/specs/glib/default.apspec.in Wed Sep 7
21:41:05 2005
@@ -53,7 +53,7 @@
echo '*' | import
[Prepare]
-# require "@gtk.org/glib" 1
+require @gnu.org/libtool 3
[Install]
[ -d etc ] && copyFiles etc/* "$PREFIX/etc"
Index: installers/linux/autopackage/specs/guile/default.apspec.in
diff -u installers/linux/autopackage/specs/guile/default.apspec.in:1.4
installers/linux/autopackage/specs/guile/default.apspec.in:1.5
--- installers/linux/autopackage/specs/guile/default.apspec.in:1.4 Tue Aug
30 08:46:47 2005
+++ installers/linux/autopackage/specs/guile/default.apspec.in Wed Sep 7
21:41:05 2005
@@ -70,8 +70,8 @@
echo '*' | import
[Prepare]
-# let's hope everyone has got libgmp.so.3
-# require "@gnu.org/gmp" 1
+require @gnu.org/gmp 3
+require @gnu.org/libtool 3
[Install]
safeSed bin/guile-config "s@/usr/[EMAIL PROTECTED]@g"
Index: installers/linux/autopackage/specs/pango/default.apspec.in
diff -u installers/linux/autopackage/specs/pango/default.apspec.in:1.8
installers/linux/autopackage/specs/pango/default.apspec.in:1.9
--- installers/linux/autopackage/specs/pango/default.apspec.in:1.8 Mon Aug
22 23:12:58 2005
+++ installers/linux/autopackage/specs/pango/default.apspec.in Wed Sep 7
21:41:05 2005
@@ -63,7 +63,8 @@
echo '*' | import
[Prepare]
-require "@gtk.org/glib" 1
+require @gtk.org/glib 2
+require @gnu.org/libtool 3
[Install]
[ -d etc ] && copyFiles etc/* "$PREFIX/etc"
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
