diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-06-26 14:38:20 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-06-26 14:38:20 +0000 |
| commit | 97f7bdf137281afc070b99f64d36279cfce2644c (patch) | |
| tree | e41b3aedcb7f0f81dd4abe16a6a252785dfb01f4 /Makefile | |
| parent | d5b0d7671c55acfd7fe4ad765b04aaaa246fa07d (diff) | |
| download | ATCD-97f7bdf137281afc070b99f64d36279cfce2644c.tar.gz | |
fix UPTODATE check by not running it in a sub-shell; added ACE-lessons.html to RELEASE_FILES
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -50,6 +50,7 @@ clone: RELEASE_FILES = ACE_wrappers/ACE-categories \ ACE_wrappers/ACE-install.sh \ + ACE_wrappers/ACE-lessons.html \ ACE_wrappers/BIBLIOGRAPHY \ ACE_wrappers/ChangeLog-97a \ ACE_wrappers/ChangeLog-96b \ @@ -93,12 +94,12 @@ RELEASE_LIB_FILES = \ #### 4.2, it will not be modified because it is assumed to be for a #### final release. ifeq ($(shell pwd),/project/adaptive/ACE_wrappers) - TIMESTAMP = CHANGELOG=`/pkg/gnu/bin/find -name 'ChangeLog*' -maxdepth 1 \ + TIMESTAMP = (CHANGELOG=`/pkg/gnu/bin/find -name 'ChangeLog*' -maxdepth 1 \ -type f | xargs ls -1t | head -1`; export CHANGELOG; \ - if [ -z "$$CHANGELOG" ]; then echo unable to find latest ChangeLog file; exit; fi; \ + if [ -z "$$CHANGELOG" ]; then echo unable to find latest ChangeLog file; exit 1; fi; \ DATE=`/usr/bin/date +"%a %b %d %T %Y"`; export DATE; \ - (cd ..; UPTODATE=`cvs -nq update $(RELEASE_FILES)`); \ - if [ "$$UPTODATE" ]; then echo ERROR: workspace must be updated, and/or non-controlled files must be removed or added/committed: $$UPTODATE; exit; fi; \ + cd ..; UPTODATE=`cvs -nq update $(RELEASE_FILES) | egrep -v '/tests/log/' | perl -pi -e 's%/ACE_wrappers%%g; s/$$/\\\n /g'`; cd ACE_wrappers; \ + if [ "$$UPTODATE" ]; then /pkg/gnu/bin/echo -e ERROR: workspace must be updated, and/or non-controlled files must be removed or added/committed: $$UPTODATE; exit 1; fi; \ ACE_VERSION=`perl -pi -e \ 'BEGIN { $$date=$$ENV{"DATE"} } \ s/(ACE version \d+\.\d+\.)(\d+)/sprintf("$$1%d",$$2+1)/e; \ @@ -116,7 +117,7 @@ ifeq ($(shell pwd),/project/adaptive/ACE_wrappers) if ( ! $$message_printed++ ) { print "$$message\n"; } \ print; } ' $$CHANGELOG; \ cvs commit -m"$$ACE_VERSION" VERSION $$CHANGELOG; \ - chmod 644 VERSION; + chmod 644 VERSION) && else TIMESTAMP = endif @@ -126,15 +127,14 @@ endif #### Solaris 2.5.1, and gnu cpio 2.3, do support that option. cleanrelease: - @($(TIMESTAMP)make realclean; cd ..; \ + @$(TIMESTAMP) (make realclean; cd ..; \ find $(RELEASE_FILES) -name CVS -prune -o -print | cpio -o -H tar | gzip -9 > ACE.tar.gz; \ chmod a+r ACE.tar.gz; mv ACE.tar.gz ./ACE_wrappers/) release: - @($(TIMESTAMP)cd ..; \ + @$(TIMESTAMP) (cd ..; \ find $(RELEASE_FILES) -name CVS -prune -o -print | cpio -o -H tar | gzip -9 > ACE.tar.gz; \ - chmod a+r ACE.tar.gz; mv ACE.tar.gz ./ACE_wrappers/); \ - (cd ..; \ find $(RELEASE_LIB_FILES) -name CVS -prune -o -print | cpio -o -H tar | gzip -9 > ACE-lib.tar.gz; \ - chmod a+r ACE-lib.tar.gz; mv ACE-lib.tar.gz ./ACE_wrappers/) + chmod a+r ACE.tar.gz ACE-lib.tar.gz; \ + mv ACE.tar.gz ACE-lib.tar.gz ./ACE_wrappers/) |