Revision 13423 trunk/applications/appgvSIG/build.xml

View differences:

build.xml
7 7

  
8 8
	<!--
9 9
		============================================
10
		Properties for build of the appgvSIG proyect
10
		Properties for build of the appgvSIG project
11 11
		============================================
12 12
	-->
13 13
	<property name="version" value="1.2 ${eclipse.startTime}"/>
14 14
	<property name="src" location="src"/>
15 15
	<property name="build" location="bin"/>
16
	<property name="src-test" location="src-test"/>
17
	<property name="build-test" location="bin-test"/>
16 18
	<property name="dist"  location="dist"/>
17 19
	<property name="lib"   location="lib"/>
18 20
	<property name="plugin" value="com.iver.cit.gvsig"/>
......
49 51

  
50 52
	<!--
51 53
		============================================
52
		Targets for build of the appgvSIG proyect
54
		Targets for build of the appgvSIG project
53 55
		============================================
54 56
	-->
55 57

  
......
78 80
		<!-- Compile the Java code from ${src} to ${build} -->
79 81
		<loadEclipseClasspath project="${basedir}"/>
80 82
		<gvSIG-javac
81
			classpath="${eclipseClasspath}"
82
			excludes="com/iver/cit/gvsig/test/**"/>
83
			classpath="${eclipseClasspath}"/>
83 84

  
84 85
	</target>
85 86

  
......
134 135
		<delete dir="${build}"/>
135 136
		<!--<delete dir="${dist}"/> -->
136 137
	</target>
137

  
138
	<target name="run-tests">
138
	
139
	<target name="run-tests" depends="batch-build,compile-tests">
139 140
		<antcall target="generic-run-tests">
140 141
			<param name="TestSuite.Name" value="com.iver.cit.gvsig.AllTests"/>
141 142
		</antcall>
......
244 245
	<target name="clean-all-projects"
245 246
		description="cleans the base components of gvSIG: appgvSIG + libs">
246 247
		<!-- Delete the ${build} and ${dist} directory trees -->
247
		<foreach list="${gvSIG_projects}" delimiter="," target="clean-proyect" param="c-proyect.name"/>
248
		<foreach list="${gvSIG_projects}" delimiter="," target="clean-project" param="c-project.name"/>
248 249
	</target>
249 250

  
250 251
	<target name="install-all"
......
296 297
	</target>
297 298

  
298 299

  
299
	<target name="clean-proyect">
300
		<property name="c-proyect.dir" location="../${c-proyect.name}"/>
300
	<target name="clean-project">
301
		<property name="c-project.dir" location="../${c-project.name}"/>
301 302
		<if>
302
			<available file="${c-proyect.dir}" type="dir"/>
303
			<available file="${c-project.dir}" type="dir"/>
303 304
			<then>
304 305
				<echo>
305
					Clean ${c-proyect.name}
306
					Clean ${c-project.name}
306 307
				</echo>
307
				<ant dir="${c-proyect.dir}" target="clean" inheritAll="false"/>
308
				<ant dir="${c-project.dir}" target="clean" inheritAll="false"/>
308 309
			</then>
309 310
			<else>
310 311
				<if>
311
					<contains string="${mandatoryProjets}" substring="${c-proyect.name}"/>
312
					<contains string="${mandatoryProjets}" substring="${c-project.name}"/>
312 313
					<then>
313
						<fail message="The required project is missing for Clean: ${c-proyect.name}"/>
314
						<fail message="The required project is missing for Clean: ${c-project.name}"/>
314 315
					</then>
315 316
					<else>
316 317
						<echo>
317
							Skip ${c-proyect.name} project from Clean
318
							Skip ${c-project.name} project from Clean
318 319
						</echo>
319 320
					</else>
320 321
				</if>
......
404 405
		<move 	file="${JUnitGlobalResultsFile}"
405 406
				tofile="${JUnitGlobalResults}.old"
406 407
				failonerror="false" />
407

  
408
		<var name="gvSIG_projects" value="_fwAndami,appgvSIG,libInternationalization,libRaster,libDXF,libCorePlugin" />
408
		<property file="build.number"/>
409
<!--	<property name="gvSIG_projects" value="libInternationalization,libIverUtiles,libUIComponent,libExceptions,_fwAndami,libCorePlugin,libProjection,libRaster,libDXF,libDriverManager,libRemoteServices,libGDBMS,libFMap,appgvSIG,libJCRS,extJCRS,libDwg,extDwg,extRasterTools-SE,extAddEventTheme,appCatalogAndGazetteerClient,extCatalogAndGazetteer,extDataLocator,extJDBC,extCAD,extGeoProcessing,extGeoprocessingExtensions,extGeoreferencing,extOracleSpatial,extSDE,extScripting,extAnnotations,extExpresionField,extWCS,extWFS2,extWMS,extCenterViewToPoint,libArcIMS,extArcims,binaries"/>-->
410
		<var name="gvSIG_projects" value="libInternationalization,_fwAndami,libCorePlugin,libRaster,libDXF,libFMap,appgvSIG" />
409 411
		<foreach	list="${gvSIG_projects}"
410 412
					delimiter=","
411 413
					target="run-one-test"
......
419 421
		<if>
420 422
			<available file="${FlagTestError}" type="file"/>
421 423
			<then>
424
				<echo file="${JUnitGlobalResultsFile}.tmp"> === Global JUnit Results: FAILURE.${line.separator}${line.separator}</echo>
425
				<concat  destfile="${JUnitGlobalResultsFile}.tmp2"
426
						binary="true">
427
					<fileset file="${JUnitGlobalResultsFile}.tmp"/>
428
					<fileset file="${JUnitGlobalResultsFile}"/>
429
				</concat>
430
				<move file="${JUnitGlobalResultsFile}.tmp2" tofile="${JUnitGlobalResultsFile}"/>
431
				<delete file="${JUnitGlobalResultsFile}.tmp"/>
422 432
				<echo level="error">JUnitTests: FAILURE.
423 433
					See ${JUnitGlobalResultsFile} file for details.
424 434
				</echo>
425 435
			</then>
426 436
			<else>
437
				<echo file="${JUnitGlobalResultsFile}.tmp"> === Global JUnit Results: SUCCESS.${line.separator}${line.separator}</echo>
438
				<concat  destfile="${JUnitGlobalResultsFile}.tmp2"
439
						binary="true">
440
					<fileset file="${JUnitGlobalResultsFile}.tmp"/>
441
					<fileset file="${JUnitGlobalResultsFile}"/>
442
				</concat>
443
				<move file="${JUnitGlobalResultsFile}.tmp2" tofile="${JUnitGlobalResultsFile}"/>
444
				<delete file="${22JUnitGlobalResultsFile}.tmp"/>
427 445
				<echo>JUnitTests: SUCCESS.
428 446
						See ${JUnitGlobalResultsFile} file for details.
429 447
				</echo>

Also available in: Unified diff