|
 |
1eeec11 |
diff -up jmol-12.0.41/build.xml.nosign jmol-12.0.41/build.xml
|
|
|
1eeec11 |
--- jmol-12.0.41/build.xml.nosign 2011-04-28 15:51:50.356440735 +0300
|
|
|
1eeec11 |
+++ jmol-12.0.41/build.xml 2011-04-28 15:52:46.113118352 +0300
|
|
|
1eeec11 |
@@ -418,13 +418,13 @@ all support for previous versions remove
|
|
|
1eeec11 |
<fileset dir="${appjars.dir}" includes="**/*"/>
|
|
|
1eeec11 |
<fileset dir="src/org/jmol/translation/Jmol" includes="Messages*.class"/>
|
|
|
1eeec11 |
</jar>
|
|
|
1eeec11 |
-
|
|
|
1eeec11 |
+
|
|
|
1eeec11 |
signedjar="${jmol.build.dir}/Jmol.jar"
|
|
|
1eeec11 |
keystore="selfSignedCertificate/selfSignedCertificate.store"
|
|
|
1eeec11 |
- storepass="selfSignedCertificate" alias="selfSignedCertificate" />
|
|
|
1eeec11 |
+ storepass="selfSignedCertificate" alias="selfSignedCertificate" />-->
|
|
|
1eeec11 |
|
|
|
1eeec11 |
|
|
|
1eeec11 |
- <delete file="${jmol.build.dir}/JmolUnsigned.jar"/>
|
|
|
1eeec11 |
+
|
|
|
1eeec11 |
|
|
|
1eeec11 |
manifest="manifest/applicationData.txt">
|
|
|
1eeec11 |
<fileset dir="${classes.dir}" >
|
|
|
1eeec11 |
@@ -453,13 +453,13 @@ all support for previous versions remove
|
|
|
1eeec11 |
<fileset dir="${appjars.dir}" includes="**/cli/** **/vecmath/**" />
|
|
|
1eeec11 |
<fileset dir="src/org/jmol/translation/Jmol" includes="Messages*.class"/>
|
|
|
1eeec11 |
</jar>
|
|
|
1eeec11 |
-
|
|
|
1eeec11 |
+
|
|
|
1eeec11 |
signedjar="${jmol.build.dir}/JmolData.jar"
|
|
|
1eeec11 |
keystore="selfSignedCertificate/selfSignedCertificate.store"
|
|
|
1eeec11 |
- storepass="selfSignedCertificate" alias="selfSignedCertificate" />
|
|
|
1eeec11 |
+ storepass="selfSignedCertificate" alias="selfSignedCertificate" />-->
|
|
|
1eeec11 |
|
|
|
1eeec11 |
|
|
|
1eeec11 |
- <delete file="${jmol.build.dir}/JmolUnsignedF.jar"/>
|
|
|
1eeec11 |
+
|
|
|
1eeec11 |
<copy todir="${jmol.build.dir}">
|
|
|
1eeec11 |
<fileset dir=".">
|
|
|
1eeec11 |
<include name="jmol" />
|
|
|
1eeec11 |
@@ -485,11 +485,11 @@ all support for previous versions remove
|
|
|
1eeec11 |
<fileset dir="${appjars.dir}" includes="**/*"/>
|
|
|
1eeec11 |
</jar>
|
|
|
1eeec11 |
|
|
|
1eeec11 |
-
|
|
|
1eeec11 |
+
|
|
|
1eeec11 |
signedjar="${jmol.build.dir}/Jvxl.jar"
|
|
|
1eeec11 |
keystore="selfSignedCertificate/selfSignedCertificate.store"
|
|
|
1eeec11 |
storepass="selfSignedCertificate" alias="selfSignedCertificate" />
|
|
|
1eeec11 |
- <delete file="${jmol.build.dir}/JvxlUnsigned.jar"/>
|
|
|
1eeec11 |
+ <delete file="${jmol.build.dir}/JvxlUnsigned.jar"/>-->
|
|
|
1eeec11 |
|
|
|
1eeec11 |
</target>
|
|
|
1eeec11 |
|
|
|
1eeec11 |
@@ -756,7 +756,8 @@ all support for previous versions remove
|
|
|
1eeec11 |
</fileset>
|
|
|
1eeec11 |
<fileset dir="${appletjars.dir}" includes="**/*"/>
|
|
|
1eeec11 |
</jar>
|
|
|
1eeec11 |
-
|
|
|
1eeec11 |
+
|
|
|
1eeec11 |
+
|
|
|
1eeec11 |
signedjar="${jmol.applet.build.dir}/JmolAppletSigned.jar"
|
|
|
1eeec11 |
keystore="selfSignedCertificate/selfSignedCertificate.store"
|
|
|
1eeec11 |
storepass="selfSignedCertificate" alias="selfSignedCertificate" />
|
|
|
1eeec11 |
@@ -770,7 +771,7 @@ all support for previous versions remove
|
|
|
1eeec11 |
|
|
|
1eeec11 |
signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_Minimize.jar"
|
|
|
1eeec11 |
keystore="selfSignedCertificate/selfSignedCertificate.store"
|
|
|
1eeec11 |
- storepass="selfSignedCertificate" alias="selfSignedCertificate" />
|
|
|
1eeec11 |
+ storepass="selfSignedCertificate" alias="selfSignedCertificate" />-->
|
|
|
1eeec11 |
|
|
|
1eeec11 |
|
|
|
1eeec11 |
manifest="manifest/appletMonolithic.txt" index="true" >
|
|
|
1eeec11 |
@@ -779,6 +780,7 @@ all support for previous versions remove
|
|
|
1eeec11 |
<include name="com/sparshui/**" />
|
|
|
1eeec11 |
</fileset>
|
|
|
1eeec11 |
</jar>
|
|
|
1eeec11 |
+
|
|
|
1eeec11 |
|
|
|
1eeec11 |
signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_MultiTouch.jar"
|
|
|
1eeec11 |
keystore="selfSignedCertificate/selfSignedCertificate.store"
|
|
|
1eeec11 |
@@ -860,16 +862,17 @@ all support for previous versions remove
|
|
|
1eeec11 |
storepass="selfSignedCertificate" alias="selfSignedCertificate" />
|
|
|
1eeec11 |
</sequential>
|
|
|
1eeec11 |
</for>
|
|
|
1eeec11 |
+ -->
|
|
|
1eeec11 |
|
|
|
1eeec11 |
|
|
|
1eeec11 |
|
|
|
1eeec11 |
we cannot simply rename the jar file, because the index has
|
|
|
1eeec11 |
the old name (JmolApplet?.jar) inside it -->
|
|
|
1eeec11 |
-
|
|
|
1eeec11 |
+
|
|
|
1eeec11 |
manifest="manifest/applet0.txt"
|
|
|
1eeec11 |
- index="true">
|
|
|
1eeec11 |
+ index="true">-->
|
|
|
1eeec11 |
|
|
|
1eeec11 |
- <fileset dir="${appletjars.dir}" includes="**/*"/>
|
|
|
1eeec11 |
+
|
|
|
1eeec11 |
<fileset dir="${applet.classes.dir}">
|
|
|
1eeec11 |
<include name="org/jmol/appletwrapper/*" />
|
|
|
1eeec11 |
<include name="JmolApplet*.class" />
|
|
|
1eeec11 |
@@ -908,10 +911,11 @@ all support for previous versions remove
|
|
|
1eeec11 |
<pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_Symmetry.jar" />
|
|
|
1eeec11 |
<fileset dir="${jmol.applet.build.dir}" includes="JmolAppletSigned0_i18n_*.jar" />
|
|
|
1eeec11 |
</indexjars>
|
|
|
1eeec11 |
- </jar>
|
|
|
1eeec11 |
-
|
|
|
1eeec11 |
+ </jar>-->
|
|
|
1eeec11 |
+
|
|
|
1eeec11 |
+
|
|
|
1eeec11 |
keystore="selfSignedCertificate/selfSignedCertificate.store"
|
|
|
1eeec11 |
- storepass="selfSignedCertificate" alias="selfSignedCertificate" />
|
|
|
1eeec11 |
+ storepass="selfSignedCertificate" alias="selfSignedCertificate" />-->
|
|
|
1eeec11 |
|
|
|
1eeec11 |
</target>
|
|
|
1eeec11 |
|
|
|
1eeec11 |
@@ -1306,7 +1310,7 @@ all support for previous versions remove
|
|
|
1eeec11 |
workaround for a bugs in the fileset feature of the signjar task. See bugs
|
|
|
1eeec11 |
5230 and 6988.
|
|
|
1eeec11 |
-->
|
|
|
1eeec11 |
- <target name="internal-dist-jws-sign" id="internal-dist-jws-sign">
|
|
|
1eeec11 |
+
|
|
|
1eeec11 |
|
|
|
1eeec11 |
storepass="${keystore.password}"
|
|
|
1eeec11 |
keystore="${keystore.name}" >
|
|
|
1eeec11 |
@@ -1315,7 +1319,7 @@ all support for previous versions remove
|
|
|
1eeec11 |
<exclude name="**/.AppleDouble/**" />
|
|
|
1eeec11 |
</fileset>
|
|
|
1eeec11 |
</signjar>
|
|
|
1eeec11 |
- </target>
|
|
|
1eeec11 |
+ </target>-->
|
|
|
1eeec11 |
|
|
|
1eeec11 |
<target name="clean" id="clean">
|
|
|
1eeec11 |
<delete dir="${classes.dir}"/>
|