forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bd...@apache.org
Subject svn commit: r1101299 - in /forrest/trunk/whiteboard/forrest-osgi: ./ org.apache.forrest.log4j.conf/ org.apache.forrest.plugin.input.xdoc.res/ org.apache.forrest.plugin.output.html.res/ org.apache.forrest.plugin.output.pdf.res/
Date Tue, 10 May 2011 03:29:22 GMT
Author: bdube
Date: Tue May 10 03:29:22 2011
New Revision: 1101299

URL: http://svn.apache.org/viewvc?rev=1101299&view=rev
Log:
Update build process

Set JVM source and target to 1.5
Skip jar step and bundle from classes
Update bundle fragments to deal with jar-less build

Modified:
    forrest/trunk/whiteboard/forrest-osgi/master.xml
    forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.log4j.conf/build.xml
    forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.input.xdoc.res/build.xml
    forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html.res/build.xml
    forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf.res/build.xml

Modified: forrest/trunk/whiteboard/forrest-osgi/master.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/master.xml?rev=1101299&r1=1101298&r2=1101299&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/master.xml (original)
+++ forrest/trunk/whiteboard/forrest-osgi/master.xml Tue May 10 03:29:22 2011
@@ -31,6 +31,9 @@
 
   <property name="bundle.deploy.dir" location="${forrest.home}/bundle" />
 
+  <property name="build.compiler.source" value="1.5" />
+  <property name="build.compiler.target" value="1.5" />
+
 <!--
   Bundle properties
   Override in bundle build.xml where necessary
@@ -66,6 +69,8 @@
            destdir="${build.classes}"
            classpathref="classpath"
            debug="true"
+           source="${build.compiler.source}"
+           target="${build.compiler.target}"
            includeantruntime="false">
       <compilerarg value="-Xlint" />
     </javac>
@@ -76,6 +81,8 @@
     <javac srcdir="${java.test.src.dir}"
            destdir="${build.test.classes}"
            debug="true"
+           source="${build.compiler.source}"
+           target="${build.compiler.target}"
            includeantruntime="false">
       <classpath>
         <pathelement location="${forrest.lib.dir}/junit-4.8.1.jar" />
@@ -104,27 +111,21 @@
     <fail if="junit.failure" message="There are unit test failures. Please check the output
above." />
   </target>
 
-  <target name="jar" depends="test">
-    <echo>Packaging ${ant.project.name}</echo>
-    <jar destfile="${build.dir}/${jar.file}">
-      <fileset dir="${build.classes}" />
-    </jar>
-  </target>
-
-  <target name="bundle" depends="jar">
+  <target name="bundle" depends="test">
     <echo>Bundling ${ant.project.name}</echo>
     <mkdir dir="${bundle.deploy.dir}" />
 
     <taskdef resource="aQute/bnd/ant/taskdef.properties"
              classpath="${bnd.jar.file}" />
 
+    <!-- bnd was chosen over bndwrap because bnd seems to be fail-fast -->
     <!--
     <bndwrap
         jars="${build.dir}/${jar.file}"
         output="${bundle.deploy.dir}/${bundle.symbolic.name}-${bundle.version}.jar" />
     -->
     <bnd
-        classpath="${build.dir}/${jar.file}"
+        classpath="${build.classes}"
         eclipse="false"
         failok="false"
         files="${bundle.bnd.file}"

Modified: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.log4j.conf/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.log4j.conf/build.xml?rev=1101299&r1=1101298&r2=1101299&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.log4j.conf/build.xml (original)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.log4j.conf/build.xml Tue May
10 03:29:22 2011
@@ -26,12 +26,12 @@
   <property name="bundle.bnd.file" location="log4j.bnd" />
 
   <!--
-    Override master jar target to include bundle resources
+    Override master compile target to include bundle resources
   -->
-  <target name="jar">
-    <jar destfile="${build.dir}/${jar.file}">
-      <fileset dir="${java.src.dir}" />
-    </jar>
+  <target name="compile" depends="init">
+    <copy file="src/java/log4j.properties"
+          todir="build/classes"
+          preservelastmodified="true" />
   </target>
 
   <import file="../master.xml" />

Modified: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.input.xdoc.res/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.input.xdoc.res/build.xml?rev=1101299&r1=1101298&r2=1101299&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.input.xdoc.res/build.xml
(original)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.input.xdoc.res/build.xml
Tue May 10 03:29:22 2011
@@ -26,14 +26,17 @@
   <property name="bundle.bnd.file" location="xdocInputRes.bnd" />
 
   <!--
-    Override master jar target to include bundle resources
+    Override master compile target to include bundle resources
   -->
-  <target name="jar">
-    <jar destfile="${build.dir}/${jar.file}">
-      <fileset dir="${bundle.resource.dir}" />
-    </jar>
+  <target name="compile" depends="init">
+    <copy todir="build/classes"
+          preservelastmodified="true">
+      <fileset dir="src/bundle" />
+    </copy>
   </target>
 
+  <target name="test" depends="compile" />
+
   <import file="../master.xml" />
 
 </project>

Modified: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html.res/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html.res/build.xml?rev=1101299&r1=1101298&r2=1101299&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html.res/build.xml
(original)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html.res/build.xml
Tue May 10 03:29:22 2011
@@ -26,14 +26,17 @@
   <property name="bundle.bnd.file" location="htmlOutputRes.bnd" />
 
   <!--
-    Override master jar target to include bundle resources
+    Override master compile target to include bundle resources
   -->
-  <target name="jar">
-    <jar destfile="${build.dir}/${jar.file}">
-      <fileset dir="${bundle.resource.dir}" />
-    </jar>
+  <target name="compile" depends="init">
+    <copy todir="build/classes"
+          preservelastmodified="true">
+      <fileset dir="src/bundle" />
+    </copy>
   </target>
 
+  <target name="test" depends="compile" />
+
   <import file="../master.xml" />
 
 </project>

Modified: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf.res/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf.res/build.xml?rev=1101299&r1=1101298&r2=1101299&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf.res/build.xml
(original)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf.res/build.xml
Tue May 10 03:29:22 2011
@@ -26,14 +26,17 @@
   <property name="bundle.bnd.file" location="pdfOutputRes.bnd" />
 
   <!--
-    Override master jar target to include bundle resources
+    Override master compile target to include bundle resources
   -->
-  <target name="jar">
-    <jar destfile="${build.dir}/${jar.file}">
-      <fileset dir="${bundle.resource.dir}" />
-    </jar>
+  <target name="compile" depends="init">
+    <copy todir="build/classes"
+          preservelastmodified="true">
+      <fileset dir="src/bundle" />
+    </copy>
   </target>
 
+  <target name="test" depends="compile" />
+
   <import file="../master.xml" />
 
 </project>



Mime
View raw message