X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=build.xml;h=b6faa09d9814df43077891beb660e4a300bb3521;hp=057c6881623ea77dfa40d9b2aaee337e07c1066c;hb=9b01e471cde09546f79c8182d470d6cccdf60623;hpb=40f85c683288d3b19d7ff057854df9cd7ff469c3

diff --git a/build.xml b/build.xml
index 057c6881..b6faa09d 100644
--- a/build.xml
+++ b/build.xml
@@ -1,28 +1,42 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project basedir="." default="all" name="cacert-gigi">
+<project basedir="." default="develop" name="cacert-gigi" xmlns:jacoco="antlib:org.jacoco.ant">
+
+	<taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml">
+		<classpath path="/usr/share/java/jacocoant.jar" />
+	</taskdef>
+
 	<property environment="env" />
+	<property name="PACKAGE" value="cacert-gigi" />
 	<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="." />
+	<property name="sqlconnector" value="/usr/share/java/postgresql-jdbc4.jar" />
+	<property name="juintexec" value="/usr/share/java" />
 	<path id="JUnit 4.libraryclasspath">
-		<pathelement location="${juintexec}/junit.jar" />
-		<pathelement location="${juintexec}/org.hamcrest.core.jar" />
+		<pathelement location="${juintexec}/junit4.jar" />
+		<pathelement location="${juintexec}/hamcrest-core.jar" />
 	</path>
 	<path id="cacert-gigi.classpath">
 		<pathelement location="bin" />
-		<pathelement location="${mysqlconnector}" />
+		<pathelement location="binutil" />
+		<pathelement location="${sqlconnector}" />
 	</path>
 	<path id="cacert-gigi.test.classpath">
-		<pathelement location="bin" />
 		<pathelement location="bintest" />
+		<pathelement location="bin" />
+		<pathelement location="binutil" />
+		<pathelement location="binutil-testing" />
 		<path refid="JUnit 4.libraryclasspath" />
-		<pathelement location="${mysqlconnector}" />
+		<pathelement location="${sqlconnector}" />
+	</path>
+	<path id="cacert-gigi.test.classpath.jdt">
+		<pathelement location="${jdt}" />
 	</path>
 	<target name="init">
 		<mkdir dir="bin" />
+		<mkdir dir="binutil" />
+		<mkdir dir="binutil-testing" />
 		<mkdir dir="bintest" />
 
 		<copy includeemptydirs="false" todir="bin">
@@ -30,25 +44,25 @@
 				<exclude name="**/*.launch" />
 				<exclude name="**/*.java" />
 			</fileset>
-		</copy>
-		<copy includeemptydirs="false" todir="bin">
 			<fileset dir="lib/jetty">
 				<exclude name="**/*.launch" />
 				<exclude name="**/*.java" />
 			</fileset>
-		</copy>
-		<copy includeemptydirs="false" todir="bin">
 			<fileset dir="src">
 				<exclude name="**/*.launch" />
 				<exclude name="**/*.java" />
 			</fileset>
-		</copy>
-		<copy includeemptydirs="false" todir="bin">
 			<fileset dir="util">
 				<exclude name="**/*.launch" />
 				<exclude name="**/*.java" />
 			</fileset>
 		</copy>
+		<copy includeemptydirs="false" todir="binutil-testing">
+			<fileset dir="util-testing">
+				<exclude name="**/*.launch" />
+				<exclude name="**/*.java" />
+			</fileset>
+		</copy>
 		<copy includeemptydirs="false" todir="bintest">
 			<fileset dir="tests">
 				<exclude name="**/*.launch" />
@@ -59,51 +73,125 @@
 	<target name="clean">
 		<delete dir="bin" />
 	</target>
-	<target depends="clean" name="cleanall" />
-	<target depends="build-project, native" name="build" />
+	<target name="clean-test">
+		<delete dir="bintest" />
+		<delete dir="cocoReport" failonerror="false"/>
+
+	</target>
+	<target depends="clean,clean-test" name="cleanall" />
+	<target depends="build-project, build-testing, native" name="build" />
 	<target depends="init" name="build-project">
+		<exec outputproperty="git-version" executable="git">
+			<arg line="rev-parse"/>
+			<arg line="HEAD"/>
+		</exec>
+		<manifest file="Gigi.MF">
+			<attribute name="Main-Class" value="org.cacert.gigi.Launcher" />
+			<attribute name="Implementation-Version" value="${git-version}" />
+		</manifest>
 		<echo message="${ant.project.name}: ${ant.file}" />
-		<javac debug="true" debuglevel="${debuglevel}" destdir="bin"
+		<javac encoding="UTF-8" debug="true" debuglevel="${debuglevel}" destdir="bin"
 			includeantruntime="false" source="${source}" target="${target}">
+			<compilerarg value="-XDignore.symbol.file"/>
 			<src path="lib/servlet-api" />
 			<src path="lib/jetty" />
 			<src path="lib/jtar" />
+			<src path="lib/scrypt" />
 			<src path="src" />
+			<classpath refid="cacert-gigi.classpath" />
+		</javac>
+		<javac encoding="UTF-8" debug="true" debuglevel="${debuglevel}" destdir="binutil"
+			includeantruntime="false" source="${source}" target="${target}">
+			<compilerarg value="-XDignore.symbol.file"/>
 			<src path="util" />
 			<classpath refid="cacert-gigi.classpath" />
 		</javac>
 	</target>
+	<target depends="init, build-project" name="build-testing">
+		<javac encoding="UTF-8" debug="true" debuglevel="${debuglevel}" destdir="binutil-testing"
+			includeantruntime="false" source="${source}" target="${target}">
+			<compilerarg value="-XDignore.symbol.file"/>
+			<src path="util-testing" />
+			<exclude name="org/cacert/gigi/localisation/**"/>
+			<classpath refid="cacert-gigi.classpath" />
+		</javac>
+	</target>
+	<target depends="init, build-project" name="build-testing-l10n">
+		<javac encoding="UTF-8" debug="true" debuglevel="${debuglevel}" destdir="binutil-testing"
+			includeantruntime="false" source="${source}" target="${target}">
+			<compilerarg value="-XDignore.symbol.file"/>
+			<src path="util-testing" />
+			<include name="org/cacert/gigi/localisation/**"/>
+			<classpath refid="cacert-gigi.classpath" />
+			<classpath refid="cacert-gigi.test.classpath.jdt" />
+		</javac>
+		<java classname="org.cacert.gigi.localisation.TranslationCollector" failonerror="true">
+			<arg value="util-testing/org/cacert/gigi/localisation/conf.txt"/>
+			<arg value="."/>
+			<arg value="messages.po"/>
+			<classpath refid="cacert-gigi.test.classpath" />
+			<classpath refid="cacert-gigi.test.classpath.jdt" />
+		</java>
+	</target>
 
 	<target name="native">
-		<exec executable="make" dir="natives">
-			<arg value="clean" />
-			<arg value="all" />
-		</exec>
+		<exec executable="make" dir="natives"/>
 	</target>
 
-	<target depends="build" name="pack">
-		<jar destfile="gigi.jar" basedir="bin" manifest="Gigi.MF" />
+	<target depends="build-project, update-effective-tlds" name="pack">
+		<jar destfile="gigi.jar" basedir="bin" manifest="Gigi.MF" update="false"/>
+		<jar destfile="gigi.jar" basedir="binutil" update="on"/>
+	</target>
+
+	<target depends="build-testing,update-effective-tlds" name="pack-testing">
+		<jar destfile="gigi-testing.jar" basedir="bin" manifest="Gigi.MF" update="false"/>
+		<jar destfile="gigi-testing.jar" basedir="binutil" update="on"/>
+		<jar destfile="gigi-testing.jar" basedir="binutil-testing" update="on"/>
 	</target>
 
 	<target depends="test,native" name="bundle">
 		<zip destfile="gigi-linux_amd64.zip" basedir="."
-			includes="gigi.jar,native/*.so,doc/tableStructure.sql,static/**,templates/**" />
+			includes="gigi.jar,native/*.so,src/org/cacert/gigi/database/tableStructure.sql,static/**,templates/**" />
 	</target>
 	<target name="static-bundle">
-		<tar destfile="static.tar.gz" compression="gzip" basedir="."
-			includes="doc/tableStructure.sql,static/**,templates/**" />
+		<mkdir dir="work"/>
+		<mkdir dir="work/static"/>
+		<copy todir="work/static">
+			<fileset dir="static"/>
+		</copy>
+		<move file="work/static/static/images/cacert4-test.png" tofile="work/static/static/images/cacert4.png"/>
+		<delete file="work/static/static/image/cacert4-test.png"/>
+		<tar destfile="static.tar.gz" compression="gzip" basedir="work"
+			includes="../src/org/cacert/gigi/database/tableStructure.sql,**,templates/**" />
+	</target>
+
+	<target name="static-bundle-release">
+		<mkdir dir="work"/>
+		<mkdir dir="work/static"/>
+		<copy todir="work/static">
+			<fileset dir="static"/>
+		</copy>
+		<delete file="work/static/static/image/cacert4-test.png"/>
+		<tar destfile="static.tar.gz" compression="gzip" basedir="work"
+			includes="../src/org/cacert/gigi/database/tableStructure.sql,**,templates/**" />
 	</target>
 
-	<target name="all" depends="bundle,static-bundle" />
+	<target name="develop" depends="bundle,static-bundle" />
 
+	<target name="release" depends="bundle,static-bundle-release" />
 
-	<target depends="init,build-project" name="build-project-test">
+	<target depends="init,build-testing,update-effective-tlds" name="build-project-test">
 		<echo message="${ant.project.name}: ${ant.file}" />
-		<javac debug="true" debuglevel="${debuglevel}" destdir="bintest"
+		<javac encoding="UTF-8" debug="true" debuglevel="${debuglevel}" destdir="bintest"
 			includeantruntime="false" source="${source}" target="${target}">
+			<compilerarg value="-XDignore.symbol.file"/>
 			<src path="tests" />
 			<classpath refid="cacert-gigi.test.classpath" />
 		</javac>
+		<concat destfile="bintest/org/cacert/gigi/util/effective_tld_names.dat">
+			<path path="bin/org/cacert/gigi/util/effective_tld_names.dat"/>
+			<path path="publicSuffixFooter.dat"/>
+		</concat>
 	</target>
 	<target name="check-locale">
 		<available file="locale/de.xml" property="locale.present" />
@@ -112,6 +200,7 @@
 		<java classname="org.cacert.gigi.util.FetchLocales" failonerror="true"
 			fork="yes">
 			<classpath refid="cacert-gigi.classpath" />
+			<arg value="${localePath}"/>
 		</java>
 	</target>
 	<target name="check-generateKeys">
@@ -123,14 +212,30 @@
 			<arg value="-noprompt" />
 		</exec>
 	</target>
-	<target name="test" depends="build-project-test,generateKeys,FetchLocales,pack">
+	<target name="reset-db" depends="build-project">
+		<copy file="config/test.properties" tofile="config/gigi.properties"/>
+		<java classname="org.cacert.gigi.util.DatabaseManager">
+			<arg value="--test"/>
+			<classpath refid="cacert-gigi.test.classpath" />
+		</java>
+	</target>
+	<target name="test" depends="build-project-test,FetchLocales,pack-testing,pack,reset-db">
+		<delete failonerror="false">
+			<fileset dir=".">
+				<include name="jacoco.exec"/>
+				<include name="tester.exec"/>
+			</fileset>
+		</delete>
 		<mkdir dir="${junit.output.dir}" />
-		<junit fork="yes" printsummary="withOutAndErr">
+		<junit maxmemory="2g" fork="yes" printsummary="withOutAndErr">
+			<jvmarg value="-javaagent:/usr/share/java/jacocoagent.jar=destfile=tester.exec"/>
+			<jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:50001"/>
 			<formatter type="xml" />
 			<batchtest fork="yes" todir="${junit.output.dir}">
 				<fileset dir="tests">
 					<include name="**/*.java" />
 					<exclude name="**/testUtils/**" />
+					<exclude name="**/com/lambdaworks/crypto/test/CryptoTestUtil.java"/>
 				</fileset>
 			</batchtest>
 			<classpath refid="cacert-gigi.test.classpath" />
@@ -144,4 +249,111 @@
 			<report format="frames" todir="${junit.output.dir}" />
 		</junitreport>
 	</target>
+	<target name="generatecoco">
+		<delete file="merged.exec"/>
+
+		<jacoco:merge destfile="merged.exec">
+			<fileset dir="." includes="*.exec"/>
+		</jacoco:merge>
+		<jacoco:report>
+			<executiondata>
+				<file file="merged.exec" />
+			</executiondata>
+
+			<structure name="CAcert gigi">
+				<group name="Server">
+					<classfiles>
+						<fileset dir="bin">
+							<include name="org/cacert/gigi/**"/>
+						</fileset>
+					</classfiles>
+					<sourcefiles encoding="UTF-8">
+						<fileset dir="src">
+							<include name="org/cacert/gigi/**"/>
+						</fileset>
+					</sourcefiles>
+				</group>
+				<group name="Testcases">
+					<classfiles>
+						<fileset dir="bintest">
+							<include name="org/cacert/gigi/**"/>
+						</fileset>
+					</classfiles>
+					<sourcefiles encoding="UTF-8">
+						<fileset dir="tests">
+							<include name="org/cacert/gigi/**"/>
+						</fileset>
+					</sourcefiles>
+				</group>
+			</structure>
+
+			<html destdir="cocoReport"/>
+
+		</jacoco:report>
+	</target>
+	<target name="install-native" depends="native">
+		<mkdir dir="${env.DESTDIR}/usr/lib/jni"/>
+		<copy file="natives/libsetuid.so" todir="${env.DESTDIR}/usr/lib/jni"/>
+	</target>
+	<target name="install" depends="install-common">
+		<mkdir dir="${env.DESTDIR}/usr/share/cacert-gigi/static" />
+		<copy todir="${env.DESTDIR}/usr/share/cacert-gigi/static">
+			<fileset dir="static" />
+		</copy>
+		<delete file="${env.DESTDIR}/usr/share/cacert-gigi/static/static/images/cacert4-test.png" />
+		<copy file="gigi.jar" tofile="${env.DESTDIR}/usr/share/java/gigi.jar"/>
+	</target>
+	<target name="install-testing" depends="install-common">
+		<mkdir dir="${env.DESTDIR}/usr/share/cacert-gigi/static" />
+		<copy todir="${env.DESTDIR}/usr/share/cacert-gigi/static">
+			<fileset dir="static" />
+		</copy>
+		<move file="${env.DESTDIR}/usr/share/cacert-gigi/static/static/images/cacert4-test.png" tofile="${env.DESTDIR}/usr/share/cacert-gigi/static/static/images/cacert4.png" />
+		<delete file="${env.DESTDIR}/usr/share/cacert-gigi/static/static/images/cacert4-test.png" />
+		<copy file="gigi-testing.jar" tofile="${env.DESTDIR}/usr/share/java/gigi.jar"/>
+	</target>
+
+	<target name="install-common" depends="pack">
+		<mkdir dir="${env.DESTDIR}/usr/share/java" />
+
+		<mkdir dir="${env.DESTDIR}/usr/bin"/>
+		<copy file="doc/scripts/gigi" tofile="${env.DESTDIR}/usr/bin/gigi"/>
+
+		<chmod file="${env.DESTDIR}/usr/bin/gigi" perm="+x"/>
+		<mkdir dir="${env.DESTDIR}/usr/share/dbconfig-common/data/${PACKAGE}/install/"/>
+		<copy file="src/org/cacert/gigi/database/tableStructure.sql" tofile="${env.DESTDIR}/usr/share/dbconfig-common/data/${PACKAGE}/install/mysql.sql"/>
+
+		<mkdir dir="${env.DESTDIR}/var/lib/cacert-gigi/doc"/>
+		<exec executable="ln">
+			<arg value="-s"/>
+			<arg value="/usr/share/dbconfig-common/data/${PACKAGE}/install/mysql.sql"/>
+			<arg value="${env.DESTDIR}/var/lib/cacert-gigi/doc/tableStructure.sql"/>
+		</exec>
+		<mkdir dir="${env.DESTDIR}/var/lib/cacert-gigi/natives"/>
+		<delete failonerror="false" file="${env.DESTDIR}/var/lib/cacert-gigi/static"/>
+		<exec executable="ln">
+			<arg value="-s"/>
+			<arg value="/usr/share/cacert-gigi/static"/>
+			<arg value="${env.DESTDIR}/var/lib/cacert-gigi/static"/>
+		</exec>
+		<exec executable="ln">
+			<arg value="-s"/>
+			<arg value="/usr/lib/jni/libsetuid.so"/>
+			<arg value="${env.DESTDIR}/var/lib/cacert-gigi/natives/libsetuid.so"/>
+		</exec>
+
+		<mkdir dir="${env.DESTDIR}/etc/cacert/gigi"/>
+		<!--<copy todir="${env.DESTDIR}/DEBIAN">
+			<fileset dir="debian">
+			</fileset>
+		</copy>-->
+	</target>
+	<target name="update-effective-tlds">
+		<mkdir dir="bin/org/cacert/gigi/util"/>
+		<exec executable="wget" dir="bin/org/cacert/gigi/util">
+			<arg value="-N"/>
+			<arg value="-q"/>
+			<arg value="https://publicsuffix.org/list/effective_tld_names.dat"/>
+		</exec>
+	</target>
 </project>