[pkg-java] r6992 - in trunk/easymock: . debian

[janpascal-guest at alioth.debian.org]

Author: janpascal-guest
Date: 2008-09-10 19:28:05 +0000 (Wed, 10 Sep 2008)
New Revision: 6992

Added:
   trunk/easymock/debian/build.xml
Removed:
   trunk/easymock/build.xml
Modified:
   trunk/easymock/debian/changelog
   trunk/easymock/debian/rules
Log:
Moved build.xml to debian/build.xml

Deleted: trunk/easymock/build.xml
===================================================================
--- trunk/easymock/build.xml	2008-09-10 19:27:27 UTC (rev 6991)
+++ trunk/easymock/build.xml	2008-09-10 19:28:05 UTC (rev 6992)
@@ -1,70 +0,0 @@
-<project name="easymock" default="dist" basedir=".">
-    <description>
-        build file for easymock
-    </description>
-  <!-- set global properties for this build -->
-  <property name="src" location="src"/>
-  <property name="dist" location="dist"/>
-  <property name="build" location="build"/>
-  <property name="build.test" location="tests-build"/>
-  <property name="javadoc" location="api"/>
-  <property name="jarfile" location="${dist}/easymock-2.4.jar"/>
-
-  <target name="init">
-    <!-- Create the build directory structure used by compile -->
-    <mkdir dir="${build}"/>
-    <mkdir dir="${build.test}"/>
-    <mkdir dir="${javadoc}"/>
-    <mkdir dir="${dist}"/>
-  </target>
-
-  <target name="compile" depends="init"
-        description="compile the source" >
-    <!-- Compile the java code from ${src} into ${build} -->
-    <javac srcdir="${src}" destdir="${build}"/>
-  </target>
-
-  <target name="compile-tests" depends="init,compile"
-        description="compile the unit tests" >
-    <javac srcdir="tests" destdir="${build.test}" classpath="${build}"/>
-  </target>
-
-  <target name="test" depends="init,compile,compile-tests" description="run unit tests">
-    <junit printsummary="yes" haltonfailure="yes" haltonerror="yes">
-      <classpath>
-        <pathelement location="${build}"/>
-        <pathelement location="${build.test}"/>
-      </classpath>
-
-      <formatter type="plain" usefile="false"/>
-
-      <batchtest>
-        <fileset dir="tests">
-          <include name="**/*Test*.java"/>
-          <exclude name="**/AllTests.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="javadoc" depends="init" description="generate api docs">
-    <javadoc destdir="${javadoc}" source="1.5">
-      <fileset dir="${src}" defaultexcludes="yes"/>
-    </javadoc>
-  </target>
-
-  <target name="jar" depends="compile"
-        description="generate the jarfile" >
-
-    <jar jarfile="${jarfile}" basedir="${build}"/>
-  </target>
-
-  <target name="clean"
-        description="clean up" >
-    <!-- Delete the ${build} and ${dist} directory trees -->
-    <delete dir="${build}"/>
-    <delete dir="${build.test}"/>
-    <delete dir="${javadoc}"/>
-    <delete dir="${dist}"/>
-  </target>
-</project>

Copied: trunk/easymock/debian/build.xml (from rev 6844, trunk/easymock/build.xml)
===================================================================
--- trunk/easymock/debian/build.xml	                        (rev 0)
+++ trunk/easymock/debian/build.xml	2008-09-10 19:28:05 UTC (rev 6992)
@@ -0,0 +1,70 @@
+<project name="easymock" default="dist" basedir="..">
+    <description>
+        build file for easymock
+    </description>
+  <!-- set global properties for this build -->
+  <property name="src" location="src"/>
+  <property name="dist" location="dist"/>
+  <property name="build" location="build"/>
+  <property name="build.test" location="tests-build"/>
+  <property name="javadoc" location="api"/>
+  <property name="jarfile" location="${dist}/easymock-2.4.jar"/>
+
+  <target name="init">
+    <!-- Create the build directory structure used by compile -->
+    <mkdir dir="${build}"/>
+    <mkdir dir="${build.test}"/>
+    <mkdir dir="${javadoc}"/>
+    <mkdir dir="${dist}"/>
+  </target>
+
+  <target name="compile" depends="init"
+        description="compile the source" >
+    <!-- Compile the java code from ${src} into ${build} -->
+    <javac srcdir="${src}" destdir="${build}"/>
+  </target>
+
+  <target name="compile-tests" depends="init,compile"
+        description="compile the unit tests" >
+    <javac srcdir="tests" destdir="${build.test}" classpath="${build}"/>
+  </target>
+
+  <target name="test" depends="init,compile,compile-tests" description="run unit tests">
+    <junit printsummary="yes" haltonfailure="yes" haltonerror="yes">
+      <classpath>
+        <pathelement location="${build}"/>
+        <pathelement location="${build.test}"/>
+      </classpath>
+
+      <formatter type="plain" usefile="false"/>
+
+      <batchtest>
+        <fileset dir="tests">
+          <include name="**/*Test*.java"/>
+          <exclude name="**/AllTests.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+
+  <target name="javadoc" depends="init" description="generate api docs">
+    <javadoc destdir="${javadoc}" source="1.5">
+      <fileset dir="${src}" defaultexcludes="yes"/>
+    </javadoc>
+  </target>
+
+  <target name="jar" depends="compile"
+        description="generate the jarfile" >
+
+    <jar jarfile="${jarfile}" basedir="${build}"/>
+  </target>
+
+  <target name="clean"
+        description="clean up" >
+    <!-- Delete the ${build} and ${dist} directory trees -->
+    <delete dir="${build}"/>
+    <delete dir="${build.test}"/>
+    <delete dir="${javadoc}"/>
+    <delete dir="${dist}"/>
+  </target>
+</project>


Property changes on: trunk/easymock/debian/build.xml
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: trunk/easymock/debian/changelog
===================================================================
--- trunk/easymock/debian/changelog	2008-09-10 19:27:27 UTC (rev 6991)
+++ trunk/easymock/debian/changelog	2008-09-10 19:28:05 UTC (rev 6992)
@@ -2,6 +2,7 @@
 
   * Updated debian/watch to work again with upstream version numbering
   * Added DM-Upload-Allowed: yes to debian/control
+  * Moved build.xml to debian/ to silence Lintian about it
 
  -- Jan-Pascal van Best <janpascal at vanbest.org>  Mon, 08 Sep 2008 16:03:48 +0200
 

Modified: trunk/easymock/debian/rules
===================================================================
--- trunk/easymock/debian/rules	2008-09-10 19:27:27 UTC (rev 6991)
+++ trunk/easymock/debian/rules	2008-09-10 19:28:05 UTC (rev 6992)
@@ -23,6 +23,7 @@
 
 # Set ant parameters
 DEB_ANT_BUILD_TARGET = jar javadoc 
+DEB_ANT_BUILDFILE = debian/build.xml
 DEB_ANT_CHECK_TARGET = test
 DEB_JARS = ant-junit junit4