Skip to content

Commit 9644f69

Browse files
ponderosaTXponderosaTX
committed
This commit updates the code base to use asm-all-5.0.1.jar instead of asm-3.1.jar facilitating
the integration of the JaCoCo code coverage jar which depends on asm-all-5.0.1.jar. Changes to be committed: new file: .gitignore modified: drjava/.gitignore deleted: drjava/lib/asm-3.1.jar new file: drjava/lib/asm-all-5.0.1.jar modified: drjava/lib/dynamicjava-base.jar modified: drjava/src/edu/rice/cs/drjava/model/junit/DefaultJUnitModel.java new file: dynamicjava/.gitignore modified: dynamicjava/build.xml deleted: dynamicjava/lib/asm-3.1.jar new file: dynamicjava/lib/asm-all-5.0.1.jar new file: dynamicjava/src/edu/rice/cs/dynamicjava/.gitignore
1 parent 0a31738 commit 9644f69

11 files changed

Lines changed: 18 additions & 4 deletions

File tree

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*.org
2+
*.drjava

‎drjava/.gitignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
drjava.jar
2-
classes
1+
*.jar
2+
classes/
33

‎drjava/lib/asm-3.1.jar‎

-42 KB
Binary file not shown.

‎drjava/lib/asm-all-5.0.1.jar‎

236 KB
Binary file not shown.

‎drjava/lib/dynamicjava-base.jar‎

-3.37 KB
Binary file not shown.

‎drjava/src/edu/rice/cs/drjava/model/junit/DefaultJUnitModel.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ private void _rawJUnitOpenDefDocs(List<OpenDefinitionsDocument> lod, final boole
409409
try {
410410
final Box<String> className = new SimpleBox<String>();
411411
final Box<String> sourceName = new SimpleBox<String>();
412-
new ClassReader(IOUtil.toByteArray(entry)).accept(new ClassVisitor() {
412+
new ClassReader(IOUtil.toByteArray(entry)).accept(new ClassVisitor(Opcodes.ASM4) {
413413
public void visit(int version, int access, String name, String sig, String sup, String[] inters) {
414414
className.set(name.replace('/', '.'));
415415
}

‎dynamicjava/.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
classes/
2+
*.jar
3+

‎dynamicjava/build.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -993,6 +993,12 @@
993993
</target>
994994

995995
<!-- Sets svn-revision to the current "Last Changed Rev" of "svn info". -->
996+
<target name="resolve-svn-revision">
997+
<!-- do nothing -->
998+
</target>
999+
1000+
<!-- superseded old code
1001+
<!- Sets svn-revision to the current "Last Changed Rev" of "svn info". ->
9961002
<target name="resolve-svn-revision">
9971003
<exec executable="svn" failonerror="yes" output="svn-info.txt">
9981004
<arg value="info" />
@@ -1008,7 +1014,7 @@
10081014
</loadfile>
10091015
<delete file="svn-info.txt" />
10101016
</target>
1011-
1017+
-->
10121018

10131019
<!-- Sets "already-generated" if "generate-file" is more recent than "generate-sourcefile";
10141020
otherwise, the out-of-date target file is deleted (if it exists). Note that, since

‎dynamicjava/lib/asm-3.1.jar‎

-42 KB
Binary file not shown.

‎dynamicjava/lib/asm-all-5.0.1.jar‎

236 KB
Binary file not shown.

0 commit comments

Comments
 (0)