Attachment #100012 for bug #138619

View | Details | Raw Unified | Return to bug 138619 | Differences between
Collapse All | Expand All




          <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>


          <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>
    

          <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>


          <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>


  </target>

  <target name="jar" id="jar"
          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" />

  </target>

  <target name="dist" id="dist"
          depends="doc,main,signed-applet">
    <!-- first build binary distribution -->
    <delete dir="build/dist/jmol-${version}"/>
    <mkdir dir="build/dist/jmol-${version}"/>

      <fileset dir=".">
        <include name="apisio.classes" />
        <include name="build.xml" />
        <include name="build-i18n.xml" />
      </fileset>
    </copy>


    </delete>
  </target>

  <target name="spotless" id="spotless" depends="clean">
    <delete dir="build"/>
    <delete dir="${javadoc.dir}"/>
    <delete dir="packaging/rpm/dist"/>

      <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"

      <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"

      <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"

      <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">

    <jar destfile="Tests.jar" basedir="${test-classes.dir}" />
  </target>

  <!-- i18n stuff je_fro says - this isn't working in 10.2, only in svn -->
  <target name="main-i18n" depends="classes">
    <ant antfile="build-i18n.xml" target="main-i18n"/>
  </target>
  <target name="spotless-i18n">
    <ant antfile="build-i18n.xml" target="spotless-i18n"/>
  </target>

</project>

Return to bug 138619

Lines 96-105 Link Here

(-)jmol-10.2.0-orig/build.xml (-110 / +4 lines)
96	<srcfiles dir="doc/source"	96	<srcfiles dir="doc/source"
97	includes="JmolGuide.docbook.xml, guide/*.docbook.xml"/>	97	includes="JmolGuide.docbook.xml, guide/*.docbook.xml"/>
98	</uptodate>	98	</uptodate>
99	<uptodate targetfile="build/doc/JmolUserGuide_fr/index.html">
100	<srcfiles dir="doc/source"
101	includes="JmolGuide_fr.docbook.xml, guide/*_fr.docbook.xml"/>
102	</uptodate>
103	</and>	99	</and>
104	</condition>	100	</condition>
105		101
Lines 109-122 Link Here
109	<srcfiles dir="doc/source"	105	<srcfiles dir="doc/source"
110	includes="JmolHistory.xml,JmolHistoryToHtml.xsl,history/changes.xml" />	106	includes="JmolHistory.xml,JmolHistoryToHtml.xsl,history/changes.xml" />
111	</uptodate>	107	</uptodate>
112	<uptodate targetfile="build/doc/JmolHistory/ChangeLog_fr.html">
113	<srcfiles dir="doc/source"
114	includes="JmolHistory_fr.xml,JmolHistoryToHtml.xsl,history/changes_fr.xml" />
115	</uptodate>
116	<uptodate targetfile="build/doc/JmolHistory/ChangeLog_nl.html">
117	<srcfiles dir="doc/source"
118	includes="JmolHistory_nl.xml,JmolHistoryToHtml.xsl,history/changes_nl.xml" />
119	</uptodate>
120	</and>	108	</and>
121	</condition>	109	</condition>
122		110
Lines 126-139 Link Here
126	<srcfiles dir="doc/source"	114	<srcfiles dir="doc/source"
127	includes="JmolDevelopersGuide.docbook.xml"/>	115	includes="JmolDevelopersGuide.docbook.xml"/>
128	</uptodate>	116	</uptodate>
129	<uptodate targetfile="build/doc/JmolDevelopersGuide_fr.html">
130	<srcfiles dir="doc/source"
131	includes="JmolDevelopersGuide_fr.docbook.xml"/>
132	</uptodate>
133	<uptodate targetfile="build/doc/JmolDevelopersGuide_de.html">
134	<srcfiles dir="doc/source"
135	includes="JmolDevelopersGuide_de.docbook.xml"/>
136	</uptodate>
137	</and>	117	</and>
138	</condition>	118	</condition>
139		119
Lines 143-156 Link Here
143	<srcfiles dir="doc/source"	123	<srcfiles dir="doc/source"
144	includes="JmolAppletGuide.docbook.xml, applet/*.docbook.xml"/>	124	includes="JmolAppletGuide.docbook.xml, applet/*.docbook.xml"/>
145	</uptodate>	125	</uptodate>
146	<uptodate targetfile="build/doc/JmolAppletGuide_fr.html">
147	<srcfiles dir="doc/source"
148	includes="JmolAppletGuide_fr.docbook.xml, applet/*_fr.docbook.xml"/>
149	</uptodate>
150	<uptodate targetfile="build/doc/JmolAppletGuide_de.html">
151	<srcfiles dir="doc/source"
152	includes="JmolAppletGuide_de.docbook.xml"/>
153	</uptodate>
154	</and>	126	</and>
155	</condition>	127	</condition>
156		128
Lines 326-342 Link Here
326	</target>	298	</target>
327		299
328	<target name="jar" id="jar"	300	<target name="jar" id="jar"
329	depends="init,classes,jmolGuide,jmolHistory,jmolDevelopersGuide,libjars,main-i18n">	301	depends="init,classes,jmolGuide,jmolHistory,jmolDevelopersGuide,libjars">
330	<copy todir="${classes.dir}/org/openscience/jmol/Data/guide" >	302	<copy todir="${classes.dir}/org/openscience/jmol/Data/guide" >
331	<fileset dir="build/doc/JmolUserGuide">	303	<fileset dir="build/doc/JmolUserGuide">
332	<include name="*/.html" />	304	<include name="*/.html" />
333	</fileset>	305	</fileset>
334	</copy>	306	</copy>
335	<copy todir="${classes.dir}/org/openscience/jmol/Data/guide_fr" >
336	<fileset dir="build/doc/JmolUserGuide_fr">
337	<include name="*/.html" />
338	</fileset>
339	</copy>
340	<copy todir="${classes.dir}/org/openscience/jmol/Data" >	307	<copy todir="${classes.dir}/org/openscience/jmol/Data" >
341	<fileset dir="build/doc/JmolHistory">	308	<fileset dir="build/doc/JmolHistory">
342	<include name="*/.html" />	309	<include name="*/.html" />
Lines 571-577 Link Here
571	</target>	538	</target>
572		539
573	<target name="dist" id="dist"	540	<target name="dist" id="dist"
574	depends="doc,main-i18n,main,signed-applet">	541	depends="doc,main,signed-applet">
575	<!-- first build binary distribution -->	542	<!-- first build binary distribution -->
576	<delete dir="build/dist/jmol-${version}"/>	543	<delete dir="build/dist/jmol-${version}"/>
577	<mkdir dir="build/dist/jmol-${version}"/>	544	<mkdir dir="build/dist/jmol-${version}"/>
Lines 711-717 Link Here
711	<fileset dir=".">	678	<fileset dir=".">
712	<include name="apisio.classes" />	679	<include name="apisio.classes" />
713	<include name="build.xml" />	680	<include name="build.xml" />
714	<include name="build-i18n.xml" />
715	</fileset>	681	</fileset>
716	</copy>	682	</copy>
717		683
Lines 801-807 Link Here
801	</delete>	767	</delete>
802	</target>	768	</target>
803		769
804	<target name="spotless" id="spotless" depends="clean,spotless-i18n">	770	<target name="spotless" id="spotless" depends="clean">
805	<delete dir="build"/>	771	<delete dir="build"/>
806	<delete dir="${javadoc.dir}"/>	772	<delete dir="${javadoc.dir}"/>
807	<delete dir="packaging/rpm/dist"/>	773	<delete dir="packaging/rpm/dist"/>
Lines 862-877 Link Here
862	<arg value="../../../doc/source/JmolGuide.docbook.xml" />	828	<arg value="../../../doc/source/JmolGuide.docbook.xml" />
863	<arg value="../../${docbook-xsl}/html/chunk.xsl" />	829	<arg value="../../${docbook-xsl}/html/chunk.xsl" />
864	</java>	830	</java>
865	<echo message="Generating user's guide (fr)" />
866	<mkdir dir="build/doc/JmolUserGuide_fr" />
867	<java fork="true" dir="build/doc/JmolUserGuide_fr"
868	classname="com.icl.saxon.StyleSheet"
869	classpath="${lib.dir}/saxon.jar" >
870	<jvmarg value="${proxyHost}" />
871	<jvmarg value="${proxyPort}" />
872	<arg value="../../../doc/source/JmolGuide_fr.docbook.xml" />
873	<arg value="../../${docbook-xsl}/html/chunk.xsl" />
874	</java>
875	</target>	831	</target>
876		832
877	<target name="jmolHistory" id="jmolHistory"	833	<target name="jmolHistory" id="jmolHistory"
Lines 886-911 Link Here
886	<arg value="../../../doc/source/JmolHistory.xml" />	842	<arg value="../../../doc/source/JmolHistory.xml" />
887	<arg value="../../../doc/source/JmolHistoryToHtml.xsl" />	843	<arg value="../../../doc/source/JmolHistoryToHtml.xsl" />
888	</java>	844	</java>
889	<echo message="Generating history of changes (fr)" />
890	<java fork="true" dir="build/doc/JmolHistory"
891	classname="com.icl.saxon.StyleSheet"
892	classpath="${lib.dir}/saxon.jar" >
893	<arg value="-o" />
894	<arg value="ChangeLog_fr.html" />
895	<arg value="../../../doc/source/JmolHistory_fr.xml" />
896	<arg value="../../../doc/source/JmolHistoryToHtml.xsl" />
897	<arg value="lang=fr" />
898	</java>
899	<echo message="Generating history of changes (nl)" />
900	<java fork="true" dir="build/doc/JmolHistory"
901	classname="com.icl.saxon.StyleSheet"
902	classpath="${lib.dir}/saxon.jar" >
903	<arg value="-o" />
904	<arg value="ChangeLog_nl.html" />
905	<arg value="../../../doc/source/JmolHistory_nl.xml" />
906	<arg value="../../../doc/source/JmolHistoryToHtml.xsl" />
907	<arg value="lang=nl" />
908	</java>
909	</target>	845	</target>
910		846
911	<target name="jmolDevelopersGuide" id="jmolDevelopersGuide"	847	<target name="jmolDevelopersGuide" id="jmolDevelopersGuide"
Lines 919-942 Link Here
919	<arg value="../../doc/source/JmolDevelopersGuide.docbook.xml" />	855	<arg value="../../doc/source/JmolDevelopersGuide.docbook.xml" />
920	<arg value="../${docbook-xsl}/html/docbook.xsl" />	856	<arg value="../${docbook-xsl}/html/docbook.xsl" />
921	</java>	857	</java>
922	<echo message="Generating developer's guide (fr)" />
923	<java fork="true" dir="build/doc"
924	classname="com.icl.saxon.StyleSheet"
925	classpath="${lib.dir}/saxon.jar" >
926	<arg value="-o" />
927	<arg value="JmolDevelopersGuide_fr.html" />
928	<arg value="../../doc/source/JmolDevelopersGuide_fr.docbook.xml" />
929	<arg value="../${docbook-xsl}/html/docbook.xsl" />
930	</java>
931	<echo message="Generating developer's guide (de)" />
932	<java fork="true" dir="build/doc"
933	classname="com.icl.saxon.StyleSheet"
934	classpath="${lib.dir}/saxon.jar" >
935	<arg value="-o" />
936	<arg value="JmolDevelopersGuide_de.html" />
937	<arg value="../../doc/source/JmolDevelopersGuide_de.docbook.xml" />
938	<arg value="../${docbook-xsl}/html/docbook.xsl" />
939	</java>
940	</target>	858	</target>
941		859
942	<target name="jmolAppletGuide" id="jmolAppletGuide" depends="initdoc"	860	<target name="jmolAppletGuide" id="jmolAppletGuide" depends="initdoc"
Lines 950-973 Link Here
950	<arg value="../../doc/source/JmolAppletGuide.docbook.xml" />	868	<arg value="../../doc/source/JmolAppletGuide.docbook.xml" />
951	<arg value="../${docbook-xsl}/html/docbook.xsl" />	869	<arg value="../${docbook-xsl}/html/docbook.xsl" />
952	</java>	870	</java>
953	<echo message="Generating applet guide (fr)" />
954	<java fork="true" dir="build/doc"
955	classname="com.icl.saxon.StyleSheet"
956	classpath="${lib.dir}/saxon.jar" >
957	<arg value="-o" />
958	<arg value="JmolAppletGuide_fr.html" />
959	<arg value="../../doc/source/JmolAppletGuide_fr.docbook.xml" />
960	<arg value="../${docbook-xsl}/html/docbook.xsl" />
961	</java>
962	<echo message="Generating applet guide (de)" />
963	<java fork="true" dir="build/doc"
964	classname="com.icl.saxon.StyleSheet"
965	classpath="${lib.dir}/saxon.jar" >
966	<arg value="-o" />
967	<arg value="JmolAppletGuide_de.html" />
968	<arg value="../../doc/source/JmolAppletGuide_de.docbook.xml" />
969	<arg value="../${docbook-xsl}/html/docbook.xsl" />
970	</java>
971	</target>	871	</target>
972		872
973	<target name="test" id="test" depends="main,compile-tests">	873	<target name="test" id="test" depends="main,compile-tests">
Lines 998-1009 Link Here
998	<jar destfile="Tests.jar" basedir="${test-classes.dir}" />	898	<jar destfile="Tests.jar" basedir="${test-classes.dir}" />
999	</target>	899	</target>
1000		900
1001	<!-- i18n stuff -->	901	<!-- i18n stuff je_fro says - this isn't working in 10.2, only in svn -->
1002	<target name="main-i18n" depends="classes">
1003	<ant antfile="build-i18n.xml" target="main-i18n"/>
1004	</target>
1005	<target name="spotless-i18n">
1006	<ant antfile="build-i18n.xml" target="spotless-i18n"/>
1007	</target>
1008		902
1009	</project>	903	</project>