Move 2 test util classes to the "testUtils" package

[gigi.git] / build.xml

diff --git a/build.xml b/build.xml
index 7aa2d3b679267b4b17d1c38edb6d58e369f3cf01..a9ebbcbde9171ba7db5338f71c963214ca5fe169 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -1,22 +1,30 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project basedir="." default="build" name="cacert-gigi">
+<project basedir="." default="all" name="cacert-gigi">
     <property environment="env"/>
     <property name="junit.output.dir" value="junit"/>
     <property name="debuglevel" value="source,lines,vars"/>
     <property name="target" value="1.8"/>
     <property name="source" value="1.8"/>
     <property name="mysqlconnector" value="mysql-connector-java-5.1.31-bin.jar"/>
-    <property name="juintexec" value="junit.jar"/>
+    <property name="juintexec" value="."/>
     <path id="JUnit 4.libraryclasspath">
-        <pathelement location="${juintexec}"/>
+        <pathelement location="${juintexec}/junit.jar"/>
+        <pathelement location="${juintexec}/org.hamcrest.core.jar"/>
     </path>
     <path id="cacert-gigi.classpath">
         <pathelement location="bin"/>
+        <pathelement location="${mysqlconnector}"/>
+    </path>
+    <path id="cacert-gigi.test.classpath">
+        <pathelement location="bin"/>
+        <pathelement location="bintest"/>
         <path refid="JUnit 4.libraryclasspath"/>
         <pathelement location="${mysqlconnector}"/>
     </path>
     <target name="init">
         <mkdir dir="bin"/>
+        <mkdir dir="bintest"/>
+        
         <copy includeemptydirs="false" todir="bin">
             <fileset dir="lib/servlet-api">
                 <exclude name="**/*.launch"/>
@@ -41,7 +49,7 @@
                 <exclude name="**/*.java"/>
             </fileset>
         </copy>
-        <copy includeemptydirs="false" todir="bin">
+        <copy includeemptydirs="false" todir="bintest">
             <fileset dir="tests">
                 <exclude name="**/*.launch"/>
                 <exclude name="**/*.java"/>
@@ -52,37 +60,67 @@
         <delete dir="bin"/>
     </target>
     <target depends="clean" name="cleanall"/>
-    <target depends="build-subprojects,build-project" name="build"/>
-    <target name="build-subprojects"/>
+    <target depends="build-project, native" name="build"/>
     <target depends="init" name="build-project">
         <echo message="${ant.project.name}: ${ant.file}"/>
         <javac debug="true" debuglevel="${debuglevel}" destdir="bin" includeantruntime="false" source="${source}" target="${target}">
             <src path="lib/servlet-api"/>
             <src path="lib/jetty"/>
+            <src path="lib/jtar"/>
             <src path="src"/>
             <src path="util"/>
-            <src path="tests"/>
             <classpath refid="cacert-gigi.classpath"/>
         </javac>
     </target>
-    <target description="Build all projects which reference this project. Useful to propagate changes." name="build-refprojects"/>
-    <target name="FetchLocales">
+       
+       <target name="native">
+               <exec executable="make" dir="natives"/>
+       </target>
+       
+       <target depends="build" name="pack">
+               <jar destfile="gigi.jar" basedir="bin" manifest="Gigi.MF"/>
+       </target>
+
+       <target depends="test,native" name="bundle">
+               <zip destfile="gigi-linux_amd64.zip" basedir="." includes="gigi.jar,native/*.so,doc/tableStructure.sql,static/**,templates/**"/>
+       </target>
+       <target name="static-bundle">
+               <tar destfile="static.tar.gz" compression="gzip" basedir="." includes="doc/tableStructure.sql,static/**,templates/**"/>
+       </target>
+       
+       <target name="all" depends="bundle,static-bundle"/>
+
+       
+    <target depends="init,build-project" name="build-project-test">
+        <echo message="${ant.project.name}: ${ant.file}"/>
+        <javac debug="true" debuglevel="${debuglevel}" destdir="bintest" includeantruntime="false" source="${source}" target="${target}">
+            <src path="tests"/>
+            <classpath refid="cacert-gigi.test.classpath"/>
+        </javac>
+    </target>
+       <target name="FetchLocales">
         <java classname="org.cacert.gigi.util.FetchLocales" failonerror="true" fork="yes">
             <classpath refid="cacert-gigi.classpath"/>
         </java>
     </target>
-    <target name="Launcher">
-        <java classname="org.cacert.gigi.Launcher" failonerror="true" fork="yes">
-            <classpath refid="cacert-gigi.classpath"/>
-        </java>
+    <target name="check-generateKeys">
+        <available file="config/keystore.pkcs12" property="keystore.present"/>
+    </target>
+    <target name="generateKeys" depends="check-generateKeys" unless="keystore.present">
+        <exec executable="./generateKeys.sh" dir="doc/scripts"/>
+        <exec executable="./generateTruststore.sh" dir="doc/scripts">
+            <arg value="-noprompt"/>
+        </exec>
     </target>
-    <target name="test">
+    <target name="test" depends="build-project-test,generateKeys,FetchLocales,pack">
         <mkdir dir="${junit.output.dir}"/>
         <junit fork="yes" printsummary="withOutAndErr">
             <formatter type="xml"/>
             <test name="org.cacert.gigi.TestSSL" todir="${junit.output.dir}"/>
-            <test name="org.cacert.gigi.pages.main.ResgisterPageTest" todir="${junit.output.dir}"/>
-            <classpath refid="cacert-gigi.classpath"/>
+            <test name="org.cacert.gigi.LoginTest" todir="${junit.output.dir}"/>
+            <test name="org.cacert.gigi.pages.main.RegisterPageTest" todir="${junit.output.dir}"/>
+            <test name="org.cacert.gigi.pages.wot.TestAssurance" todir="${junit.output.dir}"/>
+            <classpath refid="cacert-gigi.test.classpath"/>
         </junit>
     </target>
     <target name="junitreport">