Skip to content
This repository has been archived by the owner on Feb 8, 2020. It is now read-only.

Commit

Permalink
Updated build to use JRE 1.7 and added to .gitignore
Browse files Browse the repository at this point in the history
  • Loading branch information
kevlened committed Nov 23, 2013
1 parent ac7b73a commit f9dda71
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,17 @@
*.war
*.ear

sahi/junittestrun.out
sahi/classes/
sahi/deploy/
sahi/lib/
sahi/temp/
sahi/userdata/
sahi/config/version.txt
sahi/docs/java_client/
temp

.project
!sahi/.project

!sahi/extlib/*/*
10 changes: 5 additions & 5 deletions sahi/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<property name="compiler.args" value=""/>
<property name="compiler.max.memory" value="128m"/>
<property name="temp.dir" value="temp/sahi"/>
<property name="source" value="1.5"/>
<property name="source" value="1.7"/>
<patternset id="compiler.excluded"/>

<tstamp>
Expand All @@ -35,7 +35,7 @@
<target name="compile" description="compile module sahi">
<mkdir dir="${sahi.output.dir}"/>
<javac includeantruntime="true" destdir="${sahi.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}"
memoryMaximumSize="${compiler.max.memory}" fork="true" srcdir="src" target="1.5">
memoryMaximumSize="${compiler.max.memory}" fork="true" srcdir="src" target="1.7">
<classpath>
<pathelement location="extlib/xmlrpc/xmlrpc-client-3.0.jar"/>
<pathelement location="extlib/xmlrpc/xmlrpc-common-3.0.jar"/>
Expand All @@ -55,7 +55,7 @@
<javadoc access="public" destdir="docs/java_client" doctitle="Sahi Java Driver Client"
nodeprecated="false" nodeprecatedlist="false" noindex="false"
nonavbar="false" notree="false"
source="1.5" splitindex="true" use="true" version="true">
source="1.7" splitindex="true" use="true" version="true">
<fileset dir="src/net/sf/sahi/client/">
<include name="*.java"/>
</fileset>
Expand All @@ -69,7 +69,7 @@
<target name="compile-test" description="compile module sahi test">
<mkdir dir="${sahi.output.dir}"/>
<javac includeantruntime="true" destdir="${sahi.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}"
memoryMaximumSize="${compiler.max.memory}" fork="true" srcdir="test" target="1.5">
memoryMaximumSize="${compiler.max.memory}" fork="true" srcdir="test" target="1.7">
<classpath>
<pathelement location="extlib/ant/ant-testutil.jar"/>
<pathelement location="extlib/test/jmock-1.1.0.jar"/>
Expand Down Expand Up @@ -442,7 +442,7 @@

<target name="installer" depends="prepare-src-zip">
<taskdef name="izpack" classpath="extlib/izpack/standalone-compiler411.jar;extlib/izpack/standalone-compiler.jar" classname="com.izforge.izpack.ant.IzPackTask" />
<izpack input="installer/install.xml" output="deploy/install_sahi_v43_${DSTAMP}.jar" installertype="standard" basedir="${temp.dir}" izpackdir="." />
<izpack input="installer/install.xml" output="deploy/install_sahi_v44_${DSTAMP}.jar" installertype="standard" basedir="${temp.dir}" izpackdir="." />
</target>

<target name="zip-sahi" depends="clean-temp">
Expand Down

0 comments on commit f9dda71

Please sign in to comment.