Revision 12259 branches/v10/applications/appgvSIG/build.xml

View differences:

build.xml
22 22
	<property name="build-doc" value="build-doc"/>
23 23
	<property name="JavaSourceVersion" value="1.4"/>
24 24
	<property name="JavaTargetVersion" value="1.5"/>
25
	<property name="encoding" value="ISO_8859_1"/>
25 26
		
26 27
	<target name="init">
27 28
		<!-- Create the time stamp -->
......
129 130
			target="${JavaTargetVersion}"
130 131
			debug="${debug}"
131 132
			debuglevel="${debuglevel}"
132
			excludes="com/iver/cit/gvsig/test/**">
133
			excludes="com/iver/cit/gvsig/test/**"
134
			encoding="${encoding}">
133 135
        	<classpath refid="appgvSIG.compile-classpath"/>
134 136
<!--        	<classpath refid="_fwAndami.compile-classpath"/> -->
135 137
		</javac>
......
331 333
	<property name="scripting" location="../extScripting"/>
332 334
	<property name="centerview" location="../extCenterViewToPoint"/>
333 335
	<property name="libui" location="../libUI"/>
334
	<property name="expresionField" location="../extExpresionField"/>
336
	<property name="expressionField" location="../extExpresionField"/>
335 337
    <property name="annotations" location="../extAnnotations"/>   
336 338
    <property name="geobd" location="../extOracleSpatial"/>   
337 339
    <property name="jcrs" location="../extJCRS_binaries"/>   
......
569 571
			<property name="encoding" value="ISO_8859_1"/>
570 572
		</ant>
571 573
    
572
 		<condition property="expresionField.Dir" value="${expresionField}" else="scripts/voidTarget">
573
			<available file="${expresionField}" type="dir"/>
574
 		<condition property="expressionField.Dir" value="${expressionField}" else="scripts/voidTarget">
575
			<available file="${expressionField}" type="dir"/>
574 576
		</condition>
575
		<ant dir="${expresionField.Dir}" target="import-build-number" inheritAll="false">
577
		<ant dir="${expressionField.Dir}" target="import-build-number" inheritAll="false">
576 578
			<property name="buildNumberFile" location="build.number"/>
577 579
		</ant>		
578
		<ant dir="${expresionField.Dir}" target="batch-build" inheritAll="false">
580
		<ant dir="${expressionField.Dir}" target="batch-build" inheritAll="false">
579 581
  			<property name="JavaSourceVersion" value="${JavaSourceVersion}"/>
580 582
  			<property name="JavaTargetVersion" value="${JavaTargetVersion}"/>
581 583
			<property name="debug" value="${debug}"/>
......
733 735
			<available file="${centerview}" type="dir"/>
734 736
		</condition>
735 737
		<ant dir="${centerview.Dir}" target="clean" inheritAll="false" />
736
        <condition property="${expresionField.Dir}" value="${expresionField}" else="scripts/voidTarget">
737
            <available file="${expresionField}" type="dir"/>
738
        <condition property="${expressionField.Dir}" value="${expressionField}" else="scripts/voidTarget">
739
            <available file="${expressionField}" type="dir"/>
738 740
        </condition>
739
        <ant dir="${expresionField.Dir}" target="clean" inheritAll="false" />   
741
        <ant dir="${expressionField.Dir}" target="clean" inheritAll="false" />   
740 742
        <condition property="${annotations.Dir}" value="${annotations}" else="scripts/voidTarget">
741 743
            <available file="${annotations}" type="dir"/>
742 744
        </condition>
......
892 894
		</ant>		
893 895
		<ant dir="${scripting.Dir}" inheritAll="false"/>
894 896

  
895
		<condition property="expresionField.Dir" value="${expresionField}" else="scripts/voidTarget">
896
			<available file="${expresionField}" type="dir"/>
897
		<condition property="expressionField.Dir" value="${expressionField}" else="scripts/voidTarget">
898
			<available file="${expressionField}" type="dir"/>
897 899
		</condition>
898
		<ant dir="${expresionField.Dir}" target="import-build-number" inheritAll="false">
900
		<ant dir="${expressionField.Dir}" target="import-build-number" inheritAll="false">
899 901
			<property name="buildNumberFile" location="build.number"/>
900 902
		</ant>		
901
		<ant dir="${expresionField.Dir}" inheritAll="false"/>
903
		<ant dir="${expressionField.Dir}" inheritAll="false"/>
902 904

  
903 905
	    <condition property="annotations.Dir" value="${annotations}" else="scripts/voidTarget">
904 906
	        <available file="${annotations}" type="dir"/>

Also available in: Unified diff