Revision 5607

View differences:

trunk/extensions/extCatalogYNomenclator/build.xml
15 15
	<property name="wfsPlugin" value="wfs"/>
16 16
	<property name="postgisPlugin" value="postgis"/>
17 17
	 
18
	<property name="extensionDir" location="../_fwAndami/gvSIG/extensiones"/>
19 18
	<property name="appCatalogDir" value="../appCatalogYNomenclatorClient"/>
20 19
	<property name="remoteClientsDir" value="../libRemoteServices"/>
20
	
21
	<property name="lib" value="lib"/>
22
	<property name="andami" value="../_fwAndami"/>
23
	<property name="extensionsDir" location="${andami}/gvSIG/extensiones"/>
24
	<property name="catProtocolJarName" value="catCliProto.jar"/>
25
	<property name="andamiJar" location="${andami}/andami.jar"/>
26
	<property name="gvsigJar" location="${extensionsDir}/com.iver.cit.gvsig/lib/com.iver.cit.gvsig.jar"/>
27
	<property name="andamiLibs" location="${andami}/lib"/>
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

  
21 31
    
22 32
  
23 33
  <target name="init">
......
39 49
    <mkdir dir="${dist}/lib"/>
40 50
		
41 51
    <!-- Put everything in ${build} into the MyProject-${DSTAMP}.jar file -->
42
    <jar jarfile="${dist}/lib/catCliProto.jar" basedir="${appCatalogDir}/bin"/>
52
    <jar jarfile="${dist}/lib/${catProtocolJarName}" basedir="${appCatalogDir}/bin"/>
43 53
  	<jar jarfile="${dist}/lib/${remoteClientPlugin}.jar" basedir="${remoteClientsDir}/bin"/>
44 54
    <jar jarfile="${dist}/lib/${catalogPlugin}.jar" basedir="${build}" includes="es/gva/cit/gvsig/catalogClient/**"/>
45 55
  	<jar jarfile="${dist}/lib/${gazzetterPlugin}.jar" basedir="${build}" includes="es/gva/cit/gvsig/gazetteer/**"/>
......
59 69
    <copy todir="${dist}/lib">
60 70
    	<fileset dir="${appCatalogDir}/lib" includes="*.jar"/>
61 71
    </copy>
62
  	<move todir="${extensionDir}/${catalogPlugin}/">
72
  	<move todir="${extensionsDir}/${catalogPlugin}/">
63 73
    	<fileset dir="${dist}" includes="**/**"/>
64 74
    </move>
65
  	<delete file="${extensionDir}/${catalogPlugin}/lib/xercesImpl.jar"/>
66
  	<delete file="${extensionDir}/${catalogPlugin}/lib/xml-apis.jar"/>
75
  	<delete file="${extensionsDir}/${catalogPlugin}/lib/xercesImpl.jar"/>
76
  	<delete file="${extensionsDir}/${catalogPlugin}/lib/xml-apis.jar"/>
67 77
  		
68 78
  </target>
69 79

  
70
  <target name="generate-with-source" description="generate the distribution with the source file" >
80
	<target name="generate-with-source"
81
   			description="generate the distribution with the source file">
71 82
    <!-- Create the distribution directory -->
72 83
    <mkdir dir="${dist}"/>
73 84

  
......
90 101
    <move todir="${extension-dir}/${catalogPlugin}/">
91 102
    	<fileset dir="${dist}" includes="**/**"/>
92 103
    </move>
93
   
94
  	
95 104
  </target>
96 105

  
97
  <target name="clean"
106
	<target name="batch-build"
107
			description="compile the sources, create the jar file"
108
			depends="call-appCatalog-build,compile,create-jar,copy-data-files,move-to-andami">
109
	</target>
110
	
111
	<target name="call-appCatalog-build">
112
		<ant dir="${appCatalogDir}" target="batch-build" inheritAll="false">
113
			<property name="targetDir" location="${dist}/lib"/>
114
			<property name="jarName" value="catCliProto.jar"/>
115
			<property name="andamiLibs" value="${andamiLibs}"/>
116
		</ant>
117
	</target>
118

  
119
	<target name="compile" description="compile the source" >
120
        <!-- Compile the Java code from ${src} to ${bin} -->
121
		<!-- Compile the Java code from ${src} to ${build} -->
122
		<mkdir dir="${build}" />
123
		<mkdir dir="${dist}/lib" />
124
  		<jar jarfile="${dist}/lib/${remoteClientPlugin}.jar" basedir="${remoteClientsDir}/bin"/>
125
	    <javac   srcdir="${src}"
126
                 destdir="${build}"
127
	 			 classpath="${compile-classpath}" />
128
	</target>
129
	
130
	<target name="create-jar"
131
			description="Creates the plugin jar">
132
		<mkdir dir="${dist}/lib"/>
133
	    <jar jarfile="${dist}/lib/${catalogPlugin}.jar" basedir="${build}" includes="es/gva/cit/gvsig/catalogClient/**"/>
134
	  	<jar jarfile="${dist}/lib/${gazzetterPlugin}.jar" basedir="${build}" includes="es/gva/cit/gvsig/gazetteer/**"/>
135
	</target>
136

  
137
	<target name="copy-data-files">
138
	  	<copy file="config/config.xml" todir="${dist}"/>
139
	    <copy file="config/plugin.dtd" todir="${dist}"/>
140
	    <copy todir="${dist}">
141
	    	<fileset dir="." includes="text*.properties"/>
142
	    </copy>
143
	    <copy todir="${dist}/images">
144
	    	<fileset dir="${appCatalogDir}/images/" includes="*"/>
145
	    </copy>
146
	    <copy todir="${dist}">
147
	    	<!--fileset dir="./lib" includes="*.jar,*.zip"/ -->
148
	    	<fileset dir="." includes=".keystore"/>
149
	     	<fileset dir="${appCatalogDir}" includes="servers.txt"/>
150
        </copy>
151
	</target>
152
	
153
	<target name="move-to-andami">
154
	    <copy todir="${dist}/lib">
155
	    	<fileset dir="${appCatalogDir}/lib" includes="*.jar"/>
156
	    </copy>
157
	  	<move todir="${extensionsDir}/${catalogPlugin}/">
158
	    	<fileset dir="${dist}" includes="**/**"/>
159
	    </move>
160
	</target>
161

  
162
	<target name="clean"
163
    	description="clean up" >
164
		<!-- Delete the ${build} and ${dist} directory trees -->
165
		<delete dir="${build}"/>
166
		<delete dir="${dist}"/>
167
	</target>
168

  
169
	
170
  <target name="clean-orig"
98 171
        description="clean up" >
99 172
    <!-- Delete the ${build} and ${dist} directory trees -->
173
  	
100 174
    <delete  file="${extensiones}/es/gva/cit/gvsig/catalogClient/lib/xercesImpl.jar"/>
101 175
	<delete file="${extensiones}/es/gva/cit/gvsig/catalogClient/lib/xml-apis.jar" />
102 176
	
trunk/extensions/extCAD/build.xml
7 7
  <property name="build" location="bin"/>
8 8
  <property name="dist"  location="dist"/>
9 9
  <property name="plugin" value="com.iver.cit.gvsig.cad"/>
10
  <property name="extensionDir" location="../_fwAndami/gvSIG/extensiones"/>
11
<property name="mainplugin" value="com.iver.cit.gvsig"/>
10
  <property name="mainplugin" value="com.iver.cit.gvsig"/>
11

  
12
	<property name="lib" value="lib"/>
13
	<property name="andami" value="../_fwAndami"/>
14
	<property name="jarName" value="${plugin}.jar"/>
15
	<property name="extensionsDir" location="${andami}/gvSIG/extensiones"/>
16
	<property name="andamiJar" location="${andami}/andami.jar"/>
17
	<property name="gvsigJar" location="${extensionsDir}/com.iver.cit.gvsig/lib/com.iver.cit.gvsig.jar"/>
18
	<property name="andamiLibs" location="${andami}/lib"/>
19
	<property name="fmapLibs" location="../libFMap/lib" />
20
	<property name="fmap-compile-classpath" value="${fmapLibs}/batik-awt-util.jar:${andamiLibs}/castor-0.9.5.3-xml.jar:${fmapLibs}/cms.jar:${fmapLibs}/driver-manager-1.1.jar:${fmapLibs}/gdbms-0.8-SNAPSHOT.jar:${fmapLibs}/geoapi-2.0.jar:${fmapLibs}/gt2-legacy.jar:${fmapLibs}/gt2-main.jar:${fmapLibs}/gt2-postgis.jar:${fmapLibs}/gt2-wfs.jar:${fmapLibs}/gt2-wms.jar:${fmapLibs}/gt2sidx.jar:${fmapLibs}/hsqldb.jar:${andamiLibs}/iver-utiles.jar:${fmapLibs}/jts-1.7.jar:${fmapLibs}/jecw.jar:${andamiLibs}/log4j-1.2.8.jar:${fmapLibs}/wmsclient.jar:${fmapLibs}/mysql-connector-java-3.1.7-bin.jar:${fmapLibs}/postgis-jdbc-driver.jar:${fmapLibs}/postgresql-74.213.jar:${fmapLibs}/spatialindex.jar:${fmapLibs}/units-0.01.jar:${fmapLibs}/vecmath-1.3.jar" />
21
	<property name="compile-classpath" value="${andamiJar}:${andamiLibs}/beans.jar:${fmapLibs}/cms.jar:${fmapLibs}/driver-manager-1.1.jar:${fmapLibs}/gdbms-0.8-SNAPSHOT.jar:${fmapLibs}/gt2-main.jar:${lib}/gt2-postgis.jar:${lib}/gt2-shapefile.jar:${gvsigJar}:${andamiLibs}/iver-utiles.jar:${lib}/jdom-1.0b10.jar:${fmapLibs}/jts.jar:${lib}/JWizardComponent.jar:${lib}/Smc.jar:${fmap-compile-classpath}"/>
22
	<property name="compile-sourcepath" value="../libFMap/src:../appgvSIG/src:../extJDBC/src"/>
23
	
24
	
12 25
  <target name="init">
13 26
    <!-- Create the time stamp -->
14 27
    <tstamp/>
......
18 31
  </target>
19 32

  
20 33

  
21
  <target name="compile" depends="init"
22
        description="compile the source " >
23
  </target>
24

  
25
  <target name="dist" depends="compile"
34
  <target name="dist"
26 35
        description="generate the distribution" >
27 36
    <!-- Create the distribution directory -->
28 37
    <mkdir dir="${dist}"/>
29
    <copy todir="${extensionDir}/${mainplugin}/lib">
38
    <copy todir="${extensionsDir}/${mainplugin}/lib">
30 39
    	<fileset dir="./lib" includes="*.jar,*.zip"/>
31 40
    </copy>
32
  	<jar jarfile="${dist}/${plugin}.jar" basedir="${build}"/>
41
  	<jar jarfile="${dist}/${jarName}" basedir="${build}"/>
33 42
    <copy file="config/config.xml" todir="${dist}"/>
34 43
    <copy todir="${dist}">
35 44
    	<fileset dir="." includes="text*.properties"/>
......
38 47
    	<fileset dir="images/" includes="*"/>
39 48
    </copy>
40 49

  
41
    <move todir="${extensionDir}/${plugin}/">
50
    <move todir="${extensionsDir}/${plugin}/">
42 51
    	<fileset dir="${dist}" includes="**/**"/>
43 52
    </move>
44 53
  </target>
54
	
55
		<target name="batch-build"
56
				description="compile the sources, create the jar file"
57
				depends="compile,create-jar,copy-data-files,move-to-andami">
58
		</target>
45 59

  
60
		<target name="compile" description="compile the source" >
61
			<!-- Compile the Java code from ${src} to ${build} -->
62
			<mkdir dir="${build}" />
63
			<javac  srcdir="${src}"
64
				destdir="${build}"
65
				source="1.4"
66
				target="1.4"
67
				classpath="${compile-classpath}"
68
				sourcepath="${compile-sourcepath}"/>
69
		</target>
70
		
71
		<target name="create-jar"
72
				description="Creates the plugin jar">
73
			<mkdir dir="${dist}"/>
74
		    <jar jarfile="${dist}/${jarName}.jar" basedir="${build}"/>
75
		</target>
76
	
77
		<target name="copy-data-files">
78
		    <copy file="config/config.xml" todir="${dist}/config"/>
79
			<copy todir="${dist}">
80
				<fileset dir="." includes="text*.properties"/>
81
			</copy>
82
			<copy todir="${dist}/images">
83
				<fileset dir="images/" includes="*"/>
84
			</copy>
85
		</target>
86
		
87
		<target name="move-to-andami">
88
		    <move todir="${extensionsDir}/${plugin}/">
89
		    	<fileset dir="${dist}" includes="**/**"/>
90
	    	</move>
91
		    <copy todir="${extensionsDir}/${mainplugin}/lib">
92
		    	<fileset dir="./lib" includes="*.jar,*.zip"/>
93
		    </copy>
94
		</target>
46 95

  
47 96
  <target name="clean"
48 97
        description="clean up" >

Also available in: Unified diff