Skip to content

Commit

Permalink
Modified ANT build file to create both jars (and add the shell scripts
Browse files Browse the repository at this point in the history
to the folder). Removed jarDescs. Renamed RabbitInAHat.java to
RabbitInAHatMain.java for consistency.
  • Loading branch information
schuemie committed Feb 9, 2015
1 parent 4705c99 commit 94c45f4
Show file tree
Hide file tree
Showing 12 changed files with 1,344 additions and 1,430 deletions.
115 changes: 43 additions & 72 deletions build.xml
Original file line number Diff line number Diff line change
@@ -1,72 +1,43 @@
<project name="WhiteRabbit" default="dist" basedir=".">
<description>
simple example build file
</description>
<!-- set global properties for this build -->
<property name="src" location="src"/>
<property name="lib" location="lib"/>
<property name="build" location="build"/>
<property name="dist" location="dist"/>

<property name="JDK_VERSION" value="1.6"/>

<property name="WR_VERSION" value="v0.3"/>

<path id="classpath">
<fileset dir="${lib}" includes="**/*.jar"/>
</path>

<target name="init">
<!-- Create the time stamp -->
<tstamp/>
<!-- Create the build directory structure used by compile -->
<mkdir dir="${build}"/>
</target>

<target name="compile" depends="init"
description="compile the source " >
<!-- Compile the java code from ${src} into ${build} -->
<javac
source="${JDK_VERSION}"
target="${JDK_VERSION}"
srcdir="${src}"
classpathref="classpath"
destdir="${build}"
includeantruntime="false"
/>
</target>

<target name="dist" depends="compile"
description="generate the distribution" >
<!-- Create the distribution directory -->
<mkdir dir="${dist}/lib"/>

<!-- Put all dependency jars in a temp file -->
<jar jarfile="${dist}/lib/deps.jar">
<zipgroupfileset dir="${lib}">
<include name="**/*.jar"/>
</zipgroupfileset>
</jar>

<sleep seconds="1"/>

<!-- Put everything in ${build} into the WhiteRabbit-${DSTAMP}.jar file -->
<jar jarfile="${dist}/lib/WhiteRabbit-${WR_VERSION}.jar" basedir="${build}">
<manifest>
<attribute name="Built-By" value="${user.name}"/>
<attribute name="Main-Class" value="org.ohdsi.whiteRabbit.WhiteRabbitMain"/>
</manifest>
<fileset dir="${src}">
<include name="org/ohdsi/whiteRabbit/**/*.png"/>
</fileset>
<zipfileset src="${dist}/lib/deps.jar" excludes="META-INF/*.SF"/>
</jar>
</target>

<target name="clean"
description="clean up" >
<!-- Delete the ${build} and ${dist} directory trees -->
<delete dir="${build}"/>
<delete dir="${dist}"/>
</target>
</project>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<project default="create_run_jars" name="Create runnable WhiteRabbit and RabbitInAHat jar files with libraries in sub-folder">
<!--this file was created by Eclipse Runnable JAR Export Wizard-->
<!--ANT 1.7 is required -->
<target name="create_run_jars">
<delete dir="dist"/>
<mkdir dir="dist"/>
<jar destfile="dist/WhiteRabbit.jar">
<manifest>
<attribute name="Main-Class" value="org.ohdsi.whiteRabbit.WhiteRabbitMain"/>
<attribute name="Class-Path" value=". WhiteRabbit_lib/ojdbc5.jar WhiteRabbit_lib/ojdbc6.jar WhiteRabbit_lib/sqljdbc4.jar WhiteRabbit_lib/mysql-connector-java-5.1.30-bin.jar WhiteRabbit_lib/dom4j-1.6.1.jar WhiteRabbit_lib/poi-3.9-20121203.jar WhiteRabbit_lib/poi-excelant-3.9-20121203.jar WhiteRabbit_lib/poi-ooxml-3.9-20121203.jar WhiteRabbit_lib/poi-ooxml-schemas-3.9-20121203.jar WhiteRabbit_lib/stax-api-1.0.1.jar WhiteRabbit_lib/xmlbeans-2.3.0.jar WhiteRabbit_lib/jtds-1.2.7.jar WhiteRabbit_lib/postgresql-9.3-1101.jdbc4.jar WhiteRabbit_lib/postgresql-9.3-1101.jdbc41.jar"/>
</manifest>
<fileset dir="bin"/>
</jar>
<jar destfile="dist/RabbitInAHat.jar">
<manifest>
<attribute name="Main-Class" value="org.ohdsi.rabbitInAHat.RabbitInAHatMain"/>
<attribute name="Class-Path" value=". WhiteRabbit_lib/ojdbc5.jar WhiteRabbit_lib/ojdbc6.jar WhiteRabbit_lib/sqljdbc4.jar WhiteRabbit_lib/mysql-connector-java-5.1.30-bin.jar WhiteRabbit_lib/dom4j-1.6.1.jar WhiteRabbit_lib/poi-3.9-20121203.jar WhiteRabbit_lib/poi-excelant-3.9-20121203.jar WhiteRabbit_lib/poi-ooxml-3.9-20121203.jar WhiteRabbit_lib/poi-ooxml-schemas-3.9-20121203.jar WhiteRabbit_lib/stax-api-1.0.1.jar WhiteRabbit_lib/xmlbeans-2.3.0.jar WhiteRabbit_lib/jtds-1.2.7.jar WhiteRabbit_lib/postgresql-9.3-1101.jdbc4.jar WhiteRabbit_lib/postgresql-9.3-1101.jdbc41.jar"/>
</manifest>
<fileset dir="bin"/>
</jar>
<delete dir="dist/WhiteRabbit_lib"/>
<mkdir dir="dist/WhiteRabbit_lib"/>
<copy file="lib/ojdbc5.jar" todir="dist/WhiteRabbit_lib"/>
<copy file="lib/ojdbc6.jar" todir="dist/WhiteRabbit_lib"/>
<copy file="lib/sqljdbc4.jar" todir="dist/WhiteRabbit_lib"/>
<copy file="lib/mysql-connector-java-5.1.30-bin.jar" todir="dist/WhiteRabbit_lib"/>
<copy file="lib/dom4j-1.6.1.jar" todir="dist/WhiteRabbit_lib"/>
<copy file="lib/poi-3.9-20121203.jar" todir="dist/WhiteRabbit_lib"/>
<copy file="lib/poi-excelant-3.9-20121203.jar" todir="dist/WhiteRabbit_lib"/>
<copy file="lib/poi-ooxml-3.9-20121203.jar" todir="dist/WhiteRabbit_lib"/>
<copy file="lib/poi-ooxml-schemas-3.9-20121203.jar" todir="dist/WhiteRabbit_lib"/>
<copy file="lib/stax-api-1.0.1.jar" todir="dist/WhiteRabbit_lib"/>
<copy file="lib/xmlbeans-2.3.0.jar" todir="dist/WhiteRabbit_lib"/>
<copy file="lib/jtds-1.2.7.jar" todir="dist/WhiteRabbit_lib"/>
<copy file="lib/postgresql-9.3-1101.jdbc4.jar" todir="dist/WhiteRabbit_lib"/>
<copy file="lib/postgresql-9.3-1101.jdbc41.jar" todir="dist/WhiteRabbit_lib"/>
<copy file="scripts/WhiteRabbit1.5GB.cmd" todir="dist"/>
<copy file="scripts/WhiteRabbit1.5GB.sh" todir="dist"/>
<copy file="scripts/RabbitInAHat1.5GB.cmd" todir="dist"/>
<copy file="scripts/RabbitInAHat1.5GB.sh" todir="dist"/>
</target>
</project>
11 changes: 0 additions & 11 deletions jarDesc/RabbitInAHat.MF

This file was deleted.

22 changes: 0 additions & 22 deletions jarDesc/RabbitInAHat.jardesc

This file was deleted.

10 changes: 0 additions & 10 deletions jarDesc/WhiteRabbit.MF

This file was deleted.

22 changes: 0 additions & 22 deletions jarDesc/WhiteRabbit.jardesc

This file was deleted.

Binary file not shown.
Binary file removed man/WhiteRabbit and Rabbit-In-a-Hat User Manual.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion scripts/RabbitInAHat1.5GB.cmd
Original file line number Diff line number Diff line change
@@ -1 +1 @@
java -Xmx1500m -jar RabbitInAHat.jar
java -Xmx1500m -jar RabbitInAHat.jar
2 changes: 1 addition & 1 deletion scripts/WhiteRabbit1.5GB.cmd
Original file line number Diff line number Diff line change
@@ -1 +1 @@
java -Xmx1500m -jar WhiteRabbit.jar
java -Xmx1500m -jar WhiteRabbit.jar
Loading

0 comments on commit 94c45f4

Please sign in to comment.