From: Samuele P. <ped...@us...> - 2003-05-04 20:29:18
|
Update of /cvsroot/jython/htdocs In directory sc8-pr-cvs1:/tmp/cvs-serv17589 Modified Files: build.xml Log Message: use Misc/htgen/JyGenerator.py with ht2html Index: build.xml =================================================================== RCS file: /cvsroot/jython/htdocs/build.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** build.xml 27 May 2002 15:44:24 -0000 1.6 --- build.xml 4 May 2003 20:29:13 -0000 1.7 *************** *** 1,3 **** --- 1,4 ---- <!-- Copyright 2001 Finn Bock --> + <!-- Copyright 2003 Samuele Pedroni --> <!-- The "update" target requires that an bsf.jar file is available *************** *** 54,71 **** </target> ! <target name="generate" depends="init"> ! <!-- Create .html files in htdocs --> <execon executable="${python.home}/python"> <arg line="${ht2html.dir}/ht2html.py"/> ! <arg line="-s JPyGenerator"/> <fileset dir="."> <include name="*.ht" /> </fileset> </execon> ! <!-- Create .html files in htdocs/applets --> <execon executable="${python.home}/python" dir="applets"> <arg line="${ht2html.dir}/ht2html.py"/> ! <arg line="-s JPyGenerator"/> <arg line="-r .."/> <fileset dir="."> --- 55,76 ---- </target> ! <target name="generate-top" depends="init"> ! <!-- Create .html files in htdocs --> <execon executable="${python.home}/python"> + <env key="PYTHONPATH" path="${jython.home}/Misc/htgen"/> <arg line="${ht2html.dir}/ht2html.py"/> ! <arg line="-s JyGenerator"/> <fileset dir="."> <include name="*.ht" /> </fileset> </execon> + </target> ! <target name="generate-applets" depends="init"> ! <!-- Create .html files in htdocs/applets --> <execon executable="${python.home}/python" dir="applets"> + <env key="PYTHONPATH" path="${jython.home}/Misc/htgen"/> <arg line="${ht2html.dir}/ht2html.py"/> ! <arg line="-s JyGenerator"/> <arg line="-r .."/> <fileset dir="."> *************** *** 73,88 **** </fileset> </execon> ! <!-- Create .html files in htdocs/docs --> <copy todir="docs"> <fileset dir="${jython.home}/Doc" includes="*.ht"/> </copy> <copy todir="docs/javadoc"> <fileset dir="${jython.home}/dist/Doc/javadoc" includes="**/*.html,*.css"/> </copy> <execon executable="${python.home}/python" dir="docs"> <arg line="${ht2html.dir}/ht2html.py"/> ! <arg line="-s JPyGenerator"/> <arg line="-r .."/> <fileset dir="."> --- 78,102 ---- </fileset> </execon> + </target> ! <target name="inherit-docs" depends="init"> <copy todir="docs"> <fileset dir="${jython.home}/Doc" includes="*.ht"/> </copy> + </target> + + <target name="inherit-javadoc" depends="init"> <copy todir="docs/javadoc"> <fileset dir="${jython.home}/dist/Doc/javadoc" includes="**/*.html,*.css"/> </copy> + </target> + + <target name="generate-docs" depends="init"> + <!-- Create .html files in htdocs/docs --> <execon executable="${python.home}/python" dir="docs"> + <env key="PYTHONPATH" path="${jython.home}/Misc/htgen"/> <arg line="${ht2html.dir}/ht2html.py"/> ! <arg line="-s JyGenerator"/> <arg line="-r .."/> <fileset dir="."> *************** *** 92,95 **** --- 106,114 ---- </target> + <target + name="generate" + depends="init, generate-top, generate-applets, + inherit-docs, inherit-javadoc, generate-docs" /> + <target name="collect" depends="generate"> <tar tarfile="${htdocs.tar}" basedir="." *************** *** 119,122 **** </target> ! </project> ! --- 138,140 ---- </target> ! </project> \ No newline at end of file |