X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=c6d49850dc7ef6ffe60950079d3254700cb96835;hb=ee97067e0c7de2fc25a0834672f27dcad4468631;hp=5a04c3531d0fef5187a4557eb00a4109d57ee681;hpb=26ac91603dc5dab166667622bbc5e7de6d585f3c;p=plcapi.git

diff --git a/Makefile b/Makefile
index 5a04c35..c6d4985 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,9 @@
 # Makefile for phpxmlrpc library
-# $Id: Makefile,v 1.37 2008/03/06 22:37:19 ggiunta Exp $
 
-### USER EDITABLE VARS ###
+### USER EDITABLE VARS - can be passed as command-line options ###
 
 # path to PHP executable, preferably CLI version
-PHP=/usr/local/bin/php
+PHP=php
 
 # path were xmlrpc lib files will be copied to
 PHPINCLUDEDIR=/usr/local/lib/php
@@ -12,45 +11,52 @@ PHPINCLUDEDIR=/usr/local/lib/php
 # mkdir is a thorny beast under windows: make sure we can not use the cmd version, running eg. "make MKDIR=mkdir.exe"
 MKDIR=mkdir
 
+#find too
+FIND=find
+
+DOS2UNIX=dos2unix
 
 #### DO NOT TOUCH FROM HERE ONWARDS ###
 
 # recover version number from code
 # thanks to Firman Pribadi for unix command line help
-export VERSION=$(shell egrep "\$GLOBALS *\[ *'xmlrpcVersion' *\] *= *'" xmlrpc.inc | sed -r s/"(.*= *' *)([0-9a-zA-Z.-]+)(.*)"/\\2/g )
-
-LIBFILES=xmlrpc.inc xmlrpcs.inc xmlrpc_wrappers.inc compat/*.php
-
-EXTRAFILES=test.pl \
- test.py \
- rsakey.pem \
- workspace.testPhpServer.fttb
-
-DEMOFILES=vardemo.php \
- demo1.txt \
- demo2.txt \
- demo3.txt
-
-DEMOSFILES=discuss.php \
- server.php \
- proxy.php
-
-DEMOCFILES=agesort.php \
- client.php \
- comment.php \
- introspect.php \
- mail.php \
- simple_call.php \
- which.php \
- wrap.php \
- zopetest.php
-
-TESTFILES=testsuite.php \
- benchmark.php \
- parse_args.php \
- phpunit.php \
- verify_compat.php \
- PHPUnit/*.php
+#   on unix shells lasts char should be \\2/g )
+export VERSION=$(shell grep -E "\$GLOBALS *\[ *'xmlrpcVersion' *\] *= *'" lib/xmlrpc.inc | sed -r s/"(.*= *' *)([0-9a-zA-Z.-]+)(.*)"/\2/g )
+
+LIBFILES=lib/xmlrpc.inc lib/xmlrpcs.inc lib/xmlrpc_wrappers.inc \
+ src/*.php src/Helper/*.php
+
+EXTRAFILES=extras/test.pl \
+ extras/test.py \
+ extras/rsakey.pem \
+ extras/workspace.testPhpServer.fttb
+
+DEMOFILES=demo/vardemo.php \
+ demo/demo1.xml \
+ demo/demo2.xml \
+ demo/demo3.xml
+
+DEMOSFILES=demo/server/discuss.php \
+ demo/server/server.php \
+ demo/server/proxy.php
+
+DEMOCFILES=demo/client/agesort.php \
+ demo/client/client.php \
+ demo/client/comment.php \
+ demo/client/introspect.php \
+ demo/client/mail.php \
+ demo/client/simple_call.php \
+ demo/client/which.php \
+ demo/client/wrap.php \
+ demo/client/zopetest.php
+
+TESTFILES=test/testsuite.php \
+ tests/benchmark.php \
+ tests/parse_args.php \
+ test/InvalidHostTest.php \
+ test/LocalHostTest.php \
+ test/ParsingBugsTest.php \
+ tests/verify_compat.php
 
 INFOFILES=Changelog \
  Makefile \
@@ -66,7 +72,7 @@ DEBUGGERFILES=debugger/index.php \
 all: install
 
 install:
-	cd lib && cp ${LIBFILES} ${PHPINCLUDEDIR}
+	cp ${LIBFILES} ${PHPINCLUDEDIR}
 	@echo Lib files have been copied to ${PHPINCLUDEDIR}
 	cd doc && $(MAKE) install
 
@@ -76,10 +82,10 @@ test:
 
 ### the following targets are to be used for library development ###
 
-# make tag target: tag existing working copy as release in cvs.
-# todo: convert dots in underscore in $VERSION
+# make tag target: tag existing working copy as release in git.
 tag:
-	cvs -q tag -p release_${VERSION}
+	git tag v${VERSION}
+	git push origin --tags
 
 dist: xmlrpc-${VERSION}.zip xmlrpc-${VERSION}.tar.gz
 
@@ -90,22 +96,22 @@ xmlrpc-${VERSION}.zip xmlrpc-${VERSION}.tar.gz: ${LIBFILES} ${DEBUGGERFILES} ${I
 	${MKDIR} xmlrpc-${VERSION}/demo
 	${MKDIR} xmlrpc-${VERSION}/demo/client
 	${MKDIR} xmlrpc-${VERSION}/demo/server
-	cp --parents ${DEMOFILES} xmlrpc-${VERSION}/demo
-	cp --parents ${DEMOCFILES} xmlrpc-${VERSION}/demo/client
-	cp --parents ${DEMOSFILES} xmlrpc-${VERSION}/demo/server
 	${MKDIR} xmlrpc-${VERSION}/test
 	${MKDIR} xmlrpc-${VERSION}/test/PHPUnit
-	cp --parents ${TESTFILES} xmlrpc-${VERSION}/test
 	${MKDIR} xmlrpc-${VERSION}/extras
-	cp --parents ${EXTRAFILES} xmlrpc-${VERSION}/extras
 	${MKDIR} xmlrpc-${VERSION}/lib
-	${MKDIR} xmlrpc-${VERSION}/lib/compat
-	cp --parents ${LIBFILES} xmlrpc-${VERSION}/lib
 	${MKDIR} xmlrpc-${VERSION}/debugger
-	cp ${DEBUGGERFILES} xmlrpc-${VERSION}/debugger
+	cp --parents ${DEMOFILES} xmlrpc-${VERSION}
+	cp --parents ${DEMOCFILES} xmlrpc-${VERSION}
+	cp --parents ${DEMOSFILES} xmlrpc-${VERSION}
+	cp --parents ${TESTFILES} xmlrpc-${VERSION}
+	cp --parents ${EXTRAFILES} xmlrpc-${VERSION}
+	cp --parents ${LIBFILES} xmlrpc-${VERSION}
+	cp --parents ${DEBUGGERFILES} xmlrpc-${VERSION}
 	cp ${INFOFILES} xmlrpc-${VERSION}
 	cd doc && $(MAKE) dist
-	find xmlrpc-${VERSION} -type f ! -name "*.fttb" ! -name "*.pdf" ! -name "*.gif" -exec dos2unix {} \;
+#   on unix shells last char should be \;
+	${FIND} xmlrpc-${VERSION} -type f ! -name "*.fttb" ! -name "*.pdf" ! -name "*.gif" -exec ${DOS2UNIX} ;
 	-rm xmlrpc-${VERSION}.zip xmlrpc-${VERSION}.tar.gz
 	tar -cvf xmlrpc-${VERSION}.tar xmlrpc-${VERSION}
 	gzip xmlrpc-${VERSION}.tar