Menu
▾
▴
[gate-cvs] SF.net SVN: gate:[16478] gate/trunk
|
From: <mar...@us...> - 2013-01-21 14:12:42
|
Revision: 16478
http://sourceforge.net/p/gate/code/16478
Author: markagreenwood
Date: 2013-01-21 14:12:39 +0000 (Mon, 21 Jan 2013)
Log Message:
-----------
the deed is done, i.e. the lib folder is no more -- instead of distributing lots of jar files of 3rd party libraries we now use the ivy.xml file (which was already controlling the contents of lib) to ensure the lib directory exists and is fully stocked before any other ant tasks happen. Note that the populated lib folder is still included in the ALL and BIN zip files and the installer so that using the launch scripts in bin continue to work the same as before (and importantly once installed launching gate won't require write access to lib). Hopefully people shouldn't notice any real difference, but the nightly builds should be faster as the SVN checkout will be quicker
Modified Paths:
--------------
gate/trunk/build/deploy/build.xml
gate/trunk/build.xml
Removed Paths:
-------------
gate/trunk/lib/
Modified: gate/trunk/build/deploy/build.xml
===================================================================
--- gate/trunk/build/deploy/build.xml 2013-01-21 14:00:55 UTC (rev 16477)
+++ gate/trunk/build/deploy/build.xml 2013-01-21 14:12:39 UTC (rev 16478)
@@ -134,7 +134,6 @@
<filename name="build/**" />
<filename name="classes" />
<filename name="doc/**" />
- <filename name="lib/**" />
<filename name="src/**" />
</or>
<none>
@@ -142,6 +141,7 @@
<filename name="build/*.jar" />
<filename name="build/deploy/**" />
<filename name="doc/javadoc/" />
+ <filename name="lib/" />
</none>
</and>
</selector>
Modified: gate/trunk/build.xml
===================================================================
--- gate/trunk/build.xml 2013-01-21 14:00:55 UTC (rev 16477)
+++ gate/trunk/build.xml 2013-01-21 14:12:39 UTC (rev 16478)
@@ -85,6 +85,16 @@
<!-- Documentation directory -->
<property name="docDir" location="doc" />
+ <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant">
+ <classpath>
+ <pathelement location="${buildDir}/lib/ivy.jar" />
+ </classpath>
+ </taskdef>
+ <ivy:retrieve sync="true" pattern="${libDir}/[artifact].[ext]" />
+
+ <!-- generate the pretty HTML report for what we just retrieved -->
+ <ivy:report todir="${libDir}" graph="false" />
+
<!-- load ant-contrib for the "if" task -->
<taskdef resource="net/sf/antcontrib/antlib.xml">
<classpath>
@@ -229,37 +239,6 @@
</copy>
</target>
- <target name="prepare.lib">
- <!-- build the full classpath using ivy to resolve dependencies -->
- <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant">
- <classpath>
- <pathelement location="${buildDir}/lib/ivy.jar" />
- </classpath>
- </taskdef>
-
- <!-- retrieve everything and put the jars in lib without version
- numbers to simplify build scripts, eclipse classpaths etc. -->
- <ivy:retrieve sync="true" pattern="lib/[artifact].[ext]" />
-
- <!-- generate the pretty HTML report for what we just retrieved -->
- <ivy:report todir="lib" graph="false" />
-
- <echoxml file="lib/index.html" append="true">
- <html>
- <body>
- For details of the 3rd party libraries, and their licences, see the <a href="uk.ac.gate-gate-core-all.html">Ivy reports</a>
- </body>
- </html>
- </echoxml>
-
- <!-- convert the Ivy file into a Maven POM. Note that this is most definately
- experimental and doesn't yet replace the one in gate/build/deploy/maven -->
- <!-- <ivy:makepom ivyfile="gate-ivy.xml" pomfile="gate.pom.xml">
- <mapping conf="required,compile" scope="compile"/>
- <mapping conf="required,runtime" scope="runtime"/>
- </ivy:makepom> -->
- </target>
-
<target name="svg2java" unless="do.not.draw" depends="prepare">
<java fork="true" classname="englishcoffeedrinker.svg.in.SVGBatchConverter" failonerror="true">
<jvmarg value="-Xmx512m" />
@@ -314,7 +293,8 @@
</jar>
<!-- also build the launcher -->
<ant dir="build/launcher" inheritAll="false" target="jar" />
- <antcall target="eclipse" />
+ <typedef resource="gate/util/ant/antlib.xml" classpathref="run.class.path" />
+ <synceclipse dir="lib" />
</target>
<!-- Optional target useful for creating jars for embedded apps. It splits
@@ -711,12 +691,6 @@
<antcall target="test.reports" />
</target>
- <!-- ensures the .classpath file matches the lib folder -->
- <target name="eclipse">
- <typedef resource="gate/util/ant/antlib.xml" classpathref="run.class.path" />
- <synceclipse dir="lib" />
- </target>
-
<!-- Make the archives for the GATE Distribution -->
<target name="distro-zips" depends="prepare, compile, jar, doc, plugins.build, plugins.distro.prepare">
<ant antfile="build/deploy/build.xml" target="make-zips" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|