Attachment 156249 Details for Bug 199869 – patch

[patch] patch

berkeley-db.diff (text/plain), 2.97 KB, created by Kurt Jaeger on 2015-05-02 19:26:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Jaeger

Created: 2015-05-02 19:26:42 UTC

Size: 2.97 KB

patch

obsolete

>diff -r -u -N java/berkeley-db/files/patch-build.xml /usr/home/pi/myp/java/berkeley-db/files/patch-build.xml
>--- java/berkeley-db/files/patch-build.xml	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/home/pi/myp/java/berkeley-db/files/patch-build.xml	2015-05-02 21:12:02.000000000 +0200
>@@ -0,0 +1,40 @@
>+--- build.xml.orig	2015-05-02 19:11:37 UTC
>++++ build.xml
>+@@ -134,8 +134,11 @@
>+       <pathelement location="${android.libdir}"/>
>+     </path>
>+ 
>++    <property environment="env"/>
>+     <path id="unittest.classpath">
>+       <path refid="class.path"/>
>++      <pathelement location="${env.JAVALIBDIR}/junit.jar"/>
>++      <pathelement location="${env.JAVALIBDIR}/hamcrest.jar"/>
>+       <pathelement location="${unittest.destdir}"/>
>+     </path>
>+ 
>+@@ -468,6 +471,7 @@
>+             <property name="jdk.boot.class.path"
>+                       value="${jdk.boot.class.path}"/>
>+         </ant>
>++          <reference refid="unittest.classpath" torefid="compile.classpath"/>
>+     </target>
>+ 
>+     
>+@@ -2131,7 +2135,6 @@ ${testcase}"/>
>+              value="${installdestdir}/JE.${release.major}.${release.minor}"/>
>+       <mkdir dir="${installdir}"/>
>+       <mkdir dir="${installdir}/docs"/>
>+-      <mkdir dir="${installdir}/bin"/>
>+       <mkdir dir="${installdir}/lib"/>
>+       <copy todir="${installdir}/docs">
>+          <fileset dir="docs">
>+@@ -2141,9 +2144,6 @@ ${testcase}"/>
>+       <copy todir="${installdir}/lib">
>+ 	 <fileset dir="lib"/>
>+       </copy>
>+-      <copy todir="${installdir}/bin">
>+-	 <fileset dir="bin"/>
>+-      </copy>
>+     </target>
>+ 
>+     
>diff -r -u -N java/berkeley-db/files/patch-junit /usr/home/pi/myp/java/berkeley-db/files/patch-junit
>--- java/berkeley-db/files/patch-junit	2014-09-30 21:26:27.000000000 +0200
>+++ /usr/home/pi/myp/java/berkeley-db/files/patch-junit	1970-01-01 01:00:00.000000000 +0100
>@@ -1,31 +0,0 @@
>---- build.xml	Wed Sep 20 18:10:10 2006
>-+++ build.xml	2014-09-29 14:22:48.000000000 -0400
>-@@ -135,6 +135,8 @@
>-     </path>
>- 
>-+    <property environment="env"/>
>-     <path id="unittest.classpath">
>-       <path refid="class.path"/>
>-+      <pathelement location="${env.JAVALIBDIR}/junit.jar"/>
>-       <pathelement location="${unittest.destdir}"/>
>-     </path>
>-@@ -469,4 +471,5 @@
>-           <property name="destdir" value="${unittest.testevolvedir}"/>
>-           <reference refid="class.path" torefid="compile.classpath"/>
>-+          <reference refid="unittest.classpath" torefid="compile.classpath"/>
>-       </ant>
>-     </target>
>-@@ -1224,5 +1227,4 @@
>-       <mkdir dir="${installdir}"/>
>-       <mkdir dir="${installdir}/docs"/>
>--      <mkdir dir="${installdir}/bin"/>
>-       <mkdir dir="${installdir}/lib"/>
>-       <copy todir="${installdir}/docs">
>-@@ -1233,7 +1235,4 @@
>-       <copy todir="${installdir}/lib">
>- 	 <fileset dir="lib"/>
>--      </copy>
>--      <copy todir="${installdir}/bin">
>--	 <fileset dir="bin"/>
>-       </copy>
>-     </target>

Actions: View | Diff

Attachments on bug 199869: 156249 | 156251