git://git.onelab.eu
/
plcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
For travis tests, use the version of phpunit which we install via composer, instead...
[plcapi.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
28a83b0
..
c6d4985
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-3,7
+3,7
@@
### USER EDITABLE VARS - can be passed as command-line options ###
\r
\r
# path to PHP executable, preferably CLI version
\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
\r
# path were xmlrpc lib files will be copied to
\r
PHPINCLUDEDIR=/usr/local/lib/php
\r
@@
-21,10
+21,10
@@
DOS2UNIX=dos2unix
# recover version number from code
\r
# thanks to Firman Pribadi for unix command line help
\r
# on unix shells lasts char should be \\2/g )
\r
# recover version number from code
\r
# thanks to Firman Pribadi for unix command line help
\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
-export VERSION=3.0.0
\r
+export VERSION=$(shell grep -E "\$GLOBALS *\[ *'xmlrpcVersion' *\] *= *'" lib/xmlrpc.inc | sed -r s/"(.*= *' *)([0-9a-zA-Z.-]+)(.*)"/\2/g )
\r
\r
\r
-LIBFILES=lib/xmlrpc.inc lib/xmlrpcs.inc lib/xmlrpc_wrappers.inc
\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
\r
EXTRAFILES=extras/test.pl \
\r
extras/test.py \
\r
@@
-32,9
+32,9
@@
EXTRAFILES=extras/test.pl \
extras/workspace.testPhpServer.fttb
\r
\r
DEMOFILES=demo/vardemo.php \
\r
extras/workspace.testPhpServer.fttb
\r
\r
DEMOFILES=demo/vardemo.php \
\r
- demo/demo1.
txt
\
\r
- demo/demo2.
txt
\
\r
- demo/demo3.
txt
\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
\r
DEMOSFILES=demo/server/discuss.php \
\r
demo/server/server.php \
\r
@@
-51,11
+51,12
@@
DEMOCFILES=demo/client/agesort.php \
demo/client/zopetest.php
\r
\r
TESTFILES=test/testsuite.php \
\r
demo/client/zopetest.php
\r
\r
TESTFILES=test/testsuite.php \
\r
- test/benchmark.php \
\r
- test/parse_args.php \
\r
- test/phpunit.php \
\r
- test/verify_compat.php \
\r
- test/PHPUnit/*.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
\r
INFOFILES=Changelog \
\r
Makefile \
\r