View | Details | Raw Unified | Return to bug 199869 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/home/pi/myp/java/berkeley-db/files/patch-build.xml (+40 lines)
Line 0 Link Here
1 
--- build.xml.orig	2015-05-02 19:11:37 UTC
2 
+++ build.xml
3 
@@ -134,8 +134,11 @@
4 
       <pathelement location="${android.libdir}"/>
5 
     </path>
6
7 
+    <property environment="env"/>
8 
     <path id="unittest.classpath">
9 
       <path refid="class.path"/>
10 
+      <pathelement location="${env.JAVALIBDIR}/junit.jar"/>
11 
+      <pathelement location="${env.JAVALIBDIR}/hamcrest.jar"/>
12 
       <pathelement location="${unittest.destdir}"/>
13 
     </path>
14
15 
@@ -468,6 +471,7 @@
16 
             <property name="jdk.boot.class.path"
17 
                       value="${jdk.boot.class.path}"/>
18 
         </ant>
19 
+          <reference refid="unittest.classpath" torefid="compile.classpath"/>
20 
     </target>
21
22 
     <!-- for jar packaging -->
23 
@@ -2131,7 +2135,6 @@ ${testcase}"/>
24 
              value="${installdestdir}/JE.${release.major}.${release.minor}"/>
25 
       <mkdir dir="${installdir}"/>
26 
       <mkdir dir="${installdir}/docs"/>
27 
-      <mkdir dir="${installdir}/bin"/>
28 
       <mkdir dir="${installdir}/lib"/>
29 
       <copy todir="${installdir}/docs">
30 
          <fileset dir="docs">
31 
@@ -2141,9 +2144,6 @@ ${testcase}"/>
32 
       <copy todir="${installdir}/lib">
33 
 	 <fileset dir="lib"/>
34 
       </copy>
35 
-      <copy todir="${installdir}/bin">
36 
-	 <fileset dir="bin"/>
37 
-      </copy>
38 
     </target>
39
40 
     <!-- ============================================================ -->
(-)/usr/home/pi/myp/java/berkeley-db/files/patch-junit (-31 lines)
Lines 1-31 Link Here
1 
--- build.xml	Wed Sep 20 18:10:10 2006
2 
+++ build.xml	2014-09-29 14:22:48.000000000 -0400
3 
@@ -135,6 +135,8 @@
4 
     </path>
5
6 
+    <property environment="env"/>
7 
     <path id="unittest.classpath">
8 
       <path refid="class.path"/>
9 
+      <pathelement location="${env.JAVALIBDIR}/junit.jar"/>
10 
       <pathelement location="${unittest.destdir}"/>
11 
     </path>
12 
@@ -469,4 +471,5 @@
13 
           <property name="destdir" value="${unittest.testevolvedir}"/>
14 
           <reference refid="class.path" torefid="compile.classpath"/>
15 
+          <reference refid="unittest.classpath" torefid="compile.classpath"/>
16 
       </ant>
17 
     </target>
18 
@@ -1224,5 +1227,4 @@
19 
       <mkdir dir="${installdir}"/>
20 
       <mkdir dir="${installdir}/docs"/>
21 
-      <mkdir dir="${installdir}/bin"/>
22 
       <mkdir dir="${installdir}/lib"/>
23 
       <copy todir="${installdir}/docs">
24 
@@ -1233,7 +1235,4 @@
25 
       <copy todir="${installdir}/lib">
26 
 	 <fileset dir="lib"/>
27 
-      </copy>
28 
-      <copy todir="${installdir}/bin">
29 
-	 <fileset dir="bin"/>
30 
       </copy>
31 
     </target>

Return to bug 199869