CVSROOT: /cvsroot/lilypond
Module name: installers
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/08/22 23:12:58
Modified files:
linux/autopackage/specs/pango: default.apspec.in
linux/autopackage/specs/lilypond: default.apspec.in
linux/autopackage/specs/libpng: default.apspec.in
linux/autopackage/specs/glib: default.apspec.in
linux/autopackage: GNUmakefile ChangeLog
Added files:
linux/autopackage/specs/guile: default.apspec.in
linux/autopackage/skeletons/@gnu.org/guile: skeleton.1
linux/autopackage: .cvsignore
Log message:
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/specs/pango/default.apspec.in.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/specs/lilypond/default.apspec.in.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/specs/libpng/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/guile/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.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/skeletons/@gnu.org/guile/skeleton.1?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/.cvsignore?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/GNUmakefile.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/ChangeLog.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
Patches:
Index: installers/linux/autopackage/ChangeLog
diff -u installers/linux/autopackage/ChangeLog:1.18
installers/linux/autopackage/ChangeLog:1.19
--- installers/linux/autopackage/ChangeLog:1.18 Sat Aug 20 08:19:59 2005
+++ installers/linux/autopackage/ChangeLog Mon Aug 22 23:12:58 2005
@@ -1,3 +1,9 @@
+2005-08-22 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+
+ * GNUmakefile: Rewrite.
+
+ * skeletons/@gnu.org/guile/skeleton.1: New file.
+
2005-08-20 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
* specs/lilypond/default.apspec.in (AutopackageTarget):
Index: installers/linux/autopackage/GNUmakefile
diff -u installers/linux/autopackage/GNUmakefile:1.16
installers/linux/autopackage/GNUmakefile:1.17
--- installers/linux/autopackage/GNUmakefile:1.16 Sat Aug 20 08:19:59 2005
+++ installers/linux/autopackage/GNUmakefile Mon Aug 22 23:12:58 2005
@@ -1,3 +1,4 @@
+# -*-makefile-*-
ARCH = x86
ASSUME_OLD = touch -d '1970-1-1 01:00:00' $@
@@ -8,12 +9,31 @@
# are installed. Be sure to remove all traces of previous installs.
autopackage-version = 1.0.6
+autopackage-gtk-support =
downloads/autopackage-gtk-$(autopackage-version).$(ARCH).package
+
+packages = pango glib ghostscript libpng guile lilypond
+
+# FIXME: autopackage only installs in ~/.local
+#target-root = ./root
+target-root = $(HOME)/.local
+src-dir = ./src
+upload-dir = ./uploads
+download-dir = ./downloads
+
pango-version = 1.8.1
glib-version = 2.6.4
ghostscript-version = 8.15
libpng-version = 1.2.8
+###guile-version = 1.7.2.reloc
+guile-version = 1.6.7
-packages = pango glib ghostscript libpng lilypond
+PATH := $(target-root)/bin:$(PATH)
+PKG_CONFIG_PATH := $(target-root)/lib/pkgconfig:$(PKG_CONFIG_PATH)
+##GUILE_LOAD_PATH := $(target-root)/share/guile/1.7:$(GUILE_LOAD_PATH)
+GUILE_LOAD_PATH := $(target-root)/share/guile/1.6:$(GUILE_LOAD_PATH)
+export PATH
+export PKG_CONFIG_PATH
+export GUILE_LOAD_PATH
LILYPOND_SRCDIR = $(HOME)/cvs/savannah/lilypond/lilypond
@@ -23,7 +43,6 @@
include $(LILYPOND_SRCDIR)/VERSION
-
lilypond-version=$(MAJOR_VERSION).$(MINOR_VERSION).$(PATCH_LEVEL)
# FIXME: Dependencies of included packages, ie ghostscript.x86.package
@@ -35,34 +54,56 @@
autopackage-support = downloads/autopackage.tar.bz2
-autopackage-gtk-support =
downloads/autopackage-gtk-$(autopackage-version).$(ARCH).package
+.PHONY: all clean nsis-root real-clean target-root upset $(packages)
+.PRECIOUS: $(packagesv:%=$(src-dir)/%/.stamp)
+.PRECIOUS: $(packagesv:%=$(src-dir)/%/autopackage/default.apspec)
+.PRECIOUS: $(packagesv:%=$(target-root)/etc/autopackage/%.stamp)
+.PRECIOUS: $(packagesv:%=$(upload-dir)/%.$(ARCH).package)
-ghostscript-dependencies = \
- libpng
+default: all
-pango-dependencies = \
- glib
+all: lilypond lilypond-upgrade
-lilypond-dependencies = \
- pango\
- ghostscript\
+.setup-stamp:
+ mkdir -p $(upload-dir) $(src-dir)
+$(target-root)/.stamp: .setup-stamp
+ mkdir -p $(dir $@)
+ $(ASSUME_OLD)
-# TODO
-# uploads/python-
-# uploads/freetype-
-# uploads/libstdc++ 3
-# uploads/zlib
+$(target-root)/etc/autopackage/%.stamp: $(upload-dir)/%.$(ARCH).package
+ mkdir -p $(dir $@)
+ $< -t -p$(root)
+ touch $@
-all: default
+$(src-dir)/%/.stamp: $(target-root)/.stamp $(download-dir)/%.tar.gz
+ name=$(shell basename $(shell dirname $@));\
+ ball=$(download-dir)/$$name.tar.gz;\
+ tar -C $(src-dir) -zxf $$ball
+ $(ASSUME_OLD)
-$(foreach i, $(packages), $(eval $(i): $($(i)-dependencies)))
-$(foreach i, $(packages), $(eval $(i):
uploads/$(i)-$($(i)-version).$(ARCH).package))
-$(foreach i, $(packages), $(eval $(i)-upgrade:
uploads/$(i)-$($(i)-version)-upgrade.$(ARCH).package))
+src/%/autopackage/default.apspec: specs/%/default.apspec.in
+ rm -rf $(dir $@)
+ mkdir -p $(dir $@)/packages
+ tar -C $(dir $<) -cf- . | tar -C $(dir $@) -xf-
+ cp -pv $(autopackage-support) $(dir $@)/packages
+ cp -pv $(autopackage-gtk-support) $(dir $@)/packages
+ $(foreach i, $($(shell echo $@ | sed -e '[EMAIL PROTECTED]/@@' -e
's/-.*//')-dependencies), cp $(upload-dir)/$(i)-$($(i)-version).$(ARCH).package
$(dir $@)/packages &&) true
+ test -e $(shell dirname $(shell dirname $@))/config.status || (cd
$(shell dirname $(shell dirname $@)) && ./configure)
-$(foreach i, $(packages), $(eval .PRECIOUS: specs/$(i)/default.apspec.in
specs/$(i)-$($(i)-version)/default.apspec.in))
+dirdir = $(dir $(patsubst %/, %, $(dir $1)))
+$(upload-dir)/%.$(ARCH).package: src/%/autopackage/default.apspec
+ # FIXME: makeinstaller [re]generates default.apsec,
+ # but only if config.status exists
+ #touch $(dir $<)config.status
+ #touch $(dir $<)autopackage/default.apspec
+ cd $(call dirdir, $<) && makeinstaller $(MAKEINSTALLER_FLAGS)
+ mv $(call dirdir, $<)/$(notdir $@) $@
-default: lilypond lilypond-upgrade
+$(upload-dir)/%-upgrade.$(ARCH).package: src/%/autopackage/default.apspec
+ rm -rf $(dir $<)/packages
+ cd $(call dirdir, $<) && makeinstaller $(MAKEINSTALLER_FLAGS) -mc
+ mv $(call dirdir, $<)/$(notdir $@) $@
downloads/lilypond-$(lilypond-version).tar.gz:
$(LILYPOND_SRCDIR)/out/lilypond-$(lilypond-version).tar.gz
cp $< $@
@@ -84,82 +125,68 @@
wget -P downloads
http://ftp.sunsite.dk/projects/autopackage/$(autopackage-version)/$(notdir $@)
$(autopackage-gtk-support):
wget -P downloads
http://ftp.sunsite.dk/projects/autopackage/$(autopackage-version)/$(notdir $@)
+downloads/guile-$(guile-version).tar.gz:
+ wget -P downloads http://lilypond.org/downloads/guile/$(notdir $@)
$(LILYPOND_SRCDIR)/out/lilypond-$(lilypond-version).tar.gz:
cd $(LILYPOND_SRCDIR) && make dist
-uploads/.stamp:
- mkdir -p uploads/
+$(upload-dir)/.stamp:
+ mkdir -p $(upload-dir)/
$(ASSUME_OLD)
-uploads/%.$(ARCH).package: src/%/.stamp src/%/autopackage/default.apspec.in
src/%/autopackage/packages/.stamp uploads/.stamp
- # FIXME: makeinstaller [re]generates default.apsec,
- # but only if config.status exists
- #touch $(dir $<)config.status
- #touch $(dir $<)autopackage/default.apspec
- test -e $(dir $<)/autopackage/config.status || (cd $(dir $<) &&
./configure)
- test -e $(dir $<)/autopackage/packages/autopackage.tar.bz2 || rm -rf
src/$(dir $<)/autopackage/packages
- cd $(dir $<) && makeinstaller $(MAKEINSTALLER_FLAGS)
- mv $(dir $<)$(notdir $@) $@
-
-uploads/%-upgrade.$(ARCH).package: % src/%/autopackage/default.apspec.in
src/%/autopackage/packages/.upgrade-stamp
- # FIXME: makeinstaller [re]generates default.apsec,
- # but only if config.status exists
- #touch src/$<-$($<-version)/config.status
- #touch src/$<-($<-version)/autopackage/default.apspec
- test -e src/$<-$($<-version)/config.status || (cd src/$<-$($<-version)
&& ./configure)
- test -e src/$<-$($<-version)/autopackage/packages/autopackage.tar.bz2
|| rm -rf src/$<-$($<-version)/autopackage/packages
- cd src/$<-$($<-version) && makeinstaller $(MAKEINSTALLER_FLAGS) -mc
- mv src/$<-$($<-version)/$<-$($<-version).$(ARCH).x86.package $@
-
-src/%/.stamp: downloads/%.tar.gz
- mkdir -p src
- tar -C src -xzf $<
- touch $@
-
-src/ghostscript-8.15/.stamp: downloads/ghostscript-8.15.tar.gz
- mkdir -p src
- tar -C src -xzf $<
- cp downloads/ghostscript-fonts-std-8.11.tar.gz $(dir $@)
- touch $@
+# Dependencies
+iv = $(i)-$($(i)-version)
+$(foreach i, $(packages), $(eval $(i)-build =
$(upload-dir)/$(iv).$(ARCH).package))
+$(foreach i, $(packages), $(eval $(i)-install =
$(target-root)/etc/autopackage/$(iv).stamp))
+
+# Provide handy build+install targets for each package.
+$(foreach i, $(packages), $(eval $(i)-build: $($(i)-build)))
+$(foreach i, $(packages), $(eval $(i)-install: $($(i)-install)))
+
+# All packages depend on their installation in target
+$(foreach i, $(packages), $(eval $(i): $($(i)-install)))
+
+# Building a package depends on an unpacked source tree
+$(foreach i, $(packages), $(eval $($(i)-build): $(src-dir)/$(iv)/.stamp))
+
+# Installing a package depends on install root
+$(foreach i, $(packages), $(eval $($(i)-install): $(target-root)/.stamp))
+
+# FULL Explicit dependencies -- from windows
+#$(fontconfig-build): $(expat-install) $(freetype-install)
+#$(freetype-build): $(zlib-install)
+## gettext can build without libiconv, but it must not be there
+## at configure time
+## $(gettext-build): $(libiconv-install)
+#$(glib-build): $(libiconv-install) $(gettext-install)
+#$(guile-build): $(gettext-install) $(gmp-install) $(regex-install)
+#$(libiconv-build): $(gettext-install)
+#$(lilypond-build): $(gettext-install) $(guile-install) $(pango-install)
+#$(pango-build): $(fontconfig-install) $(freetype-install) $(glib-install)
$(libiconv-install)
+#$(ghostscript-build): $(jpeg-install) $(libpng-install) $(zlib-install)
+#gs-ncsb: $(gs-build)
+# @echo done
+
+# PARTLY Explicit dependencies -- for autopackage
+$(guile-build): $(gettext-install)
+$(pango-build): $(glib-install)
+$(ghostscript-build): $(libpng-install)
+$(lilypond-build): $(pango-install) $(ghostscript-install) $(guile-install)
+
+# kugh
+ghostscript-dependencies = libpng
+pango-dependencies = glib
+lilypond-dependencies = pango ghostscript guile
-specs/%/default.apspec.in:
- test -l specs/$(shell basename $(shell dirname $@)) || cd specs && ln
-sf $(shell echo $(shell basename $(shell dirname $@)) | sed -e s'/-.*//')
$(shell basename $(shell dirname $@))
-
-src/%/autopackage/default.apspec.in: specs/%/default.apspec.in
- rm -rf $(dir $@)
- mkdir -p $(dir $@)
- tar -C $(dir $<) -cf- . | tar -C $(dir $@) -xf-
-
-src/%/autopackage/packages/.stamp: src/%/.stamp $(autopackage-support)
$(autopackage-gtk-support)
- rm -rf $(dir $@)
+# do not install lily
+$(target-root)/etc/autopackage/lilypond-$(lilypond-version).stamp:
mkdir -p $(dir $@)
- $(foreach i, $($(shell echo $< | sed -e '[EMAIL PROTECTED]/@@' -e
's/-.*//')-dependencies), cp uploads/$(i)-$($(i)-version).$(ARCH).package $(dir
$@) &&) true
-# Dependencies get fat when including autopackage everywhere.
-# FIXME: autopackage support is required when including a package
- test -d $(dir $@) && cp -pv $(autopackage-support) $(dir $@)
- test -d $(dir $@) && cp -pv $(autopackage-gtk-support) $(dir $@)
+ echo $< -t -p$(root)
touch $@
-
-src/%/autopackage/packages/.upgrade-stamp: uploads/%.$(ARCH).package
$(autopackage-support)
- rm -rf $(dir $@)
+$(target-root)/etc/autopackage/lilypond-$(lilypond-version)-upgrade.stamp:
mkdir -p $(dir $@)
- cp -pv $(autopackage-support) $(dir $@)
- cp -pv $(autopackage-gtk-support) $(dir $@)
+ echo $< -t -p$(root)
touch $@
-uploads/lilypond-$(lilypond-version).$(ARCH).package:
src/lilypond-$(lilypond-version)/autopackage/default.apspec.in
src/lilypond-$(lilypond-version)/autopackage/packages/.stamp
- #touch src/lilypond-$(lilypond-version)/config.status
- #touch src/lilypond-$(lilypond-version)/autopackage/default.apspec
- test -e src/lilypond-$(lilypond-version)/config.status || (cd
src/lilypond-$(lilypond-version) && ./configure)
- cp -pv $(autopackage-support)
src/lilypond-$(lilypond-version)/autopackage/packages
- cp -pv $(autopackage-gtk-support)
src/lilypond-$(lilypond-version)/autopackage/packages
- cd src/lilypond-$(lilypond-version) && makeinstaller
$(MAKEINSTALLER_FLAGS)
- mv
src/lilypond-$(lilypond-version)/lilypond-$(lilypond-version).$(ARCH).package $@
-
-uploads/lilypond-$(lilypond-version)-upgrade.$(ARCH).package: lilypond
src/lilypond-$(lilypond-version)/autopackage/default.apspec.in
src/lilypond-$(lilypond-version)/autopackage/packages/.upgrade-stamp
- #touch src/lilypond-$(lilypond-version)/config.status
- #touch src/lilypond-$(lilypond-version)/autopackage/default.apspec
- test -e src/lilypond-$(lilypond-version)/config.status || (cd
src/lilypond-$(lilypond-version) && ./configure)
- cd src/lilypond-$(lilypond-version) && makeinstaller
$(MAKEINSTALLER_FLAGS) -mc
- mv
src/lilypond-$(lilypond-version)/lilypond-$(lilypond-version).$(ARCH).package $@
+lilypond-upgrade:
$(upload-dir)/lilypond-$(lilypond-version)-upgrade.$(ARCH).package
\ No newline at end of file
Index: installers/linux/autopackage/specs/glib/default.apspec.in
diff -u installers/linux/autopackage/specs/glib/default.apspec.in:1.3
installers/linux/autopackage/specs/glib/default.apspec.in:1.4
--- installers/linux/autopackage/specs/glib/default.apspec.in:1.3 Sat Aug
20 08:19:59 2005
+++ installers/linux/autopackage/specs/glib/default.apspec.in Mon Aug 22
23:12:58 2005
@@ -41,9 +41,11 @@
#export sover="0.600.4"
[Imports]
-rm -rf include
+## FIXME: devel package
+##rm -rf include
+##rm -rf lib/pkgconfig
+## FIXME: doc package
rm -rf info
-rm -rf lib/pkgconfig
rm -rf man
rm -rf share/doc
rm -rf share/gtk-doc
@@ -58,8 +60,16 @@
[ -d lib ] && installLib lib/*.so.*.*.*
rm -f lib/*.so.* || :
rm -f lib/lib* || :
- [ -e lib/[^.l]* ] && copyFiles lib/[^l]* "$PREFIX/lib"
+ ##[ -e lib/* ] && copyFiles lib/* "$PREFIX/lib"
[ -d share ] && installData share/*
-
+ ## FIXME: -devel
+ [ -d include ] && copyFiles include/* "$PREFIX/include"
+ [ -d lib/glib ] && copyFiles lib/glib/* "$PREFIX/lib/glib"
+ [ -d lib/glib-2.0 ] && copyFiles lib/glib-2.0/* "$PREFIX/lib/glib-2.0"
+ [ -d lib/pkgconfig ] && for i in lib/pkgconfig/*; do
+ safeSed "$i" "s@/usr/[EMAIL PROTECTED]@g"
+ done
+ [ -d lib/pkgconfig ] && copyFiles lib/pkgconfig/* "$PREFIX/lib/pkgconfig"
+
[Uninstall]
uninstallFromLog
Index: installers/linux/autopackage/specs/libpng/default.apspec.in
diff -u installers/linux/autopackage/specs/libpng/default.apspec.in:1.4
installers/linux/autopackage/specs/libpng/default.apspec.in:1.5
--- installers/linux/autopackage/specs/libpng/default.apspec.in:1.4 Tue Jun
7 14:53:08 2005
+++ installers/linux/autopackage/specs/libpng/default.apspec.in Mon Aug 22
23:12:58 2005
@@ -73,9 +73,10 @@
#export sover="0.600.4"
[Imports]
-rm -rf include
+## FIXME: -devel package
+##rm -rf include
+##rm -rf lib/pkgconfig
rm -rf info
-rm -rf lib/pkgconfig
rm -rf man
rm -rf share/doc
rm -rf share/gtk-doc
@@ -96,8 +97,15 @@
[ -d lib ] && installLib lib/*.so.*.*.*
rm -f lib/*.so.* || :
rm -f lib/lib* || :
- [ -e lib/[^l]* ] && copyFiles lib/[^l]* "$PREFIX/lib"
+ ##[ -e lib/[^l]* ] && copyFiles lib/[^l]* "$PREFIX/lib"
[ -d share ] && installData share/*
+ ## FIXME: -devel
+ [ -d include ] && copyFiles include/* "$PREFIX/include"
+ [ -d lib/libpng ] && copyFiles lib/libpng/* "$PREFIX/lib/libpng"
+ [ -d lib/pkgconfig ] && for i in lib/pkgconfig/*; do
+ safeSed "$i" "s@/usr/[EMAIL PROTECTED]@g"
+ done
+ [ -d lib/pkgconfig ] && copyFiles lib/pkgconfig/* "$PREFIX/lib/pkgconfig"
[Uninstall]
uninstallFromLog
Index: installers/linux/autopackage/specs/lilypond/default.apspec.in
diff -u installers/linux/autopackage/specs/lilypond/default.apspec.in:1.19
installers/linux/autopackage/specs/lilypond/default.apspec.in:1.20
--- installers/linux/autopackage/specs/lilypond/default.apspec.in:1.19 Sat Aug
20 08:19:57 2005
+++ installers/linux/autopackage/specs/lilypond/default.apspec.in Mon Aug
22 23:12:58 2005
@@ -89,6 +89,9 @@
require @python.org/python 2
require @zlib.org/zlib 1
require @gtk.org/pango 1
+## we need 1.6.7, NOT 1.6.4. Both have interface 12.3
+## require @gnu.org/guile 12.3
+require @gnu.org/guile 1.67
#requireAtLeast does not find/install the bundeled package.
#requireAtLeast @artifex.com/ghostscript:8.15
Index: installers/linux/autopackage/specs/pango/default.apspec.in
diff -u installers/linux/autopackage/specs/pango/default.apspec.in:1.7
installers/linux/autopackage/specs/pango/default.apspec.in:1.8
--- installers/linux/autopackage/specs/pango/default.apspec.in:1.7 Tue Jun
7 14:53:08 2005
+++ installers/linux/autopackage/specs/pango/default.apspec.in Mon Aug 22
23:12:58 2005
@@ -51,12 +51,15 @@
#export sover="0.800.1"
[Imports]
-rm -rf include
+## FIXME: -devel package
+##rm -rf include
+##rm -rf lib/pkgconfig
+## FIXME: -doc package
rm -rf info
-rm -rf lib/pkgconfig
rm -rf man
rm -rf share/doc
rm -rf share/gtk-doc
+##
echo '*' | import
[Prepare]
@@ -68,8 +71,15 @@
[ -d lib ] && installLib lib/*.so.*.*.*
rm -f lib/*.so.* || :
rm -f lib/lib* || :
- [ -e lib/[^l]* ] && copyFiles lib/[^l]* "$PREFIX/lib"
+ ##[ -e lib/[^l]* ] && copyFiles lib/[^l]* "$PREFIX/lib"
[ -d share ] && installData share/*
+ ## FIXME: -devel
+ [ -d include ] && copyFiles include/* "$PREFIX/include"
+ [ -d lib/pango ] && copyFiles lib/pango/* "$PREFIX/lib/pango"
+ [ -d lib/pkgconfig ] && for i in lib/pkgconfig/*; do
+ safeSed "$i" "s@/usr/[EMAIL PROTECTED]@g"
+ done
+ [ -d lib/pkgconfig ] && copyFiles lib/pkgconfig/* "$PREFIX/lib/pkgconfig"
mkdirs "$PREFIX/etc/pango"
# FIXME: getSection parses until ^[ when generating the postinstall script
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
