[pkg-java] r4153 - in trunk/easymock: . debian
janpascal-guest at alioth.debian.org
janpascal-guest at alioth.debian.org
Tue Sep 11 15:41:43 UTC 2007
Author: janpascal-guest
Date: 2007-09-11 15:41:43 +0000 (Tue, 11 Sep 2007)
New Revision: 4153
Modified:
trunk/easymock/build.xml
trunk/easymock/debian/changelog
trunk/easymock/debian/control
trunk/easymock/debian/libeasymock-java.dirs
trunk/easymock/debian/rules
Log:
Split off -doc package
Modified: trunk/easymock/build.xml
===================================================================
--- trunk/easymock/build.xml 2007-09-11 13:59:13 UTC (rev 4152)
+++ trunk/easymock/build.xml 2007-09-11 15:41:43 UTC (rev 4153)
@@ -7,7 +7,7 @@
<property name="dist" location="dist"/>
<property name="build" location="build"/>
<property name="build.test" location="tests-build"/>
- <property name="javadoc" location="javadoc"/>
+ <property name="javadoc" location="api"/>
<property name="jarfile" location="${dist}/easymock-2.3.jar"/>
<target name="init">
@@ -21,28 +21,17 @@
<target name="compile" depends="init"
description="compile the source" >
<!-- Compile the java code from ${src} into ${build} -->
- <javac srcdir="${src}" destdir="${build}" source="1.5" target="1.5"/>
+ <javac srcdir="${src}" destdir="${build}"/>
</target>
<target name="compile-tests" depends="init,compile"
description="compile the unit tests" >
- <javac srcdir="tests" destdir="${build.test}" source="1.5" target="1.5"
- classpath="${build}"/>
+ <javac srcdir="tests" destdir="${build.test}" classpath="${build}"/>
</target>
- <target name="javadoc" depends="init" description="generate api docs">
- <javadoc destdir="${javadoc}">
- <fileset dir="${src}" defaultexcludes="yes">
- <include name="org/easymock/**"/>
- <exclude name="org/easymock/LogicalOperator.java"/>
- </fileset>
- </javadoc>
- </target>
-
<target name="test" depends="init,compile,compile-tests" description="run unit tests">
<junit printsummary="yes" haltonfailure="yes" haltonerror="yes">
<classpath>
- <pathelement location="/usr/share/java/junit.jar"/>
<pathelement location="${build}"/>
<pathelement location="${build.test}"/>
</classpath>
@@ -58,6 +47,16 @@
</junit>
</target>
+ <target name="javadoc" depends="init" description="generate api docs">
+ <!-- gjdoc does not support source=1.5 -->
+ <javadoc destdir="${javadoc}" source="1.4">
+ <fileset dir="${src}" defaultexcludes="yes">
+ <!-- gjdoc barfs on the following class -->
+ <exclude name="org/easymock/LogicalOperator.java"/>
+ </fileset>
+ </javadoc>
+ </target>
+
<target name="jar" depends="compile"
description="generate the jarfile" >
Modified: trunk/easymock/debian/changelog
===================================================================
--- trunk/easymock/debian/changelog 2007-09-11 13:59:13 UTC (rev 4152)
+++ trunk/easymock/debian/changelog 2007-09-11 15:41:43 UTC (rev 4153)
@@ -1,3 +1,9 @@
+easymock (2.3+ds1-1~pre2) unstable; urgency=low
+
+ * Split off libeasymock-java-doc package.
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org> Tue, 11 Sep 2007 16:45:57 +0200
+
easymock (2.3+ds1-1~pre1) unstable; urgency=low
* Initial release. (Closes: #441839)
Modified: trunk/easymock/debian/control
===================================================================
--- trunk/easymock/debian/control 2007-09-11 13:59:13 UTC (rev 4152)
+++ trunk/easymock/debian/control 2007-09-11 15:41:43 UTC (rev 4153)
@@ -21,3 +21,18 @@
by simulating their collaborators with Mock Objects.
.
Homepage: http://www.easymock.org
+
+Package: libeasymock-java-doc
+Architecture: all
+Section: doc
+Suggests: libeasymock-java
+Description: Java library to generate Mock Objects for given interfaces (documentation)
+ EasyMock 2 is a library that provides an easy way to use Mock Objects for given
+ interfaces. Mock Objects simulate parts of the behavior of domain code,
+ and are able to check whether they are used as defined.
+ Domain classes can be tested in isolation
+ by simulating their collaborators with Mock Objects.
+ .
+ This package contains the documentation for the Mock Objects library.
+ .
+ Homepage: http://www.easymock.org
Modified: trunk/easymock/debian/libeasymock-java.dirs
===================================================================
--- trunk/easymock/debian/libeasymock-java.dirs 2007-09-11 13:59:13 UTC (rev 4152)
+++ trunk/easymock/debian/libeasymock-java.dirs 2007-09-11 15:41:43 UTC (rev 4153)
@@ -1,2 +1 @@
/usr/share/java
-/usr/share/doc/libeasymock-java/html
Modified: trunk/easymock/debian/rules
===================================================================
--- trunk/easymock/debian/rules 2007-09-11 13:59:13 UTC (rev 4152)
+++ trunk/easymock/debian/rules 2007-09-11 15:41:43 UTC (rev 4153)
@@ -15,7 +15,6 @@
CHANGESFILE = ../easymock_$(DEB_VERSION)_$(DEB_BUILD_ARCH).changes
INSTDIR=$(CURDIR)/debian/libeasymock-java
-DOCDIR=$(INSTDIR)/usr/share/doc/libeasymock-java
JAVADIR=$(INSTDIR)/usr/share/java
# Explicitly build with gcj
@@ -28,10 +27,10 @@
DEB_ANT_CHECK_TARGET = test
DEB_JARS = ant-junit junit4
-DEB_INSTALL_CHANGELOGS_solr-common := CHANGES.txt
+DEB_INSTALL_DOCS_libeasymock-java-doc := api Documentation*.html easymock.css
-cleanbuilddir:: build.xml
-build.xml:
+cleanbuilddir:: src
+src:
debian/rules restore-from-source
clean::
@@ -39,8 +38,6 @@
install/libeasymock-java::
install -m 0644 dist/easymock-$(UPSTREAM_VERSION).jar $(JAVADIR)/
ln -s easymock-$(UPSTREAM_VERSION).jar $(JAVADIR)/easymock.jar
-
- install -m 0644 Documentation*.html easymock.css $(DOCDIR)/html
remove-source:
rm -rf src tests samples
@@ -62,7 +59,8 @@
lintian -i $(CHANGESFILE)
linda -i $(CHANGESFILE)
zgrep "^---" ../easymock_$(DEB_VERSION).diff.gz | grep -v "debian\|build.xml" ; [ $$? != 0 ]
- ( dpkg --contents ../libeasymock-java_$(DEB_VERSION)_all.deb ) | less
+ ( dpkg --contents ../libeasymock-java_$(DEB_VERSION)_all.deb ; \
+ dpkg --contents ../libeasymock-java-doc_$(DEB_VERSION)_all.deb ) | less
upload:
dupload -t mentors $(CHANGESFILE)
More information about the pkg-java-commits
mailing list