build-site allows for missing directories

hansonr · hansonr · commit 77eb9a139796 · 2019-10-20T18:17:58.000-05:00
diff --git a/sources/net.sf.j2s.core/dist/build-site.xml b/sources/net.sf.j2s.core/dist/build-site.xml
@@ -54,7 +54,7 @@
 
   	<for param="file.zip">
   	  <path>
-  	    <fileset dir="${libjs.dir}" includes="*.zip"/>
+  	    <fileset dir="${libjs.dir}" includes="*.zip" erroronmissingdir="false" />
   	  </path>
   	  <sequential>
   	  	 	<unzip src="@{file.zip}" dest="${site.dir}" overwrite="true"/>  	
@@ -73,14 +73,14 @@
 
   	<echo> Copying ${resource.dir} files into ${j2s.dir} </echo>
   	<copy todir="${j2s.dir}">
-      <fileset dir="${resource.dir}">
+      <fileset dir="${resource.dir}" erroronmissingdir="false" >
       	<include name="**"/>
   	</fileset>
     </copy>
       		
   	<echo> Copying ${site-resource.dir} files into ${site.dir} </echo>
   	<copy todir="${site.dir}">
-      <fileset dir="${site-resource.dir}">
+      <fileset dir="${site-resource.dir}" erroronmissingdir="false" >
       	<include name="**"/>
   	</fileset>
     </copy>
diff --git a/sources/net.sf.j2s.java.core/build-site.xml b/sources/net.sf.j2s.java.core/build-site.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<!--
+ BH 2018.08.12
+
+ - requires tools/ant-contrib.jar
+  
+ - creates the site/ directory if it does not exist
+ - unzip libjs/*.zip into site/swingjs/j2s
+ - unzips swingjs/SwingJS-site.zip into site/
+ - copies non-java resources from resources/ into site/swingjs/j2s
+ 
+-->
+
+<project name="swingjs-project" default="tosite" basedir="."
+ xmlns:if="ant:if"
+    xmlns:unless="ant:unless">
+	
+  <target name="tosite">
+  	  	
+  	<!-- input directories -->
+  	
+  	<!-- location of ant-contrib.jar -->
+  	<property name="tools.dir" value = "tools" />
+
+ 	<!-- SwingjS_site zip file (could be varied if versioning is needed)   	
+ 	<property name="swingjs.zip" value="swingjs/SwingJS-site.zip" />
+-->
+
+  	<!-- location of third-party jar contents as precompiled zipped .js files to copy to site/ -->
+  	<property name="libjs.dir" value="libjs" />
+ 
+  	<!-- non-Java resources to copy to site/swingjs/j2s -->
+    <property name="resource.dir" value="resources" />  	
+  	
+  	<!-- non-Java resources to copy to site/ -->
+    <property name="site-resource.dir" value="site-resources" />  	  	
+
+	<!-- output directories -->
+
+  	<property name="site.dir" value="site" />
+  	<property name="j2s.dir" value="${site.dir}/swingjs/j2s" />
+  	 
+    <!-- <for  ...> construct needs ant-contrib.jar -->
+    <taskdef resource="net/sf/antcontrib/antlib.xml">
+      <classpath>
+        <pathelement location="${tools.dir}/ant-contrib.jar" />
+      </classpath>
+    </taskdef>
+
+	<!-- unzip all libjs zip files into site
+	
+	   all zip files placed in libjs will be processed
+	   
+	 -->
+
+  	<for param="file.zip">
+  	  <path>
+  	    <fileset dir="${libjs.dir}" erroronmissingdir="false" includes="*.zip"/>
+  	  </path>
+  	  <sequential>
+  	  	 	<unzip src="@{file.zip}" dest="${site.dir}" overwrite="true"/>  	
+  	  </sequential>
+  	</for>
+
+  	<!-- unzip SwingJS-site.zip 
+  	
+  	  not in net.sf.j2s
+  	  
+  	<unzip src="${swingjs.zip}" dest="${site.dir}/" overwrite="true"/>  	
+  	-->
+
+
+ 	<!-- transfer resources -->
+
+  	<echo> Copying ${resource.dir} files into ${j2s.dir} </echo>
+  	<copy todir="${j2s.dir}">
+      <fileset dir="${resource.dir}" erroronmissingdir="false" >
+      	<include name="**"/>
+  	</fileset>
+    </copy>
+      		
+  	<echo> Copying ${site-resource.dir} files into ${site.dir} </echo>
+  	<copy todir="${site.dir}">
+      <fileset dir="${site-resource.dir}" erroronmissingdir="false" >
+      	<include name="**"/>
+  	</fileset>
+    </copy>
+      		
+
+</target>
+	
+
+</project>
diff --git a/sources/net.sf.j2s.java.core/tools/ant-contrib.jar b/sources/net.sf.j2s.java.core/tools/ant-contrib.jar
