Revision 14617

View differences:

tags/tmp_build/binaries/w32/.cvsignore
1
*.dll
0 2

  
tags/tmp_build/binaries/w32/build.xml
1
<project name="binaries w32" default="main" basedir=".">
2
	<description>
3
        Reorganiza el directorio binaries/w32, para que pueda usarse directamente por gvSIG.
4
    </description>
5

  
6
	<property name="targetDir" location="." />
7

  
8

  
9
	<available property="is3D" file="3D" />
10

  
11
	<target name="main" depends="ecw, gdal, mrsid, crs, system, 3D" />
12

  
13
	<target name="ecw">
14
		<copy todir="${targetDir}">
15
			<fileset dir="raster/ecw" includes="jecw.dll jecwcompress.dll NCScnet.dll NCSEcwC.dll NCSEcw.dll NCSUtil.dll" />
16
		</copy>
17
	</target>
18

  
19
	<target name="gdal">
20
		<copy todir="${targetDir}">
21
			<fileset dir="raster/gdal" includes="gdal.dll glut32.dll jgdal060.dll jpeg62.dll libimage.dll libpng13.dll libtiff3.dll zlib1.dll" />
22
		</copy>
23
	</target>
24

  
25
	<target name="mrsid">
26
		<copy todir="${targetDir}">
27
			<fileset dir="raster/mrsid" includes="jmrsid.dll lti_dsdk_cdll.dll lti_dsdk_dll.dll" />
28
		</copy>
29
	</target>
30

  
31
	<target name="system">
32
		<copy todir="${targetDir}">
33
			<fileset dir="system" includes="msvcp71.dll msvcr71.dll" />
34
		</copy>
35
	</target>
36

  
37
	<target name="crs">
38
		<copy todir="${targetDir}">
39
			<fileset dir="crs" includes="CrsJniProj.dll proj.dll" />
40
		</copy>
41
	</target>
42

  
43
	<target name="3D" if="is3D">
44
		<copy todir="${targetDir}">
45
			<fileset dir="3D" includes="**/**" />
46
		</copy>
47
	</target>
48

  
49
	<target name="clean3D" if="is3D">
50
		<delete includeemptydirs="true">
51
			<fileset dir="${targetDir}" includes="osgPlugins**/**" />
52
		</delete>
53
	</target>
54
	
55
	<target name="clean" depends="clean3D">
56
		<delete>
57
			<fileset dir="${targetDir}" includes="*.dll *.lib *.jar" />
58
		</delete>
59
	</target>
60

  
61
</project>
0 62

  
tags/tmp_build/binaries/build.xml
1
<project name="binaries_build" default="main" basedir=".">
2
	<dirname file="${ant.file.binaries}" property="ant.file.binaries.dir"/>
3
	<import file="${basedir}/ant/utilities.xml"/>
4
    <description>
5
        Reorganiza el directorio binaries, para que pueda usarse directamente por gvSIG.
6
    </description>
7

  
8
	<target name="batch-build"
9
		depends="main"/>
10

  
11
	<target name="main">
12
		<description>Reorders the directory for the current platform, so that it
13
			can be used by gvSIG.</description>
14
		<echo> Sistema operativo: ${os.name}</echo>
15

  
16
		<condition property="isLinux">
17
			<os family="unix"/>
18
		</condition>
19

  
20
		<condition property="isWindows">
21
			<or>
22
				<os family="windows"/>
23
				<os family="win9x"/>
24
				<os name="Windows Vista"/>
25
			</or>
26
		</condition>
27

  
28
		<condition property="isMac">
29
			<os family="mac"/>
30
		</condition>
31

  
32
		<condition property="is_OS_dectected">
33
			<or>
34
				<istrue value="${isLinux}"/>
35
				<istrue value="${isWindows}"/>
36
				<istrue value="${isMac}"/>
37
			</or>
38

  
39
		</condition>
40

  
41

  
42
		<antcall target="linux" />
43
		<antcall target="windows" />
44
		<antcall target="mac" />
45
		<antcall target="no_SO_Detected" />
46

  
47

  
48
	</target>
49

  
50
	<target name="build-all">
51
		<description>Reorders the directory for all the platforms, so that it
52
			can be used by gvSIG.</description>
53
  		<ant dir="linux"  inheritAll="false" />
54
  		<ant dir="w32"  inheritAll="false" />
55
  		<ant dir="mac"  inheritAll="false" />
56
	</target>
57

  
58
	<target name="linux" if="isLinux">
59
  		<ant dir="linux"  inheritAll="false" />
60
		<echo> Compilando librerias linux </echo>
61
	</target>
62

  
63
	<target name="windows" if="isWindows">
64
  		<ant dir="w32"  inheritAll="false" />
65
		<echo> Compilando librerias w32 </echo>
66
	</target>
67

  
68
	<target name="mac" if="isMac">
69
  		<ant dir="mac"  inheritAll="false" />
70
		<echo> Compilando librerias mac </echo>
71
	</target>
72

  
73
	<target name="no_SO_Detected" unless="is_OS_dectected">
74
		<fail message="Error al detectar el Sistema Operativo"/>
75
	</target>
76

  
77
	<target name="clean">
78
		<description>
79
			Restores the directory to its original shape.
80
		</description>
81
  		<ant target="clean" dir="linux"  inheritAll="false" />
82
  		<ant target="clean" dir="w32"  inheritAll="false" />
83
  		<!--<ant target="clean" dir="mac"  inheritAll="false" />-->
84
	</target>
85
</project>
0 86

  
tags/tmp_build/binaries/linux/.cvsignore
1
*.so*
0 2

  
tags/tmp_build/binaries/linux/build.xml
1
<project name="binaries linux" default="main" basedir=".">
2
    <description>
3
        Reorganiza el directorio binaries/linux, para que pueda usarse directamente por gvSIG.
4
    </description>
5

  
6
	<target name="init">
7
		<condition property="isLinux">
8
			<os family="unix"/>
9
		</condition>
10
	</target>
11
	<property name="targetDir" location="." />
12

  
13
	<target name="main" depends="init, ecw, gdal, mrsid, crs" />
14

  
15
	<target name="ecw">
16
		<copy todir="${targetDir}">
17
			<fileset dir="raster/ecw" includes="*.so*" />
18
		</copy>
19
		<!-- necesitamos borrar los links antes de crearlos, porque failonerror=false no
20
		      funciona correctamente -->
21
		<antcall target="makeLink">
22
			<param name="ml.file" location="${targetDir}/libjecwcompress.so.0.1.0"/>
23
			<param name="ml.link" value="${targetDir}/libjecwcompress.so"/>
24
			<param name="ml.failonerror" value="false"/>
25
		</antcall>
26

  
27
		<antcall target="makeLink">
28
			<param name="ml.file" location="${targetDir}/libjecwcompress.so.0.1.0"/>
29
			<param name="ml.link" value="${targetDir}/libjecwcompress.so.0"/>
30
			<param name="ml.failonerror" value="false"/>
31
		</antcall>
32

  
33
		<antcall target="makeLink">
34
			<param name="ml.file" location="${targetDir}/libjecw.so.0.0.1"/>
35
			<param name="ml.link" value="${targetDir}/libjecw.so"/>
36
			<param name="ml.failonerror" value="false"/>
37
		</antcall>
38

  
39
		<antcall target="makeLink">
40
			<param name="ml.file" location="${targetDir}/libjecw.so.0.0.1"/>
41
			<param name="ml.link" value="${targetDir}/libjecw.so.0"/>
42
			<param name="ml.failonerror" value="false"/>
43
		</antcall>
44

  
45
		<!--
46
		<antcall target="makeLink">
47
			<param name="ml.file" location="${targetDir}/libNCSCnet.so.0.0.0"/>
48
			<param name="ml.link" value="${targetDir}/libNCScnet.so"/>
49
			<param name="ml.failonerror" value="false"/>
50
		</antcall>
51

  
52
		<antcall target="makeLink">
53
			<param name="ml.file" location="${targetDir}/libNCSCnet.so.0.0.0"/>
54
			<param name="ml.link" value="${targetDir}/libNCSCnet.so"/>
55
			<param name="ml.failonerror" value="false"/>
56
		</antcall>
57

  
58
		<antcall target="makeLink">
59
			<param name="ml.file" location="${targetDir}/libNCSCnet.so.0.0.0"/>
60
			<param name="ml.link" value="${targetDir}/libNCSCnet.so.0"/>
61
			<param name="ml.failonerror" value="false"/>
62
		</antcall>
63

  
64

  
65
		<antcall target="makeLink">
66
			<param name="ml.file" location="${targetDir}/libNCSCnet.so.0.0.0"/>
67
			<param name="ml.link" value="${targetDir}/libNCSCNet.so"/>
68
			<param name="ml.failonerror" value="false"/>
69
		</antcall>
70

  
71
		<antcall target="makeLink">
72
			<param name="ml.file" location="${targetDir}/libNCSEcw.so.0.0.0"/>
73
			<param name="ml.link" value="${targetDir}/libNCSEcw.so"/>
74
			<param name="ml.failonerror" value="false"/>
75
		</antcall>
76

  
77
		<antcall target="makeLink">
78
			<param name="ml.file" location="${targetDir}/libNCSEcw.so.0.0.0"/>
79
			<param name="ml.link" value="${targetDir}/libNCSEcw.so.0"/>
80
			<param name="ml.failonerror" value="false"/>
81
		</antcall>
82

  
83
		<antcall target="makeLink">
84
			<param name="ml.file" location="${targetDir}/libNCSEcwC.so.0.0.0"/>
85
			<param name="ml.link" value="${targetDir}/libNCSEcwC.so"/>
86
			<param name="ml.failonerror" value="false"/>
87
		</antcall>
88

  
89
		<antcall target="makeLink">
90
			<param name="ml.file" location="${targetDir}/libNCSEcwC.so.0.0.0"/>
91
			<param name="ml.link" value="${targetDir}/libNCSEcwC.so.0"/>
92
			<param name="ml.failonerror" value="false"/>
93
		</antcall>
94

  
95
		<antcall target="makeLink">
96
			<param name="ml.file" location="${targetDir}/libNCSUtil.so.0.0.0"/>
97
			<param name="ml.link" value="${targetDir}/libNCSUtil.so"/>
98
			<param name="ml.failonerror" value="false"/>
99
		</antcall>
100

  
101
		<antcall target="makeLink">
102
			<param name="ml.file" location="${targetDir}/libNCSUtil.so.0.0.0"/>
103
			<param name="ml.link" value="${targetDir}/libNCSUtil.so.0"/>
104
			<param name="ml.failonerror" value="false"/>
105
		</antcall>
106
		-->
107

  
108

  
109
	</target>
110

  
111
	<target name="gdal">
112
		<copy todir="${targetDir}">
113
			<fileset dir="raster/gdal"
114
				includes="libcrypto.so.0.9.7 libgdal.so.1.10.0 libjasper-1.701.so.1.0.0 libjgdal.so.0.6.0 libodbc.so.1 libpng.so.3 libpq.so.3 libssl.so.0.9.7"/>
115
		</copy>
116
		<antcall target="makeLink">
117
			<param name="ml.file" location="libcrypto.so.0.9.7"/>
118
			<param name="ml.link" value="${targetDir}/libcrypto.so"/>
119
			<param name="ml.failonerror" value="false"/>
120
		</antcall>
121

  
122
		<antcall target="makeLink">
123
			<param name="ml.file" location="libgdal.so.1.10.0"/>
124
			<param name="ml.link" value="${targetDir}/libgdal.so"/>
125
			<param name="ml.failonerror" value="false"/>
126
		</antcall>
127

  
128
		<antcall target="makeLink">
129
			<param name="ml.file" location="libgdal.so.1.10.0"/>
130
			<param name="ml.link" value="${targetDir}/libgdal.so.1"/>
131
			<param name="ml.failonerror" value="false"/>
132
		</antcall>
133

  
134
		<!--
135
		<antcall target="makeLink">
136
			<param name="ml.file" location="libjasper-1.701.so.1.0.0"/>
137
			<param name="ml.link" value="${targetDir}/libjasper-1.701.so"/>
138
			<param name="ml.failonerror" value="false"/>
139
		</antcall>
140

  
141

  
142
		<antcall target="makeLink">
143
			<param name="ml.file" location="libjasper-1.701.so.1.0.0"/>
144
			<param name="ml.link" value="${targetDir}/libjasper-1.701.so.1"/>
145
			<param name="ml.failonerror" value="false"/>
146
		</antcall>
147
		-->
148

  
149
		<antcall target="makeLink">
150
			<param name="ml.file" location="libjgdal.so.0.6.0"/>
151
			<param name="ml.link" value="${targetDir}/libjgdal.so"/>
152
			<param name="ml.failonerror" value="false"/>
153
		</antcall>
154

  
155
		<antcall target="makeLink">
156
			<param name="ml.file" location="libjgdal.so.0.6.0"/>
157
			<param name="ml.link" value="${targetDir}/libjgdal.so.0"/>
158
			<param name="ml.failonerror" value="false"/>
159
		</antcall>
160

  
161
		<antcall target="makeLink">
162
			<param name="ml.file" location="libodbc.so.1"/>
163
			<param name="ml.link" value="${targetDir}/libodbc.so"/>
164
			<param name="ml.failonerror" value="false"/>
165
		</antcall>
166

  
167
		<antcall target="makeLink">
168
			<param name="ml.file" location="libpng.so.3"/>
169
			<param name="ml.link" value="${targetDir}/libpng.so"/>
170
			<param name="ml.failonerror" value="false"/>
171
		</antcall>
172

  
173
		<antcall target="makeLink">
174
			<param name="ml.file" location="libpq.so.3"/>
175
			<param name="ml.link" value="${targetDir}/libpq.so"/>
176
			<param name="ml.failonerror" value="false"/>
177
		</antcall>
178

  
179
		<antcall target="makeLink">
180
			<param name="ml.file" location="libssl.so.0.9.7"/>
181
			<param name="ml.link" value="${targetDir}/libssl.so"/>
182
			<param name="ml.failonerror" value="false"/>
183
		</antcall>
184

  
185
		<antcall target="makeLink">
186
			<param name="ml.file" location="libssl.so.0.9.7"/>
187
			<param name="ml.link" value="${targetDir}/libssl.so.0"/>
188
			<param name="ml.failonerror" value="false"/>
189
		</antcall>
190

  
191
	</target>
192

  
193
	<target name="mrsid">
194
		<copy todir="${targetDir}">
195
			<fileset dir="raster/mrsid" includes="libjmrsid.so.0.0.2" />
196
		</copy>
197
		<antcall target="makeLink">
198
			<param name="ml.file" location="libjmrsid.so.0.0.2"/>
199
			<param name="ml.link" value="${targetDir}/libjmrsid.so"/>
200
			<param name="ml.failonerror" value="false"/>
201
		</antcall>
202

  
203
		<antcall target="makeLink">
204
			<param name="ml.file" location="libjmrsid.so.0.0.2"/>
205
			<param name="ml.link" value="${targetDir}/libjmrsid.so.0"/>
206
			<param name="ml.failonerror" value="false"/>
207
		</antcall>
208

  
209
	</target>
210

  
211
	<target name="crs">
212
		<antcall target="makeLink">
213
			<param name="ml.file" location="crs/libproj.so.0.5.0"/>
214
			<param name="ml.link" value="${targetDir}/libproj.so"/>
215
			<param name="ml.failonerror" value="false"/>
216
		</antcall>
217

  
218
		<antcall target="makeLink">
219
			<param name="ml.file" location="crs/libproj.so.0.5.0"/>
220
			<param name="ml.link" value="${targetDir}/libproj.so.0"/>
221
			<param name="ml.failonerror" value="false"/>
222
		</antcall>
223

  
224
		<antcall target="makeLink">
225
			<param name="ml.file" location="crs/libproj.so.0.5.0"/>
226
			<param name="ml.link" value="${targetDir}/libproj.so.0.5.0"/>
227
			<param name="ml.failonerror" value="false"/>
228
		</antcall>
229

  
230
		<antcall target="makeLink">
231
			<param name="ml.file" location="crs/libcrsjniproj.so"/>
232
			<param name="ml.link" value="${targetDir}/libcrsjniproj.so"/>
233
			<param name="ml.failonerror" value="false"/>
234
		</antcall>
235

  
236
	</target>
237

  
238

  
239

  
240

  
241
	<target name="makeLink">
242
		<!--<exec executable="ln" os="unix" failonerror="${ml.failonerror}">-->
243
		<exec executable="ln" failonerror="true">
244
		    <arg value="-sf"/>
245
		    <arg value="${ml.file}"/>
246
		    <arg value="${ml.link}"/>
247
		</exec>
248
	</target>
249

  
250
	<target name="clean">
251
		<delete>
252
			<fileset
253
				dir="${targetDir}"
254
				includes="*.so*"/>
255
		</delete>
256
	</target>
257

  
258
</project>
0 259

  
tags/tmp_build/binaries/mac/readme.txt
1
GDAL es Binario Universal, con parte PowerPC ejecutable en OS X 10.3 y 10.4, y parte Intel ejecutable en 10.4 (ya que no hay OS X 10.3 Intel :P).
2

  
3
mrSID es s?lo para PowerPC, tanto 10.3 como 10.4. Compilado contra mrSID v5 (6 a?n no soportado por libjmrsid)
0 4

  
tags/tmp_build/binaries/mac/.project
1
<?xml version="1.0" encoding="UTF-8"?>
2
<projectDescription>
3
	<name>binaries-mac</name>
4
	<comment></comment>
5
	<projects>
6
	</projects>
7
	<buildSpec>
8
	</buildSpec>
9
	<natures>
10
	</natures>
11
</projectDescription>
0 12

  
tags/tmp_build/binaries/ant/utilities.xml
1
<project name="ant_libs">
2
	<dirname file="${ant.file.ant_libs}" property="ant.file.ant_libs.dir"/>
3

  
4
	<!--
5
		====================================
6
		Compilation base properties
7
		====================================
8
	-->
9
	<property name="JUNIT_HOME" location="${ant.file.ant_libs.dir}" />
10
	<property name="JavaSourceVersion" value="1.5"/>
11
	<property name="JavaTargetVersion" value="1.5"/>
12
	<property name="debug" value="on"/>
13
	<property name="debuglevel" value="lines, vars"/>
14
	<property name="encoding" value="ISO_8859_1"/>
15

  
16

  
17

  
18

  
19
	<!--
20
		====================================
21
		ant4eclipse library load
22
		====================================
23
	-->
24
	<taskdef resource="net/sf/ant4eclipse/antlib.xml" >
25
			<classpath>
26
				<pathelement location="${ant.file.ant_libs.dir}/ant4eclipse-0.5.0.rc1.jar"/>
27
			</classpath>
28
	</taskdef>
29

  
30

  
31

  
32

  
33
	<!--
34
		====================================
35
		ant-contrib library load
36
		====================================
37
	-->
38
	<taskdef resource="net/sf/antcontrib/antlib.xml">
39
			<classpath>
40
				<pathelement location="${ant.file.ant_libs.dir}/ant-contrib-1.0b3.jar"/>
41
				<pathelement location="${ant.file.ant_libs.dir}/bcel-5.1.jar"/>
42
				<pathelement location="${ant.file.ant_libs.dir}/commons-httpclient-3.0.1.jar"/>
43
				<pathelement location="${ant.file.ant_libs.dir}/commons-logging-1.0.4.jar"/>
44
				<pathelement location="${ant.file.ant_libs.dir}/ivy-1.3.1.jar"/>
45
			</classpath>
46
	</taskdef>
47

  
48

  
49

  
50
	<!--
51
		====================================
52
		gvSIG ant utilities library load
53
		====================================
54
	-->
55
	<taskdef name="javacLikeEclipse" classname="org.gvsig.utilities.ant.taskdefs.JavacLikeEclipse">
56
		<classpath>
57
			<pathelement location="${ant.file.ant_libs.dir}/org.gvsig.utilities.ant.jar"/>
58
		</classpath>
59
	</taskdef>
60

  
61

  
62

  
63
	<!--
64
		====================================
65
		utilities tasks alias
66
		====================================
67
	-->
68

  
69
	<!--
70
	** loadEclipseClasspath Task  **
71

  
72
	Load the classpath from eclipse into the property 'eclipseClasspath'
73
	of the project recived in 'project' attribute. 'project' must
74
	be a directory of the workspace.
75

  
76
	- Use 'property="otherProperty"' : for change the return property
77

  
78
	Example:
79

  
80

  
81
	<target name="compile" description="compile the source" >
82
		<loadEclipseClasspath project="${basedir}>
83
		<mkdir dir="${build}" />
84
		<javac  srcdir="${src}"
85
			destdir="${build}"
86
			source="${JavaSourceVersion}"
87
			target="${JavaTargetVersion}"
88
			debug="${debug}"
89
			debuglevel="${debuglevel}"
90
			classpath="${eclipseClasspath}"
91
			encoding="${encoding}"/>
92
	</target>
93

  
94
	-->
95
	<presetdef name="loadEclipseClasspath">
96
		<getEclipseClasspath
97
			property="eclipseClasspath"
98
			runtime="true"/>
99

  
100
	</presetdef>
101

  
102
	<!--
103
	** gvSIG-javac Task **
104

  
105
	Javac whit default values to compile gvSIG proyects
106

  
107
	Example (minimal syntax):
108

  
109
	<gvSIG-javac
110
		classpath="${eclipseClasspath}"
111
		/>
112

  
113
	Example with exclude:
114

  
115
	<gvSIG-javac
116
		classpath="${eclipseClasspath}"
117
		exclude="org/gvsig/test/**"
118
		/>
119

  
120
	-->
121
	<presetdef name="gvSIG-javac">
122
			<javacLikeEclipse
123
				srcdir="${src}"
124
				destdir="${build}"
125
				source="${JavaSourceVersion}"
126
				target="${JavaTargetVersion}"
127
				debug="${debug}"
128
				debuglevel="${debuglevel}"
129
				sourcepath="${eclipseClasspath}"
130
				encoding="${encoding}">
131
			</javacLikeEclipse>
132
	</presetdef>
133

  
134
	<!--
135
	** gvSIG-import-build-number Target **
136

  
137
	Automate import of build.number gvSIG file
138

  
139
	Example (minimal syntax):
140

  
141
	<antcall target="gvSIG-import-build-number"/>
142

  
143
	-->
144

  
145
	<target name="gvSIG-import-build-number">
146
		<!-- check buildNumberFile property -->
147
		<if>
148
			<not>
149
				<and>
150
					<isset property="buildNumberFile"/>
151
					<available file="${buildNumberFile}" type="file"/>
152
				</and>
153
			</not>
154
			<then>
155
				<fail message="Error: property buildNumberFile not set or file not available: ${buildNumberFile}"/>
156
			</then>
157
		</if>
158
		<property name="localBuildNumberFile" value="${basedir}/build.number"/>
159
		<!-- copy the file if is needed-->
160
		<if>
161
			<not>
162
			<and>
163
				<available file="${localBuildNumberFile}" type="file"/>
164
				<filesmatch file1="${buildNumberFile}" file2="${localBuildNumberFile}"/>
165
			</and>
166
			</not>
167
			<then>
168
				<copy file="${buildNumberFile}" tofile="${localBuildNumberFile}" overwrite="true"/>
169
			</then>
170
		</if>
171
	</target>
172

  
173
	<!-- Declare Junit task -->
174
	<taskdef name="gvSIG-junit" classname="org.apache.tools.ant.taskdefs.optional.junit2.JUnitTask" onerror="fail">
175
		<classpath>
176
			<pathelement location="${ant.file.ant_libs.dir}/junit.jar"/>
177
			<pathelement location="${ant.file.ant_libs.dir}/gvsig-ant-junit.jar"/>
178
		</classpath>
179
	</taskdef>
180

  
181
	<target name="generic-run-tests">
182
		<!--
183
			=== Input Parameters ===
184
			JUnitSummaryFile: File to log the success of the project
185
			JUnitProjectResults: File to log the details of the JUnit execution
186
			TestSuite.Name: Name of the TestSuite class to run
187

  
188
			=== Throws ====
189
			JUnitTestFailed: If any of the tests failed
190
		-->
191
		<!-- define these properties in case they are not already set -->
192
		<property name="JUnitProjectResults" value="JUnitProjectResults"/>
193
		<property name="JUnitProjectResultsFile" value="JUnitProjectResults.txt"/>
194
		<property name="JUnitGlobalResults" value="JUnitGlobalResults"/>
195
		<property name="JUnitGlobalResultsFile" value="JUnitGlobalResults.txt"/>
196
		<property name="JUnitSummaryFile" location="JUnitSummary.txt"/>
197
		<loadEclipseClasspath project="${basedir}"/>
198
		<property name="test-classpath" value="${build-test}:${build}:${eclipseClasspath}"/>
199
		<gvSIG-junit
200
			fork="yes"
201
			dir="${basedir}"
202
			printsummary="on"
203
			haltonfailure="off"
204
			errorproperty="gvsig.tests.error"
205
			failureproperty="gvsig.tests.failure">
206
				<formatter type="brief" usefile="yes"/>
207
				<classpath id="test-classpath"
208
					path="${build-test}:${build}:${eclipseClasspath}"/>
209
				<test name="${TestSuite.Name}" outFile="${JUnitProjectResults}" />
210
		</gvSIG-junit>
211
		<!-- define these properties in case they are not already set -->
212
		<property name="gvsig.tests.error" value="false"/>
213
		<property name="gvsig.tests.failure" value="false"/>
214
		<if>
215
			<and>
216
				<equals arg1="${gvsig.tests.error}" arg2="false" />
217
				<equals arg1="${gvsig.tests.failure}" arg2="false" />
218
			</and>
219
			<then>
220
				<echo file="${JUnitSummaryFile}" append="true">JUnitTests for ${target.project.name}: SUCCESS.${line.separator}</echo>
221
			</then>
222
			<else>
223
				<throw id="JUnitTestFailed" message="JUnitTestFailed"/>
224
			</else>
225
		</if>
226
	</target>
227

  
228
	<target name="concat-test-output">
229
		<property name="target.project.dir" location="../${target.project.name}"/>
230
		<if>
231
			<available file="${target.project.dir}" type="dir"/>
232
			<then>
233
				<echo append="yes" file="${JUnitGlobalResultsFile}">${line.separator}${line.separator} ===== Details for ${target.project.name}: =====${line.separator}</echo>
234
				<concat  destfile="${JUnitGlobalResultsFile}.tmp"
235
						binary="true">
236
					<fileset file="${JUnitGlobalResultsFile}"/>
237
					<fileset file="${target.project.dir}/${JUnitProjectResultsFile}"/>
238
				</concat>
239
				<move file="${JUnitGlobalResultsFile}.tmp" tofile="${JUnitGlobalResultsFile}"/>
240
				<delete file="${target.project.dir}/${JUnitProjectResultsFile}"/>
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff