gunnar: server Makefile,1.103,1.104 test_environment.dist,1.1,1.2

cvs at kolab.org cvs at kolab.org
Tue Feb 9 17:18:57 CET 2010


Author: gunnar

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

Modified Files:
	Makefile test_environment.dist 
Log Message:
Add a install-server-from-source target.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- Makefile	9 Feb 2010 14:14:55 -0000	1.103
+++ Makefile	9 Feb 2010 16:18:55 -0000	1.104
@@ -436,18 +436,38 @@
 # as being a test machine (by creating the test_environment file).
 
 ifeq "x$(TEST_ENVIRONMENT)" "xYES"
-# Convenience target to install the server
+# Convenience target for installing the server
 .PHONY:install-server
 install-server: $(KOLABDIR)
 
+# Convenience target for downloading the binary server packages
+.PHONY:download-binary
+download-binary: $(BINARY_PKGS_DIR)
+
 # Downloads the binary packages for installation
-$(BINARY_SOURCE_DIR):
+$(BINARY_PKGS_DIR):
 	mkdir -p $@
 	cd $@ && wget -r -l1 -nd --no-parent $(CURRENT_BINARY_RELEASE)
 
 # Installs the Kolab server from the binary packages
-$(KOLABDIR): $(BINARY_SOURCE_DIR)
-	cd $(BINARY_SOURCE_DIR) && sh install-kolab.sh 2>&1 | tee kolab-install.log
+$(KOLABDIR): $(BINARY_PKGS_DIR)
+	cd $(BINARY_PKGS_DIR) && sh install-kolab.sh 2>&1 | tee kolab-install.log
+
+# Convenience target for downloading the source server packages
+.PHONY:download-source
+download-source: $(SOURCE_PKGS_DIR)
+
+# Downloads the binary packages for installation
+$(SOURCE_PKGS_DIR):
+	mkdir -p $@
+	cd $@ && wget -r -l1 -nd --no-parent $(CURRENT_SOURCE_RELEASE)
+
+# Installs the Kolab server from the source packages. This should not
+# be the common target is mainly meant as a helper if you are working
+# on a platform where binaries cannot be downloaded from files.kolab.org
+.PHONY:install-server-from-source
+install-server-from-source: $(SOURCE_PKGS_DIR)
+	cd $(SOURCE_PKGS_DIR) && sh install-kolab.sh 2>&1 | tee kolab-install.log
 
 # Convenience target to uninstall the server
 .PHONY:clean-server

Index: test_environment.dist
===================================================================
RCS file: /kolabrepository/server/test_environment.dist,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- test_environment.dist	9 Feb 2010 14:14:55 -0000	1.1
+++ test_environment.dist	9 Feb 2010 16:18:55 -0000	1.2
@@ -5,7 +5,10 @@
 # and adapt the settings to your need.
 
 # The location where the binary packages should be downloaded to.
-BINARY_SOURCE_DIR=/root/kolab-server-2.2.3/ix86-debian5.0 
+BINARY_PKGS_DIR=/root/kolab-server-2.2.3/ix86-debian5.0 
+
+# The location where the binary packages should be downloaded to.
+SOURCE_PKGS_DIR=/root/kolab-server-2.2.3/sources
 
 # The location to which the Kolab server should be installed.
 KOLABDIR=/kolab





More information about the commits mailing list