Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 8830fff

Browse files
committed
javac "source" parameter added for Java 1.7
1 parent 4c550d3 commit 8830fff

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

build.xml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
<property name="distribZipFile" location="target/base64coder.zip"/>
2222
<property name="jUnitVersionToDownload" value="4.7"/>
2323

24-
<target name="buildAll" description="Compiles, builds the JAR and generates the API docs."
24+
<target name="buildAll" description="Compiles, builds the JAR file and generates the API docs."
2525
depends="buildJar, javaDoc"/>
2626

2727
<target name="buildJar" description="Compiles the main Java sources and builds the JAR file.">
2828
<delete dir="${classesDir}" failonerror="true"/>
2929
<mkdir dir="${classesDir}"/>
3030
<javac srcdir="${srcDir}" deprecation="true" includeAntRuntime="false" debug="true" debuglevel="lines,source"
31-
target="1.5" destdir="${classesDir}">
31+
source="1.5" target="1.5" destdir="${classesDir}">
3232
<compilerarg line="-Xlint -Xmaxerrs 6"/>
3333
</javac>
3434
<jar destfile="${jarFile}">
@@ -42,7 +42,7 @@
4242
<mkdir dir="${testClassesDir}"/>
4343
<!-- Note: The "Sun proprietary" warnings cannot be suppressed as of 2010-02. -->
4444
<javac srcdir="${testSrcDir}" deprecation="true" includeAntRuntime="false" debug="true" debuglevel="lines,source"
45-
target="1.5" destdir="${testClassesDir}">
45+
source="1.5" target="1.5" destdir="${testClassesDir}">
4646
<compilerarg line="-Xlint -Xmaxerrs 6"/>
4747
<classpath>
4848
<pathelement location="${jUnitJar}"/>
@@ -96,15 +96,16 @@
9696
<target name="buildDistribZip" description="Builds the distribution ZIP file." depends="buildAll">
9797
<delete file="${distribZipFile}"/>
9898
<zip destfile="${distribZipFile}">
99-
<zipfileset dir="." includes="build.xml, CHANGES.txt, README.txt, src/, target/base64coder.jar, target/Base64Coder.html"/>
99+
<zipfileset dir="." includes="build.xml, pom.xml, CHANGES.txt, README.txt, src/, target/base64coder.jar, target/Base64Coder.html"/>
100100
</zip>
101101
</target>
102102

103103
<target name="updateWebsite" depends="buildAll, buildDistribZip">
104+
<fail unless="env.base64CoderJavaWebsiteDir" message="Undefined website directory."/>
104105
<property name="websiteDir" location="${env.base64CoderJavaWebsiteDir}"/>
105106
<copy todir="${websiteDir}" overwrite="true">
106107
<fileset dir="src" includes="**/*.java"/>
107-
<fileset dir="target" includes="Base64Coder.html, base64coder.jar"/>
108+
<fileset dir="target" includes="Base64Coder.html"/>
108109
<fileset file="${distribZipFile}"/>
109110
<chainedmapper>
110111
<flattenmapper/>
@@ -116,4 +117,4 @@
116117
</copy>
117118
</target>
118119

119-
</project>
120+
</project>

0 commit comments

Comments
 (0)