Make charset-related tests more friendly to hhvm; stricter tests for demo files

[plcapi.git] / Makefile

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