JAL-3032 adds Java 8 functionality (2/2)

[jalview.git] / build-libjs.xml

diff --git a/build-libjs.xml b/build-libjs.xml
index 69b0510..ef8847a 100644 (file)
--- 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" />