Revision 19308 trunk/extensions/extSymbology/build.xml

View differences:

build.xml
21 21
  <import file="../binaries/ant/utilities.xml"/>
22 22

  
23 23
  <!--Plugins-->
24
	
24

  
25 25
  <property name="log4j-jar" location="${andamiLibs}/log4j-1.2.8.jar" />
26 26
  <property name="gdbms-jar" location="${fmapLibs}/gdbms-0.8-SNAPSHOT.jar"/>
27 27
  <property name="generated-src" location="generated-src"/>
28 28
  <property name="parserpackage" value="org/gvsig/symbology/fmap/labeling/parse"/>
29 29
  <property name="javacchome" location="ext-tools"/>
30
		
30

  
31 31
  <property name="plugin" value="org.gvsig.extended-symbology"/>
32 32
  <property name="jarName" value="${plugin}.jar"/>
33 33

  
34 34

  
35 35
  <property name="ParserJar" value="org.gvsig.fmap.expr-parser"/>
36 36
  <property name="jarParserName" value="${ParserJar}.jar"/>
37
	
37

  
38 38
  <target name="init">
39 39
    <!-- Create the time stamp -->
40 40
    <tstamp/>
......
49 49

  
50 50
  <target name="generate-without-source"
51 51
  		description="generate the distribution without the source file"
52
  	depends="init,create-jar,copy-data-files,copy-to-fmap,move-to-andami">
52
  	depends="init,expression-parser-jar,compile-sources,create-jar,copy-data-files,move-to-andami">
53 53
  </target>
54 54

  
55 55
	<target name="batch-build"
56 56
			description="compile the sources, create the jar file"
57
			depends="init,compile,create-jar,copy-data-files,copy-to-fmap,move-to-andami">
57
			depends="init,expression-parser-jar,compile,create-jar,copy-data-files,move-to-andami">
58 58
	</target>
59 59

  
60
	<target name="compile" description="compile the source" >
60
	<target name="import_BN">
61
		<antcall target="gvSIG-import-build-number"/>
62
	</target>
63

  
64
	<target name="compile-sources" description="compile the source" >
61 65
		<!-- Compile the Java code from ${src} to ${build} -->
62
		<antcall target="gvSIG-import-build-number"/>
63 66
		<mkdir dir="${build}" />
64 67
		<loadEclipseClasspath project="${basedir}"/>
65 68
		<gvSIG-javac
......
74 77
			classpath="${compile-classpath}"/>-->
75 78
	</target>
76 79

  
80
	<target name="compile" description="compile the source" depends="import_BN,compile-sources"/>
81

  
77 82
	<target name="create-jar"
78 83
			description="Creates the plugin jar">
79 84
		<mkdir dir="${dist}"/>
80 85

  
81
	  	<!-- Jar de la extensión -->
86
	  	<!-- Jar de la extensión - ->
82 87
	  	<jar jarfile="${dist}/${jarName}" basedir="${build}"
83
	  	includes="org/gvsig/symbology/*.class"
88
	  	includes="org/gvsig/symbology/*.class,org/gvsig/symbology/gui/**/**"
89
	    excludes="org/gvsig/symbology/labeling/**/**"
84 90
	  	/>
85 91

  
92

  
86 93
	  	<jar jarfile="${dist}/${jarName}" basedir="${build}"
87 94
	  	includes="org/gvsig/symbology/gui/**/**" update="yes"
88 95
	  	/>
89
	  	
90
	  	<!-- Jar de FMap -->
96
	  	-->
97

  
98
	  	<!-- Jar de FMap - ->
91 99
	  	<jar jarfile="${fmapRTJar}" basedir="${build}"
92 100
	  	excludes="org/gvsig/symbology/*,org/gvsig/symbology/gui/**/**"
93 101
	  	includes="org/gvsig/symbology/**/**"
94 102
	  	/>
95
		
96
		
97
		<antcall target="expression-parser-jar"></antcall>
98
		<!-- Jar de la extensión - ->
99
		
100
	
103

  
104
		-->
105

  
106
		<!-- Jar de la extensión -->
107

  
108

  
101 109
		<jar jarfile="${dist}/${jarName}" basedir="${build}"
102 110
		includes="org/gvsig/symbology/**,org/gvsig/symbology/gui/**/**"/>
103 111

  
104
		<!- - Jar de FMap - ->
112
		<!-- Jar de FMap -->
105 113
		<jar jarfile="${fmapRTJar}" basedir="${build}"
106
			includes="org/gvsig/fmap/symbology/**"/> -->
114
			includes="org/gvsig/fmap/symbology/**"/>
107 115
	</target>
108 116

  
109
	
110
	<target name="expression-parser-jar" 
117

  
118
	<target name="expression-parser-jar"
111 119
		description="This target builds the expression parser jar. It requires Javacc to be installed">
112 120
		<!-- build the parser -->
113
		
121

  
114 122
		<property name="srcdir" value="${generated-src}/src/${parserpackage}"/>
115 123
		<property name="destdir" value="${generated-src}/bin/${parserpackage}"/>
116 124
		<mkdir dir="${srcdir}"/>
......
119 127
		    outputdirectory="${srcdir}"
120 128
		    static="false"
121 129
		/>
122
		
130

  
123 131
		<!-- Jar de ExpressionParser -->
124 132
		<mkdir dir="${destdir}"/>
125 133
		<echo>javac -classpath=${fmapRTJar}:${gdbms-jar}:${log4j-jar} ${generated-src}/bin"</echo>
126
		<javac srcdir="${srcdir}" classpath="${fmapRTJar}:${gdbms-jar}:${log4j-jar}" destdir="${generated-src}/bin"/>
134
		<gvSIG-javac srcdir="${srcdir}" classpath="${gdbms-jar}:${log4j-jar}" sourcepath="./src" destdir="${generated-src}/bin"/>
135
	    <!--
127 136
		<jar jarfile="${dist}/${ParserJar}.jar" basedir="${generated-src}/bin" includes="${parserpackage}/**/**"
128 137
		/>
129
		<move file="${dist}/${jarParserName}" todir="${fmapLibs}"/>
138
		<move file="${dist}/${jarParserName}" todir="${fmapLibs}"/>-->
130 139
		<copy todir="${src}/${parserpackage}/">
131 140
			<fileset dir="${generated-src}/src/${parserpackage}" includes="*.java"/>
132 141
		</copy>
133 142
		<deltree dir="${generated-src}"/>
134 143
	</target>
135
	
144

  
136 145
	<target name="copy-data-files">
137 146
	    <copy file="config/config.xml" todir="${dist}"/>
138 147
		<copy todir="${dist}">
......
152 161
	    	<fileset dir="${dist}" includes="**/**"/>
153 162
    	</move>
154 163
	</target>
155
	
156
	<target name="copy-to-fmap">
157
	 	<copy file="${fmapRTJar}" todir="${fmapLibs}"/>
158
	</target>
159 164

  
160 165
  <target name="clean"
161 166
        description="clean up" >
......
169 174
    <delete file="${extensionsDir}/com.iver.cit.gvsig/lib/gvsig.extended-symbology.jar"/>
170 175
    <delete file="${extensionsDir}/com.iver.cit.gvsig/lib/fmap.extended-symbology.jar"/>
171 176
  </target>
172
	
177

  
173 178
	<target name="run-tests" depends="batch-build,compile-tests">
174 179
		<antcall target="generic-run-tests">
175 180
			<param name="TestSuite.Name" value="org.gvsig.symbology.AllTests"/>

Also available in: Unified diff