Author: marcusb-guest
Date: 2007-06-06 15:57:20 +0000 (Wed, 06 Jun 2007)
New Revision: 3611
Removed:
branches/libjaxen-java/feature/debian/debian/svn-deblayout
Modified:
branches/libjaxen-java/feature/debian/build.xml
branches/libjaxen-java/feature/debian/debian/ant.properties
branches/libjaxen-java/feature/debian/debian/rules
Log:
Build fixes.
Modified: branches/libjaxen-java/feature/debian/build.xml
===================================================================
--- branches/libjaxen-java/feature/debian/build.xml 2007-06-06 15:44:19 UTC
(rev 3610)
+++ branches/libjaxen-java/feature/debian/build.xml 2007-06-06 15:57:20 UTC
(rev 3611)
@@ -24,8 +24,9 @@
</property>
<path id="build.classpath">
<fileset dir="${libdir}">
- <include name="**/*.jar">
- </include>
+ <include name="jdom1.jar"/>
+ <include name="dom4j.jar"/>
+ <include name="xercesImpl.jar"/>
</fileset>
</path>
<target name="init" description="o Initializes some properties">
Modified: branches/libjaxen-java/feature/debian/debian/ant.properties
===================================================================
--- branches/libjaxen-java/feature/debian/debian/ant.properties 2007-06-06
15:44:19 UTC (rev 3610)
+++ branches/libjaxen-java/feature/debian/debian/ant.properties 2007-06-06
15:57:20 UTC (rev 3611)
@@ -1 +1,2 @@
noget=true
+libdir=/usr/share/java
Modified: branches/libjaxen-java/feature/debian/debian/rules
===================================================================
--- branches/libjaxen-java/feature/debian/debian/rules 2007-06-06 15:44:19 UTC
(rev 3610)
+++ branches/libjaxen-java/feature/debian/debian/rules 2007-06-06 15:57:20 UTC
(rev 3611)
@@ -4,11 +4,12 @@
DEB_JARS_BASE := /usr/share/java
JAVACMD := $(JAVA_HOME)/bin/java
-DEB_JARS := ant ant-launcher jdom1 dom4j ant-junit junit xercesImpl
+DEB_JARS := ant ant-launcher ant-junit junit
DEB_CLASSPATH = $(shell for jar in $(DEB_JARS); do \
echo -n "$(DEB_JARS_BASE)/$${jar}.jar:"; \
done; \
+ if [ -f "$(JAVA_HOME)/lib/tools.jar" ]; then echo -n
"$(JAVA_HOME)/lib/tools.jar"; fi)
DEB_ANT_ARGS := -propertyfile debian/ant.properties
ANT_INVOKE := $(JAVACMD) -classpath $(DEB_CLASSPATH) \
Deleted: branches/libjaxen-java/feature/debian/debian/svn-deblayout
===================================================================
--- branches/libjaxen-java/feature/debian/debian/svn-deblayout 2007-06-06
15:44:19 UTC (rev 3610)
+++ branches/libjaxen-java/feature/debian/debian/svn-deblayout 2007-06-06
15:57:20 UTC (rev 3611)
@@ -1,2 +0,0 @@
-buildArea=../../build-area
-origDir=..
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
