[pkg-java] r4540 - trunk/libjboss-common-java/debian
varun-guest at alioth.debian.org
varun-guest at alioth.debian.org
Wed Oct 31 11:55:41 UTC 2007
Author: varun-guest
Date: 2007-10-31 11:55:41 +0000 (Wed, 31 Oct 2007)
New Revision: 4540
Removed:
trunk/libjboss-common-java/debian/libjboss-common-core-java.install
trunk/libjboss-common-java/debian/libjboss-common-logging-jdk-java.install
trunk/libjboss-common-java/debian/libjboss-common-logging-log4-java.install
trunk/libjboss-common-java/debian/libjboss-common-logging-spi-java.install
Modified:
trunk/libjboss-common-java/debian/ant.properties
trunk/libjboss-common-java/debian/build.xml
trunk/libjboss-common-java/debian/control
trunk/libjboss-common-java/debian/rules
Log:
* Build only one jboss-common.jar
* Create only one binary package libjboss-common-java
Modified: trunk/libjboss-common-java/debian/ant.properties
===================================================================
--- trunk/libjboss-common-java/debian/ant.properties 2007-10-31 08:43:39 UTC (rev 4539)
+++ trunk/libjboss-common-java/debian/ant.properties 2007-10-31 11:55:41 UTC (rev 4540)
@@ -5,7 +5,4 @@
common-logging-spi.dir=common-logging-spi
common-logging-jdk.dir=common-logging-jdk
common-logging-log4j.dir=common-logging-log4j
-common-core.jar=jboss-common-core.jar
-common-logging-spi.jar=jboss-common-logging-spi.jar
-common-logging-jdk.jar=jboss-common-logging-jdk.jar
-common-logging-log4j.jar=jboss-common-logging-log4j.jar
+jboss-common.jar=jboss-common.jar
Modified: trunk/libjboss-common-java/debian/build.xml
===================================================================
--- trunk/libjboss-common-java/debian/build.xml 2007-10-31 08:43:39 UTC (rev 4539)
+++ trunk/libjboss-common-java/debian/build.xml 2007-10-31 11:55:41 UTC (rev 4540)
@@ -5,15 +5,7 @@
<target name="clean">
<delete dir="all-sources" quiet="true"/>
<delete dir="${class.dir}" quiet="true"/>
- <delete dir="${common-core.dir}/${class.dir}" quiet="true"/>
- <delete dir="${common-logging-jdk.dir}/${class.dir}" quiet="true"/>
- <delete dir="${common-logging-log4j.dir}/${class.dir}" quiet="true"/>
- <delete dir="${common-logging-spi.dir}/${class.dir}" quiet="true"/>
- <delete file="jboss-common.jar" quiet="true"/>
- <delete file="${common-core.jar}" quiet="true"/>
- <delete file="${common-logging-spi.jar}" quiet="true"/>
- <delete file="${common-logging-jdk.jar}" quiet="true"/>
- <delete file="${common-logging-log4j.jar}" quiet="true"/>
+ <delete file="${jboss-common.jar}" quiet="true"/>
</target>
<target name="compile">
@@ -28,48 +20,14 @@
<mkdir dir="${class.dir}"/>
<javac srcdir="all-sources" destdir="${class.dir}"
debug="true" source="1.5"/>
-
- <jar jarfile="jboss-common.jar">
- <fileset dir="${class.dir}">
- <include name="org/**"/>
- </fileset>
- </jar>
-
- <mkdir dir="${common-logging-log4j.dir}/${class.dir}"/>
- <javac srcdir="${common-logging-log4j.dir}/${source.dir}" destdir="common-logging-log4j/${class.dir}"
- debug="true" classpath="jboss-common.jar" source="1.5"/>
- <mkdir dir="${common-logging-jdk.dir}/${class.dir}"/>
- <javac srcdir="${common-logging-jdk.dir}/${source.dir}" destdir="common-logging-jdk/${class.dir}"
- debug="true" classpath="jboss-common.jar" source="1.5"/>
- <mkdir dir="${common-logging-spi.dir}/${class.dir}"/>
- <javac srcdir="${common-logging-spi.dir}/${source.dir}" destdir="common-logging-spi/${class.dir}"
- debug="true" classpath="jboss-common.jar" source="1.5"/>
- <mkdir dir="${common-core.dir}/${class.dir}"/>
- <javac srcdir="${common-core.dir}/${source.dir}" destdir="common-core/${class.dir}"
- debug="true" classpath="jboss-common.jar" source="1.5"/>
</target>
<target name="jar" description="o Create the jar" depends="compile">
- <jar jarfile="${common-core.jar}">
- <fileset dir="${common-core.dir}/${class.dir}">
+ <jar jarfile="${jboss-common.jar}">
+ <fileset dir="${class.dir}">
<include name="org/**"/>
</fileset>
</jar>
- <jar jarfile="${common-logging-log4j.jar}">
- <fileset dir="${common-logging-log4j.dir}/${class.dir}">
- <include name="org/**"/>
- </fileset>
- </jar>
- <jar jarfile="${common-logging-jdk.jar}">
- <fileset dir="${common-logging-jdk.dir}/${class.dir}">
- <include name="org/**"/>
- </fileset>
- </jar>
- <jar jarfile="${common-logging-spi.jar}">
- <fileset dir="${common-logging-spi.dir}/${class.dir}">
- <include name="org/**"/>
- </fileset>
- </jar>
</target>
</project>
Modified: trunk/libjboss-common-java/debian/control
===================================================================
--- trunk/libjboss-common-java/debian/control 2007-10-31 08:43:39 UTC (rev 4539)
+++ trunk/libjboss-common-java/debian/control 2007-10-31 11:55:41 UTC (rev 4540)
@@ -12,7 +12,7 @@
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjboss-common-java
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjboss-common-java
-Package: libjboss-common-core-java
+Package: libjboss-common-java
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends},
java-gcj-compat | java1-runtime | java2-runtime
@@ -20,38 +20,9 @@
The common module in JBoss Application Server has been promoted to a
standalone project. The project itself has now been and broken up
into several projects.
+ * common-core: Utility classes of Jboss.
+ * common-logging-spi: The JBoss Logging interface.
+ * common-logging-log4: The log4j implementation of JBoss.
+ * common-logging-jdk: The logging jdk classes of JBoss.
.
- This package ships the Utility classes of Jboss.
-
-Package: libjboss-common-logging-spi-java
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends},
- java-gcj-compat | java1-runtime | java2-runtime
-Description: The JBoss Common Project
- The common module in JBoss Application Server has been promoted to a
- standalone project. The project itself has now been and broken up
- into several projects.
- .
- This package ships the The JBoss Logging interface.
-
-Package: libjboss-common-logging-log4-java
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends},
- java-gcj-compat | java1-runtime | java2-runtime
-Description: The JBoss Common Project
- The common module in JBoss Application Server has been promoted to a
- standalone project. The project itself has now been and broken up
- into several projects.
- .
- This package ships the the log4j implementation of JBoss.
-
-Package: libjboss-common-logging-jdk-java
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends},
- java-gcj-compat | java1-runtime | java2-runtime
-Description: The JBoss Common Project
- The common module in JBoss Application Server has been promoted to a
- standalone project. The project itself has now been and broken up
- into several projects.
- .
- This package ships the logging jdk classes of JBoss.
+ This package ships all the components of JBoss common.
Deleted: trunk/libjboss-common-java/debian/libjboss-common-core-java.install
===================================================================
--- trunk/libjboss-common-java/debian/libjboss-common-core-java.install 2007-10-31 08:43:39 UTC (rev 4539)
+++ trunk/libjboss-common-java/debian/libjboss-common-core-java.install 2007-10-31 11:55:41 UTC (rev 4540)
@@ -1 +0,0 @@
-debian/tmp/usr/share/java/jboss-common-core*
Deleted: trunk/libjboss-common-java/debian/libjboss-common-logging-jdk-java.install
===================================================================
--- trunk/libjboss-common-java/debian/libjboss-common-logging-jdk-java.install 2007-10-31 08:43:39 UTC (rev 4539)
+++ trunk/libjboss-common-java/debian/libjboss-common-logging-jdk-java.install 2007-10-31 11:55:41 UTC (rev 4540)
@@ -1 +0,0 @@
-debian/tmp/usr/share/java/jboss-common-logging-jdk*
Deleted: trunk/libjboss-common-java/debian/libjboss-common-logging-log4-java.install
===================================================================
--- trunk/libjboss-common-java/debian/libjboss-common-logging-log4-java.install 2007-10-31 08:43:39 UTC (rev 4539)
+++ trunk/libjboss-common-java/debian/libjboss-common-logging-log4-java.install 2007-10-31 11:55:41 UTC (rev 4540)
@@ -1 +0,0 @@
-debian/tmp/usr/share/java/jboss-common-logging-log4j*
Deleted: trunk/libjboss-common-java/debian/libjboss-common-logging-spi-java.install
===================================================================
--- trunk/libjboss-common-java/debian/libjboss-common-logging-spi-java.install 2007-10-31 08:43:39 UTC (rev 4539)
+++ trunk/libjboss-common-java/debian/libjboss-common-logging-spi-java.install 2007-10-31 11:55:41 UTC (rev 4540)
@@ -1 +0,0 @@
-debian/tmp/usr/share/java/jboss-common-logging-spi*
Modified: trunk/libjboss-common-java/debian/rules
===================================================================
--- trunk/libjboss-common-java/debian/rules 2007-10-31 08:43:39 UTC (rev 4539)
+++ trunk/libjboss-common-java/debian/rules 2007-10-31 11:55:41 UTC (rev 4540)
@@ -7,17 +7,10 @@
DEB_ANT_BUILD_TARGET := jar
DEB_ANT_BUILDFILE := debian/build.xml
DEB_JARS := log4j-1.2 commons-httpclient jakarta-slide-webdavlib
-DEB_DESTDIR := $(CURDIR)/debian/tmp
-ALL_JARS = $(wildcard *.jar)
-DEST_DIR = $(DEB_DESTDIR)/usr/share/java
-common-install-prehook-indep::
- for jar in $(ALL_JARS); do \
- BASENAME=`basename $$jar .jar`; \
- FULLNAME=$$BASENAME-$(DEB_UPSTREAM_VERSION).jar; \
- install -m 644 -D $$jar $(DEST_DIR)/$$FULLNAME; \
- ln -s $$FULLNAME $(DEST_DIR)/$$BASENAME.jar; \
- done
+install/libjboss-common-java::
+ install -m 644 -D jboss-common.jar $(DEB_DESTDIR)/usr/share/java/jboss-common-$(DEB_UPSTREAM_VERSION).jar
+ dh_link /usr/share/java/jboss-common-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jboss-common.jar
get-orig-source:
sh debian/orig-tar.sh $(DEB_UPSTREAM_VERSION)
More information about the pkg-java-commits
mailing list