gunnar: server Makefile,1.56,1.57 install-kolab.sh,1.42,1.43

cvs at kolab.org cvs at kolab.org
Tue Sep 16 16:26:50 CEST 2008


Author: gunnar

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

Modified Files:
	Makefile install-kolab.sh 
Log Message:
Update the Makefile and the installation script for the new packages.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- Makefile	12 Sep 2008 05:20:20 -0000	1.56
+++ Makefile	16 Sep 2008 14:26:48 -0000	1.57
@@ -29,24 +29,48 @@
                kolab-filter            \
                kolab-webadmin          \
 
-HORDE_PACKAGES=pear/PEAR-Auth_SASL      \
+PEAR_PACKAGES= pear/PEAR-Auth_SASL      \
                pear/PEAR-Date           \
                pear/PEAR-Log            \
                pear/PEAR-Mail           \
                pear/PEAR-Mail_Mime      \
-               pear/PEAR-Net_Socket     \
-               pear/PEAR-Net_URL        \
-               pear/PEAR-Net_Sieve      \
                pear/PEAR-Net_IMAP       \
-               pear/PEAR-Net_SMTP       \
                pear/PEAR-Net_LMTP       \
+               pear/PEAR-Net_SMTP       \
+               pear/PEAR-Net_Sieve      \
+               pear/PEAR-Net_Socket     \
+               pear/PEAR-Net_URL        \
                pear/PEAR-HTTP_Request   \
+               pear/Horde_Auth          \
+               pear/Horde_Browser       \
+               pear/Horde_CLI           \
+               pear/Horde_Cache         \
+               pear/Horde_Cipher        \
+               pear/Horde_DOM           \
+               pear/Horde_DataTree      \
+               pear/Horde_Date          \
+               pear/Horde_Framework     \
+               pear/Horde_Group         \
+               pear/Horde_History       \
+               pear/Horde_LDAP          \
+               pear/Horde_MIME          \
+               pear/Horde_NLS           \
+               pear/Horde_Perms         \
+               pear/Horde_Secret        \
+               pear/Horde_Serialize     \
+               pear/Horde_SessionObjects \
+               pear/Horde_Util          \
+               pear/Horde_iCalendar     \
+               php-kolab/Kolab_Format   \
+               php-kolab/Kolab_Server   \
+               php-kolab/Kolab_Storage  \
+               php-kolab/Kolab_Freebusy \
 
 BASE_FILES=install-kolab.sh \
            README.1st
 
 .PHONY: dist
-dist: stage base kolab horde files
+dist: stage base kolab pear files
 
 stage:
 	mkdir stage
@@ -68,15 +92,11 @@
 $(PERL_MAKEFILES): $(@:%=%.PL)
 	cd $(@:%/Makefile=%) && perl Makefile.PL
 
-.PHONY: horde
-horde: stage
-	for PKG in $(HORDE_PACKAGES);                   \
+.PHONY: pear
+pear: stage
+	for PKG in $(PEAR_PACKAGES);                   \
 	do                                              \
 	  make -C $$PKG dist || exit $$?;               \
-	  echo -e "\n==" >> stage/ChangeLog.horde;      \
-	  echo "$$PKG" >> stage/ChangeLog.horde;        \
-	  echo -e "==\n" >> stage/ChangeLog.horde;      \
-	  cat $$PKG/ChangeLog >> stage/ChangeLog.horde; \
 	done
 
 .PHONY: files
@@ -85,7 +105,7 @@
 	echo 'Remember to update 00INDEX.rdf and install-kolab.sh!'
 
 .PHONY: clean
-clean: clean-base clean-kolab clean-horde clean-stage
+clean: clean-base clean-kolab clean-pear clean-stage
 	find . | grep "~$$" | xargs rm -rf
 
 .PHONY: clean-stage
@@ -106,9 +126,9 @@
 	  make -C $$PKG clean_all || exit $$?;          \
 	done
 
-.PHONY: clean-horde
-clean-horde:
-	for PKG in $(HORDE_PACKAGES);                   \
+.PHONY: clean-pear
+clean-pear:
+	for PKG in $(PEAR_PACKAGES);                   \
 	do                                              \
 	  make -C $$PKG clean || exit $$?;              \
 	done

Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- install-kolab.sh	16 Jul 2008 11:00:38 -0000	1.42
+++ install-kolab.sh	16 Sep 2008 14:26:48 -0000	1.43
@@ -21,7 +21,7 @@
 
 INSTALL=""
 
-PACKAGES="openpkg-tools openldap postfix kolabd kolab-filter kolab-freebusy kolab-webadmin fbview-kronolith horde-kolab-client"
+PACKAGES="openpkg-tools openldap postfix kolabd kolab-filter Kolab-Freebusy kolab-webadmin fbview-kronolith kolab-webclient"
 DEFINE="-D openldap::with_pth=no -D sasl::with_ldap -D sasl::with_login -D sasl::with_ntlm -D postfix::with_sasl -D postfix::with_ssl -D postfix::with_ldap -D imapd::with_kolab_nocaps"
 EXCLUDEPKGS=""
 





More information about the commits mailing list