Revision 16738

View differences:

tags/v1_1_1_Build_1019/upgrade/buildExt.xml
1 1
<project name="instalador-gvSIG" default="init" basedir=".">
2
	
2

  
3 3
	<dirname file="${ant.file.instalador-gvSIG}" property="base_dir"/>
4 4
	<dirname file="${base_dir}" property="proyect_dir"/>
5 5
	<property value="${proyect_dir}" name="workspace_dir"/>
6
	
6

  
7 7
	<taskdef resource="net/sf/antcontrib/antcontrib.properties">
8 8
		<classpath>
9 9
			<pathelement location="${workspace_dir}/binaries/ant/ant-contrib-1.0b3.jar"/> <!--CAMBIAR SEGUN DONDE SE COLOQUEN FINALMENTE LOS JARS-->
10 10
		</classpath>
11 11
	</taskdef>
12
	
12

  
13 13
	<taskdef resource="net/sf/antcontrib/antlib.xml">
14 14
		<classpath>
15 15
			<pathelement location="${workspace_dir}/binaries/ant/ant-contrib-1.0b3.jar"/> <!--CAMBIAR SEGUN DONDE SE COLOQUEN FINALMENTE LOS JARS-->
16 16
		</classpath>
17 17
	</taskdef>
18
	
18

  
19 19
	<property file="build.properties"/>
20 20
	<property file="${workspace_dir}/_fwAndami/gvSIG/extensiones/com.iver.cit.gvsig/build.number"/>
21
	
21

  
22 22
	<property name="dir_inst" location="/usr/local"/>
23 23
	<!--<property name="base_dir" location="./"/>		-->
24 24
	<property name="izpack_dir" location="${workspace_dir}/install/IzPack"/>
25 25
	<property name="dir_libs" location="${izpack_dir}/lib"/>
26
	
27
	
26

  
27

  
28 28
	<property name="GVSIG_INSTALLDIR" location="${workspace_dir}/install"/>
29 29
	<property name="ANDAMI_DIR" location="${workspace_dir}/_fwAndami"/>
30 30
	<property name="INSTALLER_DIR" value="${APPNAME}-${version}_upgrader"/>
......
35 35
	<property name="LINUXBIN" value="${APPNAME}-${bversion}_${build.number}-upgraderFrom_1_1_1015-linux-i586.bin"/>
36 36
	<property name="WINDOWSEXE" value="${APPNAME}-${bversion}_${build.number}-upgraderFrom_1_1_1015-windows-i586.exe"/>
37 37
	<property name="MAC_10_ZIP" value="${APPNAME}-${bversion}_${build.number}-upgraderFrom_1_1_1015-mac-10_4.zip"/>
38
	<property name="autoinstalador" value="annotation_Installer" />
38
	<property name="autoinstalador" value="APPNAME}_update-1_1-TO-${bversion}" />
39 39
	<property name="OUTPUT_DIR" location="./tmp/versiones/v${version}/${build.number}"/> <!--CAMBIAR ESTO SEGUN DIRECTORIO OUTPUT,VERIFICAR BUILD.PROPERTIES -->
40
	
40

  
41 41
	<condition property="LAUNCHER7Z" value="${GVSIG_INSTALLDIR}/launcher/7z/7za" else="${GVSIG_INSTALLDIR}/launcher/7z/7z.exe">
42 42
		<os family="unix" />
43 43
	</condition>
44
	
44

  
45 45
	<taskdef name="izpack" classpath="${dir_libs}/compiler.jar" classname="com.izforge.izpack.ant.IzPackTask"/>
46
	
47
	
46

  
47

  
48 48
	<condition property="Lang.Is.Spanish">
49 49
		<contains string="${env.LANG}" substring="es"/>
50 50
	</condition>
51 51
	<condition property="directorio.base">
52 52
		<available file="${base_dir}/install.xml" type="file" />
53 53
	</condition>
54
	
54

  
55 55
	<target name="E_Spanish" if="Lang.Is.Spanish">
56 56
		<property name="ERROR_BASEDIR" value="En el directorio ${base_dir} no se encuentra el fichero install.xml" />
57 57
	</target>
58
	
58

  
59 59
	<target name="E_notSpanish" unless="Lang.Is.Spanish">
60 60
		<property name="ERROR_BASEDIR" value="Cannot find install.xml in ${base_dir} folder " />
61 61
	</target>
62
	
62

  
63 63
	<target name="check" depends="E_Spanish,E_notSpanish">
64 64
		<fail message="${ERROR_BASEDIR}" unless="directorio.base"/>
65 65
	</target>
66
	
67 66

  
68
	
67

  
68

  
69 69
	<target name="init" depends="check,CopyFiles,CreateJar,Installation,InstallMac,CleanDir" >
70
		
70

  
71 71
	</target>
72 72
	<target name="CopyFiles" description="Copia de ficheros de librerias y de las extensiones necesarias">
73 73
		<delete dir="${base_dir}/bin"/>
74 74
		<copy file="${base_dir}/resources/gpl.txt" todir="./bin"/>
75
		<mkdir dir="${base_dir}/bin/lib"/> 
75
		<mkdir dir="${base_dir}/bin/lib"/>
76 76
<!-- 		copiamos los jar y zip que tenemos en _fwAndami/lib		 -->
77
		<copy todir="${base_dir}/bin/lib"> 
78
			<fileset dir="${ANDAMI_DIR}/lib"> 
79
				<include name="*.jar"/> 
80
				<include name="*.zip"/> 
77
		<copy todir="${base_dir}/bin/lib">
78
			<fileset dir="${ANDAMI_DIR}/lib">
79
				<include name="*.jar"/>
80
				<include name="*.zip"/>
81 81
			</fileset>
82 82
		</copy>
83
		
83

  
84 84
		<copy todir="${base_dir}/bin" file="${ANDAMI_DIR}/andami.jar"/>
85 85
		<copy todir="${base_dir}/bin" file="${ANDAMI_DIR}/castor.properties"/>
86
		
86

  
87 87
<!-- 		PARA WINDOWS -->
88
		
89 88

  
89

  
90 90
		<delete dir="${base_dir}/tmpResources"/>
91 91
		<mkdir dir="${base_dir}/tmpResources" />
92 92

  
......
99 99
			</fileset>
100 100
		</copy>
101 101
		<move file="${base_dir}/tmpResources/launcher-Win32.exe" tofile="./tmpResources/gvSIG.exe"/>
102
		
103
		
104
		
105
		
102

  
103

  
104

  
105

  
106 106
		<for list="${EXTENSIONS}" param="extensions">
107 107
			<sequential>
108 108
				<copy todir="${base_dir}/extensiones/@{extensions}">
......
113 113
		</for>
114 114
	</target>
115 115
	<target name="CreateJar" description="Generacion del instalador Jar">
116
		<izpack input="${base_dir}/install.xml" 
117
			output="${base_dir}/${JARNAME}" 
118
			installerType="standard" 
119
			basedir="${base_dir}" 
116
		<izpack input="${base_dir}/install.xml"
117
			output="${base_dir}/${JARNAME}"
118
			installerType="standard"
119
			basedir="${base_dir}"
120 120
			izPackDir="${izpack_dir}/"/>
121 121
	</target>
122 122
<!-- 		generar el tar.gz para linux -->
......
124 124

  
125 125
		<mkdir dir="${OUTPUT_DIR}" />
126 126
		<delete dir="${base_dir}/${INSTALLER_DIR}"/>
127
		<mkdir dir="${base_dir}/${INSTALLER_DIR}/tmp_gvSIGInstall"/>		
127
		<mkdir dir="${base_dir}/${INSTALLER_DIR}/tmp_gvSIGInstall"/>
128 128
		<copy file="${base_dir}/${JARNAME}" todir="./${INSTALLER_DIR}/tmp_gvSIGInstall"/>
129
		
129

  
130 130
<!-- 		carpetas CVS no se copiaran, ANT las excluye por defecto -->
131 131
		<copy todir="${base_dir}/${INSTALLER_DIR}/tmp_gvSIGInstall">
132 132
			<fileset dir="${GVSIG_INSTALLDIR}/launcher/izpack-launcher-1.3_linux/dist/"/>
133 133
		</copy>
134
		
134

  
135 135
		<chmod file="${base_dir}/${INSTALLER_DIR}/tmp_gvSIGInstall/launcher-Linux" perm="ugo+rx"/>
136 136
		<delete file="${base_dir}/${INSTALLER_DIR}/tmp_gvSIGInstall/launcher.ini"/>
137 137
		<copy file="${DIR_LIN_GVSIG}/resources/launcher.ini.j15" tofile="${base_dir}/${INSTALLER_DIR}/tmp_gvSIGInstall/launcher.ini"/>
138 138
		<replace file="${base_dir}/${INSTALLER_DIR}/tmp_gvSIGInstall/launcher.ini" token="%JARNAME%" value="${JARNAME}"/>
139
		
139

  
140 140
<!-- 		comprimimos la carpeta tmp_gvSIGInstall en tmp.tgz  -->
141 141
		<tar destfile="${base_dir}/${INSTALLER_DIR}/tmp.tgz"  compression="gzip">
142 142
			<tarfileset dir="${base_dir}/${INSTALLER_DIR}" mode="755" >
......
158 158
		<delete file="${base_dir}/${INSTALLER_DIR}/xx.tmp"/>
159 159
		<move file="${base_dir}/${INSTALLER_DIR}/${LINUXBIN}" todir="${OUTPUT_DIR}" />
160 160
		<delete dir="${base_dir}/${INSTALLER_DIR}"/>
161
		
162
		
163
		
161

  
162

  
163

  
164 164
<!-- 		PARA WINDOWS  -->
165 165
		<delete dir="${base_dir}/${INSTALLER_DIR}"/>
166
		<mkdir dir="${base_dir}/${INSTALLER_DIR}"/>		
166
		<mkdir dir="${base_dir}/${INSTALLER_DIR}"/>
167 167
		<copy todir="${base_dir}/${INSTALLER_DIR}">
168 168
			<fileset dir="${GVSIG_INSTALLDIR}/launcher/izpack-launcher-1.3/dist"/>
169 169
		</copy>
......
182 182
		</concat>
183 183
		<move file="${WINDOWSEXE}" todir="${OUTPUT_DIR}"/>
184 184
	</target>
185
	
185

  
186 186
	<target name="InstallMac" description="Actualizador para MAC">
187
		
188
		<copy todir="${GVSIG_INSTALLDIR}/instalador-gvSIG-mac/actualizador.app/Contents/Resources/updates/gvSIGbin/gvSIG/extensiones/${MAIN_INSTALL_PLUGIN}">
189
			<fileset dir="${ANDAMI_DIR}/gvSIG/extensiones/${MAIN_INSTALL_PLUGIN}/"/>
187
		<property name="mac_install_path_bin" value="${GVSIG_INSTALLDIR}/instalador-gvSIG-mac/actualizador.app/Contents/Resources/updates/gvSIGbin"/>
188
		<property name="mac_install_path_ext" value="${mac_install_path_bin}/gvSIG/extensiones"/>
189

  
190
		<copy todir="${mac_install_path_bin}" file="bin/andami.jar"/>
191
		<copy todir="${mac_install_path_bin}/lib">
192
			<filelist>
193
				<file name="bin/lib/beans.jar"/>
194
				<file name="bin/lib/gvsig-i18n.jar"/>
195
				<file name="bin/lib/iver-utiles.jar"/>
196
			</filelist>
190 197
		</copy>
191
		
192
		<copy todir="${GVSIG_INSTALLDIR}/instalador-gvSIG-mac/actualizador.app/Contents/Resources/updates/gvSIGbin/gvSIG/extensiones/com.iver.cit.gvsig/lib">
193
			<fileset file="${ANDAMI_DIR}/gvSIG/extensiones/com.iver.cit.gvsig/lib/gvsig-annotation.jar"/>
198

  
199
		<copy todir="${mac_install_path_ext}/com.iver.cit.gvsig/">
200
			<filelist>
201
				<file name="extensiones/com.iver.cit.gvsig/text.properties"/>
202
				<file name="extensiones/com.iver.cit.gvsig/config.xml"/>
203
			</filelist>
194 204
		</copy>
195
		
205
		<copy todir="${mac_install_path_ext}/com.iver.cit.gvsig/lib">
206
			<filelist>
207
				<file name="extensiones/com.iver.cit.gvsig/lib/com.iver.cit.gvsig.jar"/>
208
				<file name="extensiones/com.iver.cit.gvsig/lib/driver-manager-1.1.jar"/>
209
				<file name="extensiones/com.iver.cit.gvsig/lib/fmap-arcims.jar"/>
210
				<file name="extensiones/com.iver.cit.gvsig/lib/gvsig-annotation.jar"/>
211
				<file name="extensiones/com.iver.cit.gvsig/lib/gvsig-ui.jar"/>
212
				<file name="extensiones/com.iver.cit.gvsig/lib/hsqldb_spatial.jar"/>
213
				<file name="extensiones/com.iver.cit.gvsig/lib/mysql_spatial.jar"/>
214
				<file name="extensiones/com.iver.cit.gvsig/lib/oracle_spatial.jar"/>
215
				<file name="extensiones/com.iver.cit.gvsig/lib/postgis_spatial.jar"/>
216
				<file name="extensiones/com.iver.cit.gvsig/lib/remote-clients-arcims.jar"/>
217
				<file name="extensiones/com.iver.cit.gvsig/lib/fmap.jar"/>
218
				<file name="extensiones/com.iver.cit.gvsig/lib/cms.jar"/>
219
				<file name="extensiones/com.iver.cit.gvsig/lib/jcrs.jar"/>
220
				<file name="extensiones/com.iver.cit.gvsig/lib/gdbms-0.8-SNAPSHOT.jar"/>
221
				<file name="extensiones/com.iver.cit.gvsig/lib/remote-clients.jar"/>
222

  
223
			</filelist>
224
		</copy>
225

  
226

  
227
		<copy todir="${mac_install_path_ext}/com.iver.cit.gvsig.annotation/lib"
228
			file="extensiones/com.iver.cit.gvsig.annotation/lib/com.iver.cit.gvsig.annotation.jar"/>
229

  
230
		<copy todir="${mac_install_path_ext}/com.iver.cit.gvsig.cad"
231
					file="extensiones/com.iver.cit.gvsig.cad/com.iver.cit.gvsig.cad.jar"/>
232

  
233
		<copy todir="${mac_install_path_ext}/com.iver.gvsig.expresionfield"
234
					file="extensiones/com.iver.gvsig.expresionfield/com.iver.gvsig.expresionfield.jar"/>
235

  
236
		<copy todir="${mac_install_path_ext}/es.prodevelop.cit.gvsig.arcims"
237
					file="extensiones/es.prodevelop.cit.gvsig.arcims/es.prodevelop.cit.gvsig.arcims.jar"/>
238

  
239
		<copy todir="${mac_install_path_ext}/org.gvsig.crs"
240
					file="extensiones/org.gvsig.crs/org.gvsig.crs.jar"/>
241
		<copy todir="${mac_install_path_ext}/org.gvsig.crs"
242
					file="extensiones/org.gvsig.crs/text_pl.properties"/>
243

  
244
		<copy todir="${mac_install_path_ext}/org.gvsig.georeferencing"
245
					file="extensiones/org.gvsig.georeferencing/text_pt_br.properties"/>
246

  
247

  
248
		<copy todir="${mac_install_path_ext}/com.iver.cit.gvsig.jdbc_spatial"
249
					file="extensiones/com.iver.cit.gvsig.jdbc_spatial/com.iver.cit.gvsig.jdbc_spatial.jar"/>
250
		<copy todir="${mac_install_path_ext}/com.iver.cit.gvsig/drivers">
251
			<fileset dir="extensiones/com.iver.cit.gvsig/drivers">
252
				<include name="jdbc_spatial/*"/>
253
			</fileset>
254
		</copy>
255

  
256

  
257
		<copy todir="${mac_install_path_ext}/com.iver.cit.gvsig.oracle_spatial"
258
					file="extensiones/com.iver.cit.gvsig.oracle_spatial/com.iver.cit.gvsig.oracle_spatial.jar"/>
259
		<copy todir="${mac_install_path_ext}/com.iver.cit.gvsig.oracle_spatial/images"
260
					file="extensiones/com.iver.cit.gvsig.oracle_spatial/images/jdbc.png"/>
261

  
262

  
263
		<copy todir="${mac_install_path_ext}/com.iver.core"
264
					file="extensiones/com.iver.core/text_pt_br.properties"/>
265
		<copy todir="${mac_install_path_ext}/com.iver.core"
266
					file="extensiones/com.iver.core/com.iver.core.jar"/>
267

  
268
		<copy todir="${mac_install_path_ext}/extensiones">
269
			<fileset dir="extensiones">
270
				<include name="es.gva.cit.gvsig.catalogClient/**/**"/>
271
			</fileset>
272
		</copy>
273

  
274

  
275
		<copy todir="${mac_install_path_ext}/extensiones">
276
			<fileset dir="extensiones">
277
				<include name="**/build.number"/>
278
			</fileset>
279
		</copy>
280
		<copy todir="${mac_install_path_ext}/extensiones">
281
			<fileset dir="extensiones">
282
				<include name="**/text_ro.properties,**/text_en.properties,**/text_eu.properties,**/text_de.properties"/>
283
			</fileset>
284
		</copy>
285
		<copy todir="${mac_install_path_ext}/extensiones">
286
			<fileset dir="extensiones">
287
				<include name="**/about.htm"/>
288
			</fileset>
289
		</copy>
290

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

  
200 295
		<zip destfile="${OUTPUT_DIR}/${MAC_10_ZIP}" basedir="${GVSIG_INSTALLDIR}/instalador-gvSIG-mac" includes="${autoinstalador}.app/**"/>
201
		
296

  
202 297
		<delete dir="${GVSIG_INSTALLDIR}/instalador-gvSIG-mac/${autoinstalador}.app"/>
203 298
		<delete dir="${GVSIG_INSTALLDIR}/instalador-gvSIG-mac/actualizador.app/Contents/Resources/updates/gvSIGbin" />
204
		
299

  
205 300
	</target>
206
	
301

  
207 302
	<target name="CleanDir" description="Limpiamos los directorios creados">
208
	
303

  
209 304
		<delete file="${base_dir}/${WINDOWSZIP}" />
210 305
		<delete file="${base_dir}/dist_config.txt" />
211 306
		<delete dir="${base_dir}/${INSTALLER_DIR}" />
......
213 308
		<delete dir="extensiones"/>
214 309
		<delete dir="bin"/>
215 310
	</target>
216
	
311

  
217 312
</project>

Also available in: Unified diff