gunnar: server/make-helper package.mk,1.10,1.11
cvs at kolab.org
cvs at kolab.org
Tue Jan 19 05:53:28 CET 2010
Author: gunnar
Update of /kolabrepository/server/make-helper
In directory doto:/tmp/cvs-serv6448/make-helper
Modified Files:
package.mk
Log Message:
Allow to use the staging area for an update. Copy the binary packages into the staging area too.
Index: package.mk
===================================================================
RCS file: /kolabrepository/server/make-helper/package.mk,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- package.mk 18 Jan 2010 10:57:00 -0000 1.10
+++ package.mk 19 Jan 2010 04:53:26 -0000 1.11
@@ -9,6 +9,7 @@
BUILD_OPTIONS ?=
RELEASETARGET ?= $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+BINTARGET ?= $(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
CLEAN_EXTRA ?=
@@ -20,7 +21,7 @@
# includes building the binary package which is an additional check for
# the final release. Thus it is the default target.
.PHONY: dist
-dist: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm $(STAGING)/$(RELEASETARGET)
+dist: $(KOLABRPMPKG)/$(BINTARGET) $(STAGING)/source/$(RELEASETARGET) $(STAGING)/$(PLATTAG)/$(BINTARGET)
# Target for placing the source rpm in the staging area. This is the soft
# variant that is quicker and omits the binary package.
@@ -30,8 +31,8 @@
# Target for installing the binary rpm package in our current Kolab
# server installation
.PHONY: install
-install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
- $(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
+install: $(KOLABRPMPKG)/$(BINTARGET)
+ $(RPM) -Uhv --force $(KOLABRPMPKG)/$(BINTARGET)
# Target for cleaning up the files that can be generated with this Makefile
.PHONY: clean
@@ -39,7 +40,7 @@
rm -rf $(KOLABRPMSRC)/$(PACKAGE)
rm -rf $(KOLABRPMTMP)/$(PACKAGE)*
rm -f $(KOLABRPMPKG)/$(RELEASETARGET)
- rm -f $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
+ rm -f $(KOLABRPMPKG)/$(BINTARGET)
rm -f $(RELEASETARGET)
rm -f *.tar.gz *.tgz *.tar.bz2
rm -f *~
@@ -74,10 +75,19 @@
endif
# Prepare the staging area
-$(STAGING)/.dir:
+$(STAGING)/source/.dir:
mkdir -p $(STAGING)
- touch $(STAGING)/.dir
+ touch $(STAGING)/source/.dir
# Final package location
-$(STAGING)/$(RELEASETARGET): $(STAGING)/.dir $(RELEASETARGET)
- cp $(RELEASETARGET) $(STAGING)
+$(STAGING)/source/$(RELEASETARGET): $(STAGING)/source/.dir $(RELEASETARGET)
+ cp $(RELEASETARGET) $(STAGING)/source
+
+# Prepare the binary staging area
+$(STAGING)/$(PLATTAG)/.dir:
+ mkdir -p $(STAGING)/$(PLATTAG)
+ touch $(STAGING)/$(PLATTAG)/.dir
+
+# Final binary package location
+$(STAGING)/$(PLATTAG)/$(BINTARGET): $(STAGING)/$(PLATTAG)/.dir $(KOLABRPMPKG)/$(BINTARGET)
+ cp $(KOLABRPMPKG)/$(BINTARGET) $(STAGING)/$(PLATTAG)
More information about the commits
mailing list