X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.xml;h=327cc334c774faa18262bfa1256a3ccfbced337a;hb=0b573ed90b14079f7326281f50c0c9cffdace586;hp=dd903732398f10c1fbff251f4a01309f2cab8e9c;hpb=3da878124135ff033f42d19d8733891b09e953cd;p=jalview.git

diff --git a/build.xml b/build.xml
index dd90373..327cc33 100755
--- a/build.xml
+++ b/build.xml
@@ -315,7 +315,7 @@
     </testng>
   </target>
 
-  <target name="buildindices" depends="init, prepare" unless="help.uptodate">
+  <target name="buildindices" depends="init, prepare, buildPropertiesFile" unless="help.uptodate">
     <replace value="${JALVIEW_VERSION}">
       <replacetoken>
         <![CDATA[$$Version-Rel$$]]>
@@ -982,8 +982,9 @@
 </target>
 
 <target name="signApplet" description="internal target to sign applet" depends="-signappletnotsa,-signapplettsa" />
+<target name="pubapplet" description="Dummy target to keep legacy Jalview build system happy. We don't actually publish the applet anymore."/>
 
-<target name="pubapplet" description="installs the jalviewLite applet and dependent jars into an applet examples directory built under ${outputDir}" depends="makeApplet, signApplet">
+<target name="_pubapplet" description="installs the jalviewLite applet and dependent jars into an applet examples directory built under ${outputDir}" depends="makeApplet, signApplet">
 
   <!-- 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" />
@@ -1042,7 +1043,7 @@
     <tarfileset dir="site" />
   </tar>
 </target>
-<target name="prepare-site" depends="init,prepare">
+<target name="prepare-site" depends="init,prepare,buildPropertiesFile">
   <property name="swingjsdir" value="swingjs"/>
   <property name="eclipse-inst" value="/home/bamboo/buildtools/eclipse/eclipse-js"/>
   <property name="eclipse-exec" value="${eclipse-inst}/eclipse"/>
@@ -1111,33 +1112,10 @@
   <!-- finally copy artefacts from eclipse project checkout to the build site -->
   <copy todir="${site}">
     <fileset dir="${eclipse-workrepo}/site"/>
-  </copy>
+  </copy>  
 </target>
 <target name="unzip-to-site" depends="prepare-site">
-  <property name="swingjs.zip" value="${swingjsdir}/SwingJS-site.zip" />
-  <unzip dest="${site}/" overwrite="true">
-    <fileset dir="libjs">
-      <include name="*.zip" />
-    </fileset>
-  </unzip>
-  <copy overwrite="true" todir="${site}/swingjs/j2s/">
-    <fileset dir="${resourceDir}">
-      <include name="**"/>
-    </fileset>
-  </copy>
-
-  <!-- copy test files into place in site -->
-  <copy todir="${site}/examples">
-    <fileset dir="examples">
-      <include name="*.*"/>
-    </fileset>
-  </copy>
-  <!-- lastly, update SwingJS -->
-  <unzip dest="${site}/" overwrite="true">
-    <fileset dir="${swingjsdir}">
-      <include name="SwingJS-site.zip"/>
-    </fileset>
-  </unzip>
+  <ant antfile="build-site.xml"/>
 </target>
 
   <target name="make-j2s-cores" depends="">