Revision: 19309
http://sourceforge.net/p/gate/code/19309
Author: markagreenwood
Date: 2016-05-12 08:55:49 +0000 (Thu, 12 May 2016)
Log Message:
-----------
started to remove bits from the build.xml that are now handled by maven and no
longer work properly from ant
Modified Paths:
--------------
gate/branches/sawdust2/build.xml
gate/branches/sawdust2/notes.txt
gate/branches/sawdust2/pom.xml
Modified: gate/branches/sawdust2/build.xml
===================================================================
--- gate/branches/sawdust2/build.xml 2016-05-12 08:40:50 UTC (rev 19308)
+++ gate/branches/sawdust2/build.xml 2016-05-12 08:55:49 UTC (rev 19309)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!-- $Id$ -->
-<project name="GATE" default="all" basedir="."
xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:jacoco="antlib:org.jacoco.ant">
+<project name="GATE" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant"
xmlns:jacoco="antlib:org.jacoco.ant">
<description>
GATE
see http://gate.ac.uk
@@ -44,8 +44,8 @@
<property name="gate.home" location="${basedir}" />
<!-- Sources -->
- <property name="srcDir" location="src/main" />
- <property name="tests.srcDir" location="src/test" />
+ <property name="srcDir" location="src/main/java" />
+ <property name="tests.srcDir" location="src/test/java" />
<!-- Files required by the build process -->
<property name="buildDir" location="build" />
@@ -63,16 +63,6 @@
<!-- 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]-[revision].[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>
@@ -80,12 +70,6 @@
</classpath>
</taskdef>
- <taskdef resource="org/jacoco/ant/antlib.xml" uri="antlib:org.jacoco.ant" >
- <classpath>
- <pathelement location="${buildDir}/lib/jacocoant.jar" />
- </classpath>
- </taskdef>
-
<!-- Read version and build numbers -->
<loadfile property="gate.version" srcFile="${buildDir}/version.txt" />
<loadfile property="gate.build" srcFile="${buildDir}/build.txt" />
@@ -200,29 +184,6 @@
<mkdir dir="${outputDir}" />
</target>
- <!-- Copies resources to the output directory -->
- <target name="resources">
- <copy todir="${outputDir}/gate/resources" includeEmptyDirs="true">
- <fileset dir="${srcDir}/gate/resources"
excludes="**/CVS,**/CVS/**,**/.cvsignore" />
- </copy>
- <copy file="${buildDir}/build.txt" todir="${outputDir}/gate/resources" />
- <copy file="${buildDir}/version.txt" todir="${outputDir}/gate/resources" />
- <copy todir="${outputDir}/gate/util" includeEmptyDirs="true">
- <fileset dir="${srcDir}/gate/util" includes="*.tcl" />
- </copy>
- <!-- This is for the Spring support -->
- <copy todir="${outputDir}/META-INF" includeEmptyDirs="true">
- <fileset dir="${srcDir}/META-INF" />
- </copy>
- <copy todir="${outputDir}/gate/util/spring/xml" includeEmptyDirs="true">
- <fileset dir="${srcDir}/gate/util/spring/xml" includes="*.xsd" />
- </copy>
- <!-- This is for the Ant tasks -->
- <copy todir="${outputDir}/gate/util/ant" includeEmptyDirs="true">
- <fileset dir="${srcDir}/gate/util/ant" includes="antlib.xml" />
- </copy>
- </target>
-
<target name="svg2java" unless="do.not.draw" depends="prepare">
<java fork="true"
classname="englishcoffeedrinker.svg.in.SVGBatchConverter" failonerror="true">
<jvmarg value="-Xmx512m" />
@@ -248,103 +209,6 @@
</java>
</target>
- <!-- Calculates dependencies for the source code -->
- <target name="depend">
- <depend srcdir="${srcDir}" destdir="${outputDir}"
cache="${buildDir}/depcache" closure="yes" />
- </target>
-
- <!-- This target compiles all the classes -->
- <target name="compile" depends="prepare, depend, svg2java"
description="compile the source ">
- <!-- Compile the java code from ${srcDir} into ${buildDir} -->
- <javac srcdir="${srcDir}" destdir="${outputDir}" source="1.8" target="1.8"
encoding="UTF-8" debug="true" deprecation="${deprecation}"
debuglevel="lines,source" includes="gate/**,com/**,hepple/**"
classpathref="build.class.path">
- <compilerarg value="-Xmaxwarns" />
- <compilerarg value="${gate.compile.maxwarnings}" />
- <compilerarg value="-Xlint:all" />
- </javac>
- </target>
-
- <!-- This target compiles all the classes including debug information -->
- <target name="compile_debug" depends="prepare, depend" description="compile
the source ">
- <!-- Compile the java code from ${srcDir} into ${buildDir} -->
- <javac srcdir="${srcDir}" destdir="${outputDir}" encoding="UTF-8"
source="1.8" target="1.8" debug="true" deprecation="${deprecation}"
includes="gate/**,com/**,hepple/**" classpathref="build.class.path" />
- </target>
-
-
- <!-- Make gate.jar archive -->
- <target name="jar" depends="compile,resources">
- <jar destfile="${binDir}/gate.jar" update="false" index="true">
- <fileset dir="${outputDir}/"
includes="META-INF/**,gate/**,com/**,hepple/**" />
- <!-- <zipgroupfileset refid="libs"/> -->
- </jar>
- <!-- also build the launcher -->
- <ant dir="build/launcher" inheritAll="false" target="jar" />
- </target>
-
- <!-- Optional target useful for creating jars for embedded apps. It splits
- the contents that would go into gate.jar into subjars for easier updating,
- omitting classes and test files not required for normal execution. -->
- <target name="split_jars" depends="compile,resources">
- <jar destfile="${binDir}/gate-core.jar" update="false" index="true">
- <fileset dir="${outputDir}/">
- <include name="**/*.class" />
- <include name="gate/resources/creole/creole.xml" />
- <include name="gate/resources/build.txt" />
- <include name="gate/resources/version.txt" />
- <include name="gate/util/ant/antlib.xml" />
- <exclude name="**/*Test*.class" />
- <exclude name="gate/creole/annic/**" />
- <exclude name="gate/**/gui/**" />
- <exclude name="gate/swing/**" />
- </fileset>
- </jar>
- <jar destfile="${binDir}/gate-gui.jar" update="false" index="true">
- <fileset dir="${outputDir}/">
- <include name="gate/**/gui/**/*.class" />
- <include name="gate/swing/**/*.class" />
- <exclude name="**/*Test*.class" />
- </fileset>
- </jar>
- <jar destfile="${binDir}/gate-annic.jar" update="false" index="true">
- <fileset dir="${outputDir}/">
- <include name="gate/creole/annic/**/*.class" />
- <exclude name="**/*Test*.class" />
- </fileset>
- </jar>
- <jar destfile="${binDir}/gate-resources.jar" update="false" index="true">
- <fileset dir="${outputDir}/">
- <include name="**/img/**" />
- <include name="**/icons/**" />
- <include name="gate/resources/splash.html" />
- <include name="gate/resources/**/bootstrap/**" />
- <exclude name="**/img/splash_large.png" />
- </fileset>
- </jar>
- <!-- I don't think any of these files are needed for running the UI.
- Uncomment if this turns out to be incorrect-->
- <!--
- <jar destfile="${binDir}/gate-resources-ext.jar"
- update="false"
- index="true">
- <fileset dir="${outputDir}/"
- includes="META-INF/**,gate/**,com/**,hepple/**">
- <exclude name="**/test/**"/>
- <exclude name="**/*.class"/>
- <exclude name="**/img/**"/>
- </fileset>
- </jar>
- -->
- </target>
-
-
- <!-- Make gate.jar archive -->
- <target name="bigjar" depends="compile,resources">
- <jar destfile="${binDir}/gate.jar" update="false" index="true">
- <fileset dir="${outputDir}/" includes="gate/**,com/**,hepple/**" />
- <zipgroupfileset refid="libs" />
- </jar>
- </target>
-
-
<!-- Plugins -->
<!-- Learning plugin needs to be before Lang_Chinese -->
<filelist id="plugins.to.build" dir="plugins" files="
@@ -364,7 +228,7 @@
Teamware_Tools TermRaider Text_Categorization Tools Twitter UIMA
Web_Crawler_Websphinx WordNet Lang_Danish
" />
- <target name="plugins.build" depends="jar">
+ <target name="plugins.build">
<for param="plugin">
<path>
<filelist refid="plugins.to.build" />
@@ -378,77 +242,6 @@
</for>
</target>
- <target name="plugins.javadoc" depends="jar">
- <for param="plugin">
- <path>
- <filelist refid="plugins.to.build" />
- </path>
- <sequential>
- <echo>Running javadoc for plugin @{plugin}</echo>
- <ant dir="@{plugin}" inheritAll="false" target="javadoc" />
- </sequential>
- </for>
- </target>
-
- <target name="plugins.test" depends="jar">
- <for param="plugin">
- <path>
- <filelist refid="plugins.to.build" />
- </path>
- <sequential>
- <echo>Running tests for plugin @{plugin}</echo>
- <ant dir="@{plugin}" inheritAll="false" target="test" />
- </sequential>
- </for>
- </target>
- <target name="plugins.distro.prepare">
- <for param="plugin">
- <path>
- <filelist refid="plugins.to.build" />
- </path>
- <sequential>
- <echo>Preparing plugin @{plugin} for distribution</echo>
- <ant dir="@{plugin}" inheritAll="false" target="distro.prepare" />
- </sequential>
- </for>
- </target>
-
- <target name="plugins.clean">
- <for param="plugin">
- <path>
- <filelist refid="plugins.to.build" />
- </path>
- <sequential>
- <echo>Cleaning plugin @{plugin}</echo>
- <ant dir="@{plugin}" inheritAll="false" target="clean" />
- </sequential>
- </for>
- </target>
-
- <!-- Everything! -->
- <target name="all" depends="jar, plugins.build">
- </target>
-
- <target name="run">
- <echo message="Running GATE via this ANT build file is no longer
supported" />
- </target>
-
- <!-- Clear all build output -->
- <target name="clean.gate">
- <!-- <delete includeemptydirs="true">
- <fileset dir="${outputDir}" excludes="**/CVS,**/CVS/**,**/.cvsignore" />
- </delete>
- <delete includeemptydirs="true">
- <fileset dir="${tests.outputDir}"
excludes="**/CVS,**/CVS/**,**/.cvsignore" />
- </delete>
--->
- <delete dir="${outputDir}" />
- <delete dir="${tests.outputDir}" />
- </target>
-
- <!-- Clean everything (including buildable plugins) -->
- <target name="clean" depends="clean.gate, plugins.clean" />
-
<!-- Make documentation -->
<target name="java2html.taskdef">
<taskdef name="java2html" classname="de.java2html.anttasks.Java2HtmlTask"
classpath="${buildDir}/lib/java2html.jar" />
@@ -473,11 +266,6 @@
<java2html srcdir="${srcDir}"
destdir="${docDir}/javadoc/internal/src-html" includes="**/*.java"
style="eclipse" showLineNumbers="true" showFileName="true"
showTableBorder="false" includeDocumentHeader="true" outputFormat="html"
lineAnchorPrefix="line." tabs="2" addLineAnchors="true" showDefaultTitle="true"
useShortFileName="true" overwrite="true" />
</target>
- <target name="javadoc" depends="javadoc.core,plugins.javadoc" />
-
- <target name="doc" depends="javadoc, internaljavadoc" />
-
-
<!-- Clear all built documentation -->
<target name="docclean">
<delete includeemptydirs="true">
@@ -507,106 +295,6 @@
<move file="${srcDir}/gate/jape/parser/ParseCpsl.html"
toFile="${srcDir}/gate/jape/parser/ParseCpslPlain.html" />
</target>
- <target name="prepare.tests" depends="jar">
- <mkdir dir="${tests.outputDir}"/>
- <javac srcdir="${tests.srcDir}" destdir="${tests.outputDir}" source="1.8"
target="1.8" encoding="UTF-8" debug="true" deprecation="${deprecation}"
debuglevel="lines,source" classpathref="run.class.path">
- <compilerarg value="-Xmaxwarns" />
- <compilerarg value="${gate.compile.maxwarnings}" />
- </javac>
- <copy todir="${tests.outputDir}/gate/resources" includeEmptyDirs="true">
- <fileset dir="${tests.srcDir}/gate/resources"
excludes="**/CVS,**/CVS/**,**/.cvsignore" />
- </copy>
- </target>
-
- <target name="test.gate" depends="prepare.tests">
- <makeurl property="creole.plugins" separator=";">
- <path>
- <pathelement location="${basedir}/plugins/ANNIE/" />
- </path>
- </makeurl>
- <jacoco:coverage destfile="jacoco.exec" append="false">
- <junit fork="true" showoutput="true" printsummary="yes"
maxmemory="512m">
- <classpath refid="test.class.path" />
- <sysproperty key="gate.config" value="${buildDir}/gate.xml" />
- <sysproperty key="gate.home" value="${basedir}" />
- <sysproperty key="load.plugin.path" value="${creole.plugins}" />
- <sysproperty key="java.awt.headless" value="true" />
- <!-- set this property to run just a single test case -->
- <syspropertyset>
- <propertyref name="gate.testcase" />
- </syspropertyset>
- <formatter type="plain" usefile="false" />
- <formatter type="xml" if="write.xml" />
- <formatter type="plain" if="write.plain" />
- <test name="gate.TestGate" outfile="testResult" todir="${buildDir}" />
- </junit>
- </jacoco:coverage>
- </target>
-
- <target name="test.coverage" depends="test.gate" >
- <!-- this isn't used by jenkins so class/package exclusions have to be
done
- via the jenkins web interface if as well if you want to keep the
two
- different report processes in sync with one another -->
- <jacoco:report>
- <executiondata>
- <file file="jacoco.exec"/>
- </executiondata>
- <structure name="JaCoCo GATE Report">
- <classfiles>
- <fileset dir="classes/main">
- <!-- don't include any of the GUI stuff -->
- <exclude name="gate/gui/**"/>
- <exclude name="gate/resources/**"/>
- <exclude name="gate/swing/**"/>
-
- <!-- these packages are only used from plugins -->
- <exclude name="gate/wordnet/**"/>
- <exclude name="gate/creole/ir/**"/>
- <exclude name="gate/creole/ontology/**"/>
-
- <!-- exclude all test classes -->
- <exclude name="**/Test*"/>
- </fileset>
- </classfiles>
- <sourcefiles encoding="UTF-8"><fileset
dir="src/main"/></sourcefiles>
- </structure>
- <html destdir="jacoco"/>
- <csv destfile="jacoco/report.csv"/>
- <xml destfile="jacoco/report.xml"/>
- </jacoco:report>
- </target>
-
- <target name="test" depends="test.gate, plugins.build, plugins.test" />
-
- <target name="test.reports">
- <junitreport>
- <fileset dir="${basedir}">
- <include name="build/testResult.xml" />
- <include name="plugins/**/TEST-*.xml" />
- </fileset>
- <report todir="build" format="noframes" />
- </junitreport>
- </target>
-
- <target name="cruise">
- <antcall target="test">
- <param name="write.xml" value="true" />
- </antcall>
- <antcall target="test.reports" />
- </target>
-
- <!-- Make the archives for the GATE Distribution -->
- <target name="distro-zips" depends="prepare, compile, jar, plugins.build,
doc, plugins.distro.prepare">
- <ant antfile="build/deploy/build.xml" target="make-zips" />
- </target>
-
- <!-- build the installer .jar -->
- <target name="installer" depends="prepare, compile, jar, plugins.build, doc,
plugins.distro.prepare">
- <ant antfile="build/deploy/build.xml" target="build-installer" />
- </target>
-
- <target name="distro" depends="distro-zips, installer" />
-
<!--
Regenerate plugins.html. If perl is not on your path or you need to use a
non-default perl interpreter, set -Dperl.bin=/path/to/perl on the ant command
Modified: gate/branches/sawdust2/notes.txt
===================================================================
--- gate/branches/sawdust2/notes.txt 2016-05-12 08:40:50 UTC (rev 19308)
+++ gate/branches/sawdust2/notes.txt 2016-05-12 08:55:49 UTC (rev 19309)
@@ -19,7 +19,7 @@
things to remove
================
-gate.hui.HelpFrame
+gate.gui.HelpFrame
can't display the user guide properly but need to unwire from options dialog
gate.swing.XJEditorPane
Modified: gate/branches/sawdust2/pom.xml
===================================================================
--- gate/branches/sawdust2/pom.xml 2016-05-12 08:40:50 UTC (rev 19308)
+++ gate/branches/sawdust2/pom.xml 2016-05-12 08:55:49 UTC (rev 19309)
@@ -457,6 +457,26 @@
<build>
<plugins>
<plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>0.7.6.201602180812</version>
+ <executions>
+ <execution>
+ <id>default-prepare-agent</id>
+ <goals>
+
<goal>prepare-agent</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>default-report</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
@@ -479,4 +499,56 @@
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.19.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>3.0.3</version>
+ <configuration>
+ <xmlOutput>true</xmlOutput>
+ <effort>Max</effort>
+ <threshold>Low</threshold>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>0.7.6.201602180812</version>
+ <configuration>
+ <excludes>
+ <!-- this excludes known GUI
code from the code coverage results as
+ we know we aren't
testing them so will likely have a 0% coverage -->
+ <exclude>**/gui/**/*</exclude>
+ <exclude>**/swing/**/*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+ <systemPropertyVariables>
+
<jacoco-agent.destfile>target/jacoco.exec</jacoco-agent.destfile>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9.1</version>
+ <configuration>
+ <failOnError>false</failOnError>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
</project>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Mobile security can be enabling, not merely restricting. Employees who
bring their own devices (BYOD) to work are irked by the imposition of MDM
restrictions. Mobile Device Manager Plus allows you to control only the
apps on BYO-devices by containerizing them, leaving personal data untouched!
https://ad.doubleclick.net/ddm/clk/304595813;131938128;j
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
