X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=c6d49850dc7ef6ffe60950079d3254700cb96835;hb=b19b4df8cca4856106ed6d19c9fec5d3e2fdcab3;hp=8e42dac24cdadb9afd646eb53a792d917d85c142;hpb=32e2c0cec01cb6979535d5bb46e48a573d85634e;p=plcapi.git

diff --git a/Makefile b/Makefile
index 8e42dac..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
@@ -15,15 +14,17 @@ 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
 #   on unix shells lasts char should be \\2/g )
-export VERSION=$(shell egrep "\$GLOBALS *\[ *'xmlrpcVersion' *\] *= *'" lib/xmlrpc.inc | sed -r s/"(.*= *' *)([0-9a-zA-Z.-]+)(.*)"/\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 lib/compat/*.php
+LIBFILES=lib/xmlrpc.inc lib/xmlrpcs.inc lib/xmlrpc_wrappers.inc \
+ src/*.php src/Helper/*.php
 
 EXTRAFILES=extras/test.pl \
  extras/test.py \
@@ -31,9 +32,9 @@ EXTRAFILES=extras/test.pl \
  extras/workspace.testPhpServer.fttb
 
 DEMOFILES=demo/vardemo.php \
- demo/demo1.txt \
- demo/demo2.txt \
- demo/demo3.txt
+ demo/demo1.xml \
+ demo/demo2.xml \
+ demo/demo3.xml
 
 DEMOSFILES=demo/server/discuss.php \
  demo/server/server.php \
@@ -50,11 +51,12 @@ DEMOCFILES=demo/client/agesort.php \
  demo/client/zopetest.php
 
 TESTFILES=test/testsuite.php \
- test/benchmark.php \
- test/parse_args.php \
- test/phpunit.php \
- test/verify_compat.php \
- test/PHPUnit/*.php
+ tests/benchmark.php \
+ tests/parse_args.php \
+ test/InvalidHostTest.php \
+ test/LocalHostTest.php \
+ test/ParsingBugsTest.php \
+ tests/verify_compat.php
 
 INFOFILES=Changelog \
  Makefile \
@@ -70,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
 
@@ -80,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
 
@@ -98,7 +100,6 @@ xmlrpc-${VERSION}.zip xmlrpc-${VERSION}.tar.gz: ${LIBFILES} ${DEBUGGERFILES} ${I
 	${MKDIR} xmlrpc-${VERSION}/test/PHPUnit
 	${MKDIR} xmlrpc-${VERSION}/extras
 	${MKDIR} xmlrpc-${VERSION}/lib
-	${MKDIR} xmlrpc-${VERSION}/lib/compat
 	${MKDIR} xmlrpc-${VERSION}/debugger
 	cp --parents ${DEMOFILES} xmlrpc-${VERSION}
 	cp --parents ${DEMOCFILES} xmlrpc-${VERSION}
@@ -110,7 +111,7 @@ xmlrpc-${VERSION}.zip xmlrpc-${VERSION}.tar.gz: ${LIBFILES} ${DEBUGGERFILES} ${I
 	cp ${INFOFILES} xmlrpc-${VERSION}
 	cd doc && $(MAKE) dist
 #   on unix shells last char should be \;
-	${FIND} xmlrpc-${VERSION} -type f ! -name "*.fttb" ! -name "*.pdf" ! -name "*.gif" -exec dos2unix {} ;
+	${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