Revision 19200

View differences:

trunk/extensions/extSymbology/build.xml
22 22

  
23 23
  <!--Plugins-->
24 24
	
25
  <property name="log4j-jar" location="${andamiLibs}/log4j-1.2.8.jar" />
26
  <property name="gdbms-jar" location="${fmapLibs}/gdbms-0.8-SNAPSHOT.jar"/>
25 27
  <property name="generated-src" location="generated-src"/>
26 28
  <property name="parserpackage" value="org/gvsig/symbology/fmap/labeling/parse"/>
27 29
  <property name="javacchome" location="ext-tools"/>
......
89 91
	  	<jar jarfile="${fmapRTJar}" basedir="${build}"
90 92
	  	excludes="org/gvsig/symbology/*,org/gvsig/symbology/gui/**/**"
91 93
	  	includes="org/gvsig/symbology/**/**"
92
	  	/> 
94
	  	/>
95
		
96
		
97
		<antcall target="expression-parser-jar"></antcall>
93 98
		<!-- Jar de la extensión - ->
94 99
		
100
	
95 101
		<jar jarfile="${dist}/${jarName}" basedir="${build}"
96 102
		includes="org/gvsig/symbology/**,org/gvsig/symbology/gui/**/**"/>
97 103

  
......
109 115
		<property name="destdir" value="${generated-src}/bin/${parserpackage}"/>
110 116
		<mkdir dir="${srcdir}"/>
111 117
		<javacc javacchome="${javacchome}"
112
		    target="${src}/${parserpackage}/ExpressionParser.jj"
118
		    target="${src}/${parserpackage}/LabelExpressionParser.jj"
113 119
		    outputdirectory="${srcdir}"
114 120
		    static="false"
115 121
		/>
116 122
		
117 123
		<!-- Jar de ExpressionParser -->
118 124
		<mkdir dir="${destdir}"/>
119
		<javac srcdir="${srcdir}" classpath="${dist}/${FMapJar}.jar:${gdbms-jar}" destdir="${generated-src}/bin"/>
125
		<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"/>
120 127
		<jar jarfile="${dist}/${ParserJar}.jar" basedir="${generated-src}/bin" includes="${parserpackage}/**/**"
121 128
		/>
122 129
		<move file="${dist}/${jarParserName}" todir="${fmapLibs}"/>
123
				
124
		<deltree dir="${generated-src}"/>
130
		<copy todir="${src}/${parserpackage}/">
131
			<fileset dir="${generated-src}/src/${parserpackage}" includes="*.java"/>
132
		</copy>
133
		<!--deltree dir="${generated-src}"/-->
125 134
	</target>
126 135
	
127 136
	<target name="copy-data-files">

Also available in: Unified diff