X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build-libjs.xml;h=2997c1266329475a758910f005e75aa393f37576;hb=refs%2Fheads%2FJalview-JS%2F20190123;hp=69b05109b0fbf1c492e14884e556e63d9f66e77e;hpb=98e8559d12ce661c653070903d61dc1f491fa94e;p=jalview.git

diff --git a/build-libjs.xml b/build-libjs.xml
index 69b0510..2997c12 100644
--- a/build-libjs.xml
+++ b/build-libjs.xml
@@ -7,45 +7,49 @@
     xmlns:unless="ant:unless">
 
   	<!-- inputs directories -->
-    <property name="resourceDir" value="resources" />  	
-  	<property name="libjsDir" value="libjs"/>
-    <property name="swingjsDir" value="swingjs"/>
+    <property name="resource.dir" value="resources" />  	
+    <property name="swingjs.dir" value="swingjs"/>
 	<!-- output directories -->
-  	<property name="site" value="site"/>
-  	<property name="j2sDir" value="${site}/swingjs/j2s"/>
-  	<property name="libjsDir" value="libjs"/>
+  	<property name="site.dir" value="site"/>
+  	<property name="j2s.dir" value="${site.dir}/swingjs/j2s"/>
+  	<property name="libjs.dir" value="libjs"/>
 
-	<target name="zipall" depends="zipvarna,zipmig,ziplog4j,zipjson">
+	<target name="zipall" depends="zipvarna,zipmig,zipjson">
 		
 		
   </target>
 
   <target name="zipvarna">
     <!-- VARNA -->
-	    <property name="varna.zip" value="${libjsDir}/VARNA-site.zip" />	  	  	
+	    <property name="varna.zip" value="${libjs.dir}/VARNA-site.zip" />	  	  	
 	  	<echo> Zipping up ${varna.zip} </echo>
-	  	<zip destfile="${varna.zip}" basedir="${site}" includes="fr_*,swingjs/j2s/fr/**" />
+	  	<zip destfile="${varna.zip}" basedir="${site.dir}" includes="fr_*.html,swingjs/j2s/fr/**" />
 	</target>
 
 	<target name="zipmig">
 		  <!-- net.miginfo.com MiGLayout -->
-		    <property name="mig.zip" value="${libjsDir}/MiGLayout-site.zip" />	  	  	
+		    <property name="mig.zip" value="${libjs.dir}/MiGLayout-site.zip" />	  	  	
 		  	<echo> Zipping up ${mig.zip} </echo>
-		  	<zip destfile="${mig.zip}" basedir="${site}" includes="swingjs/j2s/net/miginfocom/**" />
-	</target>
-
-	<target name="ziplog4j">
-		  <!-- org.apache.log4j -->
-		    <property name="log4j.zip" value="${libjsDir}/log4j-site.zip" />	  	  	
-		  	<echo> Zipping up ${log4j.zip} </echo>
-		  	<zip destfile="${log4j.zip}" basedir="${site}" includes="swingjs/j2s/org/apache/log4j/**" />
+		  	<zip destfile="${mig.zip}" basedir="${site.dir}" includes="swingjs/j2s/net/miginfocom/**" />
 	</target>
 
 	<target name="zipjson">
 		  <!-- org.json.simple -->
-		    <property name="json.zip" value="${libjsDir}/jsonsimple-site.zip" />	  	  	
+		    <property name="json.zip" value="${libjs.dir}/json-site.zip" />	  	  	
 		  	<echo> Zipping up ${json.zip} </echo>
-		  	<zip destfile="${json.zip}" basedir="${site}" includes="swingjs/j2s/org/json/**" />
+		  	<zip destfile="${json.zip}" basedir="${site.dir}" includes="swingjs/j2s/org/json/**" />
 	</target>
 
+	<!-- log4j minimal implementation is already in jalview/javascript
+	      and is mapped from org.apache.log4j by the following .j2s line:
+	      
+	      j2s.class.replacements=org.apache.log4j.->jalview.javascript.log4j.
+	       
+	<target name="ziplog4j">
+		  <!- org.apache.log4j ->
+		    <property name="log4j.zip" value="${libjs.dir}/log4j-site.zip" />	  	  	
+		  	<echo> Zipping up ${log4j.zip} </echo>
+		  	<zip destfile="${log4j.zip}" basedir="${site.dir}" includes="swingjs/j2s/org/apache/log4j/**" />
+	</target>
+    -->
 </project>