[easymock] 06/37: Switch to maven-debian-helper.
Markus Koschany
apo at moszumanska.debian.org
Fri Oct 7 17:33:33 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository easymock.
commit a4cdf174030544ad25940a2512aed84e4e71816b
Author: Markus Koschany <apo at debian.org>
Date: Fri Oct 7 12:16:59 2016 +0200
Switch to maven-debian-helper.
---
debian/build.xml | 96 --------------------------
debian/control | 3 +-
debian/libeasymock-java-doc.javadoc | 1 -
debian/libeasymock-java.jlibs | 1 -
debian/libeasymock-java.poms | 1 -
debian/pom.xml | 134 ------------------------------------
debian/rules | 15 +---
7 files changed, 2 insertions(+), 249 deletions(-)
diff --git a/debian/build.xml b/debian/build.xml
deleted file mode 100644
index daeecf5..0000000
--- a/debian/build.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<project name="easymock" default="jar" 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.jar"/>
- <property name="lib.dir" location="/usr/share/java"/>
-
- <path id="classpath">
-<!--
- <fileset dir="${lib.dir}" includes="**/*.jar"/>
--->
- </path>
- <path id="junit.classpath">
- <pathelement location="${build}"/>
- <pathelement location="${build.test}"/>
- <pathelement location="/usr/share/java/junit4.jar"/>
- <!-- only needed for version 3.2 and later -->
- <pathelement location="/usr/share/java/objenesis.jar"/>
- <pathelement location="/usr/share/java/cglib.jar"/>
- <pathelement location="/usr/share/java/asm.jar"/>
- </path>
-
- <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 sourcepath="" target="1.6" source="1.6" includeantruntime="true" srcdir="${src}"
- classpathref="classpath" destdir="${build}" >
- <include name="**/*.java"/>
- <exclude name="**/AndroidClassProxyFactory.java"/>
- </javac>
- </target>
-
- <target name="compile-tests" depends="init,compile" description="compile the unit tests" >
- <javac sourcepath="" target="1.6" source="1.6" includeantruntime="true" srcdir="tests"
- destdir="${build.test}" classpathref="classpath" classpath="${build}" >
- <include name="**/*.java"/>
- <exclude name="**/ClassExtensionHelperTest.java"/>
- </javac>
- </target>
-
- <target name="test" depends="init,compile,compile-tests" description="run unit tests">
- <junit printsummary="yes" haltonfailure="yes" haltonerror="yes">
- <formatter type="plain" usefile="false"/>
- <classpath refid="junit.classpath"/>
- <batchtest>
- <fileset dir="tests">
- <include name="**/*Test*.java"/>
- <exclude name="**/*EasyMockPropertiesTest.java"/>
- <!-- only needed for version 3.2 and later -->
- <exclude name="**/*BaseEasyMockRunnerTest.java"/>
- <exclude name="**/*DependencyTest.java"/>
- <exclude name="**/*ClassExtensionHelperTest.java"/>
- <exclude name="**/*EasyMockSupportClassTest.java"/>
- <exclude name="**/*EasyMockAnnotationsTest.java"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
- <target name="javadoc" depends="init" description="generate api docs">
- <javadoc destdir="${javadoc}" source="1.6" classpathref="classpath">
- <fileset dir="${src}"
- defaultexcludes="yes"
- excludes="**/*AndroidClassProxyFactory.java"
- />
- </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>
diff --git a/debian/control b/debian/control
index 7acbe8e..4f0dbb0 100644
--- a/debian/control
+++ b/debian/control
@@ -10,11 +10,10 @@ Build-Depends:
ant-optional,
debhelper (>= 10),
default-jdk,
- javahelper,
junit4,
libcglib-java,
libobjenesis-java,
- maven-repo-helper
+ maven-debian-helper
Standards-Version: 3.9.8
Vcs-Git: https://anonscm.debian.org/git/pkg-java/easymock.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/easymock.git
diff --git a/debian/libeasymock-java-doc.javadoc b/debian/libeasymock-java-doc.javadoc
deleted file mode 100644
index eedd89b..0000000
--- a/debian/libeasymock-java-doc.javadoc
+++ /dev/null
@@ -1 +0,0 @@
-api
diff --git a/debian/libeasymock-java.jlibs b/debian/libeasymock-java.jlibs
deleted file mode 100644
index 00752d9..0000000
--- a/debian/libeasymock-java.jlibs
+++ /dev/null
@@ -1 +0,0 @@
-dist/easymock.jar
diff --git a/debian/libeasymock-java.poms b/debian/libeasymock-java.poms
deleted file mode 100644
index 3a895d1..0000000
--- a/debian/libeasymock-java.poms
+++ /dev/null
@@ -1 +0,0 @@
-debian/pom.xml --no-parent --usj-name=easymock
diff --git a/debian/pom.xml b/debian/pom.xml
deleted file mode 100644
index 6c0c1af..0000000
--- a/debian/pom.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.easymock</groupId>
- <artifactId>easymock-parent</artifactId>
- <version>3.3.1</version>
- </parent>
-
- <artifactId>easymock</artifactId>
- <packaging>jar</packaging>
- <name>EasyMock</name>
- <description>EasyMock provides an easy way to create Mock Objects for interfaces and classes generating them on the fly</description>
- <inceptionYear>2001</inceptionYear>
-
- <developers>
- <developer>
- <id>tammo</id>
- <name>Tammo Freese</name>
- <timezone>+1</timezone>
- </developer>
- <developer>
- <id>henri</id>
- <name>Henri Tremblay</name>
- <url>http://blog.tremblay.pro/</url>
- <timezone>-5</timezone>
- </developer>
- </developers>
-
- <dependencies>
- <!-- Used for class mocking -->
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>3.1</version>
- </dependency>
- <!-- Use version 5 to be compliant with Java 8 -->
- <dependency>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm</artifactId>
- <version>5.0.3</version>
- <scope>runtime</scope>
- </dependency>
- <!-- Used for class mocking -->
- <dependency>
- <groupId>org.objenesis</groupId>
- <artifactId>objenesis</artifactId>
- <version>2.1</version>
- </dependency>
- <!-- Used for class mocking on Android (cglib replacement) -->
- <dependency>
- <groupId>com.google.dexmaker</groupId>
- <artifactId>dexmaker</artifactId>
- <version>1.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <optional>true</optional>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/src/samples/java</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Export-Package>org.easymock.internal.*;poweruser=true;mandatory:=poweruser,org.easymock</Export-Package>
- <Import-Package>net.sf.cglib.core;resolution:=optional,net.sf.cglib.proxy;resolution:=optional,net.sf.cglib.reflect;resolution:=optional,org.easymock,org.easymock.internal;poweruser=true,org.objenesis;resolution:=optional</Import-Package>
- </instructions>
- </configuration>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <profiles>
- <profile>
- <id>fullBuild</id>
- <build>
- <plugins>
- <plugin>
- <groupId>com.mycila.maven-license-plugin</groupId>
- <artifactId>maven-license-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>deployBuild</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>easymock-bundle</id>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
diff --git a/debian/rules b/debian/rules
index 2c7bb80..430435f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +1,7 @@
#!/usr/bin/make -f
-export JAVA_HOME=/usr/lib/jvm/default-java
-export CLASSPATH=/usr/share/java/objenesis.jar:/usr/share/java/cglib.jar:/usr/share/java/junit4.jar
-PKD = $(abspath $(dir $(MAKEFILE_LIST)))
-PKG = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
-VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s*([\d\.]+)}')
-DTYPE = +ds
%:
- dh $@ --with javahelper,jh_maven_repo_helper
-
-override_dh_auto_build:
- ant -f $(CURDIR)/debian/build.xml jar javadoc test
-
-override_dh_auto_clean:
- dh_auto_clean
- ant -f $(CURDIR)/debian/build.xml clean
+ dh $@
get-orig-source:
uscan --download-current-version --force-download --repack --compression xz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/easymock.git
More information about the pkg-java-commits
mailing list