diff options
| author | aclement <aclement> | 2004-05-24 15:58:44 +0000 |
|---|---|---|
| committer | aclement <aclement> | 2004-05-24 15:58:44 +0000 |
| commit | 6de5ccc14f5dbebd697204b6d8109a48457fcd40 (patch) | |
| tree | 6fe515a6f20ad159193005afbb8bf36bd66ef93b /bcel-builder/patch.txt | |
| parent | 3cc0b4160db0259790593ce71b12222521e4e56d (diff) | |
| download | aspectj-6de5ccc14f5dbebd697204b6d8109a48457fcd40.tar.gz aspectj-6de5ccc14f5dbebd697204b6d8109a48457fcd40.zip | |
Patch now includes the bcel fix for 62631. Also changed the bcel-builder build.xml to construct a bcel-src.zip that matches the bcel.jar - to ease debugging.V1_2_0
Diffstat (limited to 'bcel-builder/patch.txt')
| -rw-r--r-- | bcel-builder/patch.txt | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/bcel-builder/patch.txt b/bcel-builder/patch.txt index f1d7b3417..9f07195a7 100644 --- a/bcel-builder/patch.txt +++ b/bcel-builder/patch.txt @@ -1,6 +1,6 @@ diff -N -a -u -r -b bcel-5.1/build.xml bcel/build.xml ---- bcel-5.1/build.xml 2003-04-25 09:06:14.000000000 -0700 -+++ bcel/build.xml 2004-01-29 04:37:15.593750000 -0800 +--- bcel-5.1/build.xml 2003-04-25 09:06:14.000000000 +0100 ++++ bcel/build.xml 2004-05-24 14:05:28.265625000 +0100 @@ -65,7 +65,7 @@ <target name="build" depends="compile"/> @@ -11,15 +11,15 @@ diff -N -a -u -r -b bcel-5.1/build.xml bcel/build.xml basedir="${build.dest}" manifest="${basedir}/manifest.txt" diff -N -a -u -r -b bcel-5.1/manifest.txt bcel/manifest.txt ---- bcel-5.1/manifest.txt 1969-12-31 16:00:00.000000000 -0800 -+++ bcel/manifest.txt 2004-01-29 04:37:15.609375000 -0800 +--- bcel-5.1/manifest.txt 1970-01-01 00:00:00.000000000 +0000 ++++ bcel/manifest.txt 2004-05-24 14:05:28.328125000 +0100 @@ -0,0 +1,3 @@ +Created-By: Jakarta BCEL 5.1 +Manifest-Version: 1.0 +Main-Class: listclass diff -N -a -u -r -b bcel-5.1/src/java/org/apache/bcel/generic/Instruction.java bcel/src/java/org/apache/bcel/generic/Instruction.java ---- bcel-5.1/src/java/org/apache/bcel/generic/Instruction.java 2003-04-25 09:06:16.000000000 -0700 -+++ bcel/src/java/org/apache/bcel/generic/Instruction.java 2004-01-29 04:37:15.640625000 -0800 +--- bcel-5.1/src/java/org/apache/bcel/generic/Instruction.java 2003-04-25 09:06:16.000000000 +0100 ++++ bcel/src/java/org/apache/bcel/generic/Instruction.java 2004-05-24 14:38:31.062500000 +0100 @@ -190,26 +190,223 @@ Class clazz; @@ -256,9 +256,20 @@ diff -N -a -u -r -b bcel-5.1/src/java/org/apache/bcel/generic/Instruction.java b return obj; } +diff -N -a -u -r -b bcel-5.1/src/java/org/apache/bcel/generic/LDC_W.java bcel/src/java/org/apache/bcel/generic/LDC_W.java +--- bcel-5.1/src/java/org/apache/bcel/generic/LDC_W.java 2003-04-25 09:06:16.000000000 +0100 ++++ bcel/src/java/org/apache/bcel/generic/LDC_W.java 2004-05-24 14:38:31.359375000 +0100 +@@ -83,6 +83,6 @@ + { + setIndex(bytes.readUnsignedShort()); + // Override just in case it has been changed +- opcode = org.apache.bcel.Constants.LDC_W; ++ // opcode = org.apache.bcel.Constants.LDC_W; + } + } diff -N -a -u -r -b bcel-5.1/src/java/org/apache/bcel/generic/MethodGen.java bcel/src/java/org/apache/bcel/generic/MethodGen.java ---- bcel-5.1/src/java/org/apache/bcel/generic/MethodGen.java 2003-04-25 09:06:16.000000000 -0700 -+++ bcel/src/java/org/apache/bcel/generic/MethodGen.java 2004-01-29 04:39:47.265625000 -0800 +--- bcel-5.1/src/java/org/apache/bcel/generic/MethodGen.java 2003-04-25 09:06:16.000000000 +0100 ++++ bcel/src/java/org/apache/bcel/generic/MethodGen.java 2004-05-24 14:38:30.343750000 +0100 @@ -133,9 +133,9 @@ /* Add local variables, namely the implicit `this' and the arguments |