diff options
| author | Matt Wilson <msw@redhat.com> | 2000-09-07 21:09:22 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@redhat.com> | 2000-09-07 21:09:22 +0000 |
| commit | 5ffadf062954f29a5d772a50dac230082e61f7a4 (patch) | |
| tree | c752d9e5129384c5f64e70637c346eedac9a73fa /Makefile | |
| parent | cf970b91b6d4536a748e736fd4b565e334bdae51 (diff) | |
| download | anaconda-5ffadf062954f29a5d772a50dac230082e61f7a4.tar.gz anaconda-5ffadf062954f29a5d772a50dac230082e61f7a4.tar.xz anaconda-5ffadf062954f29a5d772a50dac230082e61f7a4.zip | |
merge from anaconda-7-0-branch
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 26 |
1 files changed, 9 insertions, 17 deletions
@@ -1,7 +1,7 @@ include Makefile.inc VERSION = 7.0.1 -RELEASE = 5 +RELEASE = 6 SNAPRELEASE = $(shell date "+1.%Y%m%d%H%M") SUBDIRSHD = balkan isys libfdisk collage loader po text-help \ @@ -77,11 +77,16 @@ archive: create-archive src: create-archive @rpm -ts anaconda-$(VERSION).tar.gz +snapsrc: create-snapshot + @rpm -ts anaconda-$(VERSION).tar.gz + create-snapshot: @rm -rf /tmp/anaconda @rm -rf /tmp/anaconda-$(VERSION) - @echo "WARNING WARNING WARNING: Pulling HEAD off - need to do tagging instead!" - @cd /tmp ; cvs -Q -d $(CVSROOT) export -r HEAD anaconda || echo "Um... export aborted." + @tag=`cvs status Makefile | awk ' /Sticky Tag/ { print $$3 } '` 2> /dev/null; \ + [ x"$$tag" = x"(none)" ] && tag=HEAD; \ + echo "*** Pulling off $$tag!"; \ + cd /tmp ; cvs -Q -d $(CVSROOT) export -r $$tag anaconda || echo "Um... export aborted." @cd /tmp/anaconda ; rm isys/modutils/modutils.spec @cd /tmp/anaconda ; rm -rf comps @cd /tmp/anaconda ; sed -e "s/@@VERSION@@/$(VERSION)/g" -e "s/@@RELEASE@@/$(SNAPRELEASE)/g" < anaconda.spec.in > anaconda.spec @@ -94,17 +99,4 @@ create-snapshot: @echo "The final archive is in anaconda-$(VERSION).tar.gz" create-archive: - @rm -rf /tmp/anaconda - @rm -rf /tmp/anaconda-$(VERSION) - @echo "WARNING WARNING WARNING: Pulling HEAD off - need to do tagging instead!" - @cd /tmp ; cvs -Q -d $(CVSROOT) export -r HEAD anaconda || echo "Um... export aborted." - @cd /tmp/anaconda ; rm isys/modutils/modutils.spec - @cd /tmp/anaconda ; rm -rf comps - @cd /tmp/anaconda ; sed -e "s/@@VERSION@@/$(VERSION)/g" -e "s/@@RELEASE@@/$(RELEASE)/g" < anaconda.spec.in > anaconda.spec - @mv /tmp/anaconda /tmp/anaconda-$(VERSION) - @cd /tmp ; tar -czSpf anaconda-$(VERSION).tar.gz anaconda-$(VERSION) - @rm -rf /tmp/anaconda-$(VERSION) - @cp /tmp/anaconda-$(VERSION).tar.gz . - @rm -f /tmp/anaconda-$(VERSION).tar.gz - @echo "" - @echo "The final archive is in anaconda-$(VERSION).tar.gz" + make SNAPRELEASE=$(RELEASE) create-snapshot |