Revision 16848

View differences:

tags/tmp_build/upgrade/buildExt.xml
157 157
		<chmod file="${base_dir}/${INSTALLER_DIR}/${LINUXBIN}" perm="ugo+rx"/>
158 158
		<delete file="${base_dir}/${INSTALLER_DIR}/xx.tmp"/>
159 159
		<move file="${base_dir}/${INSTALLER_DIR}/${LINUXBIN}" todir="${OUTPUT_DIR}" />
160
		<chmod file="${OUTPUT_DIR}/${LINUXBIN}" perm="ugo+rx"/>
160 161
		<delete dir="${base_dir}/${INSTALLER_DIR}"/>
161 162

  
162 163

  
......
187 188

  
188 189
	<target name="InstallMac" description="Actualizador para MAC">
189 190
		<property name="mac_install_path_bin" value="${GVSIG_INSTALLDIR}/instalador-gvSIG-mac/actualizador.app/Contents/Resources/updates/gvSIGbin"/>
190
		<property name="mac_install_path_ext" value="${mac_install_path_bin}/gvSIG/extensiones"/>
191
		<property name="mac_install_path_gvsig" value="${mac_install_path_bin}/gvSIG"/>
192
		<property name="mac_install_path_ext" value="${mac_install_path_gvsig}/extensiones"/>
191 193

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

  
192 198
		<copy todir="${mac_install_path_bin}" file="bin/andami.jar"/>
193 199
		<copy todir="${mac_install_path_bin}/lib">
194
			<fileset dir=".">
195
				<include name="bin/lib/beans.jar"/>
196
				<include name="bin/lib/gvsig-i18n.jar"/>
197
				<include name="bin/lib/iver-utiles.jar"/>
200
			<fileset dir="bin/lib">
201
				<include name="beans.jar"/>
202
				<include name="gvsig-i18n.jar"/>
203
				<include name="iver-utiles.jar"/>
198 204
			</fileset>
199 205
		</copy>
200 206

  
201
		<copy todir="${mac_install_path_ext}/com.iver.cit.gvsig/">
207
		<copy todir="${mac_install_path_gvsig}">
202 208
			<fileset dir=".">
203 209
				<include name="extensiones/com.iver.cit.gvsig/text.properties"/>
204 210
				<include name="extensiones/com.iver.cit.gvsig/config.xml"/>
205 211
			</fileset>
206 212
		</copy>
207
		<copy todir="${mac_install_path_ext}/com.iver.cit.gvsig/lib">
213
		<copy todir="${mac_install_path_gvsig}">
208 214
			<fileset dir=".">
209 215
				<include name="extensiones/com.iver.cit.gvsig/lib/com.iver.cit.gvsig.jar"/>
210 216
				<include name="extensiones/com.iver.cit.gvsig/lib/driver-manager-1.1.jar"/>
......
270 276
		<copy todir="${mac_install_path_ext}/com.iver.core"
271 277
					file="extensiones/com.iver.core/com.iver.core.jar"/>
272 278

  
273
		<copy todir="${mac_install_path_ext}/extensiones">
279
		<copy todir="${mac_install_path_ext}">
274 280
			<fileset dir="extensiones">
275 281
				<include name="es.gva.cit.gvsig.catalogClient/**/**"/>
276 282
			</fileset>
277 283
		</copy>
278 284

  
279 285

  
280
		<copy todir="${mac_install_path_ext}/extensiones">
286
		<copy todir="${mac_install_path_ext}">
281 287
			<fileset dir="extensiones">
282 288
				<include name="**/build.number"/>
283 289
			</fileset>
284 290
		</copy>
285
		<copy todir="${mac_install_path_ext}/extensiones">
291
		<copy todir="${mac_install_path_ext}">
286 292
			<fileset dir="extensiones">
287 293
				<include name="**/text_ro.properties,**/text_en.properties,**/text_eu.properties,**/text_de.properties"/>
288 294
			</fileset>
289 295
		</copy>
290
		<copy todir="${mac_install_path_ext}/extensiones">
296
		<copy todir="${mac_install_path_ext}">
291 297
			<fileset dir="extensiones">
292 298
				<include name="**/about.htm"/>
293 299
			</fileset>
......
299 305

  
300 306
		<zip destfile="${OUTPUT_DIR}/${MAC_10_ZIP}" basedir="${GVSIG_INSTALLDIR}/instalador-gvSIG-mac" includes="${autoinstalador}.app/**"/>
301 307

  
302
		<delete dir="${GVSIG_INSTALLDIR}/instalador-gvSIG-mac/${autoinstalador}.app"/>
303 308
		<delete >
304
			<fileset dir="${GVSIG_INSTALLDIR}/instalador-gvSIG-mac/actualizador.app/Contents/Resources/updates/gvSIGbin" includes="**/**"/>
309
			<fileset dir="${mac_install_path_bin}" includes="**"/>
305 310
		</delete>
311

  
312
		<delete dir="${GVSIG_INSTALLDIR}/instalador-gvSIG-mac/${autoinstalador}.app"/>
306 313
	</target>
307 314

  
308 315
	<target name="CleanDir" description="Limpiamos los directorios creados">
tags/tmp_build/upgrade/build.properties
2 2

  
3 3
EXTENSIONS=${MAIN_INSTALL_PLUGIN},com.iver.cit.gvsig.annotation,com.iver.cit.gvsig.cad,com.iver.cit.gvsig.geoprocess,com.iver.cit.gvsig.geoprocessextensions,com.iver.cit.gvsig.jdbc_spatial,com.iver.cit.gvsig.oracle_spatial,com.iver.cit.gvsig.wcs,com.iver.cit.gvsig.wfs2,com.iver.cit.gvsig.wms,com.iver.core,com.iver.gvsig.addeventtheme,com.iver.gvsig.centerviewpoint,com.iver.gvsig.datalocator,com.iver.gvsig.expresionfield,es.gva.cit.gvsig.catalogClient,es.prodevelop.cit.gvsig.arcims,org.gvsig.crs,org.gvsig.georeferencing,org.gvsig.rasterTools,org.gvsig.scripting
4 4
version=1.1.1
5
bversion=1
5
bversion=1_1_1
6 6
APPNAME=gvSIG
7 7

  
8 8
OUTPUT_DIR=/tmp/Upgrade1.1.1/

Also available in: Unified diff