Revision 16339

View differences:

trunk/extensions/extCatalogAndGazetteer/build.xml
8 8
	<property name="dist"  location="dist"/>
9 9
	<property name="mainplugin" value="com.iver.cit.gvsig"/>
10 10
	<property name="gvsiglibjar" value="gvsig-catalogClient"/>
11
	  
11

  
12 12
	<property name="catalogPlugin" value="es.gva.cit.gvsig.catalogClient"/>
13 13
	<property name="gazzetterPlugin" value="es.gva.cit.gvsig.gazetteer"/>
14 14
	<property name="remoteClientPlugin" value="remoteClient"/>
15 15
	<property name="wfsPlugin" value="wfs"/>
16 16
	<property name="postgisPlugin" value="postgis"/>
17
	 
17

  
18 18
	<property name="appCatalogDir" value="../appCatalogAndGazetteerClient"/>
19 19
	<property name="remoteClientsDir" value="../libRemoteServices"/>
20
	
20

  
21 21
	<property name="lib" value="lib"/>
22 22
	<property name="andami" value="../_fwAndami"/>
23 23
	<property name="extensionsDir" location="${andami}/gvSIG/extensiones"/>
......
26 26
	<property name="gvsigJar" location="${extensionsDir}/com.iver.cit.gvsig/lib/com.iver.cit.gvsig.jar"/>
27 27
	<property name="andamiLibs" location="${andami}/lib"/>
28 28
	<property name="fmapLibs" location="../libFMap/lib" />
29
	<property name="compile-classpath" value="${andamiJar}:${gvsigJar}:${dist}/lib/catCliProto.jar:${andamiLibs}/castor-0.9.5.3-xml.jar:${fmapLibs}/cms.jar:${appCatalogDir}/lib/commons-httpclient-2.0.2.jar:${fmapLibs}/driver-manager-1.1.jar:${fmapLibs}/fmap.jar:${fmapLibs}/gdbms-0.8-SNAPSHOT.jar:${andamiLibs}/gvsig-i18n.jar:${andamiLibs}/iver-utiles.jar:${appCatalogDir}/lib/ostermillerutils_1_04_03_for_java_1_4.jar:${dist}/lib/${postgisPlugin}.jar:${fmapLibs}/postgis-jdbc-driver.jar:${fmapLibs}/postgresql-74.213.jar" />
30
	<property name="JavaSourceVersion" value="1.4"/>
31
	<property name="JavaTargetVersion" value="1.4"/>
32
	<property name="encoding" value="ISO_8859_1"/>
29
	<import file="../binaries/ant/utilities.xml"/>
33 30

  
34
    
35
  
31

  
32

  
36 33
  <target name="init">
37 34
    <!-- Create the time stamp -->
38 35
    <tstamp/>
......
40 37
    <mkdir dir="${build}"/>
41 38
    <mkdir dir="${dist}"/>
42 39
  	<!-- Creamos un fichero con el timeStamp para que lo lea el FPanelAbout -->
43
  	
40

  
44 41
  </target>
45
	
42

  
46 43
	<target name="buildNumber">
47 44
		<!--      <echo> Obsoleto: este proyecto se distribuye con gvSIG de base </echo>        -->
48
        
45

  
49 46
		<propertyfile
50 47
				file="build.number"
51 48
				comment="Build Number for ANT. Do not edit!">
......
53 50
		</propertyfile>
54 51
		<property file="build.number"/>
55 52

  
56
	</target>	
53
	</target>
57 54

  
58 55
	<target name="import-build-number">
59 56
	  	<copy todir=".">
......
67 64
    <!-- Create the distribution directory -->
68 65
    <mkdir dir="${dist}"/>
69 66
    <mkdir dir="${dist}/lib"/>
70
		
67

  
71 68
    <!-- Put everything in ${build} into the MyProject-${DSTAMP}.jar file -->
72 69
    <jar jarfile="${dist}/lib/${catProtocolJarName}" basedir="${appCatalogDir}/bin"/>
73 70
  	<jar jarfile="${dist}/lib/${remoteClientPlugin}.jar" basedir="${remoteClientsDir}/bin"/>
......
84 81
  	<replace casesensitive="true"
85 82
  		file="${dist}/about.htm"
86 83
  	  	token="#build.number.original#"
87
  		value="${build.number.original}"/>  	
84
  		value="${build.number.original}"/>
88 85
    <copy file="config/plugin.dtd" todir="${dist}"/>
89 86
    <copy todir="${dist}">
90 87
    	<fileset dir="config" includes="text*.properties"/>
......
108 105
    </move>
109 106
  	<delete file="${extensionsDir}/${catalogPlugin}/lib/xercesImpl.jar"/>
110 107
  	<delete file="${extensionsDir}/${catalogPlugin}/lib/xml-apis.jar"/>
111
  		
108

  
112 109
  </target>
113 110

  
114 111
	<target name="generate-with-source"
......
129 126
	  	<replace casesensitive="true"
130 127
	  		file="${dist}/about.htm"
131 128
	  	  	token="#build.number.original#"
132
	  		value="${build.number.original}"/>  	
129
	  		value="${build.number.original}"/>
133 130
    <copy file="config/plugin.dtd" todir="${dist}"/>
134 131
    <copy todir="${dist}">
135 132
    	<fileset dir="config" includes="text*.properties"/>
......
152 149
			description="compile the sources, create the jar file"
153 150
			depends="call-appCatalog-build,compile,create-jar,copy-data-files,move-to-andami">
154 151
	</target>
155
	
152

  
156 153
	<target name="call-appCatalog-build">
157 154
		<ant dir="${appCatalogDir}" target="batch-build" inheritAll="false">
158 155
			<property name="targetDir" location="${dist}/lib"/>
......
162 159
	</target>
163 160

  
164 161
	<target name="compile" description="compile the source" >
165
        <!-- Compile the Java code from ${src} to ${bin} -->
166 162
		<!-- Compile the Java code from ${src} to ${build} -->
163
		<antcall target="gvSIG-import-build-number"/>
167 164
		<mkdir dir="${build}" />
168
		<mkdir dir="${dist}/lib" />
169
  		<jar jarfile="${dist}/lib/${remoteClientPlugin}.jar" basedir="${remoteClientsDir}/bin"/>
170
	    <javac  srcdir="${src}"
171
				destdir="${build}"
172
				source="${JavaSourceVersion}"
173
				target="${JavaTargetVersion}"
174
				debug="${debug}"
175
				debuglevel="${debuglevel}"
176
				classpath="${compile-classpath}"
177
				encoding="${encoding}"/>
165
		<loadEclipseClasspath project="${basedir}"/>
166
		<gvSIG-javac
167
			classpath="${eclipseClasspath}"/>
178 168
	</target>
179
	
169

  
170

  
180 171
	<target name="create-jar"
181 172
			description="Creates the plugin jar">
182 173
		<mkdir dir="${dist}/lib"/>
......
196 187
	  	<replace casesensitive="true"
197 188
	  		file="${dist}/about.htm"
198 189
	  	  	token="#build.number.original#"
199
	  		value="${build.number.original}"/>  	
190
	  		value="${build.number.original}"/>
200 191
	    <copy file="config/plugin.dtd" todir="${dist}"/>
201 192
	    <copy todir="${dist}">
202 193
	    	<fileset dir="config" includes="text*.properties"/>
......
216 207
	      	<fileset dir="${appCatalogDir}/config/" includes="*"/>
217 208
	    </copy>
218 209
	</target>
219
	
210

  
220 211
	<target name="move-to-andami">
221 212
	    <copy todir="${dist}/lib">
222 213
	    	<fileset dir="${appCatalogDir}/lib" includes="*.jar"/>
......
233 224
		<delete dir="${dist}"/>
234 225
	</target>
235 226

  
236
	
227

  
237 228
  <target name="clean-orig"
238 229
        description="clean up" >
239 230
    <!-- Delete the ${build} and ${dist} directory trees -->
240
  	  
241
	
231

  
232

  
242 233
  </target>
243 234
	<target name="distribution"
244 235
		description="increment build number and generate the distribution without the source file"
245 236
		depends="buildNumber,call-appCatalog-build,compile,create-jar,copy-data-files,move-to-andami">
246 237
	</target>
247
	
238

  
248 239
	<target name="generate-without-source"
249 240
   			description="generate the distribution with the source file"
250 241
		depends="call-appCatalog-build,create-jar,copy-data-files,move-to-andami">

Also available in: Unified diff