You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
331 lines
14 KiB
331 lines
14 KiB
--- orig-build.xml 2012-05-31 13:42:43.943062427 -0500
|
|
+++ build.xml 2012-05-31 14:01:01.691982062 -0500
|
|
@@ -52,8 +52,6 @@
|
|
|
|
<property file="proxy.properties" />
|
|
|
|
- <import file="tools/build-i18n.xml"/>
|
|
-
|
|
<path id="project.class.path">
|
|
<fileset dir="${lib.dir}">
|
|
<include name="*.jar" />
|
|
@@ -111,10 +109,6 @@
|
|
<srcfiles dir="doc/source"
|
|
includes="JmolGuide.docbook.xml, guide/*.docbook.xml"/>
|
|
</uptodate>
|
|
- <uptodate targetfile="build/doc/JmolUserGuide_fr/index.html">
|
|
- <srcfiles dir="doc/source"
|
|
- includes="JmolGuide_fr.docbook.xml, guide/*_fr.docbook.xml"/>
|
|
- </uptodate>
|
|
</and>
|
|
</condition>
|
|
|
|
@@ -124,14 +118,6 @@
|
|
<srcfiles dir="doc/source"
|
|
includes="JmolHistory.xml,JmolHistoryToHtml.xsl,history/changes.xml" />
|
|
</uptodate>
|
|
- <uptodate targetfile="build/doc/JmolHistory/ChangeLog_fr.html">
|
|
- <srcfiles dir="doc/source"
|
|
- includes="JmolHistory_fr.xml,JmolHistoryToHtml.xsl,history/changes_fr.xml" />
|
|
- </uptodate>
|
|
- <uptodate targetfile="build/doc/JmolHistory/ChangeLog_nl.html">
|
|
- <srcfiles dir="doc/source"
|
|
- includes="JmolHistory_nl.xml,JmolHistoryToHtml.xsl,history/changes_nl.xml" />
|
|
- </uptodate>
|
|
</and>
|
|
</condition>
|
|
|
|
@@ -141,14 +127,6 @@
|
|
<srcfiles dir="doc/source"
|
|
includes="JmolDevelopersGuide.docbook.xml"/>
|
|
</uptodate>
|
|
- <uptodate targetfile="build/doc/JmolDevelopersGuide_fr.html">
|
|
- <srcfiles dir="doc/source"
|
|
- includes="JmolDevelopersGuide_fr.docbook.xml"/>
|
|
- </uptodate>
|
|
- <uptodate targetfile="build/doc/JmolDevelopersGuide_de.html">
|
|
- <srcfiles dir="doc/source"
|
|
- includes="JmolDevelopersGuide_de.docbook.xml"/>
|
|
- </uptodate>
|
|
</and>
|
|
</condition>
|
|
|
|
@@ -158,14 +136,6 @@
|
|
<srcfiles dir="doc/source"
|
|
includes="JmolAppletGuide.docbook.xml, applet/*.docbook.xml"/>
|
|
</uptodate>
|
|
- <uptodate targetfile="build/doc/JmolAppletGuide_fr.html">
|
|
- <srcfiles dir="doc/source"
|
|
- includes="JmolAppletGuide_fr.docbook.xml, applet/*_fr.docbook.xml"/>
|
|
- </uptodate>
|
|
- <uptodate targetfile="build/doc/JmolAppletGuide_de.html">
|
|
- <srcfiles dir="doc/source"
|
|
- includes="JmolAppletGuide_de.docbook.xml"/>
|
|
- </uptodate>
|
|
</and>
|
|
</condition>
|
|
|
|
@@ -388,17 +358,12 @@
|
|
</target>
|
|
|
|
<target name="jar" id="jar"
|
|
- depends="init,classes,jmolGuide,jmolHistory,jmolDevelopersGuide,libjars,main-i18n">
|
|
+ depends="init,classes,jmolGuide,jmolHistory,jmolDevelopersGuide,libjars">
|
|
<copy todir="${classes.dir}/org/openscience/jmol/Data/guide" >
|
|
<fileset dir="build/doc/JmolUserGuide">
|
|
<include name="**/*.html" />
|
|
</fileset>
|
|
</copy>
|
|
- <copy todir="${classes.dir}/org/openscience/jmol/Data/guide_fr" >
|
|
- <fileset dir="build/doc/JmolUserGuide_fr">
|
|
- <include name="**/*.html" />
|
|
- </fileset>
|
|
- </copy>
|
|
<copy todir="${classes.dir}/org/openscience/jmol/Data" >
|
|
<fileset dir="build/doc/JmolHistory">
|
|
<include name="**/*.html" />
|
|
@@ -603,18 +568,6 @@
|
|
<fileset dir="${appletjars.dir}" includes="**/*"/>
|
|
</jar>
|
|
|
|
- <for list="${all.JmolApplet.languages}" delimiter=","
|
|
- param="current.Jmol.language">
|
|
- <sequential>
|
|
- <jar destfile="${jmol.applet.build.dir}/JmolApplet0_i18n_@{current.Jmol.language}.jar"
|
|
- manifest="manifest/applet_i18n.txt" >
|
|
- <fileset dir="${applet.classes.dir}">
|
|
- <include name="org/jmol/translation/JmolApplet/@{current.Jmol.language}/**" />
|
|
- </fileset>
|
|
- </jar>
|
|
- </sequential>
|
|
- </for>
|
|
-
|
|
<jar destfile="${jmol.applet.build.dir}/JmolApplet0_Minimize.jar" manifest="manifest/applet.txt">
|
|
<fileset dir="${applet.classes.dir}">
|
|
<include name="org/jmol/minimize/**" />
|
|
@@ -729,7 +682,6 @@
|
|
<include name="org/jmol/constant/**" />
|
|
<include name="org/jmol/g3d/**" />
|
|
<include name="org/jmol/geodesic/**" />
|
|
- <include name="org/jmol/i18n/**" />
|
|
<include name="org/jmol/modelset/**" />
|
|
<include name="org/jmol/script/**" />
|
|
<include name="org/jmol/shape/**" />
|
|
@@ -755,7 +707,6 @@
|
|
<pathelement path="${jmol.applet.build.dir}/JmolApplet0_ShapeSurface.jar" />
|
|
<pathelement path="${jmol.applet.build.dir}/JmolApplet0_Smiles.jar" />
|
|
<pathelement path="${jmol.applet.build.dir}/JmolApplet0_Symmetry.jar" />
|
|
- <fileset dir="${jmol.applet.build.dir}" includes="JmolApplet0_i18n_*.jar" />
|
|
</indexjars>
|
|
</jar>
|
|
<!-- changes to this must be replicated below for the signed applet -->
|
|
@@ -868,16 +819,6 @@
|
|
keystore="selfSignedCertificate/selfSignedCertificate.store"
|
|
storepass="selfSignedCertificate" alias="selfSignedCertificate" />
|
|
|
|
- <for list="${all.JmolApplet.languages}" delimiter=","
|
|
- param="current.Jmol.language">
|
|
- <sequential>
|
|
- <signjar jar="${jmol.applet.build.dir}/JmolApplet0_i18n_@{current.Jmol.language}.jar"
|
|
- signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_i18n_@{current.Jmol.language}.jar"
|
|
- keystore="selfSignedCertificate/selfSignedCertificate.store"
|
|
- storepass="selfSignedCertificate" alias="selfSignedCertificate" />
|
|
- </sequential>
|
|
- </for>
|
|
-
|
|
<!-- vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv -->
|
|
<!-- this one must be treated specially because of jar indexing
|
|
we cannot simply rename the jar file, because the index has
|
|
@@ -905,7 +846,6 @@
|
|
<include name="org/jmol/shape/**" />
|
|
<include name="org/jmol/viewer/**" />
|
|
<include name="org/jmol/util/**" />
|
|
- <include name="org/jmol/i18n/**" />
|
|
</fileset>
|
|
<indexjars>
|
|
<pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_Console.jar" />
|
|
@@ -924,7 +864,6 @@
|
|
<pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_ShapeSurface.jar" />
|
|
<pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_Smiles.jar" />
|
|
<pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_Symmetry.jar" />
|
|
- <fileset dir="${jmol.applet.build.dir}" includes="JmolAppletSigned0_i18n_*.jar" />
|
|
</indexjars>
|
|
</jar>
|
|
<signjar jar="${jmol.applet.build.dir}/JmolAppletSigned0.jar"
|
|
@@ -963,18 +902,6 @@
|
|
</fileset>
|
|
</jar>
|
|
|
|
- <for list="${all.JmolApplet.languages}" delimiter=","
|
|
- param="current.Jmol.language">
|
|
- <sequential>
|
|
- <jar destfile="${jmol.applet.build.dir}/JmolApplet0_i18n_@{current.Jmol.language}.jar"
|
|
- manifest="manifest/applet_i18n.txt" >
|
|
- <fileset dir="${applet.classes.dir}">
|
|
- <include name="org/jmol/translation/JmolApplet/@{current.Jmol.language}/**" />
|
|
- </fileset>
|
|
- </jar>
|
|
- </sequential>
|
|
- </for>
|
|
-
|
|
<jar destfile="${jmol.applet.build.dir}/JmolApplet0_Minimize.jar" manifest="manifest/applet.txt">
|
|
<fileset dir="${applet.classes.dir}">
|
|
<include name="org/jmol/minimize/**" />
|
|
@@ -1088,7 +1015,6 @@
|
|
<include name="org/jmol/constant/**" />
|
|
<include name="org/jmol/g3d/**" />
|
|
<include name="org/jmol/geodesic/**" />
|
|
- <include name="org/jmol/i18n/**" />
|
|
<include name="org/jmol/modelset/**" />
|
|
<include name="org/jmol/script/**" />
|
|
<include name="org/jmol/shape/**" />
|
|
@@ -1114,7 +1040,6 @@
|
|
<pathelement path="${jmol.applet.build.dir}/JmolApplet0_ShapeSurface.jar" />
|
|
<pathelement path="${jmol.applet.build.dir}/JmolApplet0_Smiles.jar" />
|
|
<pathelement path="${jmol.applet.build.dir}/JmolApplet0_Symmetry.jar" />
|
|
- <fileset dir="${jmol.applet.build.dir}" includes="JmolApplet0_i18n_*.jar" />
|
|
</indexjars>
|
|
</jar>
|
|
<!-- changes to this must be replicated below for the signed applet -->
|
|
@@ -1123,7 +1048,7 @@
|
|
</target>
|
|
|
|
<target name="dist" id="dist"
|
|
- depends="doc,main-i18n,main,signed-applet">
|
|
+ depends="doc,main,signed-applet">
|
|
<!-- first build binary distribution -->
|
|
<delete dir="build/dist/jmol-${version}"/>
|
|
<mkdir dir="build/dist/jmol-${version}"/>
|
|
@@ -1183,7 +1108,6 @@
|
|
<fileset dir=".">
|
|
<include name="applet.classes" />
|
|
<include name="build.xml" />
|
|
- <include name="build-i18n.xml" />
|
|
</fileset>
|
|
</copy>
|
|
|
|
@@ -1278,7 +1202,6 @@
|
|
<fileset dir=".">
|
|
<include name="apisio.classes" />
|
|
<include name="build.xml" />
|
|
- <include name="build-i18n.xml" />
|
|
</fileset>
|
|
</copy>
|
|
|
|
@@ -1374,7 +1297,7 @@
|
|
<target name="xclean" id="xclean">
|
|
</target>
|
|
|
|
- <target name="spotless" id="spotless" depends="clean,spotless-i18n">
|
|
+ <target name="spotless" id="spotless" depends="clean">
|
|
<delete dir="build"/>
|
|
<delete dir="${javadoc.dir}"/>
|
|
<delete dir="packaging/rpm/dist"/>
|
|
@@ -1438,16 +1361,6 @@
|
|
<arg value="../../../doc/source/JmolGuide.docbook.xml" />
|
|
<arg value="../../${docbook-xsl}/html/chunk.xsl" />
|
|
</java>
|
|
- <echo message="Generating user's guide (fr)" />
|
|
- <mkdir dir="build/doc/JmolUserGuide_fr" />
|
|
- <java fork="true" dir="build/doc/JmolUserGuide_fr"
|
|
- classname="com.icl.saxon.StyleSheet"
|
|
- classpath="${lib.dir}/saxon.jar" >
|
|
- <jvmarg value="${proxyHost}" />
|
|
- <jvmarg value="${proxyPort}" />
|
|
- <arg value="../../../doc/source/JmolGuide_fr.docbook.xml" />
|
|
- <arg value="../../${docbook-xsl}/html/chunk.xsl" />
|
|
- </java>
|
|
</target>
|
|
|
|
<target name="jmolHistory" id="jmolHistory"
|
|
@@ -1462,26 +1375,6 @@
|
|
<arg value="../../../doc/source/JmolHistory.xml" />
|
|
<arg value="../../../doc/source/JmolHistoryToHtml.xsl" />
|
|
</java>
|
|
- <echo message="Generating history of changes (fr)" />
|
|
- <java fork="true" dir="build/doc/JmolHistory"
|
|
- classname="com.icl.saxon.StyleSheet"
|
|
- classpath="${lib.dir}/saxon.jar" >
|
|
- <arg value="-o" />
|
|
- <arg value="ChangeLog_fr.html" />
|
|
- <arg value="../../../doc/source/JmolHistory_fr.xml" />
|
|
- <arg value="../../../doc/source/JmolHistoryToHtml.xsl" />
|
|
- <arg value="lang=fr" />
|
|
- </java>
|
|
- <echo message="Generating history of changes (nl)" />
|
|
- <java fork="true" dir="build/doc/JmolHistory"
|
|
- classname="com.icl.saxon.StyleSheet"
|
|
- classpath="${lib.dir}/saxon.jar" >
|
|
- <arg value="-o" />
|
|
- <arg value="ChangeLog_nl.html" />
|
|
- <arg value="../../../doc/source/JmolHistory_nl.xml" />
|
|
- <arg value="../../../doc/source/JmolHistoryToHtml.xsl" />
|
|
- <arg value="lang=nl" />
|
|
- </java>
|
|
</target>
|
|
|
|
<target name="jmolDevelopersGuide" id="jmolDevelopersGuide"
|
|
@@ -1495,24 +1388,6 @@
|
|
<arg value="../../doc/source/JmolDevelopersGuide.docbook.xml" />
|
|
<arg value="../${docbook-xsl}/html/docbook.xsl" />
|
|
</java>
|
|
- <echo message="Generating developer's guide (fr)" />
|
|
- <java fork="true" dir="build/doc"
|
|
- classname="com.icl.saxon.StyleSheet"
|
|
- classpath="${lib.dir}/saxon.jar" >
|
|
- <arg value="-o" />
|
|
- <arg value="JmolDevelopersGuide_fr.html" />
|
|
- <arg value="../../doc/source/JmolDevelopersGuide_fr.docbook.xml" />
|
|
- <arg value="../${docbook-xsl}/html/docbook.xsl" />
|
|
- </java>
|
|
- <echo message="Generating developer's guide (de)" />
|
|
- <java fork="true" dir="build/doc"
|
|
- classname="com.icl.saxon.StyleSheet"
|
|
- classpath="${lib.dir}/saxon.jar" >
|
|
- <arg value="-o" />
|
|
- <arg value="JmolDevelopersGuide_de.html" />
|
|
- <arg value="../../doc/source/JmolDevelopersGuide_de.docbook.xml" />
|
|
- <arg value="../${docbook-xsl}/html/docbook.xsl" />
|
|
- </java>
|
|
</target>
|
|
|
|
<target name="jmolAppletGuide" id="jmolAppletGuide" depends="initdoc"
|
|
@@ -1526,24 +1401,6 @@
|
|
<arg value="../../doc/source/JmolAppletGuide.docbook.xml" />
|
|
<arg value="../${docbook-xsl}/html/docbook.xsl" />
|
|
</java>
|
|
- <echo message="Generating applet guide (fr)" />
|
|
- <java fork="true" dir="build/doc"
|
|
- classname="com.icl.saxon.StyleSheet"
|
|
- classpath="${lib.dir}/saxon.jar" >
|
|
- <arg value="-o" />
|
|
- <arg value="JmolAppletGuide_fr.html" />
|
|
- <arg value="../../doc/source/JmolAppletGuide_fr.docbook.xml" />
|
|
- <arg value="../${docbook-xsl}/html/docbook.xsl" />
|
|
- </java>
|
|
- <echo message="Generating applet guide (de)" />
|
|
- <java fork="true" dir="build/doc"
|
|
- classname="com.icl.saxon.StyleSheet"
|
|
- classpath="${lib.dir}/saxon.jar" >
|
|
- <arg value="-o" />
|
|
- <arg value="JmolAppletGuide_de.html" />
|
|
- <arg value="../../doc/source/JmolAppletGuide_de.docbook.xml" />
|
|
- <arg value="../${docbook-xsl}/html/docbook.xsl" />
|
|
- </java>
|
|
</target>
|
|
|
|
<target name="test" id="test" depends="main,compile-tests">
|
|
@@ -1575,12 +1432,4 @@
|
|
<jar destfile="${tests.dir}/Tests.jar" basedir="${test-classes.dir}" />
|
|
</target>
|
|
|
|
- <!-- i18n stuff -->
|
|
- <target name="main-i18n" depends="classes">
|
|
- <ant antfile="tools/build-i18n.xml" target="main-i18n"/>
|
|
- </target>
|
|
- <target name="spotless-i18n">
|
|
- <ant antfile="tools/build-i18n.xml" target="spotless-i18n"/>
|
|
- </target>
|
|
-
|
|
</project>
|