Revision 23524

View differences:

branches/v2_0_0_prep/libraries/libUIComponent/build.xml
2 2
    <description>
3 3
        Generates Beans
4 4
    </description>
5

  
6 5
  <!-- set global properties for this build -->
7
	<import file="../binaries/ant/utilities.xml"/>
8 6
  <property name="src" location="src"/>
9 7
  <property name="src-test" location="src-test-ui"/>
10 8
  <property name="build" location="bin"/>
11 9
  <property name="build-test" location="bin-test"/>
12
  <property name="dist"  location="${lib_loc}"/>
10
  <property name="dist"  location="dist"/>
11
  <property name="lib"  location="lib"/>
13 12
  <property name="beans.home" location="${build}/org/gvsig/gui/beans"/>
14 13
  <property name="jarName" value="org.gvsig.ui"/>
14
  <property name="installBaseDir" location="../_fwAndami"/>
15
  <property name="installDir" location="${installBaseDir}/lib"/>
16
  <property name="andami" location="../_fwAndami"/>
17
  <property name="andamiLibs" location="${andami}/lib"/>
18
  <property name="extensionsDir" location="${andami}/gvSIG/extensiones"/>
19
  <property name="gvsigLibDir" location="${extensionsDir}/com.iver.cit.gvsig/lib/"/>
20
  <property name="targetDir" location="${andamiLibs}"/>
15 21

  
22
	<import file="../binaries/ant/utilities.xml"/>
16 23

  
17

  
18 24
	<!--<property name="compile-classpath" value="${andamiLibs}/gvsig-i18n.jar"/>-->
19 25

  
20 26
  <target name="init">
......
25 31
		Compiling ${ant.project.name}...</echo>
26 32
  </target>
27 33

  
28
  <target name="dist" depends="init,copy-data-files,create-jar" />
34
  <target name="dist" depends="init,copy-data-files,create-jar,move-to-installDir" />
29 35

  
30 36
  <target name="clean"
31 37
        description="clean up" >
32 38
    <!-- Delete the ${build} and ${dist} directory trees -->
33 39
    <delete dir="${build}"/>
40
    <delete dir="${dist}"/>
34 41
  </target>
35 42

  
36 43

  
37 44
	<target name="batch-build"
38 45
			description="compile the sources, create the jar file"
39
			depends="compile,copy-data-files,create-jar">
46
			depends="compile,copy-data-files,create-jar,move-to-installDir">
40 47
	</target>
41 48

  
42 49
	<target name="compile" description="compile the source">
......
81 88
		<jar jarfile="${dist}/${jarName}.jar" basedir="." includes="images/*" update="true" />
82 89
	</target>
83 90

  
91
	<target name="move-to-installDir" description="Moves the build directory to andami">
92
		<copy todir="${dist}">
93
			<fileset dir="${lib}" excludes="gvsig-i18n.jar, JWizardComponent.jar, log4j-1.2.8.jar" />
94
		</copy>
95
		<move todir="${targetDir}">
96
			<fileset dir="${dist}" includes="**/*" />
97
		</move>
98
	</target>
99

  
84 100
	<target name="run-tests" depends="batch-build,compile-tests">
85 101
		<antcall target="generic-run-tests">
86 102
			<param name="TestSuite.Name" value="org.gvsig.gui.beans.AllTests"/>
branches/v2_0_0_prep/libraries/libUIComponent/.classpath
2 2
<classpath>
3 3
	<classpathentry kind="src" path="src"/>
4 4
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
5
	<classpathentry kind="var" path="JUNIT_HOME/junit.jar"/>
5 6
	<classpathentry kind="src" output="bin-test" path="src-test-ui"/>
7
	<classpathentry kind="lib" path="lib/JWizardComponent.jar"/>
8
	<classpathentry kind="lib" path="lib/jfreechart-1.0.6.jar"/>
9
	<classpathentry kind="lib" path="lib/jcommon-1.0.10.jar"/>
10
	<classpathentry kind="lib" path="lib/log4j-1.2.8.jar"/>
11
	<classpathentry kind="lib" path="lib/jcalendar.jar"/>
12
	<classpathentry kind="lib" path="/libInternationalization/lib/gvsig-i18n.jar" sourcepath="/libInternationalization/src"/>
6 13
	<classpathentry combineaccessrules="false" kind="src" path="/libTools"/>
7
	<classpathentry kind="lib" path="/binaries/dependencies/jcalendar.jar"/>
8
	<classpathentry kind="lib" path="/binaries/dependencies/jcommon-1.0.10.jar"/>
9
	<classpathentry kind="lib" path="/binaries/dependencies/jfreechart-1.0.6.jar"/>
10
	<classpathentry kind="lib" path="/binaries/dependencies/JWizardComponent.jar"/>
11
	<classpathentry kind="lib" path="/binaries/dependencies/log4j-1.2.8.jar"/>
12
	<classpathentry kind="lib" path="/binaries/lib/org.gvsig.i18n.jar"/>
13
	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
14 14
	<classpathentry kind="output" path="bin"/>
15 15
</classpath>

Also available in: Unified diff