- 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

diff --git a/Makefile b/Makefile
index 5a04c35..8e42dac 100644 (file)
--- 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"\r
 MKDIR=mkdir\r
 \r
+#find too\r
+FIND=find\r
+\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 egrep "\$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 lib/compat/*.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.txt \\r
+ demo/demo2.txt \\r
+ demo/demo3.txt\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
+ test/benchmark.php \\r
+ test/parse_args.php \\r
+ test/phpunit.php \\r
+ test/verify_compat.php \\r
+ test/PHPUnit/*.php\r
 \r
 INFOFILES=Changelog \\r
  Makefile \\r
@@ -90,22 +94,23 @@ 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

diff --git a/doc/Makefile b/doc/Makefile
index 15598b5..516a458 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -6,6 +6,12 @@ WEB=/var/www/xmlrpc/doc
 \r
 MKDIR=mkdir\r
 \r
+PHP=php\r
+\r
+FOP=fop\r
+\r
+PHPDOC=phpdoc\r
+\r
 \r
 #### DO NOT TOUCH FROM HERE ONWARDS ###\r
 \r
@@ -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 \\r
 #      com.icl.saxon.StyleSheet -o xmlrpc_php.fo.xml xmlrpc_php.xml custom.fo.xsl use.extensions=1\r
 #\r
-       # custom php script that does the xslt magic\r
-       php convert.php xmlrpc_php.xml custom.xsl out/\r
-       # post process html files to highlight php code samples\r
-       php highlight.php out\r
-       # convert to fo and then to pdf using apache fop\r
-       php convert.php xmlrpc_php.xml custom.fo.xsl xmlrpc_php.fo.xml\r
-       fop xmlrpc_php.fo.xml xmlrpc_php.pdf\r
-       #-rm xmlrpc_php.fo.xml\r
-\r
-javadoc-out/index.html: ../xmlrpc.inc ../xmlrpcs.inc ../xmlrpc_wrappers.inc\r
+#      custom php script that does the xslt magic\r
+       ${PHP} convert.php xmlrpc_php.xml custom.xsl out/\r
+#      post process html files to highlight php code samples\r
+       ${PHP} highlight.php out\r
+#      convert to fo and then to pdf using apache fop\r
+       ${PHP} convert.php xmlrpc_php.xml custom.fo.xsl xmlrpc_php.fo.xml\r
+       ${FOP} xmlrpc_php.fo.xml xmlrpc_php.pdf\r
+#      -rm xmlrpc_php.fo.xml\r
+\r
+javadoc-out/index.html: ../lib/xmlrpc.inc ../lib/xmlrpcs.inc ../lib/xmlrpc_wrappers.inc\r
 # generate docs out of javadoc via doxygen\r
 #      doxygen phpxmlrpc.dox\r
 #\r
-       # generate docs out of javadoc via phpdocumentor\r
-       phpdoc -f ../xmlrpc.inc,../xmlrpcs.inc,../xmlrpc_wrappers.inc -t javadoc-out -ti PHP-XMLRPC -o HTML:frames:default -s\r
+#      generate docs out of javadoc via phpdocumentor\r
+       ${PHPDOC} -f ../lib/xmlrpc.inc,../lib/xmlrpcs.inc,../lib/xmlrpc_wrappers.inc -t javadoc-out -ti PHP-XMLRPC -o HTML:frames:default -s\r
 \r
 dist: doc\r
        ${MKDIR} -p ../xmlrpc-${VERSION}/doc\r