1
0
mirror of git://projects.qi-hardware.com/ben-wpan.git synced 2024-11-29 13:42:47 +02:00

Fix two bugs left from the great reorganization.

- Makefile (UPLOAD): updated for new directory structure
- scripts/schhist2web: unchanged Postscript files were not replaced with
  symlinks because the symlink paths were wrong
This commit is contained in:
Werner Almesberger 2010-08-31 01:46:18 -03:00
parent a3aac7e80b
commit 80c6f3e75f
2 changed files with 6 additions and 6 deletions

View File

@ -1,8 +1,8 @@
SHELL = /bin/bash SHELL = /bin/bash
UPLOAD = {index.html,unchanged.png,thumb_*,diff_*,pdf_*,html_*} CACHE_DIRS = {ppm0,ppm1,ppm2,ps}
DEST = werner@host:/home/httpd/almesberger/misc/ben/ DEST = werner@host:/home/httpd/almesberger/misc/ben/
RSYNC = rsync -a --progress RSYNC = eval rsync -a --progress "--exclude "$(CACHE_DIRS)/
.PHONY: all ben-wpan-schhist ben-wpan-schhist-upload .PHONY: all ben-wpan-schhist ben-wpan-schhist-upload
.PHONY: xue-schhist xue-schhist-upload .PHONY: xue-schhist xue-schhist-upload
@ -24,7 +24,7 @@ ben-wpan-schhist:
./schhist2web atrf/wpan-atrf.sch ./schhist2web atrf/wpan-atrf.sch
ben-wpan-schhist-upload: ben-wpan-schhist-upload:
$(RSYNC) _out/$(UPLOAD) $(DEST)/demo/ $(RSYNC) _out/* $(DEST)/demo/
xue-schhist: xue-schhist:
SCHHIST_TITLE=Xue \ SCHHIST_TITLE=Xue \
@ -33,7 +33,7 @@ xue-schhist:
./schhist2web -S ../../xue kicad/xue-rnc/xue-rnc.sch _xue ./schhist2web -S ../../xue kicad/xue-rnc/xue-rnc.sch _xue
xue-schhist-upload: xue-schhist-upload:
$(RSYNC) _xue/$(UPLOAD) $(DEST)/demo2/ $(RSYNC) _xue/* $(DEST)/demo2/
cntr-schhist: cntr-schhist:
SCHHIST_TITLE=ben-wpan/cntr \ SCHHIST_TITLE=ben-wpan/cntr \
@ -42,4 +42,4 @@ cntr-schhist:
./schhist2web cntr/cntr.sch _cntr ./schhist2web cntr/cntr.sch _cntr
cntr-schhist-upload: cntr-schhist-upload:
$(RSYNC) _cntr/$(UPLOAD) $(DEST)/demo3/ $(RSYNC) _cntr/* $(DEST)/demo3/

View File

@ -250,7 +250,7 @@ for n in $first `cd "$dir" && git rev-list --reverse $first..HEAD`; do
symlink "../../$head/$d/${m##*/}" "$cache/$n/$d/${m##*/}" symlink "../../$head/$d/${m##*/}" "$cache/$n/$d/${m##*/}"
done done
m_ps=${m%.ppm}.ps m_ps=${m%.ppm}.ps
symlink "../../$head/$d/${m_ps##*/}" "$cache/$n/$d/${m_ps##*/}" symlink "../../$head/ps/${m_ps##*/}" "$cache/$n/ps/${m_ps##*/}"
fi fi
fi fi
touch "$out/names/`basename \"$m\" .ppm`" touch "$out/names/`basename \"$m\" .ppm`"