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
Test if we can get faster tests for hhvm
[plcapi.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
12a9638
..
c6d4985
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,10
+1,9
@@
# Makefile for phpxmlrpc library
\r
# Makefile for phpxmlrpc library
\r
-# $Id: Makefile,v 1.37 2008/03/06 22:37:19 ggiunta Exp $
\r
\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
\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
@@
-15,15
+14,17
@@
MKDIR=mkdir
#find too
\r
FIND=find
\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
# on unix shells lasts char should be \\2/g )
\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
# on unix shells lasts char should be \\2/g )
\r
-export VERSION=$(shell
egrep
"\$GLOBALS *\[ *'xmlrpcVersion' *\] *= *'" lib/xmlrpc.inc | sed -r s/"(.*= *' *)([0-9a-zA-Z.-]+)(.*)"/\2/g )
\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
@@
-31,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
@@
-50,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
@@
-80,10
+82,10
@@
test:
\r
### the following targets are to be used for library development ###
\r
\r
\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
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
\r
dist: xmlrpc-${VERSION}.zip xmlrpc-${VERSION}.tar.gz
\r
\r
@@
-109,7
+111,7
@@
xmlrpc-${VERSION}.zip xmlrpc-${VERSION}.tar.gz: ${LIBFILES} ${DEBUGGERFILES} ${I
cp ${INFOFILES} xmlrpc-${VERSION}
\r
cd doc && $(MAKE) dist
\r
# on unix shells last char should be \;
\r
cp ${INFOFILES} xmlrpc-${VERSION}
\r
cd doc && $(MAKE) dist
\r
# on unix shells last char should be \;
\r
- ${FIND} xmlrpc-${VERSION} -type f ! -name "*.fttb" ! -name "*.pdf" ! -name "*.gif" -exec
dos2unix {
} ;
\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
-rm xmlrpc-${VERSION}.zip xmlrpc-${VERSION}.tar.gz
\r
tar -cvf xmlrpc-${VERSION}.tar xmlrpc-${VERSION}
\r
gzip xmlrpc-${VERSION}.tar
\r