X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build-libjs.xml;fp=build-libjs.xml;h=ef8847abbd378ea2ea05da52a5524c8135cfe5fd;hb=665d2c2f4c1310e6985b93b7c2c8a8eec2fa9086;hp=69b05109b0fbf1c492e14884e556e63d9f66e77e;hpb=0e684f72690bd6532272a39ab6c188a27559fd09;p=jalview.git

diff --git a/build-libjs.xml b/build-libjs.xml
index 69b0510..ef8847a 100644
--- a/build-libjs.xml
+++ b/build-libjs.xml
@@ -15,7 +15,7 @@
   	<property name="j2sDir" value="${site}/swingjs/j2s"/>
   	<property name="libjsDir" value="libjs"/>
 
-	<target name="zipall" depends="zipvarna,zipmig,ziplog4j,zipjson">
+	<target name="zipall" depends="zipvarna,zipmig,zipjson">
 		
 		
   </target>
@@ -24,7 +24,7 @@
     <!-- VARNA -->
 	    <property name="varna.zip" value="${libjsDir}/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}" includes="fr_*.html,swingjs/j2s/fr/**" />
 	</target>
 
 	<target name="zipmig">
@@ -34,13 +34,18 @@
 		  	<zip destfile="${mig.zip}" basedir="${site}" includes="swingjs/j2s/net/miginfocom/**" />
 	</target>
 
+	<!-- log4j minimal implementation is 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 -->
+		  <!- 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/**" />
 	</target>
-
+    -->
 	<target name="zipjson">
 		  <!-- org.json.simple -->
 		    <property name="json.zip" value="${libjsDir}/jsonsimple-site.zip" />