Changeset 2845

Timestamp:

05/07/07 16:58:31 (5 years ago)

Author:

michael

Message:

Tidy up dependencies and build process

Files:

• trunk/.classpath (deleted)
• trunk/.project (deleted)
• trunk/build.properties (added)
• trunk/build.xml (modified) (6 diffs)
• trunk/ivy.xml (modified) (2 diffs)

trunk/build.xml

@@ -4 +4 @@
-        <property name="ant.server" value="http://ant.sarugo.org" />
-        <property name="sarugo.ant.file" value="${ant.lib.dir}/common-build.xml" />
+        <!-- Ant-Eclipse -->
+        <property name="ant.eclipse.url" value="http://trac.sarugo.org/ant-eclipse/attachment/wiki/WikiStart/ant-eclipse.jar?format=raw" />
+        <property name="ant.eclipse.file" value="${ant.lib.dir}/ant-eclipse.jar" />
+        <condition property="download-ant.eclipse.required">
+                <not>
+                        <available file="${ant.eclipse.file}" type="file" />
+                </not>
+        </condition>
-        <!-- Ivy configuration -->
-        <property name="ivy.server" value="${ant.server}/ivy" />
@@ -13 +21 @@
-                </not>
-        </condition>
-directories
+Configuration
-        <property name="src.dir" value="src" />
-        <property name="build.dir" value="build" />
-        <property name="dist.dir" value="dist" />
-        <property name="lib.dir" value="lib" />
+        <property file="build.properties"/>
-        <condition property="bootstrap.required">
-                <not>
@@ -31 +40 @@
-                <get src="${ivy.server}/${ivy.version}/ivy-${ivy.version}.jar" dest="${ivy.dest.file}" usetimestamp="true" />
-        </target>
-
+
+
+
+
+
-        <target name="bootstrap" description="Downloads common ant scripts and libraries">
-                <mkdir dir="${ant.lib.dir}" />
-                <antcall target="download-ivy" />
-
-
-
-
+
-                <ivy:configure file="ivysettings.xml" />
-                <ivy:resolve file="ivy.xml" />
-                <ivy:retrieve pattern="${lib.dir}/[artifact]-[revision].[ext]" />
+                <antcall target="download-ant.eclipse" />
+                <taskdef name="eclipse" classname="org.sarugo.ant.eclipse.EclipseTask" classpath="${ant.eclipse.file}" />
+                <eclipse>
+                        <sourcepath>
+                                <dirset dir="${src.dir}" includes="main/*" />
+                                <dirset dir="${src.dir}" includes="test/*" />
+                        </sourcepath>
+                        <globmapper from="${src.dir}/*" to="${build.dir}/*"/>
+                        <classpath>
+                                <fileset dir="${lib.dir}" includes="**/*.jar" />
+                        </classpath>
+                </eclipse>
-        </target>
-
-
+pre-
-                <fail message="You need to run ant bootstrap" />
+        </target>
+        
+        <target name="init" depends="pre-init">
+                <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpath="${ivy.dest.file}" />
-        </target>
-
@@ -89 +115 @@
-                        <batchtest>
-                                <fileset dir="${src.dir}/test/java">
+                                        <include name="**/*Test.java" />
-                                        <include name="**/*Tests.java" />
-                                </fileset>
@@ -97 +124 @@
-        <target name="package" depends="compile" description="Build distribution files">
-                <mkdir dir="${dist.dir}" />
-xtc
+${project.name}-${project.rev}
-                        <fileset dir="${build.dir}/main/java" />
-                        <fileset dir="${build.dir}/main/resources" />
-                </jar>
-                <!-- Use ivy to copy the runtime dependencies to distribution directory -->
-                <path id="ivy.lib.path">
-                        <fileset file="${ivy.dest.file}" />
-                </path>
-                <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path" />
-                <ivy:configure file="ivysettings.xml" />
-                <ivy:resolve file="ivy.xml" />
@@ -114 +137 @@
-        </target>
-        
-
-
+
+
+
+
-        </target>
-

trunk/ivy.xml

@@ -1 +1 @@
-<ivy-module version="1.3">
-xtc" revision="1.0.0" status="integration
+${project.name}" revision="${project.rev}" status="${project.status}
-    <license name="CDDL" url="http://www.sun.com/cddl/"/>
-  </info>
@@ -9 +9 @@
-  </configurations>
-  <dependencies>
-1
-1" conf="
+2
+2" conf="test->
-    <dependency org="de.odysseus.juel" name="juel" rev="2.1.0" conf="default,compile->default"/>
-    <dependency org="junit" name="junit" rev="3.8.1" conf="test->default"/>