diff options
author | Shevek <[email protected]> | 2013-12-27 05:49:13 -0800 |
---|---|---|
committer | Shevek <[email protected]> | 2013-12-27 05:49:13 -0800 |
commit | bdc6c852f418c3e042aa41469d84544e5f60a526 (patch) | |
tree | 7866346f0fa48ad46a6a427d016dd4b83451dbbe /etc/targets | |
parent | 39264fd6d2a6646e49f83b5b2b3512c1663a1c9b (diff) |
Version bump to 1.4.0-SNAPSHOT.
Rewrite build system to use gradle.
Clean up source for the new generation.
Diffstat (limited to 'etc/targets')
-rw-r--r-- | etc/targets/global-checkstyle.xml | 23 | ||||
-rw-r--r-- | etc/targets/global-clean.xml | 8 | ||||
-rw-r--r-- | etc/targets/global-cobertura.xml | 35 | ||||
-rw-r--r-- | etc/targets/global-compile.xml | 35 | ||||
-rw-r--r-- | etc/targets/global-findbugs.xml | 47 | ||||
-rw-r--r-- | etc/targets/global-inject.xml | 20 | ||||
-rw-r--r-- | etc/targets/global-jar.xml | 40 | ||||
-rw-r--r-- | etc/targets/global-javadoc.xml | 55 | ||||
-rw-r--r-- | etc/targets/global-junit.xml | 99 | ||||
-rw-r--r-- | etc/targets/global-tar.xml | 86 | ||||
-rw-r--r-- | etc/targets/global-taskdefs.xml | 65 | ||||
-rw-r--r-- | etc/targets/global-verify.xml | 23 | ||||
-rw-r--r-- | etc/targets/global-vpp.xml | 32 |
13 files changed, 0 insertions, 568 deletions
diff --git a/etc/targets/global-checkstyle.xml b/etc/targets/global-checkstyle.xml deleted file mode 100644 index 5c15352..0000000 --- a/etc/targets/global-checkstyle.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project name="global-checkstyle" basedir="."> - - <target name="global-checkstyle" depends="global-vpp" - unless="test.no.checkstyle"> - - <mkdir dir="${global.dir.build.reports}" /> - - <!-- XXX: Stupid checkstyle task doesn't expand it's parameters --> - <checkstyle config="etc/checkstyle/config.xml" - failOnViolation="false"> - <classpath refid="checkstyle-classpath" /> - <fileset dir="${global.dir.build.java}" /> - <formatter type="xml" - toFile="${global.dir.build.reports}/checkstyle.xml" /> - <formatter type="plain" - toFile="${global.dir.build.reports}/checkstyle.txt" /> - </checkstyle> - - </target> - -</project> diff --git a/etc/targets/global-clean.xml b/etc/targets/global-clean.xml deleted file mode 100644 index 246a2d0..0000000 --- a/etc/targets/global-clean.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project name="global-clean" basedir="."> - <target name="global-clean"> - <delete dir="${global.dir.root}/build" /> - <delete dir="${global.dir.root}/webroot" /> - </target> -</project> diff --git a/etc/targets/global-cobertura.xml b/etc/targets/global-cobertura.xml deleted file mode 100644 index 425a9fd..0000000 --- a/etc/targets/global-cobertura.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project name="global-cobertura" basedir="."> - - <target name="global-cobertura-instrument" depends="global-taskdefs" - unless="test.no.cobertura"> - <delete dir="${global.dir.build.cobertura}" /> - <mkdir dir="${global.dir.build.cobertura}" /> - - <cobertura-instrument - todir="${global.dir.build.cobertura}" - datafile="${global.dir.build.cobertura}/cobertura.ser"> - <fileset dir="${global.dir.build.classes}"> - <include name="**/*.class" /> - <exclude name="**/Main.class" /> - <exclude name="**/cmd/**" /> - <exclude name="**/soap/port/*/*PortSoapBindingStub.class" /> - <exclude name="**/soap/port/*/*PortServiceLocator.class" /> - <exclude name="**/soap/port/*/*PortService.class" /> - </fileset> - </cobertura-instrument> - - </target> - - <target name="global-cobertura-report" depends="global-taskdefs" - unless="test.no.cobertura"> - <cobertura-report - format="html" - datafile="${global.dir.build.cobertura}/cobertura.ser" - destdir="${global.dir.build.reports}/cobertura" - srcdir="${global.dir.build.java}" /> - </target> - - -</project> diff --git a/etc/targets/global-compile.xml b/etc/targets/global-compile.xml deleted file mode 100644 index b226041..0000000 --- a/etc/targets/global-compile.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project name="global-compile" basedir="."> - - <target name="global-compile" depends="global-vpp"> - <mkdir dir="${global.dir.build.classes}" /> - <mkdir dir="${global.dir.build.depcache}" /> - <mkdir dir="${global.dir.build.java}" /> - - <depend - srcdir="${global.dir.build.java}" - destdir="${global.dir.build.classes}" - cache="${global.dir.build.depcache}" - closure="yes"> - </depend> - - <javac - srcdir="${global.dir.build.java}" - destdir="${global.dir.build.classes}" - optimize="${system.javac.optimize}" - debug="${system.javac.debug}" - source="${system.javac.source}" - target="${system.javac.target}" - deprecation="${system.javac.deprecation}" - > - <classpath refid="compile-classpath" /> - <!-- - <compilerarg compiler="modern" value="-Xlint:unchecked" /> - --> - <compilerarg compiler="modern" value="-Xlint:deprecation" /> - <compilerarg compiler="modern" value="-Xlint:finally" /> - </javac> - </target> - -</project> diff --git a/etc/targets/global-findbugs.xml b/etc/targets/global-findbugs.xml deleted file mode 100644 index 9a06996..0000000 --- a/etc/targets/global-findbugs.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project name="global-findbugs" basedir="."> - - <!-- Used to depend on compile. --> - <target name="global-findbugs" depends="global-taskdefs"> - <delete dir="${global.dir.build.reports}/findbugs-output" /> - <mkdir dir="${global.dir.build.reports}/findbugs-output" /> - <findbugs - home="${global.dir.lib}/findbugs" - output="xml" - outputFile="${global.dir.build.reports}/findbugs-output/findbugs.xml" > - <sourcePath path="${global.dir.build.java}" /> - <class location="${global.dir.build.classes}" /> - <auxClasspath refid="compile-classpath" /> - </findbugs> - - </target> - - <target name="global-findbugs-report" depends="global-taskdefs"> - <xslt - basedir="${global.dir.build.reports}/findbugs-output" - destdir="${global.dir.build.reports}/findbugs" - extension=".html" - style="${global.dir.lib}/findbugs/xsl/plain.xsl"> - </xslt> - </target> - - <target name="global-findbugs-gui" depends="global-taskdefs"> - <java - fork="true" - spawn="true" - classname="edu.umd.cs.findbugs.gui.FindBugsFrame"> - <classpath> - <fileset dir="${global.dir.lib}/findbugs/lib" /> - </classpath> - <sysproperty - key="findbugs.home" - value="${global.dir.lib}/findbugs" /> - <jvmarg value="-Xmx768m" /> - <arg value="-loadbugs" /> - <arg value="${global.dir.build.reports}/findbugs-output/findbugs.xml" /> - </java> - </target> - - -</project> diff --git a/etc/targets/global-inject.xml b/etc/targets/global-inject.xml deleted file mode 100644 index e707b04..0000000 --- a/etc/targets/global-inject.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project name="global-inject" basedir="."> - - <target name="global-inject"> - <inject> - <fileset dir="${global.dir.build.classes}"> - <include name="**/*.class" /> - </fileset> - <criteria> - <!-- <includeClass class="org.jboss.util.stream.*"/> --> - <!-- <excludeClass class="java.lang.reflect.*"/> --> - <!-- <excludeMethod method="get*"/> --> - <!-- <excludeMethod method="set*"/> --> - </criteria> - </inject> - - </target> - -</project> diff --git a/etc/targets/global-jar.xml b/etc/targets/global-jar.xml deleted file mode 100644 index c84dd2a..0000000 --- a/etc/targets/global-jar.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project name="global-jar" basedir="."> - - <target name="global-jar" depends="global-compile"> - <delete dir="${global.dir.build.jar}" /> - <mkdir dir="${global.dir.build.jar}" /> - <mkdir dir="${global.dir.build.tar}/lib" /> - <mkdir dir="${global.dir.src.resources}" /> - - <copy todir="${global.dir.build.jar}"> - <fileset dir="${global.dir.build.java}"> - <include name="**/*.dat" /> - </fileset> - <fileset dir="${global.dir.build.classes}"> - <include name="**" /> - </fileset> - <fileset dir="${global.dir.src.resources}"> - <include name="org/**" /> - </fileset> - <!-- - <fileset dir="${global.dir.src.resources}"> - <include name="log4j.properties" /> - </fileset> - --> - </copy> - - <jar - destfile="${global.file.jar}" - manifest="etc/MANIFEST" - index="true" - compress="${system.jar.compress}"> - <fileset dir="${global.dir.build.jar}" /> - <manifest> - <attribute name="Built-By" value="${user.name}" /> - </manifest> - </jar> - </target> - -</project> diff --git a/etc/targets/global-javadoc.xml b/etc/targets/global-javadoc.xml deleted file mode 100644 index 0de8285..0000000 --- a/etc/targets/global-javadoc.xml +++ /dev/null @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project name="global-javadoc" basedir="."> - - <target name="global-javadoc" depends="global-vpp" unless="build.no.javadoc"> - <javadoc - sourcepath="${global.dir.build.java}:${global.dir.src.docs}/javadoc" - destdir="${global.dir.build.javadoc}" - classpathref="compile-classpath" - source="${system.javac.source}" - access="${system.javadoc.access}" - use="true" - splitindex="false" - failonerror="true" - windowtitle="Anarres C Preprocessor version ${global.version}" - > - - <package name="org.anarres.cpp" /> - <packageset dir="${global.dir.build.java}" /> - - <link - href="http://java.sun.com/j2se/1.5.0/docs/api/" - offline="${system.javadoc.offline}" /> - <link - href="http://java.sun.com/j2ee/1.4/docs/api/" - offline="${system.javadoc.offline}" /> - <link - href="http://java.sun.com/products/servlet/2.3/javadoc/" - offline="${system.javadoc.offline}" /> - <link - href="http://ws.apache.org/axis/java/apiDocs/" - offline="${system.javadoc.offline}" /> - <!-- - <link - href="http://www.jdom.org/docs/apidocs/" - offline="${system.javadoc.offline}" /> - --> - <link - href="http://www.junit.org/junit/javadoc/3.8.1/" - offline="${system.javadoc.offline}" /> - <link - href="http://jakarta.apache.org/commons/configuration/apidocs/" - offline="${system.javadoc.offline}" /> - <link - href="http://www.jajakarta.org/ant/ant-1.6.1/docs/ja/manual/api/" - offline="${system.javadoc.offline}" /> -<!-- href="http://www.cs.bris.ac.uk/Teaching/Resources/General/ant/docs/manual/api/" --> - <tag dir="${global.dir.etc}/javadoc" /> - - <bottom><![CDATA[Copyright © 2007 <a href="http://www.anarres.org/">Shevek, Anarres</a>. All Rights Reserved.]]></bottom> - </javadoc> - - </target> - -</project> diff --git a/etc/targets/global-junit.xml b/etc/targets/global-junit.xml deleted file mode 100644 index e53c5a7..0000000 --- a/etc/targets/global-junit.xml +++ /dev/null @@ -1,99 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project name="global-junit" basedir="."> - - <target name="global-junit" depends="global-taskdefs"> - <runtarget target="global-junit-compile" /> - <runtarget target="global-cobertura-instrument" /> - - <mkdir dir="${global.dir.build.reports}/junit-output" /> - <!-- This only sets the properties if they aren't set - - already. --> - <property name="test.package" value="" /> - <property name="test.case" value="" /> - <property name="test.all" value="" /> - <property name="test.root" value="${global.dir.build.tests}"/> - <property name="jrat.configuration" value="${global.dir.src.resources}/jrat.xml" /> - - <runtarget target="global-junit-cleanup" /> - - <junit - printsummary="yes" - showoutput="yes" - haltonfailure="no" - fork="yes" - forkmode="once" - > - <jvmarg value="-Xbootclasspath/p:${global.dir.build}/hacks/lib/boot.jar"/> - <classpath refid="junit-run-classpath"/> - <formatter type="plain" /> - <formatter type="xml" /> - <sysproperty key="net.sourceforge.cobertura.datafile" - file="${global.dir.build.cobertura}/cobertura.ser" /> - <sysproperty key="test.package" value="${test.package}" /> - <sysproperty key="test.case" value="${test.case}" /> - <sysproperty key="test.root" value="${test.root}" /> - <sysproperty key="test.all" value="${test.all}" /> - <sysproperty key="global.dir.build.classes" - value="${global.dir.build.classes}" /> - <sysproperty key="jrat.configuration" value="${jrat.configuration}" /> - - <assertions> - <enable/> - </assertions> - - <batchtest fork="yes" todir="${global.dir.build.reports}/junit-output"> - <fileset dir="${global.dir.build.tests}"> - <include name="AutoTestSuite.class" /> - </fileset> - </batchtest> - </junit> - - <delete dir="${global.dir.root}/webroot" /> - <delete dir="${global.dir.src.resources}/webapp/WEB-INF" /> - - - <runtarget target="global-junit-report" /> - <runtarget target="global-cobertura-report" /> - </target> - - <target name="global-junit-cleanup"> - <delete dir="${global.dir.root}/webroot" /> - </target> - - <target name="global-junit-compile"> - <delete dir="${global.dir.build.tests}" /> - <mkdir dir="${global.dir.src.tests}" /> - <mkdir dir="${global.dir.build.tests}" /> - - <javac - srcdir="${global.dir.src.tests}" - destdir="${global.dir.build.tests}" - optimize="false" - debug="true" - source="${system.javac.source}" - target="${system.javac.target}" - deprecation="${system.javac.deprecation}" - classpathref="junit-compile-classpath" - > - <!-- - <exclude name="**/master/**" /> - <exclude name="**/slave/**" /> - <exclude name="**/old/**" /> - --> - </javac> - </target> - - <target name="global-junit-report" depends="global-taskdefs"> - <junitreport - todir="${global.dir.build.reports}/junit-output"> - <fileset dir="${global.dir.build.reports}/junit-output"> - <include name="*.xml" /> - <exclude name="TESTS-TestSuites.xml" /> - </fileset> - <report format="frames" todir="${global.dir.build.reports}/junit" - styledir="${global.dir.etc}/junit/xsl"/> - </junitreport> - </target> - -</project> diff --git a/etc/targets/global-tar.xml b/etc/targets/global-tar.xml deleted file mode 100644 index 778cf2f..0000000 --- a/etc/targets/global-tar.xml +++ /dev/null @@ -1,86 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project name="global-tar" basedir="."> - - <target name="global-tar-dir" depends="global-jar"> - <mkdir dir="${global.dir.build.dist}" /> - <mkdir dir="${global.dir.build.tar}/lib" /> - <mkdir dir="${global.dir.build.tar}/bin" /> - <mkdir dir="${global.dir.build.javadoc}" /> - - <copy todir="${global.dir.build.tar}/lib"> - <!-- - <fileset dir="${global.dir.lib}/log4j"> - <include name="**/*.jar" /> - </fileset> - --> - <fileset dir="${global.dir.lib}/runtime"> - <include name="**/*.jar" /> - </fileset> - <mapper type="flatten" /> - </copy> - - <copy todir="${global.dir.build.tar}"> - <fileset dir="${global.dir.src.scripts}"> - <include name="jcpp" /> - </fileset> - <fileset dir="${global.dir.root}"> - <include name="LICENSE" /> - </fileset> - </copy> - - <chmod perm="a+x"> - <fileset dir="${global.dir.build.tar}/bin"> - <include name="**/*.pl"/> - </fileset> - <fileset dir="${global.dir.build.tar}"> - <include name="*.sh"/> - </fileset> - <fileset dir="${global.dir.build.tar}"> - <include name="jcpp"/> - </fileset> - </chmod> - - <!-- <runtarget target="global-inject" /> --> - </target> - - <target name="global-tar" depends="global-tar-dir,global-javadoc"> - - <copy todir="${global.dir.build.tar}/docs/api"> - <fileset dir="${global.dir.build.javadoc}" /> - </copy> - - <tar - destfile="${global.file.bintar}" - compression="gzip" - longfile="gnu"> - <tarfileset - dir="${global.dir.build.tar}" - prefix="${global.name}-bin-${global.version}" - username="root" group="root" - uid="0" gid="0" - > - <include name="**" /> - </tarfileset> - </tar> - - <tar - destfile="${global.file.srctar}" - compression="gzip" - longfile="gnu"> - <tarfileset - dir="${global.dir.root}" - prefix="${global.name}-src-${global.version}" - username="root" group="root" - uid="0" gid="0" - > - <include name="**" /> - <exclude name="build/**" /> - <exclude name="**/.*.swp" /> - <exclude name="src/scripts/release.sh" /> - </tarfileset> - </tar> - - </target> - -</project> diff --git a/etc/targets/global-taskdefs.xml b/etc/targets/global-taskdefs.xml deleted file mode 100644 index 8218c91..0000000 --- a/etc/targets/global-taskdefs.xml +++ /dev/null @@ -1,65 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project name="global-taskdefs"> - - <target name="global-taskdefs" unless="global.taskdefs.done"> - - <taskdef - resource="net/sf/antcontrib/antlib.xml" - classpathref="antcontrib-classpath" - loaderref="ant" /> - - <taskdef - resource="net/sf/antcontrib/antcontrib.properties" - classpathref="antcontrib-classpath" - loaderref="ant" /> - - <taskdef - resource="checkstyletask.properties" - classpathref="checkstyle-classpath" - loaderref="checkstyle" - /> - - <taskdef - resource="foundrylogic/vpp/taskdef.properties" - classpathref="vpp-classpath" - loaderref="vpp" /> - - <!-- - velocity-tools-generic-1.4.jar - jtidy-r8-21122004.jar - --> - - <taskdef name="injectcopy" - classname="org.shiftone.jrat.inject.ant.InjectCopyTask" - classpathref="jrat-classpath" - loaderref="jrat" /> - - <taskdef name="inject" - classname="org.shiftone.jrat.inject.ant.InjectTask" - classpathref="jrat-classpath" - loaderref="jrat" /> - - <taskdef - classpathref="cobertura-classpath" - resource="tasks.properties" - loaderref="cobratura" - /> - - <taskdef name="findbugs" - classname="edu.umd.cs.findbugs.anttask.FindBugsTask" - classpathref="findbugs-classpath" - loaderref="findbugs" /> - - <taskdef - name="svn" - classname="org.tigris.subversion.svnant.SvnTask" - classpathref="svn-classpath" - loaderref="svn" - /> - - <property name="global.taskdefs.done" value="true" /> - - </target> - -</project> diff --git a/etc/targets/global-verify.xml b/etc/targets/global-verify.xml deleted file mode 100644 index 11c8674..0000000 --- a/etc/targets/global-verify.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project name="global-verify" basedir="."> - - <target name="global-verify" depends="global-taskdefs"> - <!-- "master-jar,slave-jar,client-jar" --> - <mkdir dir="${global.dir.build.reports}" /> - - <verifydesign - design="${global.dir.etc}/design.xml" - jar="${master.file.jar}" /> - - <verifydesign - design="${global.dir.etc}/design.xml" - jar="${slave.file.jar}" /> - - <verifydesign - design="${global.dir.etc}/design.xml" - jar="${client.file.jar}" /> - - </target> - -</project> diff --git a/etc/targets/global-vpp.xml b/etc/targets/global-vpp.xml deleted file mode 100644 index 6ffc23d..0000000 --- a/etc/targets/global-vpp.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project name="global-vpp"> - - <target name="global-vpp" depends="global-taskdefs"> - <mkdir dir="${global.dir.build.java}" /> - - <vppcopy todir="${global.dir.build.java}"> - <fileset dir="${global.dir.src.java}"> - <include name="**/*.java" /> - </fileset> - <config> - <context> - <!-- Avoid subversion and RCS tags. --> - <property key="Revision" value="\$Revision" /> - <property key="Id" value="\$Id" /> - <property key="Author" value="\$Author" /> - <property key="Date" value="\$Date" /> - <property key="URL" value="\$URL" /> - <property key="Rev" value="\$Rev" /> - <property key="SOA" value="\$SOA" /> - <property key="TTL" value="\$TTL" /> - <property key="DATASET" value="$DATASET" /> - <property key="_" value="\$_" /> - - <property key="version" value="${global.version}" /> - </context> - </config> - </vppcopy> - </target> - -</project> |