<echo message="build - compiles all necessary files for Application" />
<echo message="makedist - compiles and places all necessary jar files into directory dist" />
<echo message="makefulldist - signs all jar files and builds jnlp file for full distribution" />
- <echo message=" this needs a keystore and key. Add -Dtimestamp to timestamp signed jars"/>
+ <echo message=" this needs a keystore and key."/>
+ <echo message=" Add -Dtimestamp to timestamp signed jars"/>
+ <echo message=" -Djalview.keyalg and -Djalview.keydig are SHA1/SHA1withRSA"/>
<echo message=" See docs/building.html for more information." />
<echo message="compileApplet - compiles all necessary files for Applet" />
<echo message="makeApplet - compiles, then packages and obfuscates the Applet" />
<!-- locally valid proxy for signing with external time server -->
<property name="proxyPort" value="80"/>
<property name="proxyHost" value="sqid"/>
+ <!-- key sign/digest algorithms -->
+ <property name="jalview.keyalg" value="SHA1withRSA" description="key algorithm for signing"/>
+ <property name="jalview.keydig" value="SHA1" description="algorithm for jar digest"/>
<!-- default TestNG groups to run -->
<property name="testng-groups" value="Functional" />
</fileset>
<pathelement location="appletlib/${jmolJar}" />
<pathelement location="lib/${varnaJar}" />
- <pathelement location="lib/${jsoup}" />
- <pathelement location="lib/${jsonSimple}" />
- <pathelement location="lib/${javaJson}" />
+ <pathelement location="appletlib/${jsoup}" />
+ <pathelement location="appletlib/${jsonSimple}" />
+ <pathelement location="appletlib/${javaJson}" />
</path>
<!-- default location for outputting javadoc -->
</target>
<target name="-jarsignwithtsa" depends="makedist,preparejnlp" if="timestamp">
- <signjar storepass="${jalview.keystore.pass}" keypass="${jalview.key.pass}" keystore="${jalview.keystore}" alias="${jalview.key}" lazy="false" verbose="false" sigalg="SHA1withRSA"
+ <signjar storepass="${jalview.keystore.pass}" keypass="${jalview.key.pass}" keystore="${jalview.keystore}" alias="${jalview.key}" lazy="false" verbose="false" sigalg="${jalview.keyalg}" digestalg="${jalview.keydig}"
tsaproxyhost="${proxyHost}" tsaproxyport="${proxyPort}" tsaurl="${jalview.tsaurl}">
<fileset dir="${packageDir}">
<include name="*.jar" />
</signjar>
</target>
<target name="-jarsignnotsa" depends="makedist,preparejnlp" unless="timestamp">
- <signjar storepass="${jalview.keystore.pass}" keypass="${jalview.key.pass}" keystore="${jalview.keystore}" alias="${jalview.key}" lazy="false" verbose="false" sigalg="SHA1withRSA">
+ <signjar storepass="${jalview.keystore.pass}" keypass="${jalview.key.pass}" keystore="${jalview.keystore}" alias="${jalview.key}" lazy="false" verbose="false" sigalg="${jalview.keyalg}" digestalg="${jalview.keydig}">
<fileset dir="${packageDir}">
<include name="*.jar" />
</fileset>
</information>
<resources>
<j2se version="${j2sev}" initial_heap_size="${inih}" max_heap_size="${maxh}" />
+ <jar main="true" href="jalview.jar"/>
<fileset dir="${packageDir}">
- <include name="jalview.jar" />
- </fileset>
- <fileset dir="${packageDir}">
+ <exclude name="jalview.jar" />
<include name="*.jar" />
<include name="*_*.jar" />
- <exclude name="jalview.jar" />
<exclude name="*jnilib.jar" />
</fileset>
<property name="jalview.version" value="${JALVIEW_VERSION}" />
<target name="compileApplet" depends="init,clean">
<mkdir dir="${outputDir}" />
- <javac source="${javac.source}" target="${javac.target}" srcdir="${sourceDir}" destdir="${outputDir}" debug="${javac.debug}" classpathref="jalviewlite.deps" includes="jalview/appletgui/**" excludes="ext/**,gui/**,jbgui/**,MCview/**,org/**,vamsas/**,jalview/ext/rbvi/**,jalview/ext/paradise/**" />
+ <javac source="${javac.source}" target="${javac.target}" srcdir="${sourceDir}" destdir="${outputDir}" debug="${javac.debug}" classpathref="jalviewlite.deps" includes="jalview/appletgui/**" excludes="ext/**,gui/**,jbgui/**,MCview/**,org/**,vamsas/**,jalview/ext/rbvi/**,jalview/ext/paradise/**,jalview/ext/ensembl/**,jalview/ext/so" />
</target>
<target name="packageApplet" depends="compileApplet, buildPropertiesFile">
<path id="obfuscateDeps.path">
<pathelement location="${applet.jre.tools}" />
<pathelement location="appletlib/${jmolJar}" />
+ <pathelement location="lib/${varnaJar}" />
+ <pathelement location="appletlib/${jsoup}" />
<pathelement location="appletlib/${jsonSimple}" />
<pathelement location="appletlib/${javaJson}" />
+ <fileset dir="${java.home}/lib">
+ <include name="plugin.jar" />
+ </fileset>
</path>
<taskdef resource="proguard/ant/task.properties" classpath="utils/proguard.jar" />
- <proguard>
- <injar file="in.jar" />
- <outjar file="${jalviewLiteJar}" />
- <libraryjar refid="obfuscateDeps.path" />
+ <proguard verbose="true" >
+ <injar file="in.jar" />
+ <outjar file="${jalviewLiteJar}" />
+ <libraryjar refid="obfuscateDeps.path" />
<dontwarn />
<keep access="public" type="class" name="jalview.bin.JalviewLite">
<field access="public" />
<method access="public" />
<constructor access="public" />
</keep>
+
+ <keep name="jalview.json.binding**">
+ <constructor/>
+ <method name="*"/>
+ </keep>
+
+ <keep access="public" type="class" name="MCview.PDBfile">
+ <field access="public" />
+ <method access="public" />
+ <constructor access="public" />
+ </keep>
+
+ <keep access="public" type="class" name="jalview.ws.jws1.Annotate3D">
+ <field access="public" />
+ <method access="public" />
+ <constructor access="public" />
+ </keep>
+
+ <keep access="public" type="class" name="jalview.ext.jmol.JmolParser">
+ <field access="public" />
+ <method access="public" />
+ <constructor access="public" />
+ </keep>
+
+
<!-- -libraryjars "${obfuscateDeps}"
-injars in.jar
-outjars jalviewApplet.jar
<include name="${resourceDir}/**/*" />
<include name="${helpDir}/**/*" />
<include name="appletlib/${jmolJar}" />
+ <include name="appletlib/${jsonSimple}" />
+ <include name="appletlib/${javaJson}" />
<exclude name="**/*locales" />
<exclude name="*locales/**" />
<exclude name="utils/InstallAnywhere/**Build.iap_xml" />
<attribute name="Caller-Allowable-Codebase" value="${applet.caller-codebase}" />
</manifest>
</jar>
-</target>
-<target name="-signexdirsnotsa" depends="prepubapplet_1" unless="timestamp">
- <signjar sigalg="SHA1WithRSA" storepass="${jalview.keystore.pass}" keypass="${jalview.key.pass}" keystore="${jalview.keystore}" alias="${jalview.key}" lazy="false" verbose="false">
- <fileset dir="${packageDir}/examples">
- <include name="*.jar" />
- </fileset>
- </signjar>
-</target>
-<target name="-signexdirstsa" depends="prepubapplet_1" if="timestamp">
- <signjar sigalg="SHA1WithRSA" storepass="${jalview.keystore.pass}" keypass="${jalview.key.pass}" keystore="${jalview.keystore}" alias="${jalview.key}" lazy="false" verbose="false" tsaproxyhost="${proxyHost}" tsaproxyport="${proxyPort}" tsaurl="${jalview.tsaurl}">
- <fileset dir="${packageDir}/examples">
- <include name="*.jar" />
- </fileset>
- </signjar>
-</target>
-<target name="prepubapplet_2" depends="-signexdirsnotsa,-signexdirstsa">
<presetdef name="ap_applet.jar">
<!-- build a signed applet with 'all-permissions' -
Needs 'param name="permissions' value="all-permissions"' in applet tag
<!-- todo - write examples/downloads for alternate versions of the applet
probably don't need to do this now since we don't have alternate versions anymore !-->
</target>
-<target name="-signapplet" depends="prepubapplet_2">
+<target name="-signapplet" depends="prepubapplet_1">
<fileset id="signappletjarset" dir="${packageDir}/examples">
<exclude name="u_*.jar" />
<include name="${jalviewLiteJar}" />
<!-- bizarre bug causes JmolApplet to always get signed, even if excluded from above. so copy explicitly -->
<copy file="appletlib/${jmolJar}" tofile="${packageDir}/examples/u_${jmolJar}" overwrite="true" />
+ <copy file="appletlib/${jsonSimple}" tofile="${packageDir}/examples/u_${jsonSimple}" overwrite="true" />
+ <copy file="appletlib/${javaJson}" tofile="${packageDir}/examples/u_${javaJson}" overwrite="true" />
<!-- finally, replace any launchApp servlet tags with a version specification -->
<replace value="http://www.jalview.org/services/launchApp?version=${JALVIEW_VERSION}"">
<replacetoken>
git://source.jalview.org / jalview.git / blobdiff