summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2010-02-09 16:18:55 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2010-02-09 16:18:55 (GMT)
commit5b4749ae21a2257a686546f3dbde80b94cd08345 (patch)
tree1c7baa4f33af2f2adceffa6bac070a33d963490c
parent08bbd06849f9dd89b3fc880956cbc522ab62a69d (diff)
downloadserver-5b4749ae21a2257a686546f3dbde80b94cd08345.tar.gz
Add a install-server-from-source target.
-rw-r--r--Makefile28
-rw-r--r--make-helper/kolab.mk3
-rw-r--r--test_environment.dist5
3 files changed, 30 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 821b79f..8241a56 100644
--- a/Makefile
+++ b/Makefile
@@ -436,18 +436,38 @@ files: stage/source
# 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
diff --git a/make-helper/kolab.mk b/make-helper/kolab.mk
index a14fbdc..5da762e 100644
--- a/make-helper/kolab.mk
+++ b/make-helper/kolab.mk
@@ -1,7 +1,8 @@
# Check if we are in a test environment
TEST_ENVIRONMENT=$(shell test -e test_environment && echo YES)
ifeq "x$(TEST_ENVIRONMENT)" "xYES"
- BINARY_SOURCE_DIR=$(shell source test_environment && echo $$BINARY_SOURCE_DIR)
+ BINARY_PKGS_DIR=$(shell source test_environment && echo $$BINARY_PKGS_DIR)
+ SOURCE_PKGS_DIR=$(shell source test_environment && echo $$SOURCE_PKGS_DIR)
endif
# Initial sanity check for the OpenPKG tool
diff --git a/test_environment.dist b/test_environment.dist
index 878c5bb..c623043 100644
--- a/test_environment.dist
+++ b/test_environment.dist
@@ -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