[yum-git] 11 commits - Makefile
Tim Lauridsen
timlau at linux.duke.edu
Thu May 22 10:17:16 UTC 2008
Makefile | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
New commits:
commit ebfa3d461970897bf662be4a8dbc3cb0003ce6d9
Author: Tim Lauridsen <tla at rasmil.dk>
Date: Thu May 22 11:53:24 2008 +0200
Make test-release target a little better
diff --git a/Makefile b/Makefile
index d5daebf..25ea61c 100644
--- a/Makefile
+++ b/Makefile
@@ -56,7 +56,6 @@ test-release:
@git-archive --format=tar --prefix=$(PKGNAME)-$(VERSION).test/ HEAD | gzip -9v >${PKGNAME}-$(VERSION).test.tar.gz
# Build RPMS
@rpmbuild -ta ${PKGNAME}-${VERSION}.test.tar.gz
- @$(MAKE) test-cleanup
@rm -rf ${PKGNAME}-${VERSION}.test.tar.gz
@echo "Cleanup the git release-test local branch"
@git checkout -f
commit 47b880854f544434b7b2f2a7025243809d3a613d
Author: Tim Lauridsen <tla at rasmil.dk>
Date: Thu May 22 11:52:13 2008 +0200
Make test-release target a little better
diff --git a/Makefile b/Makefile
index 153e53d..d5daebf 100644
--- a/Makefile
+++ b/Makefile
@@ -57,14 +57,12 @@ test-release:
# Build RPMS
@rpmbuild -ta ${PKGNAME}-${VERSION}.test.tar.gz
@$(MAKE) test-cleanup
-
-test-cleanup:
@rm -rf ${PKGNAME}-${VERSION}.test.tar.gz
@echo "Cleanup the git release-test local branch"
@git checkout -f
@git checkout master
@git branch -D release-test
-
+
upload: archive srpm
@scp ${PKGNAME}-${VERSION}.tar.gz $(WEBHOST):$(WEBPATH)/
@scp ~/rpmbuild/SRPMS/${PKGNAME}-${VERSION}-*.src.rpm $(WEBHOST):$(WEBPATH)/
commit adf8f072acf6c6374203af6d16c40ae2ca11e998
Author: Tim Lauridsen <tla at rasmil.dk>
Date: Thu May 22 11:49:32 2008 +0200
Make test-release target a little better
diff --git a/Makefile b/Makefile
index ec3cb3c..153e53d 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ test-release:
@rpmbuild -ta ${PKGNAME}-${VERSION}.test.tar.gz
@$(MAKE) test-cleanup
-test-cleanup:
+test-cleanup:
@rm -rf ${PKGNAME}-${VERSION}.test.tar.gz
@echo "Cleanup the git release-test local branch"
@git checkout -f
commit 9fa1719066c63a8488a969ae9d62d2fbda543387
Author: Tim Lauridsen <tla at rasmil.dk>
Date: Thu May 22 11:48:06 2008 +0200
Make test-release target a little better
diff --git a/Makefile b/Makefile
index 693a79f..ec3cb3c 100644
--- a/Makefile
+++ b/Makefile
@@ -59,6 +59,7 @@ test-release:
@$(MAKE) test-cleanup
test-cleanup:
+ @rm -rf ${PKGNAME}-${VERSION}.test.tar.gz
@echo "Cleanup the git release-test local branch"
@git checkout -f
@git checkout master
commit 04ab534cd702ef9a9dccbf8a806b1a4a0a6716e1
Author: Tim Lauridsen <tla at rasmil.dk>
Date: Thu May 22 11:46:39 2008 +0200
Make test-release target a little better
diff --git a/Makefile b/Makefile
index f7f8d5c..693a79f 100644
--- a/Makefile
+++ b/Makefile
@@ -56,6 +56,9 @@ test-release:
@git-archive --format=tar --prefix=$(PKGNAME)-$(VERSION).test/ HEAD | gzip -9v >${PKGNAME}-$(VERSION).test.tar.gz
# Build RPMS
@rpmbuild -ta ${PKGNAME}-${VERSION}.test.tar.gz
+ @$(MAKE) test-cleanup
+
+test-cleanup:
@echo "Cleanup the git release-test local branch"
@git checkout -f
@git checkout master
commit 3d9ba0a8a0f9305f3012c1e01857754a81b4559e
Author: Tim Lauridsen <tla at rasmil.dk>
Date: Thu May 22 11:39:06 2008 +0200
Make test-release target a little better
diff --git a/Makefile b/Makefile
index 0d4be09..f7f8d5c 100644
--- a/Makefile
+++ b/Makefile
@@ -47,16 +47,15 @@ test-release:
@git checkout -b release-test
# Add '.test' to Version in spec file
@cat yum-utils.spec | sed 's/^Version:.*/&.test/' > yum-utils-test.spec ; mv yum-utils-test.spec yum-utils.spec
- VERSION=$VERSION.test
- @git commit -a -m "bumped yum-utils version to $(VERSION)"
+ @git commit -a -m "bumped yum-utils version to $(VERSION).test"
# Make Changelog
@git log --pretty --numstat --summary | ./tools/git2cl > ChangeLog
@git commit -a -m "updated ChangeLog"
# Make archive
- @rm -rf ${PKGNAME}-${VERSION}.tar.gz
- @git-archive --format=tar --prefix=$(PKGNAME)-$(VERSION)/ HEAD | gzip -9v >${PKGNAME}-$(VERSION).tar.gz
+ @rm -rf ${PKGNAME}-${VERSION}.test.tar.gz
+ @git-archive --format=tar --prefix=$(PKGNAME)-$(VERSION).test/ HEAD | gzip -9v >${PKGNAME}-$(VERSION).test.tar.gz
# Build RPMS
- @rpmbuild -ta ${PKGNAME}-${VERSION}.tar.gz
+ @rpmbuild -ta ${PKGNAME}-${VERSION}.test.tar.gz
@echo "Cleanup the git release-test local branch"
@git checkout -f
@git checkout master
commit bfb3b2fe69da15436662aeb2407608effadd583b
Author: Tim Lauridsen <tla at rasmil.dk>
Date: Thu May 22 11:32:53 2008 +0200
Make test-release target a little better
diff --git a/Makefile b/Makefile
index 2edbadb..0d4be09 100644
--- a/Makefile
+++ b/Makefile
@@ -45,15 +45,19 @@ release:
test-release:
@git checkout -b release-test
+ # Add '.test' to Version in spec file
@cat yum-utils.spec | sed 's/^Version:.*/&.test/' > yum-utils-test.spec ; mv yum-utils-test.spec yum-utils.spec
VERSION=$VERSION.test
@git commit -a -m "bumped yum-utils version to $(VERSION)"
- @$(MAKE) ChangeLog
+ # Make Changelog
+ @git log --pretty --numstat --summary | ./tools/git2cl > ChangeLog
@git commit -a -m "updated ChangeLog"
- @$(MAKE) archive
- @echo "The archive is in ${PKGNAME}-$(VERSION).tar.gz"
+ # Make archive
+ @rm -rf ${PKGNAME}-${VERSION}.tar.gz
+ @git-archive --format=tar --prefix=$(PKGNAME)-$(VERSION)/ HEAD | gzip -9v >${PKGNAME}-$(VERSION).tar.gz
+ # Build RPMS
@rpmbuild -ta ${PKGNAME}-${VERSION}.tar.gz
- @echo "RPM Build completed"
+ @echo "Cleanup the git release-test local branch"
@git checkout -f
@git checkout master
@git branch -D release-test
commit 7baa85e996150b6dfb5542bfe6abd72aca69e1f9
Author: Tim Lauridsen <tla at rasmil.dk>
Date: Thu May 22 11:27:33 2008 +0200
Make test-release target a little better
diff --git a/Makefile b/Makefile
index 3f55d8a..2edbadb 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,9 @@ test-release:
@$(MAKE) ChangeLog
@git commit -a -m "updated ChangeLog"
@$(MAKE) archive
+ @echo "The archive is in ${PKGNAME}-$(VERSION).tar.gz"
@rpmbuild -ta ${PKGNAME}-${VERSION}.tar.gz
+ @echo "RPM Build completed"
@git checkout -f
@git checkout master
@git branch -D release-test
commit 8d827c66bdf3ef6881a620e40dbcd5b300a47b71
Author: Tim Lauridsen <tla at rasmil.dk>
Date: Thu May 22 11:23:03 2008 +0200
Make test-release target a little better
diff --git a/Makefile b/Makefile
index 42268b4..3f55d8a 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ release:
test-release:
@git checkout -b release-test
@cat yum-utils.spec | sed 's/^Version:.*/&.test/' > yum-utils-test.spec ; mv yum-utils-test.spec yum-utils.spec
- VERSION=$(shell awk '/Version:/ { print $$2 }' ${PKGNAME}.spec)
+ VERSION=$VERSION.test
@git commit -a -m "bumped yum-utils version to $(VERSION)"
@$(MAKE) ChangeLog
@git commit -a -m "updated ChangeLog"
commit bce12bcd0e536fbee9b823569b2185c68749c41d
Author: Tim Lauridsen <tla at rasmil.dk>
Date: Thu May 22 11:18:00 2008 +0200
Make test-release target a little better
diff --git a/Makefile b/Makefile
index bb8597d..42268b4 100644
--- a/Makefile
+++ b/Makefile
@@ -44,15 +44,17 @@ release:
@$(MAKE) upload
test-release:
- @git branch -D release-test
@git checkout -b release-test
@cat yum-utils.spec | sed 's/^Version:.*/&.test/' > yum-utils-test.spec ; mv yum-utils-test.spec yum-utils.spec
VERSION=$(shell awk '/Version:/ { print $$2 }' ${PKGNAME}.spec)
@git commit -a -m "bumped yum-utils version to $(VERSION)"
@$(MAKE) ChangeLog
@git commit -a -m "updated ChangeLog"
- @$(MAKE) srpm
-# @git checkout master
+ @$(MAKE) archive
+ @rpmbuild -ta ${PKGNAME}-${VERSION}.tar.gz
+ @git checkout -f
+ @git checkout master
+ @git branch -D release-test
upload: archive srpm
@scp ${PKGNAME}-${VERSION}.tar.gz $(WEBHOST):$(WEBPATH)/
commit 62115df6aaf122d3220f568cbc3a547512358206
Author: Tim Lauridsen <tla at rasmil.dk>
Date: Thu May 22 11:10:23 2008 +0200
Make test-release target to Makefile, to make it easier test the build of a releases without sending it to HEAD
diff --git a/Makefile b/Makefile
index fdbd490..bb8597d 100644
--- a/Makefile
+++ b/Makefile
@@ -42,6 +42,17 @@ release:
@git tag -a -f -m "Tagged ${PKGNAME}-$(VERSION)" ${PKGNAME}-$(VERSION)
@git push --tags origin
@$(MAKE) upload
+
+test-release:
+ @git branch -D release-test
+ @git checkout -b release-test
+ @cat yum-utils.spec | sed 's/^Version:.*/&.test/' > yum-utils-test.spec ; mv yum-utils-test.spec yum-utils.spec
+ VERSION=$(shell awk '/Version:/ { print $$2 }' ${PKGNAME}.spec)
+ @git commit -a -m "bumped yum-utils version to $(VERSION)"
+ @$(MAKE) ChangeLog
+ @git commit -a -m "updated ChangeLog"
+ @$(MAKE) srpm
+# @git checkout master
upload: archive srpm
@scp ${PKGNAME}-${VERSION}.tar.gz $(WEBHOST):$(WEBPATH)/
More information about the Yum-cvs-commits
mailing list