From: janneke <janneke> Date: Thu, 24 Jul 2003 17:34:49 +0000 (+0000) Subject: * cygwin/changelog: X-Git-Tag: release/1.7.29~47 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bf8099ac0dd280a53bc0271148fc0cc59fe39d3b;p=lilypond.git * cygwin/changelog: * cygwin/mknetrel: Update. * GNUmakefile.in (web-install): Rename (was: install-html-doc). (html-doc): Remove (use: web). * stepmake/stepmake/script-rules.make: * stepmake/stepmake/python-module-rules.make ($(outdir)/%.py): Fix $(config_make) dependencies for srcdir build. * stepmake/stepmake/generic-targets.make ($(config_make)): Fix target for srcdir build. * stepmake/make/stepmake.make: * make/srcdir.make.in: * GNUmakefile.in: * make/stepmake.make (config_make): Rename variable (was: configuration). --- diff --git a/ChangeLog b/ChangeLog index f7e99a0e64..c3af5190c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +2003-07-24 Jan Nieuwenhuizen <janneke@gnu.org> + + * cygwin/changelog: + * cygwin/mknetrel: Update. + + * GNUmakefile.in (web-install): Rename (was: install-html-doc). + (html-doc): Remove (use: web). + + * stepmake/stepmake/script-rules.make: + * stepmake/stepmake/python-module-rules.make ($(outdir)/%.py): + Fix $(config_make) dependencies for srcdir build. + + * stepmake/stepmake/generic-targets.make ($(config_make)): Fix + target for srcdir build. + + * stepmake/make/stepmake.make: + * make/srcdir.make.in: + * GNUmakefile.in: + * make/stepmake.make (config_make): Rename variable (was: + configuration). + 2003-07-24 Han-Wen Nienhuys <hanwen@cs.uu.nl> * Documentation/user/internals.itely (Manipulating music diff --git a/GNUmakefile.in b/GNUmakefile.in index 09830cffe1..c24afc61ad 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -23,7 +23,7 @@ IN_FILES := $(wildcard *.in) EXTRA_DIST_FILES = $(wildcard *.el) vimrc VERSION $(README_FILES) $(SCRIPTS) $(IN_FILES) emacsclient.patch lexer-gcc-3.0.patch server.el.patch darwin.patch .cvsignore lexer-gcc-3.1.sh lilypond.words NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES) INSTALLATION_DIR=$(local_lilypond_datadir) -INSTALLATION_FILES=$(configuration) VERSION +INSTALLATION_FILES=$(config_make) VERSION # bootstrap stepmake: # @@ -38,8 +38,7 @@ pfa-fonts: (cd $(builddir)/share/lilypond/fonts && \ tar czvf ../../../$(outbase)/type1.tar.gz type1/*.pfa type1/fonts.* type1/lilypond.* ) -html-doc: web -install-html-doc: +web-install: $(INSTALL) -m 755 -d $(local_package_docdir) tar -C $(local_package_docdir)/ -xzf $(outdir)/web.tar.gz diff --git a/cygwin/mknetrel b/cygwin/mknetrel index fbac630e42..36255076cd 100644 --- a/cygwin/mknetrel +++ b/cygwin/mknetrel @@ -6,11 +6,11 @@ # LilyPond development: lilypond-1.7 # archive=ftp://lilypond.org/pub/LilyPond/v1.7 -# Guile specific mknetrel overrides +# LilyPond mknetrel overrides # To use this, do something like: cat >/dev/null <<EOC - wget -P/var/tmp ftp://lilypond.org/pub/LilyPond/v1.7/lilypond-1.7.13.tar.gz + wget -P/var/tmp ftp://lilypond.org/pub/LilyPond/v1.7/lilypond-1.7.29.tar.gz rm -rf /home/netrel/src/lilypond-* mkdir -p /home/netrel/src && cd /home/netrel/src ## TODO: look at pimport @@ -21,16 +21,14 @@ cat >/dev/null <<EOC EOC - -BUILD=1 # sover=14 patch=$mknetrel_root/patch if iscygwin; then true else - ##uploads=$here/uploads/$base && mkdir -p $uploads - uploads=$here/uploads-development/$base && mkdir -p $uploads + uploads=$here/uploads/$base && mkdir -p $uploads + [ "$ABI" = "1.5" ] && uploads=$here/uploads-development/$base && mkdir -p $uploads tarstem=$uploads/$package fi @@ -146,6 +144,8 @@ doc_name () { lib_split () { mkdir -p ./$prefix/bin || exit 1 mv $inst/$prefix/bin/*.dll ./$prefix/bin + mkdir -p ./$prefix/lib || exit 1 + mv $inst/$prefix/lib/*.la ./$prefix/lib mkdir -p ./$prefix/share || exit 1 mv $inst/$prefix/share/$base ./$prefix/share true @@ -156,7 +156,6 @@ devel_split () { mv $inst/$prefix/include ./$prefix/include mkdir -p ./$prefix/lib || exit 1 mv $inst/$prefix/lib/*.a ./$prefix/lib - mv $inst/$prefix/lib/*.la ./$prefix/lib mkdir -p ./$prefix/share || exit 1 mv $inst/$prefix/share/aclocal ./$prefix/share true @@ -296,9 +295,8 @@ prebuild () { cd $src && ln -s GNUmakefile.in GNUmakefile cd $build || exit 1 - # Ugh. Fixed in 1.6.8CVS and 1.7.13CVS. - # PATH=/bin:/usr/bin:$PATH make DO_O_DEP="echo NO DEPS;" conf=for-build all doc html-doc || exit 1 - PATH=/bin:/usr/bin:$PATH make conf=for-build all doc html-doc || exit 1 + #PATH=/bin:/usr/bin:$PATH make conf=for-build all doc html-doc || exit 1 + PATH=/bin:/usr/bin:$PATH make conf=for-build all doc web || exit 1 for i in $(find . -path "out-for-build/*.1"); do cp -pv $i $(dirname $(dirname $i))/$(basename $i) done @@ -322,7 +320,8 @@ postinstall () { cd $build || exit 1 docdir=$prefix/share/doc/$base-$ver - make conf=for-build docdir=$inst-doc/$docdir install-html-doc + #make conf=for-build docdir=$inst-doc/$docdir install-html-doc + make conf=for-build docdir=$inst-doc/$docdir web-install ## copy READMEs etc diff --git a/make/srcdir.make.in b/make/srcdir.make.in index 95954a1b23..f38e0de03d 100644 --- a/make/srcdir.make.in +++ b/make/srcdir.make.in @@ -19,7 +19,7 @@ ifdef conf CONFIGSUFFIX=-$(conf) endif -# Use same configuration, but different output directory: +# Use same configurations, but different output directory: # # make out=WWW # diff --git a/make/stepmake.make b/make/stepmake.make index 3e77405064..dee7d04835 100644 --- a/make/stepmake.make +++ b/make/stepmake.make @@ -26,12 +26,12 @@ else endif ifdef config - configuration=$(config) + config_make=$(config) else ifeq ($(builddir),) - configuration=$(depth)/config$(CONFIGSUFFIX).make + config_make=$(depth)/config$(CONFIGSUFFIX).make else - configuration=$(builddir)/config$(CONFIGSUFFIX).make + config_make=$(builddir)/config$(CONFIGSUFFIX).make endif endif @@ -41,7 +41,7 @@ else outroot=$(builddir)/$(patsubst $(shell cd $(depth); pwd)%,%,$(pwd)) endif -include $(configuration) +include $(config_make) outdir=$(outroot)/$(outbase) diff --git a/stepmake/make/stepmake.make b/stepmake/make/stepmake.make index 572ff3ef1b..8b79b35e43 100644 --- a/stepmake/make/stepmake.make +++ b/stepmake/make/stepmake.make @@ -26,12 +26,12 @@ else endif ifdef config - configuration=$(config) + config_make=$(config) else ifeq ($(builddir),) - configuration=$(depth)/config$(CONFIGSUFFIX).make + config_make=$(depth)/config$(CONFIGSUFFIX).make else - configuration=$(builddir)/config$(CONFIGSUFFIX).make + config_make=$(builddir)/config$(CONFIGSUFFIX).make endif endif @@ -41,7 +41,7 @@ else outroot=$(builddir)/$(patsubst $(shell cd $(depth); pwd)%,%,$(pwd)) endif -include $(configuration) +include $(config_make) outdir=$(outroot)/$(outbase) config_h=$(builddir)/config$(CONFIGSUFFIX).h diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make index bcaa6bf1c8..fb8e6e6a2f 100644 --- a/stepmake/stepmake/generic-targets.make +++ b/stepmake/stepmake/generic-targets.make @@ -144,11 +144,11 @@ check: local-check local-check: # ugh. ugh ugh ugh -$(depth)/$(configuration).make: $(depth)/configure +$(config_make): $(topdir)/configure @echo "************************************************************" @echo "configure changed! You should probably reconfigure manually." @echo "************************************************************" - (cd $(depth); ./config.status) + (cd $(builddir); ./config.status) touch $@ # do something for multiple simultaneous configs. @@ -183,5 +183,6 @@ local-help: www-targets-help www-targets-help: @echo -e "\ web update website in out-www\n\ + web-install install website documentation in (docdir=$(local_package_docdir))\n\ web-clean clean out-www\n\ " diff --git a/stepmake/stepmake/python-module-rules.make b/stepmake/stepmake/python-module-rules.make index e70f7311bf..8f37c41530 100644 --- a/stepmake/stepmake/python-module-rules.make +++ b/stepmake/stepmake/python-module-rules.make @@ -5,6 +5,6 @@ $(outdir)/%$(SHARED_MODULE_SUFFIX): $(outdir)/%.lo $(outdir)/%.pyc: $(outdir)/%.py $(PYTHON) -c 'import py_compile; py_compile.compile ("$<")' -$(outdir)/%.py: %.py $(builddir)/config.make +$(outdir)/%.py: %.py $(config_make) cat $< | sed $(sed-atvariables) > $@ chmod 755 $@ diff --git a/stepmake/stepmake/script-rules.make b/stepmake/stepmake/script-rules.make index f15e6831e5..9c7e0e7cef 100644 --- a/stepmake/stepmake/script-rules.make +++ b/stepmake/stepmake/script-rules.make @@ -1,25 +1,25 @@ -$(outdir)/%: %.pl $(builddir)/config.make +$(outdir)/%: %.pl $(config_make) cat $< | sed $(sed-atvariables) > $@ chmod 755 $@ -$(outdir)/%: %.bash $(builddir)/config.make +$(outdir)/%: %.bash $(config_make) cat $< | sed $(sed-atvariables) > $@ chmod 755 $@ -$(outdir)/%: %.scm $(builddir)/config.make +$(outdir)/%: %.scm $(config_make) cat $< | sed $(sed-atvariables) > $@ chmod 755 $@ -$(outdir)/%: %.expect $(builddir)/config.make +$(outdir)/%: %.expect $(config_make) cat $< | sed $(sed-atvariables) > $@ chmod 755 $@ -$(outdir)/%: %.sh $(builddir)/config.make +$(outdir)/%: %.sh $(config_make) cat $< | sed $(sed-atvariables) > $@ chmod 755 $@ -$(outdir)/%: %.py $(builddir)/config.make +$(outdir)/%: %.py $(config_make) cat $< | sed $(sed-atvariables) > $@ chmod 755 $@