diff options
| author |  David Aspinall <da@inf.ed.ac.uk> | 1998-10-14 13:16:23 +0000 |
|---|---|---|
| committer | David Aspinall <da@inf.ed.ac.uk> | 1998-10-14 13:16:23 +0000 |
| commit | 74f91cf24197b3734a83480cb236aa4a911c036a (patch) | |
| tree | f28918b80098c10d0dee433ca7beea82a6456072 | |
| parent | db1b2c3a52c071307efdfb4ac94dbf56cb197a0e (diff) | |
Added developer's distribution, link to master todo list, images target
| -rw-r--r-- | Makefile.devel | 32 | ||||
| -rw-r--r-- | images/Makefile | 2 |
2 files changed, 30 insertions, 4 deletions
diff --git a/Makefile.devel b/Makefile.devel index 6bad1174..b278ab1a 100644 --- a/Makefile.devel +++ b/Makefile.devel @@ -34,6 +34,7 @@ CVS_RELEASE_TAG=2-0pre$(shell date "+%y%m%d") NAME = ProofGeneral # Name of tar file and RPM file. RELEASENAME = ProofGeneral-$(RELEASE_TAG) +DEVELRELEASENAME = ProofGeneral-$(RELEASE_TAG)-devel CVS_RELEASENAME = Release-$(CVS_RELEASE_TAG) # Where to release (i.e. copy) a new distribution to @@ -72,6 +73,8 @@ RPM=rpm --rcfile $(RPMRC) RELEASENAMETAR = $(RELEASENAME).tar RELEASENAMETARGZ = $(RELEASENAMETAR).gz +DEVELRELEASENAMETAR = $(DEVELRELEASENAME).tar +DEVELRELEASENAMETARGZ = $(DEVELRELEASENAMETAR).gz # Files not kept under cvs to clean away. @@ -133,6 +136,12 @@ doc: FORCE alldocs: FORCE (cd doc; $(MAKE) all) +############################################################ +# +# Images +# +images: FORCE + (cd images; $(MAKE) images) ############################################################ ## @@ -169,8 +178,9 @@ untag: ############################################################ ## ## dist: make a distribution in DISTBUILDIR from CVS sources -## Builds from sources tagged with CVS_RELEASE_TAG. -## Moves html files to parent directory, and removes +## Builds for user-distribution, from sources tagged +## with CVS_RELEASE_TAG. +## Moves html files to parent directory, removes ## non-distributed files. ## (Developer only) ## @@ -183,7 +193,7 @@ dist: @echo "*************************************************" @echo " Running cvs export .." @echo "*************************************************" - (cd $(DISTBUILDIR); cvs export -kv -r "Release-$(CVS_RELEASE_TAG)" -d $(RELEASENAME) $(CVSNAME)) + (cd $(DISTBUILDIR); cvs export -kv -r "$(CVS_RELEASENAME)" -d $(RELEASENAME) $(CVSNAME)) @echo "*************************************************" @echo " Running 'make alldist' for new release .." @echo "*************************************************" @@ -211,6 +221,20 @@ dist: @echo " Finished making dist." @echo "*************************************************" +############################################################ +## +## develdist: make a distribution for developers from +## raw CVS sources. +## +develdist: + @echo "*************************************************" + @echo " Making developer distribution..." + @echo "*************************************************" + mkdir -p $(DISTBUILDIR) + (cd $(DISTBUILDIR); cvs export -kv -r "$(CVS_RELEASENAME)" -d $(RELEASENAME)-devel $(CVSNAME)) + tar -cvhf $(DISTBUILDIR)/$(DEVELRELEASENAMETAR) -C $(DISTBUILDIR) $(DEVELRELEASENAME) + gzip -9 $(DISTBUILDIR)/$(DEVELRELEASENAMETAR) + ############################################################ ## @@ -222,7 +246,7 @@ dist: ## Moreover, a link ProofGeneral -> ProofGeneral-<version> ## is made. ## -release: distclean tag dist +release: distclean tag dist develdist mkdir -p $(RELEASEDIR) cp -pfr $(DISTBUILDIR)/* $(RELEASEDIR) (cd $(RELEASEDIR); rm -f $(NAME); ln -s $(RELEASENAME) $(NAME)) diff --git a/images/Makefile b/images/Makefile index 146b4aa5..4fa2b87d 100644 --- a/images/Makefile +++ b/images/Makefile @@ -36,6 +36,8 @@ GIMP=export GIMP_DIRECTORY=$(GIMP_DIRECTORY); gimp --no-interface --no-data --c default: all +images: all + all: buttons webpix dist: all install distclean |