1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
From: Markus Koschany <apo@debian.org>
Date: Sat, 3 Oct 2020 02:52:24 +0200
Subject: platform-langtools9
langtools9 is not supported.
---
nbbuild/build.xml | 24 +-----------------------
1 file changed, 1 insertion(+), 23 deletions(-)
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index 4b3255a..5c51f81 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -249,29 +249,7 @@ metabuild.hash=${metabuild.hash}</echo>
</condition>
</target>
- <target name="prepare-vanilla-javac" depends="-check-vanilla-javac" unless="vanilla.javac.exists">
- <delete dir="${nb_all}/nbbuild/build/langtools" />
- <mkdir dir="${nb_all}/nbbuild/build/langtools" />
- <unzip src="${nb_all}/nbbuild/external/langtools-9.zip" dest="${nb_all}/nbbuild/build/langtools">
- <cutdirsmapper dirs="1"/>
- </unzip>
- <ant antfile="${nb_all}/nbbuild/build/langtools/make/build.xml" dir="${nb_all}/nbbuild/build/langtools/" target="generate-sources">
- <property name="langtools.jdk.home" value="${java.home}" />
- </ant>
- <mkdir dir="${nb_all}/nbbuild/build/langtools/build/nb" />
- <javac srcdir="${nb_all}/nbbuild/build/langtools/src/java.compiler/share/classes:${nb_all}/nbbuild/build/langtools/src/jdk.compiler/share/classes:${nb_all}/nbbuild/build/langtools/src/jdk.jdeps/share/classes:${nb_all}/nbbuild/build/langtools/build/gensrc/jdk.compiler"
- destdir="${nb_all}/nbbuild/build/langtools/build/nb"
- excludes="**/module-info.java,com/sun/tools/javac/main/JavacToolProvider.java,com/sun/tools/jdeps/**,com/sun/tools/jdeprscan/**,com/sun/tools/javap/Main.java,jdk/javadoc/internal/tool/JavadocToolProvider.java,com/sun/tools/doclets/standard/Standard.java" source="1.8" target="1.8"/>
- <copy todir="${nb_all}/nbbuild/build/langtools/build/nb">
- <fileset dir="${nb_all}/nbbuild/build/langtools/src/java.compiler/share/classes" includes="**/*.properties"/>
- <fileset dir="${nb_all}/nbbuild/build/langtools/src/jdk.compiler/share/classes" includes="**/*.properties"/>
- <fileset dir="${nb_all}/nbbuild/build/langtools/src/jdk.jdeps/share/classes" includes="**/*.properties"/>
- </copy>
- <jar destfile="${nb_all}/nbbuild/external/vanilla-javac-api.jar" basedir="${nb_all}/nbbuild/build/langtools/build/nb" includes="javax/**,com/sun/source/**" />
- <jar destfile="${nb_all}/nbbuild/external/vanilla-javac-impl.jar" basedir="${nb_all}/nbbuild/build/langtools/build/nb" excludes="javax/**,com/sun/source/**,com/sun/javadoc/**" />
- </target>
-
- <target name="init-module-list" depends="bootstrap,init-tasks,prepare-vanilla-javac">
+ <target name="init-module-list" depends="bootstrap,init-tasks">
<!-- Define modules. -->
<checkmoduleconfigs nbroot=".."/>
<resolvelist name="allmodules" path="modules.fullpath" dir="${nb_all}" list="${nb.clusters.list}"/>
|
