Changeset 308 for trunk/org.bridgedb.webservice.biomart/build.xml

Timestamp:

02/23/10 15:28:52 (2 years ago)

Author:

martijn

Message:

Big project Reogranization:
- all modules are named with their main package name,

e.g. "picr" becomes org.bridgedb.webservice.picr,
and the jar will be org.bridgedb.webservice.picr.jar

- webservice renamed to org.bridgedb.server
- corelib is split in org.bridgedb, org.bridgedb.rdb,

org.bridgedb.webservice.biomart and org.bridgedb.webservice.bridgerest

Location:

trunk/org.bridgedb.webservice.biomart

Files:

• . (added)
• build.xml (moved) (moved from trunk/corelib/build.xml) (5 diffs)

trunk/org.bridgedb.webservice.biomart/build.xml

@@ -1 +1 @@
 <?xml version="1.0"?>
-<project name="BridgeDb" default="dist" basedir=".">
+<project name="org.bridgedb.webservice.biomart" default="dist" basedir=".">
 
   <!-- always be java 1.5 compatible -->
@@ -6 +6 @@
   <property name="ant.build.javac.source" value="1.5"/>
         
-  <property name="jar.name" value="../dist/bridgedb.jar"/>
+  <property name="jar.name" value="../dist/org.bridgedb.webservice.biomart.jar"/>
   <property name="svn.exec.svnversion" value="svnversion"/>
   <property name="checkstyle.output.file" value="warnings.txt"/>
@@ -12 +12 @@
   
   <target name="prepare">
-        <tstamp /> <!-- set ${TODAY} and ${TSTAMP} -->
         <mkdir dir="build"/>
-        <mkdir dir="doc"/>
         <mkdir dir="../dist"/>
-        <exec executable="${svn.exec.svnversion}" outputproperty="subversion_revision" failifexecutionfails="false">
-                <arg line="-n ."/>
-        </exec>
-        <echo file="src/org/bridgedb/BridgeDb.properties"># Version and compilation information
-REVISION=${subversion_revision}
-COMPILE_DATE=${DSTAMP} ${TSTAMP}
-# copied from version.props
-bridgedb.version=${bridgedb.version}
-        </echo>  
   </target>
 
+        <path id="project.class.path">
+                <pathelement location="build"/>
+                <pathelement location="../dist/org.bridgedb.jar"/>
+                <pathelement location="../dist/org.bridgedb.bio.jar"/>
+                <!--TODO make sure corelib build is called first -->
+        </path>
+
   <target name="build" depends="prepare">
-        <javac srcdir="src"
-                   includes="**"
-                   debug="true"
-                   destdir="build">
-        </javac>
+                <javac srcdir="src" 
+                            debug="true"        
+                            destdir="build">
+                        <classpath refid="project.class.path"/>
+                </javac>
     <copy file="src/org/bridgedb/webservice/biomart/util/filterconversion.txt"
           todir="build/org/bridgedb/webservice/biomart/util" />
@@ -46 +42 @@
           <fileset dir="src" includes="**/*.properties"/>
         </jar>
-    <copy file="lib/derby.jar"
-          todir="../dist" />
   </target>
 
@@ -66 +60 @@
         <target name="test" depends="build">
                 <path id="test.classpath">
+                        <path refid="project.class.path"/>
                         <pathelement location="build"/>
-                        <pathelement location="lib/derby.jar"/>
-                        <pathelement location="build-lib/junit.jar"/>
-                        <pathelement location="build-lib/measure.jar"/>
-                        <pathelement location="build-lib/derbyclient.jar"/>
+                        <pathelement location="../org.bridgedb/build-lib/junit.jar"/>
+                        <pathelement location="../org.bridgedb/build-lib/measure.jar"/>
                 </path>
                 <javac srcdir="test" debug="true"