git-svn-id: https://svn.coded.pt/svn/SIPRP@1260 bb69d46d-e84e-40c8-a05a-06db0d633741

trunk/SIPRPSoft/.classpath

@@ -34,5 +34,6 @@
 	<classpathentry kind="lib" path="lib/xmlgraphics-commons-1.3.1.jar"/>
 	<classpathentry kind="lib" path="lib/swingx.jar"/>
 	<classpathentry kind="lib" path="lib/postgresql-8.4-701.jdbc4.jar"/>
+	<classpathentry kind="lib" path="lib/evologger.jar"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>

trunk/SIPRPSoft/ant/common/evo-app-build-common.xml

@@ -1,7 +1,7 @@
 <project name="evo-app-build-common" > 
 	
 	<import file="evo-app-compile-common.xml" />
-
+	
 	<target name="app-build" description="Compiles all application classes" depends="app-prepare,app-pre-build">
 		<mkdir dir="${app.build.dir}" />
 		<depend srcdir="${app.src.dir}" destdir="${app.build.dir}" cache="${app.dependencies.chache.dir}">
@@ -32,9 +32,19 @@
 			<property name="app.run.args" value="${basedir}" />
 		</ant>
 	</target>
-		
+	
 	<target name="show-codegen-properties-error" unless="codegen.properties.exists">
 		<echo message="Project's codegen configuration file not found at ${codegen.properties.file}"/>
 	</target>
 	
+	<target name="run-LEAF" description="Runs LEAF for this project" depends="load-properties">
+		<path id="leaf.classpath">
+			<fileset dir="${lib.tools.dir}" />
+			<path refid="app.build.classpath" />
+		</path>
+		<java jvmversion="${app.java.version}" classname="${leaf.main}" classpathref="leaf.classpath" fork="true" dir="${app.build.dir}">
+			<arg value="${app.src.dir}"/>
+		</java>
+	</target>
+	
 </project>

trunk/SIPRPSoft/ant/common/evo-app-build-obfuscate-common.xml

@@ -36,8 +36,6 @@
 
 	<target name="ProguardTask">
 		<property file="${app.version.file}" prefix="version" />
-		<echo message="${version.major}.${version.minor}.${version.build}" />
-		<echo message="${version.major}.${version.minor}.${version.build}" />
 		<typedef classpathref="lib.tools.classpath" resource="net/jtools/classloadertask/antlib.xml">
 			<classpath>
 				<path refid="lib.tools.classpath"/>

trunk/SIPRPSoft/ant/common/evo-app-compile-common.xml

@@ -1,9 +1,9 @@
 <project name="evo-app-compile-common" > 
 	
 	<import file="evo-app-load-properties.xml" />
-
+	
 	<!-- BUILD -->
-		
+	
 	<target name="app-post-build" />
 	
 	<target name="app-pre-build" />
@@ -19,6 +19,7 @@
 			<fileset dir="${app.src.dir}" includes="**/package-info.java"/>
 		</touch-->
 		<echo message="Copying non-java files to build directory" />
+		<copy failonerror="false" overwrite="true" verbose="true" todir="${app.build.dir}" file="${app.version.file}"/>
 		<copy verbose="true" failonerror="true" overwrite="true" todir="${app.build.dir}">
 			<fileset dir="${app.src.dir}">
 				<exclude name="**/*.java" />

trunk/SIPRPSoft/ant/common/evo-app-deploy-common.xml

@@ -125,6 +125,24 @@
 			<handler classpathref="lib.tools.classpath" classname="com.evolute.ant.VersionInputHandler"  />
 		</input>
 		<antcall target="app-deploy-choose-version"/>
+		<antcall target="app-create-software-evo-licensor"/>
 	</target>
 	
+	<target name="app-create-software-evo-licensor" depends="load-properties">
+		<property file="${app.version.file}" prefix="version" />
+		<typedef classpathref="lib.tools.classpath" resource="net/jtools/classloadertask/antlib.xml">
+			<classpath>
+				<path refid="lib.tools.classpath"/>
+			</classpath>
+		</typedef>
+		<classloader loader="project">
+			<classpath>
+				<fileset dir="${lib.tools.dir}" includes="*.jar"/>
+				<fileset dir="${app.lib.dir}" includes="*.jar"/>
+			</classpath>
+		</classloader>
+		<taskdef name="createTask" classpathref="lib.tools.classpath" classname="com.evolute.ant.CreateSoftwareAntTask" />
+
+		<createTask projectVersion="${version.major}.${version.minor}.${version.build}" projectName="${app.name}" />
+	</target>
 </project>

trunk/SIPRPSoft/ant/common/evo-app-load-properties.xml

@@ -1,5 +1,5 @@
 <project name="evo-app-load-properties" >
-
+	
 	<property name="properties.base.dir" value="${basedir}/properties" />
 	<property name="lib.tools.dir" value="${basedir}/lib.tools" />
 	
@@ -21,6 +21,7 @@
 		<property name="app.max.mem" value="512M" />
 		<property name="codegen.project.ant" value="${basedir}/../codegen/build.xml"/>
 		<property name="codegen.properties.file" value="${basedir}/properties/codegen.xml"/>
+		<property name="leaf.project.ant" value="${basedir}/../LEAF/build.xml"/>
 		
 		<path id="app.jar.classpath">
 			<fileset dir="${app.lib.dir}" />
@@ -66,6 +67,7 @@
 		<property name="app.run.args" value="" />
 		<property name="app.ws.wsdl.url" value="${app.ws.wsdl.url.protocol}://${app.ws.wsdl.url.host}:${app.ws.wsdl.url.port}${app.ws.wsdl.url.path}" />
 		
+		<property name="leaf.main" value="com.evolute.leaf.Main" />
 	</target>
 	
 </project> 

trunk/SIPRPSoft/ant/evo-tool-build.xml

@@ -0,0 +1,21 @@
+<project name="evo-tool-build" default="tool-deploy"> 
+	
+	<import file="common/evo-app-build-common.xml" />
+	
+	<target name="deploy-default-tool" depends="app-create-jar">
+		<mkdir dir="${deploy.project.dir}/lib.tools"/>
+		<copy failonerror="false" verbose="true" file="${app.dist.dir}/${app.jar.name}" toDir="${deploy.project.dir}/lib.tools" />
+	</target>
+	
+	<target name="deploy-to-project" if="deploy.project.dir">
+		<antcall target="deploy-default-tool" />
+	</target>
+	
+	<target name="tool-deploy" description="Deploys current version of evolute utilities" depends="load-static-properties">
+		<input defaultvalue="${basedir}" addproperty="deploy.project.dir">
+			<handler classpathref="lib.tools.classpath" classname="com.evolute.ant.ProjectInputHandler"  />
+		</input>
+		<antcall target="deploy-to-project" />
+	</target>
+	
+</project>