From 32e2c0cec01cb6979535d5bb46e48a573d85634e Mon Sep 17 00:00:00 2001 From: ggiunta Date: Mon, 16 Mar 2009 23:15:18 +0000 Subject: [PATCH] - fix makefiles to suit new dir layout git-svn-id: https://svn.code.sf.net/p/phpxmlrpc/code/trunk/xmlrpc@5 013ecfd8-0664-425d-a759-9c98391dc3f9 --- Makefile | 89 +++++++++++++++++++++++++++------------------------- doc/Makefile | 30 +++++++++++------- 2 files changed, 65 insertions(+), 54 deletions(-) diff --git a/Makefile b/Makefile index 5a04c353..8e42dac2 100644 --- a/Makefile +++ b/Makefile @@ -12,45 +12,49 @@ 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 + #### 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 egrep "\$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 + +EXTRAFILES=extras/test.pl \ + extras/test.py \ + extras/rsakey.pem \ + extras/workspace.testPhpServer.fttb + +DEMOFILES=demo/vardemo.php \ + demo/demo1.txt \ + demo/demo2.txt \ + demo/demo3.txt + +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 \ + test/benchmark.php \ + test/parse_args.php \ + test/phpunit.php \ + test/verify_compat.php \ + test/PHPUnit/*.php INFOFILES=Changelog \ Makefile \ @@ -90,22 +94,23 @@ 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 diff --git a/doc/Makefile b/doc/Makefile index 15598b5a..516a4587 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -6,6 +6,12 @@ WEB=/var/www/xmlrpc/doc MKDIR=mkdir +PHP=php + +FOP=fop + +PHPDOC=phpdoc + #### DO NOT TOUCH FROM HERE ONWARDS ### @@ -41,21 +47,21 @@ out/index.html xmlrpc_php.pdf: xmlrpc_php.xml # -Dxslthl.config=file:///c:/htdocs/xmlrpc_cvs/docbook-xsl/highlighting/xslthl-config.xml \ # com.icl.saxon.StyleSheet -o xmlrpc_php.fo.xml xmlrpc_php.xml custom.fo.xsl use.extensions=1 # - # custom php script that does the xslt magic - php convert.php xmlrpc_php.xml custom.xsl out/ - # post process html files to highlight php code samples - php highlight.php out - # convert to fo and then to pdf using apache fop - php convert.php xmlrpc_php.xml custom.fo.xsl xmlrpc_php.fo.xml - fop xmlrpc_php.fo.xml xmlrpc_php.pdf - #-rm xmlrpc_php.fo.xml - -javadoc-out/index.html: ../xmlrpc.inc ../xmlrpcs.inc ../xmlrpc_wrappers.inc +# custom php script that does the xslt magic + ${PHP} convert.php xmlrpc_php.xml custom.xsl out/ +# post process html files to highlight php code samples + ${PHP} highlight.php out +# convert to fo and then to pdf using apache fop + ${PHP} convert.php xmlrpc_php.xml custom.fo.xsl xmlrpc_php.fo.xml + ${FOP} xmlrpc_php.fo.xml xmlrpc_php.pdf +# -rm xmlrpc_php.fo.xml + +javadoc-out/index.html: ../lib/xmlrpc.inc ../lib/xmlrpcs.inc ../lib/xmlrpc_wrappers.inc # generate docs out of javadoc via doxygen # doxygen phpxmlrpc.dox # - # generate docs out of javadoc via phpdocumentor - phpdoc -f ../xmlrpc.inc,../xmlrpcs.inc,../xmlrpc_wrappers.inc -t javadoc-out -ti PHP-XMLRPC -o HTML:frames:default -s +# generate docs out of javadoc via phpdocumentor + ${PHPDOC} -f ../lib/xmlrpc.inc,../lib/xmlrpcs.inc,../lib/xmlrpc_wrappers.inc -t javadoc-out -ti PHP-XMLRPC -o HTML:frames:default -s dist: doc ${MKDIR} -p ../xmlrpc-${VERSION}/doc -- 2.47.0