gunnar: server Makefile,1.107,1.108
cvs at kolab.org
cvs at kolab.org
Thu Mar 4 13:10:01 CET 2010
- Previous message: gunnar: server/kolab-webclient-h4/horde-h4/configuration/horde-h4-0ef4c583a74e6521f7f2e7ea9f06c3a9f08bd091 10-kolab_conf_base.php, NONE, 1.1 10-kolab_hooks_base.php, NONE, 1.1 10-kolab_prefs_base.php, NONE, 1.1
- Next message: gunnar: server/kolab-webclient/imp ChangeLog, NONE, 1.1 imp.spec, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv17241
Modified Files:
Makefile
Log Message:
Forgot to add the H4 convenience targets.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- Makefile 18 Feb 2010 10:06:53 -0000 1.107
+++ Makefile 4 Mar 2010 12:09:59 -0000 1.108
@@ -173,6 +173,83 @@
# $(HOME)/lib/php/test/Kolab_Filter/Horde/Kolab/Filter/AllTests.php \
# $(HOME)/lib/php/test/Kolab_FreeBusy/Horde/Kolab/FreeBusy/AllTests.php
+PEAR_H4_CHANNEL_PACKAGES= \
+ pear-h4/PEAR-PHPUnit-Channel-H4 \
+# pear-h4/PEAR-Horde-Channel-H4 \
+
+PEAR_H4_PACKAGES= \
+ pear-h4/PEAR-Auth_SASL-H4 \
+ pear-h4/PEAR-DB-H4 \
+ pear-h4/PEAR-Log-H4 \
+ pear-h4/PEAR-Mail-H4 \
+ pear-h4/PEAR-Net_SMTP-H4 \
+ pear-h4/PEAR-Net_Socket-H4 \
+ pear-h4/PEAR-PEAR-H4 \
+ pear-h4/PHPUnit-H4
+
+HORDE_H4_PACKAGES= \
+ pear-h4/Horde_Ajax-H4 \
+ pear-h4/Horde_Alarm-H4 \
+ pear-h4/Horde_Auth-H4 \
+ pear-h4/Horde_Autoloader-H4 \
+ pear-h4/Horde_Block-H4 \
+ pear-h4/Horde_Browser-H4 \
+ pear-h4/Horde_Cache-H4 \
+ pear-h4/Horde_Cipher-H4 \
+ pear-h4/Horde_Cli-H4 \
+ pear-h4/Horde_Core-H4 \
+ pear-h4/Horde_Date-H4 \
+ pear-h4/Horde_Editor-H4 \
+ pear-h4/Horde_Exception-H4 \
+ pear-h4/Horde_Form-H4 \
+ pear-h4/Horde_Group-H4 \
+ pear-h4/Horde_Image-H4 \
+ pear-h4/Horde_Imap_Client-H4 \
+ pear-h4/Horde_Injector-H4 \
+ pear-h4/Horde_Ldap-H4 \
+ pear-h4/Horde_Log-H4 \
+ pear-h4/Horde_LoginTasks \
+ pear-h4/Horde_Mime-H4 \
+ pear-h4/Horde_Nls-H4 \
+ pear-h4/Horde_Notification-H4 \
+ pear-h4/Horde_Perms-H4 \
+ pear-h4/Horde_Prefs-H4 \
+ pear-h4/Horde_Secret-H4 \
+ pear-h4/Horde_Serialize-H4 \
+ pear-h4/Horde_SessionObjects-H4 \
+ pear-h4/Horde_Template-H4 \
+ pear-h4/Horde_Test-H4 \
+ pear-h4/Horde_Text_Filter-H4 \
+ pear-h4/Horde_Text_Flowed-H4 \
+ pear-h4/Horde_Token-H4 \
+ pear-h4/Horde_Tree-H4 \
+ pear-h4/Horde_Ui-H4 \
+ pear-h4/Horde_Url-H4 \
+ pear-h4/Horde_Util-H4 \
+ pear-h4/Horde_Vfs-H4 \
+ pear-h4/Kolab_Server-H4 \
+ pear-h4/Kolab_Session-H4
+# pear-h4/Horde_Argv-H4 \
+# pear-h4/Horde_Compress-H4 \
+# pear-h4/Horde_Controller-H4 \
+# pear-h4/Horde_Crypt-H4 \
+# pear-h4/Horde_Data-H4 \
+# pear-h4/Horde_Feed-H4 \
+# pear-h4/Horde_File_CSV-H4 \
+# pear-h4/Horde_File_PDF-H4 \
+# pear-h4/Horde_History-H4 \
+
+CLIENT_H4_PACKAGES= \
+ kolab-webclient-h4/horde-h4 \
+ kolab-webclient-h4/imp-h4 \
+# kolab-webclient/ingo \
+# kolab-webclient/kronolith \
+# kolab-webclient/kolab-webclient \
+# kolab-webclient/mnemo \
+# kolab-webclient/passwd \
+# kolab-webclient/nag \
+# kolab-webclient/turba \
+
PHPUNIT_TESTS_H4=$(HOME)/lib/php-h4/test/Kolab_Server/Horde/Kolab/Server/AllTests.php \
# The default target is building the distributable Kolab Server
@@ -229,8 +306,6 @@
####################
# KOLAB START
####################
-# Sub targets for pear packages from pear.php.net
-
#
# @TODO: These packages are still unclean. kolabd and kolab-webadmin
# do not deliver clean source archives as their configure script
@@ -292,7 +367,7 @@
####################
# PEAR HORDE START
####################
-# Sub targets for pear packages from pear.php.net
+# Sub targets for pear packages from pear.horde.org
.PHONY: fetch-pear-horde
fetch-pear-horde: $(PEAR_HORDE_PACKAGES:%=fetch-%)
@@ -359,7 +434,7 @@
####################
# PEAR CHANNEL START
####################
-# Sub targets for pear packages from pear.php.net
+# Sub targets for pear channels
.PHONY: dist-pear-channel
dist-pear-channel: $(PEAR_CHANNEL_PACKAGES:%=dist-%)
@@ -407,6 +482,166 @@
####################
# CLIENT END
+####################
+
+####################
+# HORDE 4 START
+####################
+# Wrapper targets for the Horde 4 installation
+
+# Fetches our basic Horde 4 requirements.
+.PHONY: fetch-h4
+fetch-h4: fetch-pear-h4-only fetch-pear-h4-horde fetch-h4-client
+
+# The core target that builds the Horde 4 packages.
+.PHONY: dist-h4
+dist-h4: dist-pear-h4-channel dist-pear-h4-only dist-pear-h4-horde dist-client-h4
+
+# Clean up all directories.
+.PHONY: clean-h4
+clean-h4: clean-pear-h4-channel clean-pear-h4-only clean-pear-h4-horde clean-client-h4
+
+# Generate all snapshots
+.PHONY: snapshot-h4
+snapshot-h4: snapshot-pear-h4-horde snapshot-client-h4
+
+ifeq "x$(TEST_ENVIRONMENT)" "xYES"
+.PHONY: install-h4
+install-h4: dist-h4
+ cd stage/$(PLATTAG) && \
+ openpkg rpm -Uhv --force --nodeps *-h4*.rpm
+ openpkg rpm -Uhv --force --nodeps *-H4*.rpm
+endif
+
+####################
+# HORDE 4 END
+####################
+
+####################
+# PEAR H4 START
+####################
+# Sub targets for pear packages from pear.php.net
+
+.PHONY: fetch-pear-h4-only
+fetch-pear-h4-only: $(PEAR_H4_PACKAGES:%=fetch-%)
+
+.PHONY: $(PEAR_H4_PACKAGES:%=fetch-%)
+$(PEAR_H4_PACKAGES:%=fetch-%):
+ make -e -C $(@:fetch-%=%) fetch
+
+.PHONY: dist-pear-h4-only
+dist-pear-h4-only: $(PEAR_H4_PACKAGES:%=dist-%)
+
+.PHONY: $(PEAR_H4_PACKAGES:%=dist-%)
+$(PEAR_H4_PACKAGES:%=dist-%):
+ make -e -C $(@:dist-%=%) dist
+
+.PHONY: clean-pear-h4-only
+clean-pear-h4-only: $(PEAR_H4_PACKAGES:%=clean-%)
+
+.PHONY: $(PEAR_H4_PACKAGES:%=clean-%)
+$(PEAR_H4_PACKAGES:%=clean-%):
+ make -e -C $(@:clean-%=%) clean
+
+####################
+# PEAR H4 END
+####################
+
+#####################
+# HORDE H4 START
+#####################
+# Sub targets for pear packages from pear.horde.org
+
+.PHONY: fetch-pear-h4-horde
+fetch-pear-h4-horde: $(HORDE_H4_PACKAGES:%=fetch-%)
+
+.PHONY: $(HORDE_H4_PACKAGES:%=fetch-%)
+$(HORDE_H4_PACKAGES:%=fetch-%):
+ make -e -C $(@:fetch-%=%) fetch
+
+.PHONY: dist-pear-h4-horde
+dist-pear-h4-horde: $(HORDE_H4_PACKAGES:%=dist-%)
+
+.PHONY: $(HORDE_H4_PACKAGES:%=dist-%)
+$(HORDE_H4_PACKAGES:%=dist-%):
+ make -e -C $(@:dist-%=%) dist
+
+.PHONY: clean-pear-h4-horde
+clean-pear-h4-horde: $(HORDE_H4_PACKAGES:%=clean-%)
+
+.PHONY: $(HORDE_H4_PACKAGES:%=clean-%)
+$(HORDE_H4_PACKAGES:%=clean-%):
+ make -e -C $(@:clean-%=%) clean
+
+.PHONY: snapshot-pear-h4-horde
+snapshot-pear-h4-horde: $(HORDE_H4_PACKAGES:%=snapshot-%)
+
+.PHONY: $(HORDE_H4_PACKAGES:%=snapshot-%)
+$(HORDE_H4_PACKAGES:%=snapshot-%):
+ make -e -C $(@:snapshot-%=%) snapshot
+
+####################
+# HORDE H4 END
+####################
+
+#######################
+# PEAR H4 CHANNEL START
+#######################
+# Sub targets for pear channels
+
+.PHONY: dist-pear-h4-channel
+dist-pear-h4-channel: $(PEAR_H4_CHANNEL_PACKAGES:%=dist-%)
+
+.PHONY: $(PEAR_H4_CHANNEL_PACKAGES:%=dist-%)
+$(PEAR_H4_CHANNEL_PACKAGES:%=dist-%):
+ make -e -C $(@:dist-%=%) dist
+
+.PHONY: clean-pear-h4-channel
+clean-pear-h4-channel: $(PEAR_H4_CHANNEL_PACKAGES:%=clean-%)
+
+.PHONY: $(PEAR_H4_CHANNEL_PACKAGES:%=clean-%)
+$(PEAR_H4_CHANNEL_PACKAGES:%=clean-%):
+ make -e -C $(@:clean-%=%) clean
+
+#####################
+# PEAR H4 CHANNEL END
+#####################
+
+####################
+# CLIENT H4 START
+####################
+# Sub targets for the web client
+
+.PHONY: fetch-client-h4
+fetch-h4-client: $(CLIENT_H4_PACKAGES:%=fetch-%)
+
+.PHONY: $(CLIENT_H4_PACKAGES:%=fetch-%)
+$(CLIENT_H4_PACKAGES:%=fetch-%):
+ make -e -C $(@:fetch-%=%) fetch
+
+.PHONY: dist-client-h4
+dist-client-h4: $(CLIENT_H4_PACKAGES:%=dist-%)
+
+.PHONY: $(CLIENT_H4_PACKAGES:%=dist-%)
+$(CLIENT_H4_PACKAGES:%=dist-%):
+ make -e -C $(@:dist-%=%) dist
+
+.PHONY: clean-client-h4
+clean-client-h4: $(CLIENT_H4_PACKAGES:%=clean-%)
+
+.PHONY: $(CLIENT_H4_PACKAGES:%=clean-%)
+$(CLIENT_H4_PACKAGES:%=clean-%):
+ make -e -C $(@:clean-%=%) clean
+
+.PHONY: snapshot-client-h4
+snapshot-client-h4: $(CLIENT_H4_PACKAGES:%=snapshot-%)
+
+.PHONY: $(CLIENT_H4_PACKAGES:%=snapshot-%)
+$(CLIENT_H4_PACKAGES:%=snapshot-%):
+ make -e -C $(@:snapshot-%=%) snapshot
+
+####################
+# CLIENT H4 END
####################
####################
- Previous message: gunnar: server/kolab-webclient-h4/horde-h4/configuration/horde-h4-0ef4c583a74e6521f7f2e7ea9f06c3a9f08bd091 10-kolab_conf_base.php, NONE, 1.1 10-kolab_hooks_base.php, NONE, 1.1 10-kolab_prefs_base.php, NONE, 1.1
- Next message: gunnar: server/kolab-webclient/imp ChangeLog, NONE, 1.1 imp.spec, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the commits
mailing list