</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" />
<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>
<include name="*.*"/>
</fileset>
</copy>
+ <!-- lastly, update SwingJS -->
+ <unzip dest="${site}/" overwrite="true">
+ <fileset dir="${swingjsdir}">
+ <include name="SwingJS-site.zip"/>
+ </fileset>
+ </unzip>
</target>
</project>