diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2019-10-22 12:29:07 -0400 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2019-10-22 13:34:29 -0400 |
| commit | 7dedf1bfd8dc730bc223fcc25120215cce19d543 (patch) | |
| tree | 327f07be960c3ee77c9e6c02f5b1d1c4ece37b98 /libre/jmol/jmol-dontsign.patch | |
| parent | 379523ee5324a1e290ab2f4cda38030502a5c24f (diff) | |
| download | abslibre-7dedf1bfd8dc730bc223fcc25120215cce19d543.tar.gz abslibre-7dedf1bfd8dc730bc223fcc25120215cce19d543.tar.bz2 abslibre-7dedf1bfd8dc730bc223fcc25120215cce19d543.zip | |
[jmol]: rework patches
Diffstat (limited to 'libre/jmol/jmol-dontsign.patch')
| -rw-r--r-- | libre/jmol/jmol-dontsign.patch | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/libre/jmol/jmol-dontsign.patch b/libre/jmol/jmol-dontsign.patch index daccac469..381dfcf0c 100644 --- a/libre/jmol/jmol-dontsign.patch +++ b/libre/jmol/jmol-dontsign.patch @@ -1,18 +1,20 @@ ---- jmol-14.6.4_2016.10.02.orig/build.xml 2016-10-02 23:01:03.000000000 -0500 -+++ jmol-14.6.4_2016.10.02/build.xml 2016-11-09 18:43:28.077873627 -0500 -@@ -159,7 +159,7 @@ - </fileset>
- </path>
-
+diff --git a/build.xml b/build.xml +index 2c891f0..bae9a5d 100644 +--- a/build.xml ++++ b/build.xml +@@ -321,7 +321,7 @@ Release Note: When releasing stable version, remove "-beta" +
+
+
- <target name="main" id="main" depends="init,jar,applet-jar,signed-applet,smiles-applet-jar"/>
+ <target name="main" id="main" depends="init,jar,applet-jar,smiles-applet-jar"/>
<target name="all" id="all" depends="doc,main"/>
-@@ -520,10 +520,10 @@ - <fileset dir="src/org/jmol/translation/Jmol" includes="Messages*.class"/>
- <fileset dir="src/org/jmol/translation/JmolApplet" includes="Messages*.class"/>
- </jar>
+@@ -685,10 +685,10 @@ all support for previous versions removed +
+ <echo message="Creating Jmol.jar -- if this fails, check to see that build/Jmol.jar is not open." />
+
- <antcall target="sign-jar-file">
+ <!--<antcall target="sign-jar-file">
<param name="sign-jar-file-dir" value="build" />
@@ -22,9 +24,9 @@ <jar destfile="build/JmolData.jar"
manifest="manifest/applicationData.txt">
-@@ -555,10 +555,10 @@ - <fileset dir="src/org/jmol/translation/Jmol" includes="Messages*.class"/>
- <fileset dir="src/org/jmol/translation/JmolApplet" includes="Messages*.class"/>
+@@ -724,10 +724,10 @@ all support for previous versions removed + </fileset>
+ <fileset dir="${appjars.dir}" includes="**/cli/** **/naga/**" />
</jar>
- <antcall target="sign-jar-file">
+ <!--<antcall target="sign-jar-file">
@@ -35,7 +37,7 @@ <copy todir="build">
<fileset dir=".">
-@@ -586,10 +586,10 @@ +@@ -755,10 +755,10 @@ all support for previous versions removed </fileset>
<fileset dir="${appjars.dir}" includes="**/*"/>
</jar>
@@ -48,7 +50,7 @@ <!--
<jar destfile="ChimeToJmol.jar"
manifest="manifest/chimetojmol.txt">
-@@ -1163,10 +1163,10 @@ +@@ -1309,10 +1309,10 @@ all support for previous versions removed </indexjars>
</jar>
<echo> signing JmolApplet*.jar</echo>
|