gunnar: server/kolab-webadmin Makefile,1.11,1.12
cvs at kolab.org
cvs at kolab.org
Wed Aug 22 08:57:33 CEST 2007
- Previous message: gunnar: server/php-kolab/Kolab_Webadmin/Webadmin address.class.php, 1.1, 1.2 administrator.class.php, 1.1, 1.2 domainmaintainer.class.php, 1.2, 1.3 group.class.php, 1.2, 1.3 maintainer.class.php, 1.1, 1.2 sharedfolder.class.php, 1.2, 1.3 user.class.php, 1.4, 1.5 webadmin.class.php, 1.6, 1.7
- Next message: gunnar: server/php-kolab/Kolab_Webadmin/Webadmin ldap.class.php, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin
In directory doto:/tmp/cvs-serv1553
Modified Files:
Makefile
Log Message:
Revert last accidental commit. This will happen later.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile 22 Aug 2007 06:53:01 -0000 1.11
+++ Makefile 22 Aug 2007 06:57:31 -0000 1.12
@@ -1,15 +1,6 @@
-PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([a-z\_-]*\).*/\1/")
-BASE_VERSION = $(shell grep "%define[ ]*V_base_version" *.spec | sed -e "s/.*V_base_version\s*\([0-9.]*\).*/\1/")
-RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
-CVS = $(shell grep "%define[ ]*V_cvs" *.spec | sed -e "s/.*V_cvs\s*\([01]\).*/\1/")
-
-ifeq "x$(CVS)" "x1"
-VERSION=$(BASE_VERSION).cvs
-TAR=$(PACKAGE)-$(VERSION)-$(RELEASE).tar.bz2
-else
-VERSION=$(BASE_VERSION)
-TAR=$(PACKAGE)-$(VERSION).tar.bz2
-endif
+PACKAGE=kolab-webadmin
+VERSION:=`grep 'm4_define(_VERSION' $(PWD)/$(PACKAGE)/configure.ac|sed 's/m4_define(_VERSION,\(.*\))/\1/'`
+RELEASE:=`date '+%Y%m%d'`
ifeq "x$(RPM)" "x"
RPM = $(HOME)/bin/openpkg rpm
@@ -24,36 +15,19 @@
KOLABRPMTMP = $(HOME)/RPM/TMP
endif
-.PHONY: all
-all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-
-.PHONY: dist
-dist: all
- cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
-
-.PHONY: clean_all
-clean_all: clean
-
-.PHONY: clean
-clean:
- rm -rf $(HOME)/RPM/TMP/$(PACKAGE)*
- find . -name "*~" | xargs rm -rf
- rm -rf *.src.rpm
- rm -rf *.tar.bz2
-
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(TAR)
+all:
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
+ cd $(PACKAGE) && ./bootstrap && ./configure --prefix=/kolab \
+ && make clean distcheck && mv $(PACKAGE)-$(VERSION).tar.bz2 $(KOLABRPMSRC)/$(PACKAGE)
+ cp $(PACKAGE)/$(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)/
+ cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec --define 'kolab_version CVS'
- cp $(TAR) $(KOLABRPMSRC)/$(PACKAGE)/
-
- cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
- cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
-
- cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
+binary:
+ $(RPM) -bB $(PACKAGE).spec
-.PHONY: tardist
-tardist: $(TAR)
+release:
+ tar cvzf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)
+ $(RPM) -ba $(PACKAGE).spec
-$(TAR): admin/*.php
- for PO in admin/locale/**/LC_MESSAGES/messages.po;do msgfmt -o $${PO/po/mo} $${PO};done
- tar cjf $@ admin --exclude="CVS" --exclude="*~" --exclude=".cvsignore"
+dist: all
+ cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
- Previous message: gunnar: server/php-kolab/Kolab_Webadmin/Webadmin address.class.php, 1.1, 1.2 administrator.class.php, 1.1, 1.2 domainmaintainer.class.php, 1.2, 1.3 group.class.php, 1.2, 1.3 maintainer.class.php, 1.1, 1.2 sharedfolder.class.php, 1.2, 1.3 user.class.php, 1.4, 1.5 webadmin.class.php, 1.6, 1.7
- Next message: gunnar: server/php-kolab/Kolab_Webadmin/Webadmin ldap.class.php, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the commits
mailing list