| 1 | From c812efa9fcbfb49a571cc73af83c8da5cb951bcf Mon Sep 17 00:00:00 2001
|
| 2 | From: Julien Lepiller <[email protected]>
|
| 3 | Date: Thu, 2 May 2019 19:05:33 +0200
|
| 4 | Subject: [PATCH] Fix non determinism and installation
|
| 5 |
|
| 6 | ---
|
| 7 | svg-core/build.xml | 22 ----------------------
|
| 8 | svg-core/nbproject/build-impl.xml | 1 -
|
| 9 | 2 files changed, 23 deletions(-)
|
| 10 |
|
| 11 | diff --git a/svg-core/build.xml b/svg-core/build.xml
|
| 12 | index cc72eb7..0f9c3e6 100755
|
| 13 | |
| 14 | |
| 15 | @@ -102,7 +102,6 @@
|
| 16 | <jar destfile="${maven-javadoc-jar}" update="false">
|
| 17 | <manifest>
|
| 18 | <attribute name="Version" value="${version}"/>
|
| 19 | - <attribute name="Date" value="${TODAY}"/>
|
| 20 | </manifest>
|
| 21 |
|
| 22 | <fileset dir="dist/javadoc">
|
| 23 | @@ -112,7 +111,6 @@
|
| 24 | <jar destfile="${maven-sources-jar}" update="false">
|
| 25 | <manifest>
|
| 26 | <attribute name="Version" value="${version}"/>
|
| 27 | - <attribute name="Date" value="${TODAY}"/>
|
| 28 | </manifest>
|
| 29 |
|
| 30 | <fileset dir="src/main/java">
|
| 31 | @@ -126,7 +124,6 @@
|
| 32 | <manifest>
|
| 33 | <attribute name="Main-Class" value="com.kitfox.svg.app.SVGPlayer"/>
|
| 34 | <attribute name="Version" value="${version}"/>
|
| 35 | - <attribute name="Date" value="${TODAY}"/>
|
| 36 | </manifest>
|
| 37 |
|
| 38 | <fileset dir="build/classes">
|
| 39 | @@ -203,7 +200,6 @@
|
| 40 | <manifest>
|
| 41 | <attribute name="Main-Class" value="com.kitfox.svg.app.SVGPlayer"/>
|
| 42 | <attribute name="Version" value="${version}"/>
|
| 43 | - <attribute name="Date" value="${TODAY}"/>
|
| 44 | </manifest>
|
| 45 |
|
| 46 | <fileset dir="build/classes">
|
| 47 | @@ -213,24 +209,6 @@
|
| 48 | </fileset>
|
| 49 | </jar>
|
| 50 |
|
| 51 | - <delete file="${key.location}"/>
|
| 52 | - <genkey alias="${key.user}" storepass="${key.password}" keystore="${key.location}" validity="1000" verbose="true">
|
| 53 | - <dname>
|
| 54 | - <param name="CN" value="Mark McKay, [email protected]"/>
|
| 55 | - <param name="OU" value="kitfox.com"/>
|
| 56 | - <param name="O" value="kitfox"/>
|
| 57 | - <param name="L" value="Toronto"/>
|
| 58 | - <param name="S" value="Ontario"/>
|
| 59 | - <param name="C" value="CA"/>
|
| 60 | - </dname>
|
| 61 | - </genkey>
|
| 62 | -
|
| 63 | - <copy file="${dist.jar}" toFile="${project.www.jar}"/>
|
| 64 | - <signjar jar="${project.www.jar}"
|
| 65 | - alias="${key.user}"
|
| 66 | - storepass="${key.password}"
|
| 67 | - keystore="${key.location}"/>
|
| 68 | -
|
| 69 | <delete file="${project.tiny.jar}"/>
|
| 70 | <jar destfile="${project.tiny.jar}" update="true">
|
| 71 | <manifest>
|
| 72 | diff --git a/svg-core/nbproject/build-impl.xml b/svg-core/nbproject/build-impl.xml
|
| 73 | index b448d8a..37725ad 100755
|
| 74 | |
| 75 | |
| 76 | @@ -1045,7 +1045,6 @@ is divided into following sections:
|
| 77 | </manifest>
|
| 78 | </target>
|
| 79 | <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.mkdist" name="-do-jar-copylibs">
|
| 80 | - <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
|
| 81 | <echo level="info">To run this application from the command line without Ant, try:</echo>
|
| 82 | <property location="${dist.jar}" name="dist.jar.resolved"/>
|
| 83 | <echo level="info">java -jar "${dist.jar.resolved}"</echo>
|
| 84 | --
|
| 85 | 2.21.0
|
| 86 |
|