gunnar: server update.mk,NONE,1.1.2.1 Makefile,1.76.2.3,1.76.2.4

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv31712

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Added Files:
      Tag: kolab_2_2_branch
	update.mk 
Log Message:
Added a preliminary update target. Does not work completely yet as some packages still have structural problems.

--- NEW FILE: update.mk ---
# Declare the packages that were updated between versions here. Each
# package must provide a "make install" procedure that will allow to
# update packages from CVS. Currently

# These are the packages that were updated from Kolab Server version
# 2.2.2 to 2.2.3.
UPDATES_2.2.2_2.2.3=clamav                  \
                    db                      \
                    imapd                   \
                    kolabd                  \
                    php-kolab/Kolab_Filter  \
                    kolab-webclient         \
# Hm, we can't update these automatically...
#                    openpkg                 \
#                    perl-kolab

# Set the new version we are aiming at after each release.
CVS_VERSION=2.2.3
# Determines the current version
CURRENT_VERSION=$(shell $(KOLABDIR)/bin/openpkg rpm -q kolabd | sed -e 's/kolabd-\([0-9.]*\)-[0-9]*/\1/')

KOLAB_SERVER_CVS=KOLAB_SERVER-$(CVS_VERSION)
KOLAB_SERVER_CURRENT=KOLAB_SERVER-$(CURRENT_VERSION)


.PHONY: update
update: current

.PHONY:current
current: $(KOLAB_SERVER_CVS)

.PHONY:$(KOLAB_SERVER_CVS)
$(KOLAB_SERVER_CVS): KOLAB_SERVER-2.2.2
	for UPDATE in $(UPDATES_2.2.2_2.2.3);   \
	do                                      \
	  make -C $$UPDATE install || exit $$?; \
	done


ifeq "x$(KOLAB_SERVER_CURRENT)" "xKOLAB_SERVER-2.2.2"
.PHONY:KOLAB_SERVER-2.2.2
KOLAB_SERVER-2.2.2:
	@echo "You are using Kolab Server 2.2.2. Updating from there..."
else
.PHONY:KOLAB_SERVER-2.2.2
KOLAB_SERVER-2.2.2:
	@echo "You are using Kolab Server $(CURRENT_VERSION)."
	@echo "The update operation is not supported for server versions below 2.2.2"
	@exit 1
endif
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.76.2.3
retrieving revision 1.76.2.4
diff -u -d -r1.76.2.3 -r1.76.2.4
--- Makefile	9 Nov 2009 17:33:54 -0000	1.76.2.3
+++ Makefile	17 Nov 2009 09:20:21 -0000	1.76.2.4
@@ -1,4 +1,5 @@
 include kolab.mk
+include update.mk
 
 BASE_PACKAGES=php-smarty              \
               openldap                \
@@ -64,19 +65,6 @@
                php-kolab/Kolab_Freebusy \
                php-kolab/Kolab_Filter   \
 
-# These are the packages that already provide a "make install"
-# procedure that will allow to update packages from CVS.
-UPDATES=imapd                   \
-        apache-php              \
-        php                     \
-        kolabd                  \
-        pear/Horde_Notification \
-        pear/Horde_Prefs        \
-        php-kolab/Kolab_Filter  \
-        php-kolab/Kolab_Server  \
-        php-kolab/Kolab_Storage \
-        kolab-webclient
-
 PHPUNIT=$(KOLABDIR)/bin/phpunit
 
 PHPUNIT_TESTS=$(KOLABDIR)/lib/php/test/Kolab_Format/Horde/Kolab/Format/AllTests.php \
@@ -142,13 +130,6 @@
 	for PKG in $(PEAR_PACKAGES);                   \
 	do                                              \
 	  make -C $$PKG clean || exit $$?;              \
-	done
-
-.PHONY: update
-update:
-	for UPDATE in $(UPDATES);               \
-	do                                      \
-	  make -C $$UPDATE install || exit $$?; \
 	done
 
 .PHONY: test