From 57d6b0c6b96097afa06a38cc2456997ad9b60187 Mon Sep 17 00:00:00 2001
From: Marko Živković <marko88zivkovic@gmail.com>
Date: Tue, 16 Dec 2014 02:05:55 +0000
Subject: - USB Stick Recognition, automatically propose workspace - New
 Default Workspace in user home directory - Automatically select last active
 user now works - Several bug fixes and minor changes

git-svn-id: https://svn.code.sf.net/p/xlogo4schools/svn/trunk@11 3b0d7934-f7ef-4143-9606-b51f2e2281fd
---
 logo/build.xml | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'logo/build.xml')

diff --git a/logo/build.xml b/logo/build.xml
index 744b87a..81b1701 100644
--- a/logo/build.xml
+++ b/logo/build.xml
@@ -17,7 +17,7 @@
 	Does the Jar has to be signed ? 
 	================================-->
 	
-	<property name="signJar" value="false" />
+	<property name="signJar" value="true" />
 	
 	<!-- Property platform:
 	================================================
@@ -35,8 +35,7 @@
 
 	<!-- Version for this Build -->
 	
-	<property name="version" value="0.9.03beta-2014-11-03"/>
-
+	<property name="version" value="0.9.04beta-2014-12-16"/>
 	
     <!-- ================================= 
          default target: deploy              
@@ -74,6 +73,8 @@
     			<include name="vecmath.jar"/>
     			<include name="j3dutils.jar"/>
 				<include name="jl1.0.1.jar"/>
+				<include name="log4j-api-2.1.jar"/>
+				<include name="log4j-core-2.1.jar"/>
 				<include name="manifest_xlogo"/>
 				<include name="manifest_start"/>
 				<include name="build.xml"/>
@@ -96,7 +97,7 @@
      	<input
     	 	message="Password"
      		addproperty="pwd"/>
-    	  <signjar keystore="keystore.ks" storepass="${pwd}" alias="myalias">
+    	  <signjar keystore=".keystore" storepass="${pwd}" alias="xlogo4schools">
         	    	<fileset dir="deploy">
         	    		<include name="XLogo4Schools.jar"/>
         			</fileset>
@@ -111,16 +112,20 @@
 		<jar destfile="deploy/tmp_xlogo.jar"
 	 		manifest="manifest_xlogo">
 	 		<fileset dir="deploy/">
+				<include name="net/**"/>
 				<include name="xlogo/**"/>
 	 			<include name="*.properties"/>
+	 			<include name="*.xml"/>
 	 		</fileset>
 	 	</jar>
 		
 		<!-- Delete Used files -->
 		<delete includeemptydirs="true">
 			<fileset dir="deploy/">
+				<include name="net/**"/>
 				<include name="xlogo/**"/>
 	 			<include name="*.properties"/>
+	 			<include name="*.xml"/>
 		    </fileset>
 	    </delete>
 		
@@ -149,13 +154,16 @@
     	<javac 
     		source="1.5" encoding="utf8"
     		target="1.5"
-    		srcdir="src" destdir="deploy/">
+    		srcdir="src" destdir="deploy/"
+    		includeantruntime="false">
     		 <classpath>
 		        <pathelement location="vecmath.jar"/>
 		        <pathelement location="j3dcore.jar"/>
 		        <pathelement location="j3dutils.jar"/>
     		    <pathelement location="jh.jar"/>
    			 	<pathelement location="jl1.0.1.jar"/> 
+   			 	<pathelement location="log4j-api-2.1.jar"/> 
+   			 	<pathelement location="log4j-core-2.1.jar"/> 
    		      </classpath>
     	</javac>
 	</target>
@@ -171,11 +179,14 @@
         			<include name="j3dutils.jar"/>
 	      			<include name="jl1.0.1.jar"/>
         			<include name="jh.jar"/>
+        			<include name="log4j-api-2.1.jar"/>
+        			<include name="log4j-core-2.1.jar"/>
         		</fileset>
         		<fileset dir="src/">
         			<include name="**.properties"/>
            			<include name="**/*.png"/>
         			<include name="**/*.html"/>
+        			<include name="**/*.xml"/>
         			<include name="**/genericPrimitive"/>
         		</fileset>
             </copy>
-- 
cgit v1.2.3