| 1 |
je_fro 12/05/31 21:00:55 |
| 2 |
|
| 3 |
Added: jmol-12.2.27-nointl.patch |
| 4 |
Log: |
| 5 |
Latest version |
| 6 |
|
| 7 |
(Portage version: 2.1.10.63/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-chemistry/jmol/files/jmol-12.2.27-nointl.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/jmol/files/jmol-12.2.27-nointl.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/jmol/files/jmol-12.2.27-nointl.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: jmol-12.2.27-nointl.patch |
| 16 |
=================================================================== |
| 17 |
--- orig-build.xml 2012-05-31 13:42:43.943062427 -0500 |
| 18 |
+++ build.xml 2012-05-31 14:01:01.691982062 -0500 |
| 19 |
@@ -52,8 +52,6 @@ |
| 20 |
|
| 21 |
<property file="proxy.properties" /> |
| 22 |
|
| 23 |
- <import file="tools/build-i18n.xml"/> |
| 24 |
- |
| 25 |
<path id="project.class.path"> |
| 26 |
<fileset dir="${lib.dir}"> |
| 27 |
<include name="*.jar" /> |
| 28 |
@@ -111,10 +109,6 @@ |
| 29 |
<srcfiles dir="doc/source" |
| 30 |
includes="JmolGuide.docbook.xml, guide/*.docbook.xml"/> |
| 31 |
</uptodate> |
| 32 |
- <uptodate targetfile="build/doc/JmolUserGuide_fr/index.html"> |
| 33 |
- <srcfiles dir="doc/source" |
| 34 |
- includes="JmolGuide_fr.docbook.xml, guide/*_fr.docbook.xml"/> |
| 35 |
- </uptodate> |
| 36 |
</and> |
| 37 |
</condition> |
| 38 |
|
| 39 |
@@ -124,14 +118,6 @@ |
| 40 |
<srcfiles dir="doc/source" |
| 41 |
includes="JmolHistory.xml,JmolHistoryToHtml.xsl,history/changes.xml" /> |
| 42 |
</uptodate> |
| 43 |
- <uptodate targetfile="build/doc/JmolHistory/ChangeLog_fr.html"> |
| 44 |
- <srcfiles dir="doc/source" |
| 45 |
- includes="JmolHistory_fr.xml,JmolHistoryToHtml.xsl,history/changes_fr.xml" /> |
| 46 |
- </uptodate> |
| 47 |
- <uptodate targetfile="build/doc/JmolHistory/ChangeLog_nl.html"> |
| 48 |
- <srcfiles dir="doc/source" |
| 49 |
- includes="JmolHistory_nl.xml,JmolHistoryToHtml.xsl,history/changes_nl.xml" /> |
| 50 |
- </uptodate> |
| 51 |
</and> |
| 52 |
</condition> |
| 53 |
|
| 54 |
@@ -141,14 +127,6 @@ |
| 55 |
<srcfiles dir="doc/source" |
| 56 |
includes="JmolDevelopersGuide.docbook.xml"/> |
| 57 |
</uptodate> |
| 58 |
- <uptodate targetfile="build/doc/JmolDevelopersGuide_fr.html"> |
| 59 |
- <srcfiles dir="doc/source" |
| 60 |
- includes="JmolDevelopersGuide_fr.docbook.xml"/> |
| 61 |
- </uptodate> |
| 62 |
- <uptodate targetfile="build/doc/JmolDevelopersGuide_de.html"> |
| 63 |
- <srcfiles dir="doc/source" |
| 64 |
- includes="JmolDevelopersGuide_de.docbook.xml"/> |
| 65 |
- </uptodate> |
| 66 |
</and> |
| 67 |
</condition> |
| 68 |
|
| 69 |
@@ -158,14 +136,6 @@ |
| 70 |
<srcfiles dir="doc/source" |
| 71 |
includes="JmolAppletGuide.docbook.xml, applet/*.docbook.xml"/> |
| 72 |
</uptodate> |
| 73 |
- <uptodate targetfile="build/doc/JmolAppletGuide_fr.html"> |
| 74 |
- <srcfiles dir="doc/source" |
| 75 |
- includes="JmolAppletGuide_fr.docbook.xml, applet/*_fr.docbook.xml"/> |
| 76 |
- </uptodate> |
| 77 |
- <uptodate targetfile="build/doc/JmolAppletGuide_de.html"> |
| 78 |
- <srcfiles dir="doc/source" |
| 79 |
- includes="JmolAppletGuide_de.docbook.xml"/> |
| 80 |
- </uptodate> |
| 81 |
</and> |
| 82 |
</condition> |
| 83 |
|
| 84 |
@@ -388,17 +358,12 @@ |
| 85 |
</target> |
| 86 |
|
| 87 |
<target name="jar" id="jar" |
| 88 |
- depends="init,classes,jmolGuide,jmolHistory,jmolDevelopersGuide,libjars,main-i18n"> |
| 89 |
+ depends="init,classes,jmolGuide,jmolHistory,jmolDevelopersGuide,libjars"> |
| 90 |
<copy todir="${classes.dir}/org/openscience/jmol/Data/guide" > |
| 91 |
<fileset dir="build/doc/JmolUserGuide"> |
| 92 |
<include name="**/*.html" /> |
| 93 |
</fileset> |
| 94 |
</copy> |
| 95 |
- <copy todir="${classes.dir}/org/openscience/jmol/Data/guide_fr" > |
| 96 |
- <fileset dir="build/doc/JmolUserGuide_fr"> |
| 97 |
- <include name="**/*.html" /> |
| 98 |
- </fileset> |
| 99 |
- </copy> |
| 100 |
<copy todir="${classes.dir}/org/openscience/jmol/Data" > |
| 101 |
<fileset dir="build/doc/JmolHistory"> |
| 102 |
<include name="**/*.html" /> |
| 103 |
@@ -603,18 +568,6 @@ |
| 104 |
<fileset dir="${appletjars.dir}" includes="**/*"/> |
| 105 |
</jar> |
| 106 |
|
| 107 |
- <for list="${all.JmolApplet.languages}" delimiter="," |
| 108 |
- param="current.Jmol.language"> |
| 109 |
- <sequential> |
| 110 |
- <jar destfile="${jmol.applet.build.dir}/JmolApplet0_i18n_@{current.Jmol.language}.jar" |
| 111 |
- manifest="manifest/applet_i18n.txt" > |
| 112 |
- <fileset dir="${applet.classes.dir}"> |
| 113 |
- <include name="org/jmol/translation/JmolApplet/@{current.Jmol.language}/**" /> |
| 114 |
- </fileset> |
| 115 |
- </jar> |
| 116 |
- </sequential> |
| 117 |
- </for> |
| 118 |
- |
| 119 |
<jar destfile="${jmol.applet.build.dir}/JmolApplet0_Minimize.jar" manifest="manifest/applet.txt"> |
| 120 |
<fileset dir="${applet.classes.dir}"> |
| 121 |
<include name="org/jmol/minimize/**" /> |
| 122 |
@@ -729,7 +682,6 @@ |
| 123 |
<include name="org/jmol/constant/**" /> |
| 124 |
<include name="org/jmol/g3d/**" /> |
| 125 |
<include name="org/jmol/geodesic/**" /> |
| 126 |
- <include name="org/jmol/i18n/**" /> |
| 127 |
<include name="org/jmol/modelset/**" /> |
| 128 |
<include name="org/jmol/script/**" /> |
| 129 |
<include name="org/jmol/shape/**" /> |
| 130 |
@@ -755,7 +707,6 @@ |
| 131 |
<pathelement path="${jmol.applet.build.dir}/JmolApplet0_ShapeSurface.jar" /> |
| 132 |
<pathelement path="${jmol.applet.build.dir}/JmolApplet0_Smiles.jar" /> |
| 133 |
<pathelement path="${jmol.applet.build.dir}/JmolApplet0_Symmetry.jar" /> |
| 134 |
- <fileset dir="${jmol.applet.build.dir}" includes="JmolApplet0_i18n_*.jar" /> |
| 135 |
</indexjars> |
| 136 |
</jar> |
| 137 |
<!-- changes to this must be replicated below for the signed applet --> |
| 138 |
@@ -868,16 +819,6 @@ |
| 139 |
keystore="selfSignedCertificate/selfSignedCertificate.store" |
| 140 |
storepass="selfSignedCertificate" alias="selfSignedCertificate" /> |
| 141 |
|
| 142 |
- <for list="${all.JmolApplet.languages}" delimiter="," |
| 143 |
- param="current.Jmol.language"> |
| 144 |
- <sequential> |
| 145 |
- <signjar jar="${jmol.applet.build.dir}/JmolApplet0_i18n_@{current.Jmol.language}.jar" |
| 146 |
- signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_i18n_@{current.Jmol.language}.jar" |
| 147 |
- keystore="selfSignedCertificate/selfSignedCertificate.store" |
| 148 |
- storepass="selfSignedCertificate" alias="selfSignedCertificate" /> |
| 149 |
- </sequential> |
| 150 |
- </for> |
| 151 |
- |
| 152 |
<!-- vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv --> |
| 153 |
<!-- this one must be treated specially because of jar indexing |
| 154 |
we cannot simply rename the jar file, because the index has |
| 155 |
@@ -905,7 +846,6 @@ |
| 156 |
<include name="org/jmol/shape/**" /> |
| 157 |
<include name="org/jmol/viewer/**" /> |
| 158 |
<include name="org/jmol/util/**" /> |
| 159 |
- <include name="org/jmol/i18n/**" /> |
| 160 |
</fileset> |
| 161 |
<indexjars> |
| 162 |
<pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_Console.jar" /> |
| 163 |
@@ -924,7 +864,6 @@ |
| 164 |
<pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_ShapeSurface.jar" /> |
| 165 |
<pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_Smiles.jar" /> |
| 166 |
<pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_Symmetry.jar" /> |
| 167 |
- <fileset dir="${jmol.applet.build.dir}" includes="JmolAppletSigned0_i18n_*.jar" /> |
| 168 |
</indexjars> |
| 169 |
</jar> |
| 170 |
<signjar jar="${jmol.applet.build.dir}/JmolAppletSigned0.jar" |
| 171 |
@@ -963,18 +902,6 @@ |
| 172 |
</fileset> |
| 173 |
</jar> |
| 174 |
|
| 175 |
- <for list="${all.JmolApplet.languages}" delimiter="," |
| 176 |
- param="current.Jmol.language"> |
| 177 |
- <sequential> |
| 178 |
- <jar destfile="${jmol.applet.build.dir}/JmolApplet0_i18n_@{current.Jmol.language}.jar" |
| 179 |
- manifest="manifest/applet_i18n.txt" > |
| 180 |
- <fileset dir="${applet.classes.dir}"> |
| 181 |
- <include name="org/jmol/translation/JmolApplet/@{current.Jmol.language}/**" /> |
| 182 |
- </fileset> |
| 183 |
- </jar> |
| 184 |
- </sequential> |
| 185 |
- </for> |
| 186 |
- |
| 187 |
<jar destfile="${jmol.applet.build.dir}/JmolApplet0_Minimize.jar" manifest="manifest/applet.txt"> |
| 188 |
<fileset dir="${applet.classes.dir}"> |
| 189 |
<include name="org/jmol/minimize/**" /> |
| 190 |
@@ -1088,7 +1015,6 @@ |
| 191 |
<include name="org/jmol/constant/**" /> |
| 192 |
<include name="org/jmol/g3d/**" /> |
| 193 |
<include name="org/jmol/geodesic/**" /> |
| 194 |
- <include name="org/jmol/i18n/**" /> |
| 195 |
<include name="org/jmol/modelset/**" /> |
| 196 |
<include name="org/jmol/script/**" /> |
| 197 |
<include name="org/jmol/shape/**" /> |
| 198 |
@@ -1114,7 +1040,6 @@ |
| 199 |
<pathelement path="${jmol.applet.build.dir}/JmolApplet0_ShapeSurface.jar" /> |
| 200 |
<pathelement path="${jmol.applet.build.dir}/JmolApplet0_Smiles.jar" /> |
| 201 |
<pathelement path="${jmol.applet.build.dir}/JmolApplet0_Symmetry.jar" /> |
| 202 |
- <fileset dir="${jmol.applet.build.dir}" includes="JmolApplet0_i18n_*.jar" /> |
| 203 |
</indexjars> |
| 204 |
</jar> |
| 205 |
<!-- changes to this must be replicated below for the signed applet --> |
| 206 |
@@ -1123,7 +1048,7 @@ |
| 207 |
</target> |
| 208 |
|
| 209 |
<target name="dist" id="dist" |
| 210 |
- depends="doc,main-i18n,main,signed-applet"> |
| 211 |
+ depends="doc,main,signed-applet"> |
| 212 |
<!-- first build binary distribution --> |
| 213 |
<delete dir="build/dist/jmol-${version}"/> |
| 214 |
<mkdir dir="build/dist/jmol-${version}"/> |
| 215 |
@@ -1183,7 +1108,6 @@ |
| 216 |
<fileset dir="."> |
| 217 |
<include name="applet.classes" /> |
| 218 |
<include name="build.xml" /> |
| 219 |
- <include name="build-i18n.xml" /> |
| 220 |
</fileset> |
| 221 |
</copy> |
| 222 |
|
| 223 |
@@ -1278,7 +1202,6 @@ |
| 224 |
<fileset dir="."> |
| 225 |
<include name="apisio.classes" /> |
| 226 |
<include name="build.xml" /> |
| 227 |
- <include name="build-i18n.xml" /> |
| 228 |
</fileset> |
| 229 |
</copy> |
| 230 |
|
| 231 |
@@ -1374,7 +1297,7 @@ |
| 232 |
<target name="xclean" id="xclean"> |
| 233 |
</target> |
| 234 |
|
| 235 |
- <target name="spotless" id="spotless" depends="clean,spotless-i18n"> |
| 236 |
+ <target name="spotless" id="spotless" depends="clean"> |
| 237 |
<delete dir="build"/> |
| 238 |
<delete dir="${javadoc.dir}"/> |
| 239 |
<delete dir="packaging/rpm/dist"/> |
| 240 |
@@ -1438,16 +1361,6 @@ |
| 241 |
<arg value="../../../doc/source/JmolGuide.docbook.xml" /> |
| 242 |
<arg value="../../${docbook-xsl}/html/chunk.xsl" /> |
| 243 |
</java> |
| 244 |
- <echo message="Generating user's guide (fr)" /> |
| 245 |
- <mkdir dir="build/doc/JmolUserGuide_fr" /> |
| 246 |
- <java fork="true" dir="build/doc/JmolUserGuide_fr" |
| 247 |
- classname="com.icl.saxon.StyleSheet" |
| 248 |
- classpath="${lib.dir}/saxon.jar" > |
| 249 |
- <jvmarg value="${proxyHost}" /> |
| 250 |
- <jvmarg value="${proxyPort}" /> |
| 251 |
- <arg value="../../../doc/source/JmolGuide_fr.docbook.xml" /> |
| 252 |
- <arg value="../../${docbook-xsl}/html/chunk.xsl" /> |
| 253 |
- </java> |
| 254 |
</target> |
| 255 |
|
| 256 |
<target name="jmolHistory" id="jmolHistory" |
| 257 |
@@ -1462,26 +1375,6 @@ |
| 258 |
<arg value="../../../doc/source/JmolHistory.xml" /> |
| 259 |
<arg value="../../../doc/source/JmolHistoryToHtml.xsl" /> |
| 260 |
</java> |
| 261 |
- <echo message="Generating history of changes (fr)" /> |
| 262 |
- <java fork="true" dir="build/doc/JmolHistory" |
| 263 |
- classname="com.icl.saxon.StyleSheet" |
| 264 |
- classpath="${lib.dir}/saxon.jar" > |
| 265 |
- <arg value="-o" /> |
| 266 |
- <arg value="ChangeLog_fr.html" /> |
| 267 |
- <arg value="../../../doc/source/JmolHistory_fr.xml" /> |
| 268 |
- <arg value="../../../doc/source/JmolHistoryToHtml.xsl" /> |
| 269 |
- <arg value="lang=fr" /> |
| 270 |
- </java> |
| 271 |
- <echo message="Generating history of changes (nl)" /> |
| 272 |
- <java fork="true" dir="build/doc/JmolHistory" |
| 273 |
- classname="com.icl.saxon.StyleSheet" |
| 274 |
- classpath="${lib.dir}/saxon.jar" > |
| 275 |
- <arg value="-o" /> |
| 276 |
- <arg value="ChangeLog_nl.html" /> |
| 277 |
- <arg value="../../../doc/source/JmolHistory_nl.xml" /> |
| 278 |
- <arg value="../../../doc/source/JmolHistoryToHtml.xsl" /> |
| 279 |
- <arg value="lang=nl" /> |
| 280 |
- </java> |
| 281 |
</target> |
| 282 |
|
| 283 |
<target name="jmolDevelopersGuide" id="jmolDevelopersGuide" |
| 284 |
@@ -1495,24 +1388,6 @@ |
| 285 |
<arg value="../../doc/source/JmolDevelopersGuide.docbook.xml" /> |
| 286 |
<arg value="../${docbook-xsl}/html/docbook.xsl" /> |
| 287 |
</java> |
| 288 |
- <echo message="Generating developer's guide (fr)" /> |
| 289 |
- <java fork="true" dir="build/doc" |
| 290 |
- classname="com.icl.saxon.StyleSheet" |
| 291 |
- classpath="${lib.dir}/saxon.jar" > |
| 292 |
- <arg value="-o" /> |
| 293 |
- <arg value="JmolDevelopersGuide_fr.html" /> |
| 294 |
- <arg value="../../doc/source/JmolDevelopersGuide_fr.docbook.xml" /> |
| 295 |
- <arg value="../${docbook-xsl}/html/docbook.xsl" /> |
| 296 |
- </java> |
| 297 |
- <echo message="Generating developer's guide (de)" /> |
| 298 |
- <java fork="true" dir="build/doc" |
| 299 |
- classname="com.icl.saxon.StyleSheet" |
| 300 |
- classpath="${lib.dir}/saxon.jar" > |
| 301 |
- <arg value="-o" /> |
| 302 |
- <arg value="JmolDevelopersGuide_de.html" /> |
| 303 |
- <arg value="../../doc/source/JmolDevelopersGuide_de.docbook.xml" /> |
| 304 |
- <arg value="../${docbook-xsl}/html/docbook.xsl" /> |
| 305 |
- </java> |
| 306 |
</target> |
| 307 |
|
| 308 |
<target name="jmolAppletGuide" id="jmolAppletGuide" depends="initdoc" |
| 309 |
@@ -1526,24 +1401,6 @@ |
| 310 |
<arg value="../../doc/source/JmolAppletGuide.docbook.xml" /> |
| 311 |
<arg value="../${docbook-xsl}/html/docbook.xsl" /> |
| 312 |
</java> |
| 313 |
- <echo message="Generating applet guide (fr)" /> |
| 314 |
- <java fork="true" dir="build/doc" |
| 315 |
- classname="com.icl.saxon.StyleSheet" |
| 316 |
- classpath="${lib.dir}/saxon.jar" > |
| 317 |
- <arg value="-o" /> |
| 318 |
- <arg value="JmolAppletGuide_fr.html" /> |
| 319 |
- <arg value="../../doc/source/JmolAppletGuide_fr.docbook.xml" /> |
| 320 |
- <arg value="../${docbook-xsl}/html/docbook.xsl" /> |
| 321 |
- </java> |
| 322 |
- <echo message="Generating applet guide (de)" /> |
| 323 |
- <java fork="true" dir="build/doc" |
| 324 |
- classname="com.icl.saxon.StyleSheet" |
| 325 |
- classpath="${lib.dir}/saxon.jar" > |
| 326 |
- <arg value="-o" /> |
| 327 |
- <arg value="JmolAppletGuide_de.html" /> |
| 328 |
- <arg value="../../doc/source/JmolAppletGuide_de.docbook.xml" /> |
| 329 |
- <arg value="../${docbook-xsl}/html/docbook.xsl" /> |
| 330 |
- </java> |
| 331 |
</target> |
| 332 |
|
| 333 |
<target name="test" id="test" depends="main,compile-tests"> |
| 334 |
@@ -1575,12 +1432,4 @@ |
| 335 |
<jar destfile="${tests.dir}/Tests.jar" basedir="${test-classes.dir}" /> |
| 336 |
</target> |
| 337 |
|
| 338 |
- <!-- i18n stuff --> |
| 339 |
- <target name="main-i18n" depends="classes"> |
| 340 |
- <ant antfile="tools/build-i18n.xml" target="main-i18n"/> |
| 341 |
- </target> |
| 342 |
- <target name="spotless-i18n"> |
| 343 |
- <ant antfile="tools/build-i18n.xml" target="spotless-i18n"/> |
| 344 |
- </target> |
| 345 |
- |
| 346 |
</project> |
Archives