X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=build.xml;h=f627816466ed56d206a2e92bb93a8f784167ede3;hp=83c95e10328deb6e9675ae3e31bafad7711278ba;hb=ed2a1041c12f9fcdba56472e1d938bb121166566;hpb=0d64798ee0a9c2091119335e0c6182f61c601173

diff --git a/build.xml b/build.xml
index 83c95e10..f6278164 100644
--- a/build.xml
+++ b/build.xml
@@ -6,6 +6,7 @@
 	</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" />
@@ -18,16 +19,19 @@
 	</path>
 	<path id="cacert-gigi.classpath">
 		<pathelement location="bin" />
+		<pathelement location="binutil" />
 		<pathelement location="${mysqlconnector}" />
 	</path>
 	<path id="cacert-gigi.test.classpath">
 		<pathelement location="bin" />
+		<pathelement location="binutil" />
 		<pathelement location="bintest" />
 		<path refid="JUnit 4.libraryclasspath" />
 		<pathelement location="${mysqlconnector}" />
 	</path>
 	<target name="init">
 		<mkdir dir="bin" />
+		<mkdir dir="binutil" />
 		<mkdir dir="bintest" />
 
 		<copy includeemptydirs="false" todir="bin">
@@ -80,6 +84,11 @@
 			<src path="lib/jetty" />
 			<src path="lib/jtar" />
 			<src path="src" />
+			<classpath refid="cacert-gigi.classpath" />
+		</javac>
+		<javac 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>
@@ -90,7 +99,8 @@
 	</target>
 
 	<target depends="build" name="pack">
-		<jar destfile="gigi.jar" basedir="bin" manifest="Gigi.MF" />
+		<jar destfile="gigi.jar" basedir="bin" manifest="Gigi.MF" update="false"/>
+		<jar destfile="gigi.jar" basedir="binutil" update="on"/>
 	</target>
 
 	<target depends="test,native" name="bundle">
@@ -192,25 +202,32 @@
 		</jacoco:merge>
 		<jacoco:report>
 			<executiondata>
-				<file file="jacoco.exec" />
-				<file file="tester.exec" />
+				<file file="merged.exec" />
 			</executiondata>
 
 			<structure name="CAcert gigi">
 				<group name="Server">
 					<classfiles>
-						<fileset dir="bin/org/cacert/gigi" />
+						<fileset dir="bin">
+							<include name="org/cacert/gigi/**"/>
+						</fileset>
 					</classfiles>
 					<sourcefiles encoding="UTF-8">
-						<fileset dir="src/org/cacert/gigi" />
+						<fileset dir="src">
+							<include name="org/cacert/gigi/**"/>
+						</fileset>
 					</sourcefiles>
 				</group>
 				<group name="Testcases">
 					<classfiles>
-						<fileset dir="bintest/org/cacert/gigi" />
+						<fileset dir="bintest">
+							<include name="org/cacert/gigi/**"/>
+						</fileset>
 					</classfiles>
 					<sourcefiles encoding="UTF-8">
-						<fileset dir="tests/org/cacert/gigi" />
+						<fileset dir="tests">
+							<include name="org/cacert/gigi/**"/>
+						</fileset>
 					</sourcefiles>
 				</group>
 			</structure>
@@ -219,4 +236,48 @@
 
 		</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="pack">
+		<mkdir dir="${env.DESTDIR}/usr/share/java"/>
+		<copy file="gigi.jar" tofile="${env.DESTDIR}/usr/share/java/gigi.jar"/>
+
+		<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="doc/tableStructure.sql" tofile="${env.DESTDIR}/usr/share/dbconfig-common/data/${PACKAGE}/install/mysql.sql"/>
+
+		<mkdir dir="${env.DESTDIR}/usr/share/cacert-gigi/static"/>
+                <copy todir="${env.DESTDIR}/usr/share/cacert-gigi/static">
+			<fileset dir="static"/>
+		</copy>
+		<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>
 </project>