[pkg-java] r10395 - trunk/libjboss-nxio-base-java/debian

[Torsten Werner]

Author: twerner
Date: 2009-09-15 20:54:38 +0000 (Tue, 15 Sep 2009)
New Revision: 10395

Modified:
   trunk/libjboss-nxio-base-java/debian/
   trunk/libjboss-nxio-base-java/debian/build.properties
   trunk/libjboss-nxio-base-java/debian/build.xml
   trunk/libjboss-nxio-base-java/debian/rules
Log:
api builds



Property changes on: trunk/libjboss-nxio-base-java/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Modified: trunk/libjboss-nxio-base-java/debian/build.properties
===================================================================
--- trunk/libjboss-nxio-base-java/debian/build.properties	2009-09-15 20:26:02 UTC (rev 10394)
+++ trunk/libjboss-nxio-base-java/debian/build.properties	2009-09-15 20:54:38 UTC (rev 10395)
@@ -1,5 +1,2 @@
-build.javaVersion = 1.5
-build.javaVersion = 1.5
 javadoc.dir       = build/api
-maven.test.skip   = true
-classpath.compile = ${basedir}/api/build/marshalling-api-${version}.jar
+classpath.compile = ${basedir}/logging-jdk/classes/

Modified: trunk/libjboss-nxio-base-java/debian/build.xml
===================================================================
--- trunk/libjboss-nxio-base-java/debian/build.xml	2009-09-15 20:26:02 UTC (rev 10394)
+++ trunk/libjboss-nxio-base-java/debian/build.xml	2009-09-15 20:54:38 UTC (rev 10395)
@@ -3,50 +3,38 @@
 <project name="pkg-java" default="package" basedir="..">
 
     <property file="debian/build.properties"/>
-    <property name="maven.build" value="/usr/share/maven-ant-helper/maven-build.xml"/>
-    <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
 
     <macrodef name="cleanmodule">
 	<attribute name="dir"/>
 	<sequential>
-	    <ant target="clean" antfile="${maven.build}" dir="@{dir}">
-	        <property name="debian.dir" location="debian" />
-	        <property name="project.dir" value="@{dir}" />
-	    </ant> 
+	    <delete dir="@{dir}/classes"/>
 	</sequential>
     </macrodef>
 
-    <macrodef name="packagemodule">
-	<attribute name="dir"/>
+    <macrodef name="buildmodule">
+        <attribute name="dir"/>
 	<sequential>
-	    <ant target="package" antfile="${maven.build}" dir="@{dir}">
-		<property name="debian.dir" location="debian" />
-		<property name="project.dir" value="@{dir}" />
-	    </ant>
+	    <mkdir dir="@{dir}/classes"/>
+	    <javac srcdir="@{dir}/src/main/java" destdir="@{dir}/classes"
+		classpath="${classpath.compile}"/>
 	</sequential>
     </macrodef>
 
     <target name="clean">
 	<delete dir="build"/>
+        <cleanmodule dir="logging-jdk"/>
         <cleanmodule dir="api"/>
-        <cleanmodule dir="river"/>
-        <cleanmodule dir="serial"/>
-        <cleanmodule dir="serialization-java"/>
     </target>
 
     <target name="package">
-        <packagemodule dir="api"/>
-        <packagemodule dir="river"/>
-        <packagemodule dir="serial"/>
-        <packagemodule dir="serialization-java"/>
+        <buildmodule dir="logging-jdk"/>
+        <buildmodule dir="api"/>
     </target>
 
     <target name="javadoc">
         <javadoc destdir="${javadoc.dir}">
+            <packageset dir="logging-jdk/src/main/java/"/>
             <packageset dir="api/src/main/java/"/>
-            <packageset dir="river/src/main/java/"/>
-            <packageset dir="serial/src/main/java/"/>
-            <packageset dir="serialization-java/src/main/java/"/>
         </javadoc>
     </target>
 

Modified: trunk/libjboss-nxio-base-java/debian/rules
===================================================================
--- trunk/libjboss-nxio-base-java/debian/rules	2009-09-15 20:26:02 UTC (rev 10394)
+++ trunk/libjboss-nxio-base-java/debian/rules	2009-09-15 20:54:38 UTC (rev 10395)
@@ -14,10 +14,5 @@
 get-orig-source:
 	uscan --download-version $(VERSION) --force-download --rename
 
-binary-post-install/lib$(PACKAGE)-java::
-	mh_installpoms -plib$(PACKAGE)-java
-	mh_installjar -plib$(PACKAGE)-java -l api/pom.xml api/build/marshalling-api-$(VERSION).jar
-	mh_installjar -plib$(PACKAGE)-java -l river/pom.xml river/build/river-$(VERSION).jar
-	mh_installjar -plib$(PACKAGE)-java -l serial/pom.xml serial/build/serial-$(VERSION).jar
-	mh_installjar -plib$(PACKAGE)-java -l serialization-java/pom.xml serialization-java/build/serialization-java-$(VERSION).jar
+#binary-post-install/lib$(PACKAGE)-java::