Revision 17031

View differences:

tags/tmp_build/upgrade/install.xml
75 75
			<file targetdir="$INSTALL_PATH/bin" src="bin/andami.jar" override="true"/>
76 76

  
77 77
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig/lib" src="extensiones/com.iver.cit.gvsig/lib/com.iver.cit.gvsig.jar" override="true"/>
78

  
79
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig/lib" src="extensiones/com.iver.cit.gvsig/lib/com.iver.gvsig.addeventtheme.jar" override="true"/>
80

  
78 81
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig/" src="extensiones/com.iver.cit.gvsig/text.properties" override="true"/>
79 82
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig/lib" src="extensiones/com.iver.cit.gvsig/lib/driver-manager-1.1.jar" override="true"/>
80 83
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig/lib" src="extensiones/com.iver.cit.gvsig/lib/fmap-arcims.jar" override="true"/>
84

  
85
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig/lib" src="extensiones/com.iver.cit.gvsig/lib/fmap-georeferencing.jar" override="true"/>
86
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig/lib" src="extensiones/com.iver.cit.gvsig/lib/fmap-wcs.jar" override="true"/>
87
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig/lib" src="extensiones/com.iver.cit.gvsig/lib/fmap-wfs.jar" override="true"/>
88
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig/lib" src="extensiones/com.iver.cit.gvsig/lib/fmap-wms.jar" override="true"/>
89

  
90

  
91

  
92

  
81 93
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig/lib" src="extensiones/com.iver.cit.gvsig/lib/gvsig-annotation.jar" override="true"/>
82 94
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig/lib" src="extensiones/com.iver.cit.gvsig/lib/gvsig-ui.jar" override="true"/>
83 95
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig/lib" src="extensiones/com.iver.cit.gvsig/lib/hsqldb_spatial.jar" override="true"/>
96

  
97
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig/lib" src="extensiones/com.iver.cit.gvsig/lib/jdwglib.jar" override="true"/>
98

  
84 99
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig/lib" src="extensiones/com.iver.cit.gvsig/lib/mysql_spatial.jar" override="true"/>
85 100
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig/lib" src="extensiones/com.iver.cit.gvsig/lib/oracle_spatial.jar" override="true"/>
101

  
102
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig/lib" src="extensiones/com.iver.cit.gvsig/lib/org.gvsig.scripting.jar" override="true"/>
103

  
104

  
86 105
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig/lib" src="extensiones/com.iver.cit.gvsig/lib/postgis_spatial.jar" override="true"/>
87 106
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig/lib" src="extensiones/com.iver.cit.gvsig/lib/remote-clients-arcims.jar" override="true"/>
88 107
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig/" src="extensiones/com.iver.cit.gvsig/config.xml" override="true"/>
89 108

  
90
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig/drivers/" src="extensiones/com.iver.cit.gvsig/drivers/dxf" override="true"/>
91
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig/drivers/" src="extensiones/com.iver.cit.gvsig/drivers/dbf" override="true"/>
92
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig/drivers/" src="extensiones/com.iver.cit.gvsig/drivers/dgn" override="true"/>
93
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig/drivers/" src="extensiones/com.iver.cit.gvsig/drivers/gml" override="true"/>
94
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig/drivers/" src="extensiones/com.iver.cit.gvsig/drivers/shp" override="true"/>
95
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig/drivers/" src="extensiones/com.iver.cit.gvsig/drivers/raster" override="true"/>
109
			<fileset targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/" dir="extensiones" includes="com.iver.cit.gvsig/drivers/**" override="true"/>
96 110

  
97

  
98

  
99

  
100 111
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig.annotation/lib" src="extensiones/com.iver.cit.gvsig.annotation/lib/com.iver.cit.gvsig.annotation.jar" override="true"/>
101 112

  
102 113
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/org.gvsig.crs" src="extensiones/org.gvsig.crs/org.gvsig.crs.jar" override="true"/>
......
107 118

  
108 119
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.gvsig.expresionfield" src="extensiones/com.iver.gvsig.expresionfield/com.iver.gvsig.expresionfield.jar" override="true"/>
109 120

  
121

  
122
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig.wcs" src="extensiones/com.iver.cit.gvsig.wcs/com.iver.cit.gvsig.wcs.jar" override="true"/>
123
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig.wfs2/lib" src="extensiones/com.iver.cit.gvsig.wfs2/lib/com.iver.cit.gvsig.wfs2.jar" override="true"/>
124
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig.wms" src="extensiones/com.iver.cit.gvsig.wms/com.iver.cit.gvsig.wms.jar" override="true"/>
125
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.gvsig.datalocator" src="extensiones/com.iver.gvsig.datalocator/com.iver.gvsig.datalocator.jar" override="true"/>
126

  
127

  
128

  
129

  
110 130
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/es.prodevelop.cit.gvsig.arcims" src="extensiones/es.prodevelop.cit.gvsig.arcims/es.prodevelop.cit.gvsig.arcims.jar" override="true"/>
111 131

  
112 132
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/org.gvsig.crs" src="extensiones/org.gvsig.crs/org.gvsig.crs.jar" override="true"/>
......
114 134

  
115 135
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig.geoprocess/docs/com.iver.cit.gvsig.geoprocess.impl.dissolve.DissolveGeoprocessPlugin" src="extensiones/com.iver.cit.gvsig.geoprocess/docs/com.iver.cit.gvsig.geoprocess.impl.dissolve.DissolveGeoprocessPlugin/description_cs.html" override="true"/>
116 136
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig.geoprocess/docs/com.iver.cit.gvsig.geoprocess.impl.dissolve.DissolveGeoprocessPlugin" src="extensiones/com.iver.cit.gvsig.geoprocess/docs/com.iver.cit.gvsig.geoprocess.impl.dissolve.DissolveGeoprocessPlugin/description_pl.html" override="true"/>
137
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig.geoprocess" src="extensiones/com.iver.cit.gvsig.geoprocess/com.iver.cit.gvsig.geoprocess.jar" override="true"/>
138
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig.geoprocess/lib" src="extensiones/com.iver.cit.gvsig.geoprocess/lib/com.iver.cit.gvsig.geoprocess.jar" override="true"/>
117 139

  
118 140
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig.geoprocessextensions/docs/com.iver.cit.gvsig.geoprocess.impl.xyshift.XYShiftGeoprocessPlugin" src="extensiones/com.iver.cit.gvsig.geoprocessextensions/docs/com.iver.cit.gvsig.geoprocess.impl.xyshift.XYShiftGeoprocessPlugin/description_cs.html" override="true"/>
119 141
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig.geoprocessextensions/docs/com.iver.cit.gvsig.geoprocess.impl.xyshift.XYShiftGeoprocessPlugin" src="extensiones/com.iver.cit.gvsig.geoprocessextensions/docs/com.iver.cit.gvsig.geoprocess.impl.xyshift.XYShiftGeoprocessPlugin/description_pl.html" override="true"/>
120 142

  
121 143

  
122 144
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/org.gvsig.georeferencing" src="extensiones/org.gvsig.georeferencing/text_pt_br.properties" override="true"/>
145
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/org.gvsig.georeferencing" src="extensiones/org.gvsig.georeferencing/org.gvsig.georeferencing.jar" override="true"/>
123 146

  
147
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/org.gvsig.rasterTools" src="extensiones/org.gvsig.rasterTools/org.gvsig.rasterTools.jar" override="true"/>
148

  
149

  
124 150
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig.jdbc_spatial" src="extensiones/com.iver.cit.gvsig.jdbc_spatial/com.iver.cit.gvsig.jdbc_spatial.jar" override="true"/>
125 151
			<file targetdir="$INSTALL_PATH/bin/gvSIG/extensiones/com.iver.cit.gvsig/drivers/" src="extensiones/com.iver.cit.gvsig/drivers/jdbc_spatial" override="true"/>
126 152

  
tags/tmp_build/upgrade/resources/configfile
1
#fichero ASCII, saltos de linea UNIX (ASCII 10)
2
#comentarios en linea empezada con #
3
#se aceptan lineas en blanco
4
#Formato de parametros:
5
#nombre de parametro en una linea, contenido en siguiente/s linea/s
6
#si donde deberia haber "contenido del parametro" hay una linea en blanco, se entiende que se quiere parametro vacio
7
#Si un parametro no se define, se supone vacio.
8

  
9
#Parametro oldAndamiMD5 puede tener varios valores (se respetan todos, puede no haber ninguno)
10
#MD5 de andami.jar v1.1
11
oldAndamiMD5
12
553187b5cf860be747a65c7e627518c8
13

  
14

  
15
#Parametro oldVersion contiene un STRING con el que decir al usuario las versiones actualizables (sera igual en todos los idiomas!)
16
#puede estar vacio
17
oldVersion
18
1.1
19

  
20
#Parametro newName contiene nuevo nombre para bundle actualizado (sin extension)
21
#si vacio, no se cambiara el nombre (util para instalar extensiones, que no tienen por que modificar el nombre del gvSIG)
22
#newName
23
gvSIG 1.1.1 build %BUILD.NUMBER%
24

  
25
#Parametro newSuffix contiene nuevo sufijo para bundle "actualizado" (autoinstaller y/o normal)
26
#si vacio, no se cambiara el nombre
27
#si se especifica newName y newSuffix, se aplica primero newName y luego newSuffix
28
#newSuffix
29
#SEXTANTE
tags/tmp_build/upgrade/buildExt.xml
187 187
	</target>
188 188

  
189 189
	<target name="InstallMac" description="Actualizador para MAC">
190
		<property name="mac_install_path_bin" value="${GVSIG_INSTALLDIR}/instalador-gvSIG-mac/actualizador.app/Contents/Resources/updates/gvSIGbin"/>
190
		<property name="tmp_mac" location="${base_dir}/tmpResources_mac"/>
191

  
192
		<delete dir="${tmp_mac}" failonerror="no"/>
193

  
194
		<mkdir dir="${tmp_mac}"/>
195

  
196
		<ant antfile="build-updater.xml" dir="${GVSIG_INSTALLDIR}/instalador-gvSIG-mac">
197
			<property name="NOMBRE_BUNDLE" value="${autoinstalador}"/>
198
			<property name="DIR_DESTINO" value="${tmp_mac}"/>
199
		</ant>
200

  
201
		<copy todir="${tmp_mac}/${autoinstalador}.app/Contents/Resources" file="./resources/configfile" overwrite="yes"/>
202

  
203
		<replace file="${tmp_mac}/${autoinstalador}.app/Contents/Resources/configfile"
204
			token="%BUILD.NUMBER%"
205
			value="${build.number}"/>
206

  
207

  
208
		<property name="mac_install_path_bin" value="${tmp_mac}/${autoinstalador}.app/Contents/Resources/updates/gvSIGbin"/>
191 209
		<property name="mac_install_path_gvsig" value="${mac_install_path_bin}/gvSIG"/>
192 210
		<property name="mac_install_path_ext" value="${mac_install_path_gvsig}/extensiones"/>
193 211

  
194
		<delete >
195
			<fileset dir="${mac_install_path_bin}" includes="**/**"/>
196
		</delete>
197

  
198 212
		<copy todir="${mac_install_path_bin}" file="bin/andami.jar"/>
199 213
		<copy todir="${mac_install_path_bin}/lib">
200 214
			<fileset dir="bin/lib">
......
228 242
				<include name="extensiones/com.iver.cit.gvsig/lib/gdbms-0.8-SNAPSHOT.jar"/>
229 243
				<include name="extensiones/com.iver.cit.gvsig/lib/remote-clients.jar"/>
230 244

  
231
			</fileset>
232
		</copy>
233 245

  
234
		<copy todir="${mac_install_path_gvsig}">
235
			<fileset dir=".">
236
				<include name="extensiones/com.iver.cit.gvsig/drivers/dxf/*"/>
237
			</fileset>
238
		</copy>
246
				<include name="extensiones/com.iver.cit.gvsig/lib/com.iver.gvsig.addeventtheme.jar"/>
247
				<include name="extensiones/com.iver.cit.gvsig/lib/fmap-georeferencing.jar"/>
248
				<include name="extensiones/com.iver.cit.gvsig/lib/fmap-wcs.jar"/>
249
				<include name="extensiones/com.iver.cit.gvsig/lib/fmap-wfs.jar"/>
250
				<include name="extensiones/com.iver.cit.gvsig/lib/fmap-wms.jar"/>
251
				<include name="extensiones/com.iver.cit.gvsig/lib/jdwglib.jar"/>
252
				<include name="extensiones/com.iver.cit.gvsig/lib/org.gvsig.scripting.jar"/>
239 253

  
240
		<copy todir="${mac_install_path_gvsig}">
241
			<fileset dir=".">
242
				<include name="extensiones/com.iver.cit.gvsig/drivers/dbf/*"/>
243 254
			</fileset>
244 255
		</copy>
245 256

  
246
		<copy todir="${mac_install_path_gvsig}">
247
			<fileset dir=".">
248
				<include name="extensiones/com.iver.cit.gvsig/drivers/dgn/*"/>
249
			</fileset>
250
		</copy>
251 257

  
252 258
		<copy todir="${mac_install_path_gvsig}">
253 259
			<fileset dir=".">
254
				<include name="extensiones/com.iver.cit.gvsig/drivers/gml/*"/>
260
				<include name="extensiones/com.iver.cit.gvsig/drivers/**/**"/>
255 261
			</fileset>
256 262
		</copy>
257 263

  
258
		<copy todir="${mac_install_path_gvsig}">
259
			<fileset dir=".">
260
				<include name="extensiones/com.iver.cit.gvsig/drivers/shp/*"/>
261
			</fileset>
262
		</copy>
263

  
264
		<copy todir="${mac_install_path_gvsig}">
265
			<fileset dir=".">
266
				<include name="extensiones/com.iver.cit.gvsig/drivers/raster/*"/>
267
			</fileset>
268
		</copy>
269

  
270

  
271 264
		<copy todir="${mac_install_path_ext}/com.iver.cit.gvsig.annotation/lib"
272 265
			file="extensiones/com.iver.cit.gvsig.annotation/lib/com.iver.cit.gvsig.annotation.jar"/>
273 266

  
......
281 274
		<copy todir="${mac_install_path_ext}/com.iver.gvsig.expresionfield"
282 275
					file="extensiones/com.iver.gvsig.expresionfield/com.iver.gvsig.expresionfield.jar"/>
283 276

  
277

  
278
		<copy todir="${mac_install_path_ext}/com.iver.cit.gvsig.wcs"
279
					file="extensiones/com.iver.cit.gvsig.wcs/com.iver.cit.gvsig.wcs.jar"/>
280
		<copy todir="${mac_install_path_ext}/com.iver.cit.gvsig.wfs2/lib"
281
					file="extensiones/com.iver.cit.gvsig.wfs2/lib/com.iver.cit.gvsig.wfs2.jar"/>
282
		<copy todir="${mac_install_path_ext}/com.iver.cit.gvsig.wms"
283
					file="extensiones/com.iver.cit.gvsig.wms/com.iver.cit.gvsig.wms.jar"/>
284
		<copy todir="${mac_install_path_ext}/com.iver.gvsig.datalocator"
285
					file="extensiones/com.iver.gvsig.datalocator/com.iver.gvsig.datalocator.jar"/>
286

  
287

  
284 288
		<copy todir="${mac_install_path_ext}/es.prodevelop.cit.gvsig.arcims"
285 289
					file="extensiones/es.prodevelop.cit.gvsig.arcims/es.prodevelop.cit.gvsig.arcims.jar"/>
286 290

  
......
295 299
				<include name="extensiones/com.iver.cit.gvsig.geoprocess/docs/com.iver.cit.gvsig.geoprocess.impl.dissolve.DissolveGeoprocessPlugin/description_pl.html"/>
296 300
			</fileset>
297 301
		</copy>
302
		<copy todir="${mac_install_path_ext}/com.iver.cit.gvsig.geoprocess"
303
					file="extensiones/com.iver.cit.gvsig.geoprocess/com.iver.cit.gvsig.geoprocess.jar"/>
304
		<copy todir="${mac_install_path_ext}/com.iver.cit.gvsig.geoprocess/lib"
305
					file="extensiones/com.iver.cit.gvsig.geoprocess/lib/com.iver.cit.gvsig.geoprocess.jar"/>
298 306

  
307

  
299 308
		<copy todir="${mac_install_path_gvsig}">
300 309
			<fileset dir=".">
301 310
				<include name="extensiones/com.iver.cit.gvsig.geoprocessextensions/docs/com.iver.cit.gvsig.geoprocess.impl.xyshift.XYShiftGeoprocessPlugin/description_cs.html"/>
......
305 314

  
306 315
		<copy todir="${mac_install_path_ext}/org.gvsig.georeferencing"
307 316
					file="extensiones/org.gvsig.georeferencing/text_pt_br.properties"/>
317
		<copy todir="${mac_install_path_ext}/org.gvsig.georeferencing"
318
					file="extensiones/org.gvsig.georeferencing/org.gvsig.georeferencing.jar"/>
308 319

  
309 320

  
321
		<copy todir="${mac_install_path_ext}/org.gvsig.rasterTools"
322
					file="extensiones/org.gvsig.rasterTools/org.gvsig.rasterTools.jar"/>
323

  
324

  
310 325
		<copy todir="${mac_install_path_ext}/com.iver.cit.gvsig.jdbc_spatial"
311 326
					file="extensiones/com.iver.cit.gvsig.jdbc_spatial/com.iver.cit.gvsig.jdbc_spatial.jar"/>
312 327
		<copy todir="${mac_install_path_ext}/com.iver.cit.gvsig/drivers">
......
334 349
		</copy>
335 350

  
336 351

  
352

  
353

  
354

  
337 355
		<copy todir="${mac_install_path_ext}">
338 356
			<fileset dir="extensiones">
339 357
				<include name="**/build.number"/>
......
350 368
			</fileset>
351 369
		</copy>
352 370

  
353
		<ant antfile="build-updater.xml" dir="${GVSIG_INSTALLDIR}/instalador-gvSIG-mac">
354
			<property name="NOMBRE_BUNDLE" value="${autoinstalador}"/>
355
		</ant>
371
		<zip destfile="${OUTPUT_DIR}/${MAC_10_ZIP}" basedir="${tmp_mac}" includes="${autoinstalador}.app/**"/>
356 372

  
357
		<zip destfile="${OUTPUT_DIR}/${MAC_10_ZIP}" basedir="${GVSIG_INSTALLDIR}/instalador-gvSIG-mac" includes="${autoinstalador}.app/**"/>
358

  
359
		<delete >
360
			<fileset dir="${mac_install_path_bin}" includes="**"/>
361
		</delete>
362

  
363
		<delete dir="${GVSIG_INSTALLDIR}/instalador-gvSIG-mac/${autoinstalador}.app"/>
373
		<delete dir="${tmp_mac}"/>
364 374
	</target>
365 375

  
366 376
	<target name="CleanDir" description="Limpiamos los directorios creados">

Also available in: Unified diff