[pkg-java] r4666 - trunk/libjboss-microcontainer-java/debian
varun-guest at alioth.debian.org
varun-guest at alioth.debian.org
Fri Nov 9 12:02:44 UTC 2007
Author: varun-guest
Date: 2007-11-09 12:02:44 +0000 (Fri, 09 Nov 2007)
New Revision: 4666
Removed:
trunk/libjboss-microcontainer-java/debian/patches/
Modified:
trunk/libjboss-microcontainer-java/debian/ant.properties
trunk/libjboss-microcontainer-java/debian/build.xml
trunk/libjboss-microcontainer-java/debian/changelog
trunk/libjboss-microcontainer-java/debian/orig-tar.sh
trunk/libjboss-microcontainer-java/debian/rules
Log:
* Use svn source instead of the old tarball.
* Extra classes jboss.annotaion.* are present only in the svn.
These classes are required to build jboss-aop
Modified: trunk/libjboss-microcontainer-java/debian/ant.properties
===================================================================
--- trunk/libjboss-microcontainer-java/debian/ant.properties 2007-11-08 18:29:31 UTC (rev 4665)
+++ trunk/libjboss-microcontainer-java/debian/ant.properties 2007-11-09 12:02:44 UTC (rev 4666)
@@ -1,6 +1,30 @@
project.name=jboss-microcontainer
class.dir=class
-source.dir=main
+source.dir=src/main
+
jboss-container.jar.name=jboss-container.jar
jboss-microcontainer.jar.name=jboss-microcontainer.jar
jboss-dependency.jar.name=jboss-dependency.jar
+
+aop-mc-int.dir=aop-mc-int
+classloader.dir=classloader
+container.dir=container
+dependency.dir=dependency
+deployers-client.dir=deployers-client
+deployers-client-spi.dir=deployers-client-spi
+deployers-core.dir=deployers-core
+deployers-core-spi.dir=deployers-core-spi
+deployers-impl.dir=deployers-impl
+deployers-spi.dir=deployers-spi
+deployers-structure-spi.dir=deployers-structure-spi
+deployers-vfs.dir=deployers-vfs
+deployers-vfs-spi.dir=deployers-vfs-spi
+guice-int.dir=guice-int
+kernel.dir=kernel
+managed.dir=managed
+metatype.dir=metatype
+osgi-int.dir=osgi-int
+reliance-identity.dir=reliance-identity
+reliance-jbpm.dir=reliance-jbpm
+reliance-rules.dir=reliance-rules
+spring-int.dir=spring-int
Modified: trunk/libjboss-microcontainer-java/debian/build.xml
===================================================================
--- trunk/libjboss-microcontainer-java/debian/build.xml 2007-11-08 18:29:31 UTC (rev 4665)
+++ trunk/libjboss-microcontainer-java/debian/build.xml 2007-11-09 12:02:44 UTC (rev 4666)
@@ -3,6 +3,7 @@
<project default="jar" name="${project.name}" basedir="..">
<target name="clean">
+ <delete dir="all-sources" quiet="true"/>
<delete dir="${class.dir}" quiet="true"/>
<delete file="${jboss-container.jar.name}" quiet="true"/>
<delete file="${jboss-microcontainer.jar.name}" quiet="true"/>
@@ -10,26 +11,60 @@
</target>
<target name="compile">
+ <mkdir dir="all-sources"/>
+ <copy todir="all-sources">
+<!-- <fileset dir="${aop-mc-int.dir}/${source.dir}"/> -->
+ <fileset dir="${classloader.dir}/${source.dir}"/>
+ <fileset dir="${container.dir}/${source.dir}"/>
+ <fileset dir="${dependency.dir}/${source.dir}"/>
+<!-- <fileset dir="${deployers-client.dir}/${source.dir}"/> -->
+<!-- <fileset dir="${deployers-client-spi.dir}/${source.dir}"/> -->
+<!-- <fileset dir="${deployers-core.dir}/${source.dir}"/> -->
+<!-- <fileset dir="${deployers-core-spi.dir}/${source.dir}"/> -->
+<!-- <fileset dir="${deployers-impl.dir}/${source.dir}"/> -->
+<!-- <fileset dir="${deployers-spi.dir}/${source.dir}"/> -->
+<!-- <fileset dir="${deployers-structure-spi.dir}/${source.dir}"/> -->
+<!-- <fileset dir="${deployers-vfs.dir}/${source.dir}"/> -->
+<!-- <fileset dir="${deployers-vfs-spi.dir}/${source.dir}"/> -->
+<!-- <fileset dir="${guice-int.dir}/${source.dir}"/> -->
+ <fileset dir="${kernel.dir}/${source.dir}"/>
+ <fileset dir="${managed.dir}/${source.dir}" excludes="**/plugins/advice/**" />
+ <fileset dir="${metatype.dir}/${source.dir}"/>
+<!-- <fileset dir="${osgi-int.dir}/${source.dir}"/> -->
+<!-- <fileset dir="${reliance-identity.dir}/${source.dir}"/> -->
+<!-- <fileset dir="${reliance-jbpm.dir}/${source.dir}"/> -->
+<!-- <fileset dir="${reliance-rules.dir}/${source.dir}"/> -->
+ <fileset dir="${spring-int.dir}/${source.dir}"/>
+ </copy>
+
<mkdir dir="${class.dir}"/>
- <javac srcdir="${source.dir}" destdir="${class.dir}"
- deprecation="true" debug="true" optimize="false"/>
+ <javac srcdir="all-sources" destdir="${class.dir}"
+ debug="true" source="1.5"/>
</target>
<target name="jar" description="o Create the jar" depends="compile">
<jar jarfile="${jboss-container.jar.name}">
<fileset dir="${class.dir}">
+ <include name="org/jboss/annotation/**"/>
+ <include name="org/jboss/beans/**"/>
<include name="org/jboss/classadapter/**"/>
+ <include name="org/jboss/classloading/**"/>
+ <include name="org/jboss/config/**"/>
+ <include name="org/jboss/javabean/**"/>
<include name="org/jboss/joinpoint/**"/>
- <include name="org/jboss/reflect/**"/>
+ <include name="org/jboss/metadata/**"/>
+ <include name="org/jboss/reflect/**"/>
+ <include name="org/jboss/repository/**"/>
</fileset>
</jar>
<jar jarfile="${jboss-microcontainer.jar.name}">
<fileset dir="${class.dir}">
- <include name="org/jboss/beans/**"/>
- <include name="org/jboss/classloading/**"/>
+ <include name="org/jboss/classloader/**"/>
<include name="org/jboss/kernel/**"/>
+ <include name="org/jboss/managed/**"/>
+ <include name="org/jboss/metatype/**"/>
+ <include name="org/jboss/spring/**"/>
<include name="org/jboss/test/**"/>
- <include name="org/jboss/util/**"/>
</fileset>
</jar>
<jar jarfile="${jboss-dependency.jar.name}">
Modified: trunk/libjboss-microcontainer-java/debian/changelog
===================================================================
--- trunk/libjboss-microcontainer-java/debian/changelog 2007-11-08 18:29:31 UTC (rev 4665)
+++ trunk/libjboss-microcontainer-java/debian/changelog 2007-11-09 12:02:44 UTC (rev 4666)
@@ -1,4 +1,4 @@
-libjboss-microcontainer-java (1.0.2-1) unstable; urgency=low
+libjboss-microcontainer-java (0.0+svn66895-1) unstable; urgency=low
* Initial release (Closes: #448974)
Modified: trunk/libjboss-microcontainer-java/debian/orig-tar.sh
===================================================================
--- trunk/libjboss-microcontainer-java/debian/orig-tar.sh 2007-11-08 18:29:31 UTC (rev 4665)
+++ trunk/libjboss-microcontainer-java/debian/orig-tar.sh 2007-11-09 12:02:44 UTC (rev 4666)
@@ -1,17 +1,18 @@
#!/bin/sh -e
-# called by uscan with '--upstream-version' <version> <file>
-DIR=libjboss-microcontainer-java-$2
+# $1 = version
+TAR=../libjboss-microcontainer-java_$1.orig.tar.gz
+DIR=libjboss-microcontainer-java-$1.orig
+REVISION=`echo $1 | sed -e 's/.*svn//'`
# clean up the upstream tarball
-tar -x -z -f $3
-mv microcontainer* $DIR
-tar -c -z -f $3 $DIR
+svn export -r $REVISION http://anonsvn.jboss.org/repos/jbossas/projects/microcontainer/trunk/ $DIR
+GZIP=--best tar -c -z -f $TAR $DIR
rm -rf $DIR
# move to directory 'tarballs'
if [ -r .svn/deb-layout ]; then
. .svn/deb-layout
- mv $3 $origDir
- echo "moved $3 to $origDir"
+ mv $TAR $origDir
+ echo "moved $TAR to $origDir"
fi
Modified: trunk/libjboss-microcontainer-java/debian/rules
===================================================================
--- trunk/libjboss-microcontainer-java/debian/rules 2007-11-08 18:29:31 UTC (rev 4665)
+++ trunk/libjboss-microcontainer-java/debian/rules 2007-11-09 12:02:44 UTC (rev 4666)
@@ -2,12 +2,11 @@
include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-JAVA_HOME := /usr/lib/jvm/java-gcj
+JAVA_HOME := /usr/lib/jvm/java-6-sun
DEB_ANT_BUILD_TARGET := jar
DEB_ANT_BUILDFILE := debian/build.xml
-DEB_JARS := jboss-common jboss-test jboss-xml-binding junit xercesImpl
+DEB_JARS := jboss-common jboss-test jboss-xml-binding junit xercesImpl javassist jboss-integration
ALL_JARS = $(wildcard jboss*.jar)
DEST_DIR = $(DEB_DESTDIR)/usr/share/java
@@ -20,4 +19,4 @@
done
get-orig-source:
- -uscan --upstream-version 0 --rename
+ sh debian/orig-tar.sh $(DEB_UPSTREAM_VERSION)
More information about the pkg-java-commits
mailing list