X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.xml;h=d1c9568a356e7c21aa94c6644b358d914b71e4e4;hb=a15dea7543c960c434d3fbff44621d510eeecdc1;hp=00884855eea42301c451c33b9e648a0291ee9d26;hpb=e4843176d8337fc165c1b93ae6c161cb29521f6d;p=jalview.git

diff --git a/build.xml b/build.xml
index 0088485..d1c9568 100755
--- a/build.xml
+++ b/build.xml
@@ -38,7 +38,7 @@
     <echo message="testng - run jalview's tests via testNG. Default group is '${testng-groups}'" />
     <echo message="      you can specify particular test groups as a list via -Dtestng-groups=" />
     <echo message="See docs/building.html and the comments in build file for other targets." />
-    <echo message="note: compile and makeApplet optionally compile/obfuscate applet against a different Java version by specifying -Djava118.home=<Path to JDK>/lib which is the lib directory in the JDK install that contains rt.jar " />
+    <echo message="note: compile and makeApplet optionally compile/obfuscate applet against a different Java version by specifying -Djava118.home=PathtoJDK/lib which is the lib directory in the JDK install that contains rt.jar " />
     <echo message="Useful -D flags: -Ddonotobfuscate will prevent applet obfuscation" />
   </target>
 
@@ -308,6 +308,15 @@
   </target>
 
   <target name="buildindices" depends="init, prepare" unless="help.uptodate">
+    <replace value="${JALVIEW_VERSION}">
+      <replacetoken>
+        <![CDATA[$$Version-Rel$$]]>
+      </replacetoken>
+      <fileset dir="${outputDir}/${helpDir}">
+        <include name="help.jhm" />
+      </fileset>
+    </replace>
+
     <java classname="com.sun.java.help.search.Indexer" classpathref="build.classpath" fork="true" dir="${outputDir}/${helpDir}">
       <arg line="html" />
     </java>
@@ -442,7 +451,7 @@
         </resources>
         <resources os="Mac OS X">
           <fileset dir="${packageDir}">
-          	 <include name="quaqua-filechooser-only-8.0.jar"/>
+            <include name="quaqua-filechooser-only-8.0.jar"/>
             <include name="*quaqua64*.jnilib.jar" />
           </fileset>
         </resources>
@@ -458,7 +467,7 @@
     <jnlpf toFile="${jnlpFile}" />
     <!-- add the add-modules j2se attribute for java 9 -->
     <replace file="${jnlpFile}" value="j2se version=&quot;1.8+&quot; initial-heap-size=&quot;${inih}&quot; max-heap-size=&quot;${maxh}&quot; java-vm-args=&quot;--add-modules=java.se.ee --illegal-access=warn&quot;">
-          <replacetoken>j2se version="1.8+"</replacetoken>
+      <replacetoken>j2se version="1.8+"</replacetoken>
     </replace>
   </target>
 
@@ -752,13 +761,17 @@
   <!-- each replacetoken CDATA body must be on one line - 
        otherwise the pattern doesn't match -->
   <replace value="${JALVIEW_VERSION}">
-    <replacetoken><![CDATA[$$Version-Rel$$]]></replacetoken>
+    <replacetoken>
+      <![CDATA[$$Version-Rel$$]]>
+    </replacetoken>
     <fileset dir="_sourcedist">
       <include name="**/*" />
     </fileset>
   </replace>
   <replace dir="_sourcedist" value="${build.year}">
-    <replacetoken><![CDATA[$$Year-Rel$$]]></replacetoken>
+    <replacetoken>
+      <![CDATA[$$Year-Rel$$]]>
+    </replacetoken>
     <fileset dir="_sourcedist">
       <include name="**/*" />
     </fileset>
@@ -969,7 +982,61 @@
   <javac srcdir="utils" destdir="utils" includes="HelpLinksChecker.java"/>
   <java fork="true" dir="${helpDir}" classpath="utils" classname="HelpLinksChecker" failonerror="true">
     <arg file="${helpDir}"/>
-    <arg value="-nointernet"/>
+    <arg value="-nointernet" />
   </java>
 </target>
-</project>
+
+<target name="eclipse-install" depends="init,prepare">
+
+  <property name="eclipseTempFile" value="eclipse-jee-oxygen-R-linux-gtk-x86_64.tar.gz"/>
+  <property name="eclipseInstallURL" value="http://mirror.csclub.uwaterloo.ca/eclipse/technology/epp/downloads/release/oxygen/R/eclipse-jee-oxygen-R-linux-gtk-x86_64.tar.gz"/>
+  <property name="java2scriptURL" value="https://github.com/BobHanson/java2script/blob/master/sources/net.sf.j2s.core/dist/dropins/net.sf.j2s.core.jar?raw=true"/>
+
+  <get url="${eclipseInstallURL}" dest="${eclipseTempFile}"/>
+  <untar compression="gzip" src="${eclipseTempFile}" dest="${eclipse-inst}"/>
+
+  <!-- not needed since we ship transpiler with source
+    <get url="${java2scriptURL}" dest="eclipse-inst/dropins/net.sf.j2s.core.jar" /> -->
+
+</target>
+<target name="build-site" depends="init,prepare">
+  <property name="swingjsdir" value="swingjs"/>
+  <property name="eclipse-inst" value="../../eclipse-js/"/>
+  <property name="eclipse-exec" value="${eclipse-inst}/bin/eclipse"/>
+  <property name="site" value="site"/>
+  <!-- where the eclipse js workspace has been initialised -->
+  <property name="eclipse-workspace" value="/cluster/gjb_lab/jprocter/eclipse-workspace"/>
+  
+  <!-- execute eclipse build, trap log and dump to stdout here -->
+  <copy file="${swingjsdir}/net.sf.j2s.core.jar" todir="${eclipse-inst}/dropins"/>
+  
+  <!-- the build may fail but valid javascript may still be produced, so we ignore return codes -->
+  <exec executable="${eclipse-exec}" failonerror="no">
+    <arg value="-nosplash"/>
+    <arg value="--launcher.suppressErrors"/>
+    <arg value="-application"/>
+    <arg value="org.eclipse.jdt.apt.core.aptBuild"/>
+    <arg value="-data"/>
+    <arg value="${eclipse-workpace}"/>
+  </exec>
+
+  <!-- TODO: run jslint and something else here to check we have a complete set of .js files for java -->
+  
+  <!-- <mkdir dir="${packageDir}/${site}" /> -->
+  <!--   <property name="swingjs.zipurl" value="https://github.com/BobHanson/java2script/blob/master/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip?raw=true" /> -->
+  <property name="swingjs.zip" value="${swingjsdir}/SwingJS-site.zip" />
+  <unzip src="${swingjs.zip}" dest="${site}/" overwrite="true"/>
+  <copy todir="${site}/swingjs/j2s/">
+    <fileset dir="${resourceDir}">
+    	<include name="**"/>
+	</fileset>
+  </copy>
+  <copy todir="${site}/examples">
+  <fileset dir="examples">
+  <include name="*.*"/>
+    </fileset>
+  </copy>
+  <!-- closure compile -->
+  <!-- copy test files into place in site -->
+</target>
+</project>
\ No newline at end of file