[Firebird-checkins] SF.net SVN: firebird:[933] java-plugin/trunk/build

[<asf...@us...>]

Revision: 933
          http://firebird.svn.sourceforge.net/firebird/?rev=933&view=rev
Author:   asfernandes
Date:     2009-06-11 21:58:44 +0000 (Thu, 11 Jun 2009)

Log Message:
-----------
Build changes

Modified Paths:
--------------
    java-plugin/trunk/build/archive.xml
    java-plugin/trunk/build/compile.xml
    java-plugin/trunk/build/init.xml

Modified: java-plugin/trunk/build/archive.xml
===================================================================
--- java-plugin/trunk/build/archive.xml	2009-06-11 21:55:14 UTC (rev 932)
+++ java-plugin/trunk/build/archive.xml	2009-06-11 21:58:44 UTC (rev 933)
@@ -20,6 +20,7 @@
        <fileset dir="${build.resources}">
          <exclude name="log4j.properties"/>
          <include name="**/*.properties"/>
+         <include name="**/*.sql"/>
        </fileset>
        <zipfileset dir="${build.resources}/META-INF" prefix="META-INF">
          <include name="services/**/*"/>
@@ -32,6 +33,12 @@
        </fileset>
     </jar>
 
+    <jar jarfile="${build.lib}/${archive.name.plugin}" manifest="${build.etc}/default.mf">
+       <fileset dir="${build.plugin}">
+         <include name="org/firebirdsql/**"/>
+       </fileset>
+    </jar>
+
     <jar jarfile="${build.lib}/${archive.name.full}" manifest="${build.etc}/default.mf">
        <fileset dir="${build.classes}">
          <include name="org/firebirdsql/**"/>
@@ -45,6 +52,7 @@
        <fileset dir="${build.resources}">
          <exclude name="log4j.properties"/>
          <include name="**/*.properties"/>
+         <include name="**/*.sql"/>
        </fileset>
        <fileset dir="${build.j2ee}">
          <include name="javax/**"/>

Modified: java-plugin/trunk/build/compile.xml
===================================================================
--- java-plugin/trunk/build/compile.xml	2009-06-11 21:55:14 UTC (rev 932)
+++ java-plugin/trunk/build/compile.xml	2009-06-11 21:58:44 UTC (rev 933)
@@ -1,7 +1,7 @@
   <!-- =================================================================== -->
   <!-- Compiles the source code                                            -->
   <!-- =================================================================== -->
-  <target name="compile" depends="compile-j2ee, compile-driver, compile-pool, compile-compatibility, compile-tests, compile-etc, compile-examples, compile-resources, compile-stylesheets"/>
+  <target name="compile" depends="compile-j2ee, compile-driver, compile-pool, compile-plugin, compile-compatibility, compile-tests, compile-etc, compile-examples, compile-resources, compile-stylesheets"/>
 
   <!-- calling this unjar a compile is stretching the truth a bit-->
   <target name="compile-j2ee" depends="init">
@@ -142,6 +142,21 @@
       <src refid="source.java.pool"/>
     </javac>
   </target>
+
+  <target name="compile-plugin">
+    <mkdir dir="${build.plugin}"/>
+    <javac srcdir="${source.plugin}"
+           destdir="${build.plugin}"
+           target="${ant.java.version}"
+           debug="on"
+           deprecation="on"
+           optimize="on"
+           includes="org/firebirdsql/**"
+           excludes="**/temp*"
+    >
+      <classpath refid="javac.plugin.classpath"/>
+    </javac>
+  </target>
   
   <target name="compile-compatibility" depends="compile-pool">
   	<mkdir dir="${build.compatibility}"/>
@@ -167,7 +182,7 @@
     </path>
   </target>
 
-  <target name="compile-tests" depends="compile-pool,set-jdbc-20-test,set-jdbc-30-test">
+  <target name="compile-tests" depends="compile-pool,compile-plugin,set-jdbc-20-test,set-jdbc-30-test">
     <mkdir dir="${build.test}"/>
     <javac srcdir="${source.test}"
            destdir="${build.test}"

Modified: java-plugin/trunk/build/init.xml
===================================================================
--- java-plugin/trunk/build/init.xml	2009-06-11 21:55:14 UTC (rev 932)
+++ java-plugin/trunk/build/init.xml	2009-06-11 21:58:44 UTC (rev 933)
@@ -114,6 +114,7 @@
     <property name="source.test.30" value="${module.source}/test_30"/>
     <property name="source.pool" value="${module.source}/pool"/>
     <property name="source.compatibility" value="${module.source}/compatibility"/>
+    <property name="source.plugin" value="${module.source}/plugin"/>
 
     <property name="thirdparty" value="${module.root}/thirdparty"/>
     <property name="jboss.source.root"
@@ -141,6 +142,7 @@
     <property name="build.dist" value="${module.output}/dist"/>
     <property name="build.native" value="${module.output}/native"/>
     <property name="build.native.output" value="${build.native}"/>
+    <property name="build.plugin" value="${module.output}/plugin"/>
 
 	<property name="archive.name.main" value="jaybird"/>
 	<property name="archive.name.version" value="${version.major}.${version.minor}.${version.revision}"/>
@@ -150,6 +152,7 @@
 	<property name="archive.name.full" value="${archive.name.main}-full-${archive.name.version}.jar"/>
 	<property name="archive.name.simple" value="${archive.name.main}-${archive.name.version}.jar"/>
 	<property name="archive.name.test" value="${archive.name.main}-test-${archive.name.version}.jar"/>
+	<property name="archive.name.plugin" value="${archive.name.main}-plugin-${archive.name.version}.jar"/>
 
     <property name="junit.timeout" value="600000"/> <!-- 10 minutes -->
     <property name="junit.batchtest.todir" value="${build.reports}"/>
@@ -205,11 +208,18 @@
       <path refid="javac.driver.classpath"/>
       <pathelement location="${build.classes}"/>
       <pathelement location="${build.pool}"/>
+      <pathelement location="${build.plugin}"/>
       <pathelement location="${lib.dir}/junit.jar"/>
       <pathelement location="${module.thirdparty}/fscontext.jar"/>
       <pathelement location="${module.thirdparty}/providerutil.jar"/>
     </path>
 
+    <path id="javac.plugin.classpath">
+      <path refid="javac.driver.classpath"/>
+      <pathelement location="${build.classes}"/>
+      <pathelement location="${build.pool}"/>
+    </path>
+
     <path id="javac.examples.classpath">
       <path refid="javac.driver.classpath"/>
       <pathelement location="${build.classes}"/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.