gunnar: server Makefile,1.94,1.95
cvs at kolab.org
cvs at kolab.org
Tue Jan 19 05:53:28 CET 2010
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv6448
Modified Files:
Makefile
Log Message:
Allow to use the staging area for an update. Copy the binary packages into the staging area too.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- Makefile 18 Jan 2010 11:02:16 -0000 1.94
+++ Makefile 19 Jan 2010 04:53:26 -0000 1.95
@@ -149,19 +149,8 @@
BASE_FILES=install-kolab.sh \
1st.README
-# These are the packages that already provide a "make install"
-# procedure that will allow to update packages from CVS.
-UPDATES=imapd \
- openldap \
- apache-php \
- php \
- kolabd \
- pear/Horde_Notification \
- pear/Horde_Prefs \
- php-kolab/Kolab_Filter \
- php-kolab/Kolab_Server \
- php-kolab/Kolab_Storage \
- kolab-webclient
+CURRENT_SOURCE_RELEASE = http://files.kolab.org/server/release/kolab-server-2.2.3/sources/
+CURRENT_BINARY_RELEASE = http://files.kolab.org/server/release/kolab-server-2.2.3/$(PLATTAG)/
PHPUNIT=$(HOME)/bin/phpunit
@@ -380,17 +369,17 @@
####################
# Sub targets for the package staging area.
-stage:
- mkdir -p stage
+stage/source:
+ mkdir -p stage/source
.PHONY: clean-stage
clean-stage:
rm -rf stage
.PHONY: files
-files: stage
- cp $(BASE_FILES) stage/
- echo 'Remember to update 00INDEX.rdf and install-kolab.sh!'
+files: stage/source
+ cp $(BASE_FILES) stage/source/
+ echo 'Remember to update 00INDEX.rdf!'
####################
# STAGING END
@@ -402,12 +391,21 @@
# Sub targets for updating an installed server to the packages
# generated from CVS.
-#
-# @TODO: Needs to be completed
-#
-
.PHONY: update
-update: dist
+update: dist stage/update/source
+
+stage/release/source:
+ mkdir -p stage/release/source
+ cd stage/release/source && wget -r -l1 -nd --no-parent $(CURRENT_SOURCE_RELEASE)
+
+stage/update/source: stage/release/source
+ rm -rf stage/update/source
+ mkdir -p stage/update/source
+ rsync -avz stage/release/source/ stage/update/source/
+ rsync -avz stage/source/ stage/update/source/
+ chown -R $(KOLABUSR)\: stage/update/source
+ cd stage/update/source && sh install-kolab.sh -X
+ cd stage/update/source && sh install-kolab.sh 2>&1 | tee kolab-update.log
####################
# UPDATE END
More information about the commits
mailing list