Project

General

Profile

« Previous | Next » 

Revision 8825

Added by Jing Tao almost 10 years ago

Add target and source attribute to harvester, client and compile-lsid beside the target compile.

View differences:

build.xml
33 33
         xmlns:artifact="antlib:org.apache.maven.artifact.ant">
34 34
	<property environment="env" />
35 35
	<property file="build.properties" /><!-- USER SPECIFIC PROPS -->
36
	<property name="java.target.version" value="1.6" /> <!-- the target version for java compile-->
36 37

  
37 38

  
38 39
    <!-- Configure the maven2 ant tasks -->
......
509 510
		description="Compiles java code to build dir, and copies metacat props files there">
510 511

  
511 512
		<javac srcdir="${build.src}" destdir="${build.dest}"
512
			target="1.6"
513
			target="${java.target.version}"
514
			source="${java.target.version}"
513 515
			debug="${debug}"
514 516
			excludes="**/*.sql **/client/*.java **/harvesterClient/*.java">
515 517
			<classpath>
......
537 539
	<target name="client" depends="prepare"
538 540
		description="Compiles metacat-client java code to build dir">
539 541
		<javac srcdir="${build.src}" destdir="${build.dest}"
542
			target="${java.target.version}"
543
			source="${java.target.version}"
540 544
			includes="edu/ucsb/nceas/metacat/client/*">
541 545
			<classpath>
542 546
				<path refid="compile.classpath" />
......
561 565
	<target name="harvester" depends="client"
562 566
		description="Compiles harvester java code to build dir">
563 567
		<javac srcdir="${build.src}" destdir="${build.dest}"
568
			target="${java.target.version}"
569
			source="${java.target.version}"
564 570
			includes="edu/ucsb/nceas/metacat/harvesterClient/*">
565 571
			<classpath>
566 572
				<path refid="compile.classpath" />
......
1639 1645
		<javac srcdir="src/edu/ucsb/nceas/metacat/lsid"
1640 1646
			destdir="${lsid.build.dir}/WEB-INF/classes" debug="${compile.debug}"
1641 1647
			deprecation="${compile.deprecation}"
1648
			target="${java.target.version}"
1649
			source="${java.target.version}"
1642 1650
			optimize="${compile.optimize}">
1643 1651
			<classpath>
1644 1652
				<path refid="compile.classpath" />

Also available in: Unified diff