mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-04-19 13:02:30 +07:00
[project] updates ASM to 6.0-FINAL
This commit is contained in:
@@ -2,10 +2,10 @@ Index: org/objectweb/asm/ClassReader.java
|
||||
===================================================================
|
||||
--- org/objectweb/asm/ClassReader.java
|
||||
+++ org/objectweb/asm/ClassReader.java
|
||||
@@ -167,7 +167,7 @@
|
||||
@@ -157,7 +157,7 @@
|
||||
this.b = b;
|
||||
// checks the class version
|
||||
if (readShort(off + 6) > Opcodes.V1_9) {
|
||||
if (readShort(off + 6) > Opcodes.V9) {
|
||||
- throw new IllegalArgumentException();
|
||||
+ //[JB: accept any version] throw new IllegalArgumentException();
|
||||
}
|
||||
|
||||
12
build/asm/4_compat_const.patch
Normal file
12
build/asm/4_compat_const.patch
Normal file
@@ -0,0 +1,12 @@
|
||||
Index: org/objectweb/asm/Opcodes.java
|
||||
===================================================================
|
||||
--- org/objectweb/asm/Opcodes.java
|
||||
+++ org/objectweb/asm/Opcodes.java
|
||||
@@ -60,6 +60,7 @@
|
||||
int V1_7 = 0 << 16 | 51;
|
||||
int V1_8 = 0 << 16 | 52;
|
||||
int V9 = 0 << 16 | 53;
|
||||
+ @Deprecated int V1_9 = V9; //[JB: compatibility constant]
|
||||
|
||||
// access flags
|
||||
|
||||
@@ -42,7 +42,9 @@
|
||||
<patch dir="${src.dir}" strip="0" patchfile="1_version_check.patch" failonerror="true"/>
|
||||
<patch dir="${src.dir}" strip="0" patchfile="2_coverage_fix.patch" failonerror="true"/>
|
||||
<patch dir="${src.dir}" strip="0" patchfile="3_api_version.patch" failonerror="true"/>
|
||||
<delete file="${src.dir}/org/objectweb/asm/optimizer/ModuleInfoBndPlugin.java" quiet="true"/>
|
||||
<patch dir="${src.dir}" strip="0" patchfile="4_compat_const.patch" failonerror="true"/>
|
||||
<delete file="${src.dir}/org/objectweb/asm/tools/ModuleInfoBndPlugin.java" quiet="true"/>
|
||||
<delete dir="${src.dir}/org/objectweb/asm/optimizer" quiet="true"/>
|
||||
</target>
|
||||
|
||||
<target name="repackage" depends="patch">
|
||||
@@ -53,7 +55,7 @@
|
||||
|
||||
<target name="compile" depends="repackage">
|
||||
<mkdir dir="${out.dir}"/>
|
||||
<javac srcdir="${src.dir}" destdir="${out.dir}" source="1.5" target="1.5" debug="true"/>
|
||||
<javac srcdir="${src.dir}" destdir="${out.dir}" source="1.5" target="1.5" debug="true" includeantruntime="false"/>
|
||||
</target>
|
||||
|
||||
<target name="package" depends="compile">
|
||||
|
||||
BIN
lib/asm-all.jar
BIN
lib/asm-all.jar
Binary file not shown.
Binary file not shown.
@@ -1,18 +1,4 @@
|
||||
/*
|
||||
* Copyright 2000-2017 JetBrains s.r.o.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
|
||||
package org.jetbrains.intellij.build
|
||||
|
||||
import groovy.transform.CompileStatic
|
||||
@@ -80,7 +66,7 @@ class CommunityLibraryLicenses {
|
||||
new LibraryLicense(name: "Apache XML Graphics Commons", libraryName: "xmlgraphics-commons-1.3.1.jar", version: "1.3.1",
|
||||
license: "Apache 2.0", url: "http://xmlgraphics.apache.org/commons/",
|
||||
licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0"),
|
||||
new LibraryLicense(name: "ASM Bytecode Manipulation Framework", libraryName: "ASM", version: "6.0-ALPHA (with patches by JetBrains)",
|
||||
new LibraryLicense(name: "ASM Bytecode Manipulation Framework", libraryName: "ASM", version: "6.0 (with patches by JetBrains)",
|
||||
license: "BSD", url: "http://asm.objectweb.org/", licenseUrl: "http://asm.objectweb.org/license.html"),
|
||||
new LibraryLicense(name: "ASM Tools", libraryName: "asm-tools",
|
||||
license: "BSD", url: "http://asm.objectweb.org/", licenseUrl: "http://asm.objectweb.org/license.html"),
|
||||
|
||||
Reference in New Issue
Block a user