gzz-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gzz-commits] gzz Makefile TODO


From: Tuukka Hastrup
Subject: [Gzz-commits] gzz Makefile TODO
Date: Wed, 28 Aug 2002 12:59:27 -0400

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuukka Hastrup <address@hidden> 02/08/28 12:59:27

Modified files:
        .              : Makefile TODO 

Log message:
        revised target 'official-release' and cleaned Makefile some

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Makefile.diff?tr1=1.148&tr2=1.149&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.53&tr2=1.54&r1=text&r2=text

Patches:
Index: gzz/Makefile
diff -c gzz/Makefile:1.148 gzz/Makefile:1.149
*** gzz/Makefile:1.148  Wed Aug 28 11:36:56 2002
--- gzz/Makefile        Wed Aug 28 12:59:27 2002
***************
*** 1,3 ****
--- 1,5 ----
+ # This Makefile requires GNU make.
+ 
  # all must compile everywhere
  all: compile batchtest
  alltests: batchtest batchtest-junit slow test-
***************
*** 5,21 ****
  bottest: batchtest batchtest-junit slow
  
  CVS=cvs
- Manifest:
-       rm -f address@hidden address@hidden
-       ./cvsparser.pl | ./manifest-filter.pl > address@hidden
-       sort address@hidden -o address@hidden
-       mv address@hidden $@
-       rm -f address@hidden
  
  VERSION=snapshot-`date -u +%Y%m%d`
- TAG="Unofficial"
- 
  NOTEST=true
  dist: DISTDIR=gzz-$(VERSION)
  dist: 
        rm -Rf $(DISTDIR)
--- 7,16 ----
  bottest: batchtest batchtest-junit slow
  
  CVS=cvs
  
  VERSION=snapshot-`date -u +%Y%m%d`
  NOTEST=true
+ 
  dist: DISTDIR=gzz-$(VERSION)
  dist: 
        rm -Rf $(DISTDIR)
***************
*** 23,31 ****
        $(NOTEST) || $(MAKE) batchtest slow     
        $(MAKE) clean 
        $(MAKE) ready_to_compile doc
!       find . ! -type d|egrep -v 
'^./(basalt|lava|C\+\+|Perl|Java|Modules)|/CVS/|#|~|\$$py\.class$$'|grep -vF 
"./$(DISTDIR)/"|xargs --replace cp --parents {} $(DISTDIR)
        mkdir $(DISTDIR)/depends
!       cp $(GZZ_DEPENDS)/* $(DISTDIR)/*
  
        echo $(VERSION) >$(DISTDIR)/VERSION
  
--- 18,28 ----
        $(NOTEST) || $(MAKE) batchtest slow     
        $(MAKE) clean 
        $(MAKE) ready_to_compile doc
!       find . ! -type d|egrep -v 
'^\./(basalt|lava|C\+\+|Perl|Java|Modules)|/CVS/|#|~|\$$py\.class$$|\./gzz.*(jar|tar.gz)$$'
 | \
!           grep -vF "./$(DISTDIR)/"|xargs --replace cp --parents {} $(DISTDIR)
        mkdir $(DISTDIR)/depends
!       cp -a $(GZZ_DEPENDS)/* $(DISTDIR)/depends
!       rm -R $(DISTDIR)/depends/CVS
  
        echo $(VERSION) >$(DISTDIR)/VERSION
  
***************
*** 34,113 ****
  
        rm -Rf $(DISTDIR)
  
! 
! release : DISTDIR=gzz-$(VERSION)
! release : Z_DIR=$(CURDIR)/Z
! release :
!       $(MAKE) dist
!       $(MAKE) -C src MODULES="" compile \
!       || $(MAKE) -C src MODULES="" compile \
!       || $(MAKE) -C src MODULES="" compile \
!       || $(MAKE) -C src MODULES="" compile \
!       || $(MAKE) -C src MODULES="" compile \
!       || $(MAKE) -C src MODULES="" compile \
!       || $(MAKE) -C src MODULES="" compile \
!       || $(MAKE) -C src MODULES="" compile \
!       || $(MAKE) -C src MODULES="" compile \
!       || $(MAKE) -C src MODULES="" compile \
!       || $(MAKE) -C src MODULES="" compile
!       mkdir -p $(Z_DIR)
!       $(MAKE) -C src Z_DIR=$(Z_DIR) sync
!       $(MAKE) -C src  NOTEST="" Z_DIR=$(Z_DIR) \
!                       BUILD_TAG="$(TAG) $(VERSION) (with modules)" \
!                       JARNAME=$(DISTDIR)-with-modules.jar jar
!       mv src/$(DISTDIR)-with-modules.jar .
!       $(MAKE) -C src  NOTEST="" MODULES="" Z_DIR=$(Z_DIR) \
!                       BUILD_TAG="$(TAG) $(VERSION) (without modules)" \
!                       JARNAME=$(DISTDIR)-without-modules.jar jar
!       mv src/$(DISTDIR)-without-modules.jar .
!       $(MAKE) -C Documentation dist
!       mv Documentation/docdisttree $(DISTDIR)-doc
!       tar cf $(DISTDIR)-doc.tar $(DISTDIR)-doc
!       gzip -9vf $(DISTDIR)-doc.tar
!       zip -r9 $(DISTDIR)-doc.zip $(DISTDIR)-doc
!       rm -f $(DISTDIR).md5sums.new
!       set -e; for f in $(DISTDIR)-without-modules.jar \
!                        $(DISTDIR)-with-modules.jar \
!                        $(DISTDIR).tar.gz \
!                        $(DISTDIR).zip \
!                        $(DISTDIR)-doc.tar.gz \
!                        $(DISTDIR)-doc.zip; \
!            do \
!                sum=$$(md5sum $$f | awk '{ print $$1; }'); \
!                size=$$(ls -l $$f | awk '{ print $$5; }'); \
!                echo "$$sum $$size $$f" >> $(DISTDIR).md5sums.new; \
!            done
!       mv $(DISTDIR).md5sums.new $(DISTDIR).md5sums
!       rm -rf docdisttree
  
  CVSTAG=none
  official-release : VERSION=$(shell echo $(CVSTAG) \
                                   | sed -e 's/^rel_//' -e 's/_/./g')
! official-release : grbdir=gzigzag-release-build
! official-release : modulesupport.jar
!       rm -rf $(grbdir)
!       set -e ;\
!         if $$(echo $(VERSION) \
!               | egrep '^[0-9]+\.[0-9]+\.(pre)?[0-9]+$$' >/dev/null);\
!         then\
!             :; \
!         else \
!             echo "Bad VERSION"; \
!             exit 1; \
!         fi
!       cvs -z3 -d$(shell cat CVS/Root) checkout -r $(CVSTAG) \
!                                                -d $(grbdir) gzigzag
!       ln modulesupport.jar $(grbdir)
!       make -C $(grbdir) VERSION=$(VERSION) TAG="Official" release
!       ln -f $(grbdir)/gzigzag-$(VERSION)-with-modules.jar
!       ln -f $(grbdir)/gzigzag-$(VERSION)-without-modules.jar
!       ln -f $(grbdir)/gzigzag-$(VERSION).tar.gz
!       ln -f $(grbdir)/gzigzag-$(VERSION).zip
!       ln -f $(grbdir)/gzigzag-$(VERSION)-doc.tar.gz
!       ln -f $(grbdir)/gzigzag-$(VERSION)-doc.zip
!       ln -f $(grbdir)/gzigzag-$(VERSION).md5sums
!       rm -rf $(grbdir)
  
  
  CVS2CL=cvs2cl
  
--- 31,79 ----
  
        rm -Rf $(DISTDIR)
  
! jar: jardir=$(JARNAME).build
! jar : 
!       rm -Rf $(jardir)
!       mkdir $(jardir)
!       $(MAKE) compile
!       $(NOTEST) || $(MAKE) batchtest slow
!       echo 'Main-Class: $(mainclass)' > $(jardir)/manifest
!       (cd $(jardir) && for jar in pythonlib yaml jythonlib jython; do \
!           jar xvf ../$(GZZ_DEPENDS)/$$jar.jar ;\
!        done)
!       cp -a $(CLASSDIR)/* $(jardir)
!       find gzz -name "*.py" | while read file ; do \
!           mkdir -p $(jardir)/`dirname $$file` && cp $$file $(jardir)/$$file;\
!       done
!       cp Gzz.py $(jardir)
!       cp LICENSE.lgpl LICENSE.xpl $(jardir)
!       cp $(GZZ_DEPENDS)/{jython,python,yaml}.license $(jardir)
!       cp README $(jardir)
!       (cd $(jardir) && jar cvfm $(JARNAME) manifest *)
!       mv $(jardir)/$(JARNAME) .
!       rm -rf $(jardir)
  
  CVSTAG=none
  official-release : VERSION=$(shell echo $(CVSTAG) \
                                   | sed -e 's/^rel_//' -e 's/_/./g')
! official-release : gzzdir=gzz-$(VERSION)-cvs
! official-release : dependsdir=depends-$(VERSION)-cvs
! official-release : 
!       rm -Rf $(gzzdir) $(dependsdir)
!       $(CVS) -z3 -d$(shell cat CVS/Root) checkout -r $(CVSTAG) \
!                                                   -d $(gzzdir) gzz
!       $(CVS) -z3 -d$(shell cat $(GZZ_DEPENDS)/CVS/Root) checkout \
!                                                -r $(CVSTAG) \
!                                                -d $(dependsdir) depends
!       $(MAKE) -C $(gzzdir) VERSION=$(VERSION) GZZ_DEPENDS=../$(dependsdir) \
!               jar
!       mv $(gzzdir)/gzz-$(VERSION).jar .
! 
!       $(MAKE) -C $(gzzdir) VERSION=$(VERSION) GZZ_DEPENDS=../$(dependsdir) \
!               dist 
!       mv $(gzzdir)/gzz-$(VERSION).tar.gz .
  
+       rm -Rf $(gzzdir) $(dependsdir)
  
  CVS2CL=cvs2cl
  
***************
*** 115,153 ****
  ChangeLog ::
        CVS_RSH=$(CVS_RSH) $(CVS2CL) -U changelog-authors -l 
-d'2001-01-01\<now' -W 1200 -b --gmt -w --ignore ChangeLog
  
! .PHONY : ChangeLog Manifest distdir dist dist.tgz dist.zip
! 
! # This Makefile requires GNU make.
! 
  
  copyrighted:
        python metacode/copyrighter.py
  
- 
- 
- 
- #
- # Architectures
- #     - which architecture-dependent code to compile
- #       (directories in arch/)
- # ARCH=
- 
- # Default: none - set on command line.
- 
  # Put here the shell argument line to generate the build tag for the
  # window title
  BUILD_TAG := $(shell echo "Custom CVS Build `date -u +%Y-%m-%dT%H:%M:%SZ` by 
address@hidden")
  
- # It would be nice to use standard paths !
- #
- #JAVA_LIB=/usr/local/java/lib
- JAVA_DOC=/usr/local/java/docs/api
- 
  # For jar builds:
- JARARCHES=""
- JARMODULES=""
  JARNAME=gzz-$(VERSION).jar
- MODULESUPPORT=no
  
  # Location of the depends/ CVS module:
  ifeq (,$(GZZ_DEPENDS))
--- 81,97 ----
  ChangeLog ::
        CVS_RSH=$(CVS_RSH) $(CVS2CL) -U changelog-authors -l 
-d'2001-01-01\<now' -W 1200 -b --gmt -w --ignore ChangeLog
  
! .PHONY : ChangeLog Manifest dist official-release
  
  copyrighted:
        python metacode/copyrighter.py
  
  # Put here the shell argument line to generate the build tag for the
  # window title
  BUILD_TAG := $(shell echo "Custom CVS Build `date -u +%Y-%m-%dT%H:%M:%SZ` by 
address@hidden")
  
  # For jar builds:
  JARNAME=gzz-$(VERSION).jar
  
  # Location of the depends/ CVS module:
  ifeq (,$(GZZ_DEPENDS))
***************
*** 370,393 ****
        @echo "Removing everything found in .cvsignore's"
        find . -name ".cvsignore"|while read ign; do (cd `dirname $$ign` && cat 
.cvsignore|while read files; do rm -Rf "$$files"; done); done
  
- 
- NOTEST=true
- jar: jardir=$(JARNAME).build
- jar : 
-       rm -Rf $(jardir)
-       mkdir $(jardir)
-       $(MAKE) ARCH="$(JARARCHES)" MODULES="$(JARMODULES)" compile
-       $(NOTEST) || $(MAKE) ARCH="$(JARARCHES)" MODULES="$(JARMODULES)" 
batchtest slow
-       echo 'Main-Class: $(mainclass)' > $(jardir)/manifest
-       (cd $(jardir) && for jar in pythonlib yaml jythonlib jython; do jar xvf 
../$(GZZ_DEPENDS)/$$jar.jar ; done)
-       cp -a $(CLASSDIR)/* $(jardir)
-       find gzz -name "*.py" | while read file ; do mkdir -p 
$(jardir)/`dirname $$file` && cp $$file $(jardir)/$$file ; done
-       cp Gzz.py $(jardir)
-       cp LICENSE.lgpl LICENSE.xpl $(GZZ_DEPENDS)/{jython,python,yaml}.license 
$(jardir)
-       cp README $(jardir)
-       (cd $(jardir) && jar cvfm $(JARNAME) manifest *)
-       mv $(jardir)/$(JARNAME) .
-       rm -rf $(jardir)
  
  tags::
        ctags -R
--- 314,319 ----
Index: gzz/TODO
diff -c gzz/TODO:1.53 gzz/TODO:1.54
*** gzz/TODO:1.53       Wed Aug 28 11:44:31 2002
--- gzz/TODO    Wed Aug 28 12:59:27 2002
***************
*** 2,11 ****
  RELEASES
  
  0.8alpha1: JUST GET IT OUT OF THE DOOR
!     tuukkah:
!       revise target 'official-release'
!       
!       tag the cvs tree
  0.8alpha2: More documentation
      tuukkah:
        - document our UML software (metacode/uml*,
--- 2,8 ----
  RELEASES
  
  0.8alpha1: JUST GET IT OUT OF THE DOOR
! 
  0.8alpha2: More documentation
      tuukkah:
        - document our UML software (metacode/uml*,




reply via email to

[Prev in Thread] Current Thread [Next in Thread]