X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.xml;h=5a698f07d8d17b4aede2aa41ea3a53b8e7a0d1b2;hb=9ee61e0b05f215f6ffa0eb33d65d7b2023ff9bad;hp=4ff78e0738534dcc9b46d74b4e9628b29f621cc1;hpb=98a4aef73b7b3056bb37a4ef2d527010484b01d8;p=jalview.git

diff --git a/build.xml b/build.xml
index 4ff78e0..5a698f0 100755
--- a/build.xml
+++ b/build.xml
@@ -1028,7 +1028,11 @@
   </exec>
   <!-- update and checkout the same commit in the workspace project -->
   <exec executable="/usr/bin/git" failifexecutionfails="true" dir="${eclipse-workrepo}">
-    <arg value="pull" />
+    <arg value="reset" />
+    <arg value="--hard" />
+  </exec>
+  <exec executable="/usr/bin/git" failifexecutionfails="true" dir="${eclipse-workrepo}">
+      <arg value="pull" />
   </exec>
   <exec executable="/usr/bin/git" failifexecutionfails="true" dir="${eclipse-workrepo}">
     <arg value="checkout" />
@@ -1068,11 +1072,6 @@
 <target name="unzip-to-site" depends="prepare-site">
   <property name="swingjs.zip" value="${swingjsdir}/SwingJS-site.zip" />
   <unzip dest="${site}/" overwrite="true">
-    <fileset dir="${swingjsdir}">
-      <include name="SwingJS-site.zip"/>
-    </fileset>
-  </unzip>
-  <unzip dest="${site}/" overwrite="true">
     <fileset dir="libjs">
       <include name="*.zip" />
     </fileset>
@@ -1089,5 +1088,11 @@
       <include name="*.*"/>
     </fileset>
   </copy>
+  <!-- lastly, update SwingJS -->
+  <unzip dest="${site}/" overwrite="true">
+    <fileset dir="${swingjsdir}">
+      <include name="SwingJS-site.zip"/>
+    </fileset>
+  </unzip>
 </target>
 </project>