gunnar: server Makefile,1.92,1.93
cvs at kolab.org
cvs at kolab.org
Sun Jan 17 14:30:59 CET 2010
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv3000
Modified Files:
Makefile
Log Message:
Some cleanup and reorganization for the fetch target.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- Makefile 4 Jan 2010 15:54:57 -0000 1.92
+++ Makefile 17 Jan 2010 13:30:57 -0000 1.93
@@ -1,15 +1,17 @@
include make-helper/kolab.mk
-BASE_PACKAGES=php-smarty \
+BASE_PACKAGES=apache-php \
+ clamav \
+ db \
+ gmp \
+ imapd \
openldap \
- apache-php \
+ openpkg \
+ perl-ldap \
php \
+ php-smarty \
postfix \
- imapd \
- clamav \
- gmp \
- sqlite \
- perl-ldap
+ sqlite
PERL_PACKAGES=perl-kolab
@@ -21,7 +23,8 @@
kolab-webclient \
kolab-fbview \
-PEAR_PACKAGES= pear/Horde_Alarm \
+PEAR_HORDE_PACKAGES= \
+ pear/Horde_Alarm \
pear/Horde_Argv \
pear/Horde_Auth \
pear/Horde_Block \
@@ -46,8 +49,8 @@
pear/Horde_Http_Client \
pear/Horde_Image \
pear/Horde_LDAP \
- pear/Horde_Log \
pear/Horde_Lock \
+ pear/Horde_Log \
pear/Horde_MIME \
pear/Horde_Maintenance \
pear/Horde_Mobile \
@@ -63,19 +66,26 @@
pear/Horde_SessionHandler \
pear/Horde_SessionObjects \
pear/Horde_Share \
+ pear/Horde_SpellChecker \
pear/Horde_SyncML \
pear/Horde_Template \
+ pear/Horde_Text_Diff \
pear/Horde_Text_Filter \
pear/Horde_Text_Flowed \
+ pear/Horde_Text_Textile \
pear/Horde_Token \
pear/Horde_Tree \
+ pear/Horde_UI \
pear/Horde_Util \
+ pear/Horde_VC \
pear/Horde_XML_WBXML \
pear/Horde_Xml_Element \
- pear/Horde_iCalendar \
+ pear/Horde_Yaml \
+ pear/Horde_iCalendar
+
+PEAR_ONLY_PACKAGES= \
pear/PEAR-Auth_SASL \
pear/PEAR-Cache \
- pear/PEAR-Cache \
pear/PEAR-Console_Table \
pear/PEAR-DB \
pear/PEAR-Date \
@@ -100,8 +110,6 @@
pear/PEAR-Date_Holidays_Ukraine \
pear/PEAR-File_Find \
pear/PEAR-HTTP_Request \
- pear/PEAR-Horde-Channel \
- pear/PEAR-Log \
pear/PEAR-Log \
pear/PEAR-Mail \
pear/PEAR-Mail_mimeDecode \
@@ -114,21 +122,29 @@
pear/PEAR-Net_Sieve \
pear/PEAR-Net_Socket \
pear/PEAR-Net_URL \
- pear/PEAR-PHPUnit-Channel \
- pear/PEAR-SOAP \
pear/PEAR-SOAP \
pear/PEAR-Services_Weather \
pear/PEAR-XML_Parser \
pear/PEAR-XML_Serializer \
- pear/PEAR-XML_Serializer \
pear/PEAR-XML_Util \
- pear/PHPUnit \
+ pear/PHPUnit
+
+PEAR_KOLAB_PACKAGES= \
php-kolab/Kolab_Filter \
php-kolab/Kolab_Format \
php-kolab/Kolab_Freebusy \
php-kolab/Kolab_Server \
php-kolab/Kolab_Storage
+PEAR_CHANNEL_PACKAGES= \
+ pear/PEAR-Horde-Channel \
+ pear/PEAR-PHPUnit-Channel \
+
+PEAR_PACKAGES= $(PEAR_ONLY_PACKAGES) \
+ $(PEAR_KOLAB_PACKAGES) \
+ $(PEAR_HORDE_PACKAGES) \
+ $(PEAR_CHANNEL_PACKAGES) \
+
BASE_FILES=install-kolab.sh \
1st.README
@@ -154,21 +170,57 @@
$(HOME)/lib/php/test/Kolab_Filter/Horde/Kolab/Filter/AllTests.php \
$(HOME)/lib/php/test/Kolab_FreeBusy/Horde/Kolab/FreeBusy/AllTests.php
+# The default target is building the distributable Kolab Server
+# packages
+.PHONY: all
+all: dist
+
+# Fetches our basic requirements. This target allows testing if the
+# basic building blocks are available. But you may also use it to
+# download all requirements and unplug your network before running
+# "make dist"
+.PHONY: fetch
+fetch: fetch-base fetch-pear-only fetch-pear-horde fetch-pear-kolab
+
+# The core target that builds the server packages.
.PHONY: dist
-dist: stage base kolab pear files
+dist: dist-stage dist-base kolab pear files
-stage:
- mkdir stage
+# Clean up all directories.
+.PHONY: clean
+clean: clean-base clean-kolab clean-pear clean-stage
+ find . | grep "~$$" | xargs rm -rf
-.PHONY: base
-base: stage
+############
+# BASE START
+############
+# Sub targets for our basic Kolab Server packages.
+.PHONY: fetch-base
+fetch-base:
+ for PKG in $(BASE_PACKAGES); \
+ do \
+ make -C $$PKG fetch || exit $$?; \
+ done
+
+.PHONY: dist-base
+dist-base: dist-stage
for PKG in $(BASE_PACKAGES); \
do \
make -e -C $$PKG dist || exit $$?;\
done
+.PHONY: clean-base
+clean-base:
+ for PKG in $(BASE_PACKAGES); \
+ do \
+ make -C $$PKG clean || exit $$?; \
+ done
+############
+# BASE END
+############
+
.PHONY: kolab
-kolab: stage $(PERL_MAKEFILES)
+kolab: dist-stage $(PERL_MAKEFILES)
for PKG in $(KOLAB_PACKAGES); \
do \
cd $$PKG && make dist || exit $$?; cd ..;\
@@ -177,33 +229,32 @@
$(PERL_MAKEFILES): $(@:%=%.PL)
cd $(@:%/Makefile=%) && perl Makefile.PL
+.PHONY: horde-snapshots
+horde-snapshots:
+ for PKG in $(PEAR_HORDE_PACKAGES); \
+ do \
+ make -C $$PKG snapshot || exit $$?; \
+ done
+
.PHONY: pear
-pear: stage
- for PKG in $(PEAR_PACKAGES); \
+pear: dist-stage
+ for PKG in $(PEAR_PACKAGES); \
do \
make -C $$PKG dist || exit $$?; \
done
+.PHONY: pear-install
+pear-install: dist-stage
+ for PKG in $(PEAR_PACKAGES); \
+ do \
+ make -C $$PKG install || exit $$?; \
+ done
+
.PHONY: files
-files: stage
+files: dist-stage
cp $(BASE_FILES) stage/
echo 'Remember to update 00INDEX.rdf and install-kolab.sh!'
-.PHONY: clean
-clean: clean-base clean-kolab clean-pear clean-stage
- find . | grep "~$$" | xargs rm -rf
-
-.PHONY: clean-stage
-clean-stage:
- rm -rf stage
-
-.PHONY: clean-base
-clean-base:
- for PKG in $(BASE_PACKAGES); \
- do \
- make -C $$PKG clean || exit $$?; \
- done
-
.PHONY: clean-kolab
clean-kolab: $(PERL_MAKEFILES)
for PKG in $(KOLAB_PACKAGES); \
@@ -224,6 +275,34 @@
do \
make -C $$UPDATE install || exit $$?; \
done
+
+.PHONY: fetch-pear-only
+fetch-pear-only:
+ for PKG in $(PEAR_ONLY_PACKAGES); \
+ do \
+ make -C $$PKG fetch || exit $$?; \
+ done
+
+.PHONY: fetch-pear-horde
+fetch-pear-horde:
+ for PKG in $(PEAR_HORDE_PACKAGES); \
+ do \
+ make -C $$PKG fetch || exit $$?; \
+ done
+
+.PHONY: fetch-pear-kolab
+fetch-pear-kolab:
+ for PKG in $(PEAR_KOLAB_PACKAGES); \
+ do \
+ make -C $$PKG fetch || exit $$?; \
+ done
+
+dist-stage:
+ mkdir stage
+
+.PHONY: clean-stage
+clean-stage:
+ rm -rf stage
.PHONY: test
test:
More information about the commits
mailing list