Permalink
Browse files

Change build system to use Java 5 everywhere

  • Loading branch information...
jclark committed Dec 7, 2008
1 parent 1efca50 commit 671d496bf6e16809eafd85421b4386456deb91da
View
@@ -10,6 +10,8 @@
<project>
<xmlproperty file="version.xml"/>
<property name="build.dir" value="${{basedir}}/build"/>
<property name="ant.build.javac.source" value="1.5"/>
<property name="ant.build.javac.target" value="1.5"/>
<taskdef name="testng" classname="org.testng.TestNGAntTask">
<classpath>
<pathelement location="lib/testng.jar"/>
@@ -97,7 +99,6 @@
<mkdir dir="{$build}/mod/{$name}/classes/main"/>
<xsl:if test="compile">
<javac destdir="{$build}/mod/{$name}/classes/main" debug="true" debuglevel="lines,source">
<xsl:call-template name="javac-attributes"/>
<src>
<pathelement location="mod/{$name}/src/main"/>
<xsl:if test="ant/@precompile">
@@ -139,9 +140,6 @@
<mkdir dir="{$build}/mod/{$name}/classes/test"/>
<xsl:if test="compile[@test]">
<javac destdir="{$build}/mod/{$name}/classes/test" debug="true">
<xsl:call-template name="javac-attributes">
<xsl:with-param name="test" select="true()"/>
</xsl:call-template>
<src>
<pathelement location="mod/{$name}/src/test"/>
</src>
@@ -395,21 +393,6 @@
</target>
</xsl:template>
<xsl:template name="javac-attributes">
<xsl:param name="test" select="false()"/>
<xsl:attribute name="includeAntRuntime">no</xsl:attribute>
<xsl:choose>
<xsl:when test="java5 or ($test and test[@type='testng'])">
<xsl:attribute name="source">1.5</xsl:attribute>
<xsl:attribute name="target">1.5</xsl:attribute>
</xsl:when>
<xsl:otherwise>
<xsl:attribute name="source">1.3</xsl:attribute>
<xsl:attribute name="target">1.1</xsl:attribute>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template match="service" mode="jar">
<xsl:param name="root"/>
<xsl:copy>
View
@@ -10,9 +10,6 @@
<xsl:template match="module">
<module relativePaths="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="false">
<xsl:if test="java5|test[@type='testng']">
<xsl:attribute name="LANGUAGE_LEVEL">JDK_1_5</xsl:attribute>
</xsl:if>
<exclude-output />
<output url="file://$MODULE_DIR$/../../build/{$name}/classes/main"/>
<output-test url="file://$MODULE_DIR$/../../build/{$name}/classes/test"/>
View
@@ -374,7 +374,7 @@
<module fileurl="file://$PROJECT_DIR$/mod/xsd-datatype/xsd-datatype.iml" filepath="$PROJECT_DIR$/mod/xsd-datatype/xsd-datatype.iml" group="Common" />
</modules>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_3" assert-keyword="false" jdk-15="false" project-jdk-name="1.6" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build" />
</component>
<component name="ResourceManagerContainer">
@@ -4,6 +4,5 @@
<depends module="dtd-parse"/>
<depends module="rng-parse"/>
<depends module="rng-schema"/>
<java5/>
<compile/>
</module>
@@ -5,6 +5,5 @@
<depends module="datatype"/>
<depends module="rng-parse"/>
<depends module="rng-schema"/>
<java5/>
<compile/>
</module>
@@ -2,6 +2,5 @@
<depends module="util"/>
<depends module="rng-parse"/>
<depends module="rng-schema"/>
<java5/>
<compile/>
</module>
@@ -3,7 +3,6 @@
<depends module="datatype"/>
<depends module="rng-parse"/>
<depends module="rng-schema"/>
<java5/>
<test name="toxsd" type="convert" schema="trang/test/toxsdtest.rnc" output="xsd"/>
<compile/>
</module>
View
@@ -2,6 +2,5 @@
<depends module="util"/>
<depends module="resolver"/>
<depends module="datatype"/>
<java5/>
<compile/>
</module>
View
@@ -1,5 +1,4 @@
<module>
<java5/>
<depends module="util"/>
<depends module="resolver"/>
<compile/>
View
@@ -5,5 +5,4 @@
<depends module="rng-parse"/>
<compile test="yes"/>
<test name="unit" type="testng"/>
<java5/>
</module>
View
@@ -8,6 +8,5 @@
<depends module="pattern"/>
<depends module="jaxp"/>
<compile test="yes"/>
<java5/>
<test name="unit" type="testng"/>
</module>
View
@@ -2,7 +2,6 @@
<depends module="util"/>
<depends module="resolver"/>
<depends module="datatype"/>
<java5/>
<compile/>
<ant precompile="mod.rng-parse.gen">
<target name="mod.rng-parse.gen">
View
@@ -3,7 +3,6 @@
<depends module="resolver"/>
<depends module="datatype"/>
<depends module="rng-parse"/>
<java5/>
<test name="compact" type="convert" schema="trang/test/compacttest.rnc" output="xml"/>
<compile/>
</module>
View
@@ -12,7 +12,6 @@
<depends module="convert-to-xsd"/>
<depends module="convert-from-dtd"/>
<depends module="convert-to-dtd"/>
<java5/>
<compile/>
<version package="com/thaiopensource/relaxng/translate"/>
<jar>
View
@@ -1,6 +1,5 @@
<module>
<compile test="yes"/>
<test name="unit" type="testng"/>
<java5/>
</module>
View
@@ -1,4 +1,4 @@
Make build system use Java 5 everywhere; update wiki.
Look at turning BuildException into a type parameter.
Finish upgrading code to use Java 5 everywhere.

0 comments on commit 671d496

Please sign in to comment.