From: hansonr <hansonr@stolaf.edu>
Date: Tue, 3 Jul 2018 18:30:06 +0000 (+0100)
Subject: src2 directory added to class path, zipping/unzipping of JAR file source
X-Git-Tag: Release_2_11_4_0~45^2~18^2~593
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=f8a36759f4a0736882bbb2ea681fe56678c20c71;p=jalview.git

src2 directory added to class path, zipping/unzipping of JAR file source


JAR file source Java is in srcjar/
---

diff --git a/.classpath b/.classpath
index d32799b..8a4a050 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src2"/>
 	<classpathentry kind="src" path="utils"/>
 	<classpathentry kind="src" path="test"/>
 	<classpathentry kind="lib" path="lib/activation.jar"/>
diff --git a/build-site.xml b/build-site.xml
index e5202e2..55ff89a 100644
--- a/build-site.xml
+++ b/build-site.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0"?>
 <!--
- * just a crude unzip of non-Jalview classes for development purposes -BH 2018
+ 
+ Just a crude unzip of non-Jalview classes for development purposes -BH 2018
+ Jim can generalize.
+ 
 -->
 <project name="jalviewX" default="tosite" basedir="."
  xmlns:if="ant:if"
@@ -15,19 +18,32 @@
   	
  	<!-- inputs zip files -->
   	<property name="swingjs.zip" value="${swingjsDir}/SwingJS-site.zip" />
+
+  	<!-- packages -->
     <property name="varna.zip" value="${libjsDir}/VARNA-site.zip" />
+    <property name="mig.zip" value="${libjsDir}/MiGLayout-site.zip" />	  	  	
 
 	<!-- output directories -->
   	<property name="site" value="site"/>
   	<property name="j2sDir" value="${site}/swingjs/j2s"/>
 
-  	
+    <!-- SwingJS -->
+
   	<echo> Unzipping ${swingjs.zip} into ${site} </echo>
   	<unzip src="${swingjs.zip}" dest="${site}/" overwrite="true"/>  	
- 
+
+    <!-- VARNA -->
+
   	<echo> Unzipping ${varna.zip} into ${site} </echo> 
  	<unzip src="${varna.zip}" dest="${site}" overwrite="true"/>  	
   	
+	<!-- MiGLayout -->
+
+  	<echo> Unzipping ${mig.zip} into ${site} </echo> 
+ 	<unzip src="${mig.zip}" dest="${site}" overwrite="true"/>  	
+  	
+    <!-- resources -->
+
   	<echo> Copying ${resourceDir} files into ${j2sDir} </echo>
   	<copy todir="${j2sDir}">
       <fileset dir="${resourceDir}">
diff --git a/build-zip-jars.xml b/build-zip-jars.xml
new file mode 100644
index 0000000..ec353da
--- /dev/null
+++ b/build-zip-jars.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!--
+ * just a crude unzip of non-Jalview classes for development purposes -BH 2018
+-->
+<project name="jalviewX" default="zipall" basedir="."
+ xmlns:if="ant:if"
+    xmlns:unless="ant:unless">
+
+  	<!-- inputs directories -->
+    <property name="resourceDir" value="resources" />  	
+  	<property name="libjsDir" value="libjs"/>
+    <property name="swingjsDir" value="swingjs"/>
+	<!-- output directories -->
+  	<property name="site" value="site"/>
+  	<property name="j2sDir" value="${site}/swingjs/j2s"/>
+  	<property name="libjsDir" value="libjs"/>
+
+	<target name="zipall" depends="zipvarna,zipmig">
+		
+		
+  </target>
+
+  <target name="zipvarna">
+    <!-- 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/**" />
+	</target>
+
+	<target name="zipmig">
+		  <!-- MiGLayout -->
+		    <property name="mig.zip" value="${libjsDir}/MiGLayout-site.zip" />	  	  	
+		  	<echo> Zipping up ${mig.zip} </echo>
+		  	<zip destfile="${mig.zip}" basedir="site" includes="swingjs/j2s/net/miginfocom/**" />
+	</target>
+
+</project>
diff --git a/build-zip-varna-BH.xml b/build-zip-varna-BH.xml
deleted file mode 100644
index f9a6b04..0000000
--- a/build-zip-varna-BH.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * just a crude unzip of non-Jalview classes for development purposes -BH 2018
--->
-<project name="jalviewX" default="zipvarna" basedir="."
- xmlns:if="ant:if"
-    xmlns:unless="ant:unless">
-	
-  <target name="zipvarna">
-	
-  	
-  	<!-- inputs directories -->
-    <property name="resourceDir" value="resources" />  	
-  	<property name="libjsDir" value="libjs"/>
-    <property name="swingjsDir" value="swingjs"/>
-  	
- 	<!-- inputs zip files -->
-  	<property name="swingjs.zip" value="${swingjsDir}/SwingJS-site.zip" />
-    <property name="varna.zip" value="${libjsDir}/VARNA-site.zip" />
-
-	<!-- output directories -->
-  	<property name="site" value="site"/>
-  	<property name="j2sDir" value="${site}/swingjs/j2s"/>
-
-
-  	<property name="libjsDir" value="libjs"/>
-  	  	
-  	<echo> Zipping up ${varna.zip} </echo>
-  	<zip destfile="${varna.zip}" basedir="site" includes="fr_*,swingjs/j2s/fr/**" />
-</target>
-</project>
diff --git a/libjs/MiGLayout-site.zip b/libjs/MiGLayout-site.zip
new file mode 100644
index 0000000..181733e
Binary files /dev/null and b/libjs/MiGLayout-site.zip differ
diff --git a/src2/README_SWINGJS.txt b/src2/README_SWINGJS.txt
new file mode 100644
index 0000000..1df9391
--- /dev/null
+++ b/src2/README_SWINGJS.txt
@@ -0,0 +1,12 @@
+The src2 directory is on the class path, but it is generally empty.
+It is for transient transpiling of JAR file contents only. 
+
+
+After transpiling:
+
+1) move src code to srcjar
+2) edit README_SWINGJS.txt in main directory of the code
+3) add a zip-up target in build-zip-jars.xml (to libjs directory)
+4) add an unzip target in build-site.xml (from libjs to site directory)
+
+BH 2018.07.03
\ No newline at end of file
diff --git a/srcjar/org/apache/log4j/README.txt b/srcjar/org/apache/log4j/README.txt
deleted file mode 100644
index 342f5ff..0000000
--- a/srcjar/org/apache/log4j/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-source https://github.com/apache/log4j Latest commit 7be00ee on Jun 4, 2015
\ No newline at end of file
diff --git a/srcjar/org/apache/log4j/README_SWINGJS.txt b/srcjar/org/apache/log4j/README_SWINGJS.txt
new file mode 100644
index 0000000..e6f9f2b
--- /dev/null
+++ b/srcjar/org/apache/log4j/README_SWINGJS.txt
@@ -0,0 +1,11 @@
+https://github.com/apache/log4j 
+Latest commit 7be00ee on Jun 4, 2015
+
+Status
+======
+
+7/3/2018
+
+just a minimal implementation
+possibly not used in JavaScript
+(currently not included in build)