antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 5 Projects Releases 5 Activity Actions

chg: bumped Java source and target version to 1.7

Browse source
This commit is contained in:
Tobi Schäfer 2015-08-10 14:10:29 +02:00
parent 835c56afcf
commit fc51cb398b
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
build.xml
View file

@ -102,8 +102,8 @@
<replace file="${build.work}/src/helma/main/Server.java" <replace file="${build.work}/src/helma/main/Server.java"
token="__builddate__" value="${TODAY}"/> token="__builddate__" value="${TODAY}"/>
<javac srcdir="${build.work}/src" <javac srcdir="${build.work}/src"
source="1.5" source="1.7"
target="1.5" target="1.7"
destdir="${build.classes}" destdir="${build.classes}"
debug="${debug}" debug="${debug}"
deprecation="${deprecation}" deprecation="${deprecation}"
@ -127,7 +127,7 @@
includes="**/main/launcher/**" includes="**/main/launcher/**"
manifest="${build.src}/helma/main/launcher/manifest.txt"/> manifest="${build.src}/helma/main/launcher/manifest.txt"/>
<!-- Copy timestamped helma jar file to lib/helma.jar --> <!-- Copy timestamped helma jar file to lib/helma.jar -->
<copy file="${build.lib}/${jar.name}-${DSTAMP}.jar" <copy file="${build.lib}/${jar.name}-${DSTAMP}.jar"
tofile="${build.lib}/${jar.name}.jar"/> tofile="${build.lib}/${jar.name}.jar"/>
</target> </target>
@ -161,13 +161,13 @@
<copy todir="${build.work}/reference"> <copy todir="${build.work}/reference">
<fileset dir="${build.externals}/reference"/> <fileset dir="${build.externals}/reference"/>
</copy> </copy>
<!-- add a copy of the modules --> <!-- add a copy of the modules -->
<mkdir dir="${build.work}/reference/modules"/> <mkdir dir="${build.work}/reference/modules"/>
<copy todir="${build.work}/reference/modules"> <copy todir="${build.work}/reference/modules">
<fileset dir="${build.externals}/modules/"/> <fileset dir="${build.externals}/modules/"/>
</copy> </copy>
<mkdir dir="${build.jsdocs}"/> <mkdir dir="${build.jsdocs}"/>
<java dir="${home.dir}" fork="true" jar="${build.lib}/rhino.jar"> <java dir="${home.dir}" fork="true" jar="${build.lib}/rhino.jar">
<sysproperty key="jsdoc.dir" value="work/reference"/> <sysproperty key="jsdoc.dir" value="work/reference"/>
@ -201,7 +201,7 @@
<!-- =================================================================== --> <!-- =================================================================== -->
<target name="core" depends="init, jar"> <target name="core" depends="init, jar">
<mkdir dir="${build.work}"/> <mkdir dir="${build.work}"/>
<!-- copy all libraries except helma-YYYYMMDD.jar --> <!-- copy all libraries except helma-YYYYMMDD.jar -->
<copy todir="${build.work}/lib"> <copy todir="${build.work}/lib">
<fileset dir="${home.dir}/lib"> <fileset dir="${home.dir}/lib">
@ -240,7 +240,7 @@
<!-- =================================================================== --> <!-- =================================================================== -->
<target name="package" depends="init"> <target name="package" depends="init">
<mkdir dir="${build.work}"/> <mkdir dir="${build.work}"/>
<!-- checkout the demo apps (and zip manage-app) --> <!-- checkout the demo apps (and zip manage-app) -->
<antcall target="package-apps" /> <antcall target="package-apps" />
@ -350,7 +350,7 @@
<copy todir="${build.work}/apps/welcome"> <copy todir="${build.work}/apps/welcome">
<fileset dir="${build.externals}/welcome"/> <fileset dir="${build.externals}/welcome"/>
</copy> </copy>
<mkdir dir="${build.work}/apps/manage"/> <mkdir dir="${build.work}/apps/manage"/>
<zip zipfile="${build.work}/apps/manage/manage.zip" basedir="${build.externals}/manage/" <zip zipfile="${build.work}/apps/manage/manage.zip" basedir="${build.externals}/manage/"
includes="**" excludes="**/properties,readme/**" /> includes="**" excludes="**/properties,readme/**" />
@ -371,7 +371,7 @@
<copy todir="${build.work}/modules"> <copy todir="${build.work}/modules">
<fileset dir="${build.externals}/modules"/> <fileset dir="${build.externals}/modules"/>
</copy> </copy>
<mkdir dir="${build.work}/modules"/> <mkdir dir="${build.work}/modules"/>
<zip zipfile="${build.work}/modules/helmaTools.zip" basedir="${build.externals}/helmaTools/" <zip zipfile="${build.work}/modules/helmaTools.zip" basedir="${build.externals}/helmaTools/"
includes="**" excludes="**/*.txt, **/*.html, **/*.bat, **/*.sh" /> includes="**" excludes="**/*.txt, **/*.html, **/*.bat, **/*.sh" />