From cf539418297dac9f06557f14c3cf5e5bc18165dd Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 4 Jun 2006 16:25:15 +0000 Subject: [PATCH] reinstate old web tar/copying. --- ChangeLog | 4 ++++ GNUmakefile.in | 26 ++++++++++++++++++-------- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 334fe29a84..9eb93c21cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-06-04 Han-Wen Nienhuys + + * GNUmakefile.in: reinstate old web tar/copying. + 2006-06-03 Han-Wen Nienhuys * lily/lyric-combine-music-iterator.cc (find_voice): return 0 if diff --git a/GNUmakefile.in b/GNUmakefile.in index 21681b64cc..83d1c1621c 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -73,17 +73,27 @@ local-WWW-post: cd $(top-build-dir) && $(FIND) . -name '*.html' -print | $(footifymail) xargs $(footify) + cd $(top-build-dir) && find Documentation input \ + $(web-ext:%=-path '*/out-www/*.%' -or) -type l \ + > $(outdir)/weblist + ls $(outdir)/*.html >> $(outdir)/weblist + +## urg: this is too hairy, should write a python script to do this. + ## rewrite file names so we lose out-www rm -rf $(outdir)/web-root/ - for d in out-www `cd $(top-build-dir) && find Documentation input -name 'out-www' `; do \ - echo $$d ; \ - (mkdir -p $(outdir)/web-root/$$d/ || true) ; \ - rsync -Wa --include source --include music-glossary \ - --include lilypond-internals \ - --include lilypond \ - $(foreach pat,$(web-ext), --include '*'.$(pat)) $(top-build-dir)/$$d/ $(outdir)/web-root/$$d/../ ; \ + mkdir $(outdir)/web-root/ +## urg slow. + cat $(outdir)/weblist | (cd $(top-build-dir); tar -cf- -T- ) | \ + tar -C $(outdir)/web-root/ -xf - + for dir in $(outdir)/web-root/ ; do \ + cd $$dir && \ + for a in `find . -name out-www`; do \ + rsync -a --link-dest $$a/ $$a/ $$a/.. ; \ + rm -rf $$a ; \ + done \ done - echo $(TOPLEVEL_VERSION)> $(outdir)/web-root/VERSION + echo $(TOPLEVEL_VERSION) > $(outdir)/web-root/VERSION tree-prefix = $(outdir) tree-bin = $(tree-prefix)/bin -- 2.39.5