1.1 --- a/.hgignore Fri Sep 22 16:50:49 2017 +0200
1.2 +++ b/.hgignore Fri Apr 20 16:02:37 2018 +0200
1.3 @@ -1,6 +1,15 @@
1.4 ^make/netbeans/nb-javac/build/
1.5 ^make/netbeans/nb-javac/dist/
1.6 ^make/netbeans/nb-javac/nbproject/private/
1.7 +^make/netbeans/nb-javac-modules/api/build/
1.8 +^make/netbeans/nb-javac-modules/impl/build/
1.9 +^make/netbeans/nb-javac-modules/kit/build/
1.10 +^make/netbeans/nb-javac-modules/api/release/
1.11 +^make/netbeans/nb-javac-modules/impl/release/
1.12 +^make/netbeans/nb-javac-modules/kit/release/
1.13 +^make/netbeans/nb-javac-modules/build/
1.14 +^make/netbeans/nb-javac-modules/dist/
1.15 +^make/netbeans/nb-javac-modules/nbproject/private/
1.16 ^make/netbeans/jshell/build/
1.17 ^make/netbeans/jshell/dist/
1.18 ^make/netbeans/jshell/nbproject/private/
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2.2 +++ b/make/netbeans/nb-javac-modules/api/build.xml Fri Apr 20 16:02:37 2018 +0200
2.3 @@ -0,0 +1,8 @@
2.4 +<?xml version="1.0" encoding="UTF-8"?>
2.5 +<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
2.6 +<!-- for some information on what you could do (e.g. targets to override). -->
2.7 +<!-- If you delete this file and reopen the project it will be recreated. -->
2.8 +<project name="org.netbeans.modules.nbjavac.api" default="netbeans" basedir=".">
2.9 + <description>Builds, tests, and runs the project org.netbeans.modules.nbjavac.api.</description>
2.10 + <import file="nbproject/build-impl.xml"/>
2.11 +</project>
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.2 +++ b/make/netbeans/nb-javac-modules/api/manifest.mf Fri Apr 20 16:02:37 2018 +0200
3.3 @@ -0,0 +1,8 @@
3.4 +Manifest-Version: 1.0
3.5 +AutoUpdate-Show-In-Client: false
3.6 +OpenIDE-Module: org.netbeans.modules.nbjavac.api
3.7 +OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/nbjavac/api/Bundle.properties
3.8 +OpenIDE-Module-Specification-Version: 1.0
3.9 +OpenIDE-Module-Hide-Classpath-Packages: com.sun.javadoc.**, com.sun.source.**, javax.annotation.processing.**, javax.lang.model.**, javax.tools.**, com.sun.tools.javac.** com.sun.tools.javac.**, com.sun.tools.javadoc.**, com.sun.tools.javap.**, com.sun.tools.classfile.**, com.sun.tools.doclint.**
3.10 +OpenIDE-Module-Fragment-Host: org.netbeans.libs.javacapi
3.11 +
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
4.2 +++ b/make/netbeans/nb-javac-modules/api/nbproject/build-impl.xml Fri Apr 20 16:02:37 2018 +0200
4.3 @@ -0,0 +1,45 @@
4.4 +<?xml version="1.0" encoding="UTF-8"?>
4.5 +<!--
4.6 +*** GENERATED FROM project.xml - DO NOT EDIT ***
4.7 +*** EDIT ../build.xml INSTEAD ***
4.8 +-->
4.9 +<project name="org.netbeans.modules.nbjavac.api-impl" basedir="..">
4.10 + <fail message="Please build using Ant 1.7.1 or higher.">
4.11 + <condition>
4.12 + <not>
4.13 + <antversion atleast="1.7.1"/>
4.14 + </not>
4.15 + </condition>
4.16 + </fail>
4.17 + <property file="nbproject/private/suite-private.properties"/>
4.18 + <property file="nbproject/suite.properties"/>
4.19 + <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
4.20 + <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
4.21 + <property file="${suite.dir}/nbproject/platform.properties"/>
4.22 + <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
4.23 + <attribute name="name"/>
4.24 + <attribute name="value"/>
4.25 + <sequential>
4.26 + <property name="@{name}" value="${@{value}}"/>
4.27 + </sequential>
4.28 + </macrodef>
4.29 + <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
4.30 + <attribute name="property"/>
4.31 + <attribute name="value"/>
4.32 + <sequential>
4.33 + <property name="@{property}" value="@{value}"/>
4.34 + </sequential>
4.35 + </macrodef>
4.36 + <property file="${user.properties.file}"/>
4.37 + <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
4.38 + <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
4.39 + <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
4.40 + <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
4.41 + <condition>
4.42 + <not>
4.43 + <contains string="${cluster.path.evaluated}" substring="platform"/>
4.44 + </not>
4.45 + </condition>
4.46 + </fail>
4.47 + <import file="${harness.dir}/build.xml"/>
4.48 +</project>
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
5.2 +++ b/make/netbeans/nb-javac-modules/api/nbproject/genfiles.properties Fri Apr 20 16:02:37 2018 +0200
5.3 @@ -0,0 +1,8 @@
5.4 +build.xml.data.CRC32=456ba067
5.5 +build.xml.script.CRC32=07206217
5.6 +build.xml.stylesheet.CRC32=a56c6a5b@2.73
5.7 +# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
5.8 +# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
5.9 +nbproject/build-impl.xml.data.CRC32=456ba067
5.10 +nbproject/build-impl.xml.script.CRC32=946d4077
5.11 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.73
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
6.2 +++ b/make/netbeans/nb-javac-modules/api/nbproject/project.properties Fri Apr 20 16:02:37 2018 +0200
6.3 @@ -0,0 +1,5 @@
6.4 +javac.source=1.7
6.5 +javac.compilerargs=-Xlint -Xlint:-serial
6.6 +license.file=../../../../LICENSE
6.7 +nbm.module.author=Jan Lahoda
6.8 +nbm.needs.restart=true
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
7.2 +++ b/make/netbeans/nb-javac-modules/api/nbproject/project.xml Fri Apr 20 16:02:37 2018 +0200
7.3 @@ -0,0 +1,27 @@
7.4 +<?xml version="1.0" encoding="UTF-8"?>
7.5 +<project xmlns="http://www.netbeans.org/ns/project/1">
7.6 + <type>org.netbeans.modules.apisupport.project</type>
7.7 + <configuration>
7.8 + <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
7.9 + <code-name-base>org.netbeans.modules.nbjavac.api</code-name-base>
7.10 + <suite-component/>
7.11 + <module-dependencies/>
7.12 + <public-packages>
7.13 + <package>com.sun.javadoc</package>
7.14 + <package>com.sun.source.doctree</package>
7.15 + <package>com.sun.source.tree</package>
7.16 + <package>com.sun.source.util</package>
7.17 + <package>javax.annotation.processing</package>
7.18 + <package>javax.lang.model</package>
7.19 + <package>javax.lang.model.element</package>
7.20 + <package>javax.lang.model.type</package>
7.21 + <package>javax.lang.model.util</package>
7.22 + <package>javax.tools</package>
7.23 + </public-packages>
7.24 + <class-path-extension>
7.25 + <runtime-relative-path>ext/nb-javac-api.jar</runtime-relative-path>
7.26 + <binary-origin>external/nb-javac-api.jar</binary-origin>
7.27 + </class-path-extension>
7.28 + </data>
7.29 + </configuration>
7.30 +</project>
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
8.2 +++ b/make/netbeans/nb-javac-modules/api/nbproject/suite.properties Fri Apr 20 16:02:37 2018 +0200
8.3 @@ -0,0 +1,1 @@
8.4 +suite.dir=${basedir}/..
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
9.2 +++ b/make/netbeans/nb-javac-modules/api/src/org/netbeans/modules/nbjavac/api/Bundle.properties Fri Apr 20 16:02:37 2018 +0200
9.3 @@ -0,0 +1,5 @@
9.4 +OpenIDE-Module-Display-Category=Java SE
9.5 +OpenIDE-Module-Long-Description=\
9.6 + nb-javac Library API
9.7 +OpenIDE-Module-Name=nb-javac api
9.8 +OpenIDE-Module-Short-Description=nb-javac Library API
10.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
10.2 +++ b/make/netbeans/nb-javac-modules/build.xml Fri Apr 20 16:02:37 2018 +0200
10.3 @@ -0,0 +1,27 @@
10.4 +<?xml version="1.0" encoding="UTF-8"?>
10.5 +<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
10.6 +<!-- for some information on what you could do (e.g. targets to override). -->
10.7 +<!-- If you delete this file and reopen the project it will be recreated. -->
10.8 +<project name="nb-javac-modules" basedir=".">
10.9 + <description>Builds the module suite nb-javac-modules.</description>
10.10 + <import file="nbproject/build-impl.xml"/>
10.11 + <target name="strip-bundles" if="nbjavac.strip.bundles">
10.12 + <replaceregexp byline="true">
10.13 + <regexp pattern="^(# ([^0-9{]|[0-9]+[^:]).*)$"/>
10.14 + <substitution expression="#"/>
10.15 + <fileset dir="../nb-javac/build">
10.16 + <include name="**/*.properties*"/>
10.17 + </fileset>
10.18 + </replaceregexp>
10.19 + </target>
10.20 + <target name="-init" depends="suite.-init">
10.21 + <ant dir="../nb-javac" target="clean" inheritAll="false" inheritRefs="false" />
10.22 + <ant dir="../nb-javac" target="compile" inheritAll="false" inheritRefs="false" />
10.23 + <antcall target="strip-bundles"/>
10.24 + <ant dir="../nb-javac" target="jar" inheritAll="false" inheritRefs="false" />
10.25 + <mkdir dir="api/release/modules/ext/" />
10.26 + <copy file="../nb-javac/dist/javac-api.jar" tofile="api/release/modules/ext/nb-javac-api.jar" />
10.27 + <mkdir dir="impl/release/modules/ext/" />
10.28 + <copy file="../nb-javac/dist/javac-impl.jar" tofile="impl/release/modules/ext/nb-javac-impl.jar" />
10.29 + </target>
10.30 +</project>
11.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
11.2 +++ b/make/netbeans/nb-javac-modules/impl/build.xml Fri Apr 20 16:02:37 2018 +0200
11.3 @@ -0,0 +1,8 @@
11.4 +<?xml version="1.0" encoding="UTF-8"?>
11.5 +<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
11.6 +<!-- for some information on what you could do (e.g. targets to override). -->
11.7 +<!-- If you delete this file and reopen the project it will be recreated. -->
11.8 +<project name="org.netbeans.modules.nbjavac.impl" default="netbeans" basedir=".">
11.9 + <description>Builds, tests, and runs the project org.netbeans.modules.nbjavac.impl.</description>
11.10 + <import file="nbproject/build-impl.xml"/>
11.11 +</project>
12.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
12.2 +++ b/make/netbeans/nb-javac-modules/impl/manifest.mf Fri Apr 20 16:02:37 2018 +0200
12.3 @@ -0,0 +1,8 @@
12.4 +Manifest-Version: 1.0
12.5 +AutoUpdate-Show-In-Client: false
12.6 +OpenIDE-Module: org.netbeans.modules.nbjavac.impl
12.7 +OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/nbjavac/impl/Bundle.properties
12.8 +OpenIDE-Module-Specification-Version: 1.0
12.9 +OpenIDE-Module-Hide-Classpath-Packages: com.sun.tools.javac.**, com.sun.tools.javadoc.**, com.sun.tools.javap.**, com.sun.tools.classfile.**, com.sun.tools.doclint.**
12.10 +OpenIDE-Module-Fragment-Host: org.netbeans.libs.javacimpl
12.11 +OpenIDE-Module-Provides: org.netbeans.modules.javac,org.netbeans.modules.nbjavac
13.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
13.2 +++ b/make/netbeans/nb-javac-modules/impl/nbproject/build-impl.xml Fri Apr 20 16:02:37 2018 +0200
13.3 @@ -0,0 +1,45 @@
13.4 +<?xml version="1.0" encoding="UTF-8"?>
13.5 +<!--
13.6 +*** GENERATED FROM project.xml - DO NOT EDIT ***
13.7 +*** EDIT ../build.xml INSTEAD ***
13.8 +-->
13.9 +<project name="org.netbeans.modules.nbjavac.impl-impl" basedir="..">
13.10 + <fail message="Please build using Ant 1.7.1 or higher.">
13.11 + <condition>
13.12 + <not>
13.13 + <antversion atleast="1.7.1"/>
13.14 + </not>
13.15 + </condition>
13.16 + </fail>
13.17 + <property file="nbproject/private/suite-private.properties"/>
13.18 + <property file="nbproject/suite.properties"/>
13.19 + <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
13.20 + <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
13.21 + <property file="${suite.dir}/nbproject/platform.properties"/>
13.22 + <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
13.23 + <attribute name="name"/>
13.24 + <attribute name="value"/>
13.25 + <sequential>
13.26 + <property name="@{name}" value="${@{value}}"/>
13.27 + </sequential>
13.28 + </macrodef>
13.29 + <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
13.30 + <attribute name="property"/>
13.31 + <attribute name="value"/>
13.32 + <sequential>
13.33 + <property name="@{property}" value="@{value}"/>
13.34 + </sequential>
13.35 + </macrodef>
13.36 + <property file="${user.properties.file}"/>
13.37 + <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
13.38 + <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
13.39 + <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
13.40 + <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
13.41 + <condition>
13.42 + <not>
13.43 + <contains string="${cluster.path.evaluated}" substring="platform"/>
13.44 + </not>
13.45 + </condition>
13.46 + </fail>
13.47 + <import file="${harness.dir}/build.xml"/>
13.48 +</project>
14.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
14.2 +++ b/make/netbeans/nb-javac-modules/impl/nbproject/genfiles.properties Fri Apr 20 16:02:37 2018 +0200
14.3 @@ -0,0 +1,8 @@
14.4 +build.xml.data.CRC32=e621aa80
14.5 +build.xml.script.CRC32=ecc30546
14.6 +build.xml.stylesheet.CRC32=a56c6a5b@2.73
14.7 +# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
14.8 +# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
14.9 +nbproject/build-impl.xml.data.CRC32=e621aa80
14.10 +nbproject/build-impl.xml.script.CRC32=01eaab5e
14.11 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.73
15.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
15.2 +++ b/make/netbeans/nb-javac-modules/impl/nbproject/project.properties Fri Apr 20 16:02:37 2018 +0200
15.3 @@ -0,0 +1,5 @@
15.4 +javac.source=1.7
15.5 +javac.compilerargs=-Xlint -Xlint:-serial
15.6 +nbm.needs.restart=true
15.7 +license.file=../../../../LICENSE
15.8 +nbm.module.author=Jan Lahoda
16.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
16.2 +++ b/make/netbeans/nb-javac-modules/impl/nbproject/project.xml Fri Apr 20 16:02:37 2018 +0200
16.3 @@ -0,0 +1,48 @@
16.4 +<?xml version="1.0" encoding="UTF-8"?>
16.5 +<project xmlns="http://www.netbeans.org/ns/project/1">
16.6 + <type>org.netbeans.modules.apisupport.project</type>
16.7 + <configuration>
16.8 + <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
16.9 + <code-name-base>org.netbeans.modules.nbjavac.impl</code-name-base>
16.10 + <suite-component/>
16.11 + <module-dependencies>
16.12 + <dependency>
16.13 + <code-name-base>org.netbeans.modules.nbjavac.api</code-name-base>
16.14 + <build-prerequisite/>
16.15 + <compile-dependency/>
16.16 + <run-dependency>
16.17 + <implementation-version/>
16.18 + </run-dependency>
16.19 + </dependency>
16.20 + </module-dependencies>
16.21 + <friend-packages>
16.22 + <friend>org.netbeans.modules.jackpot.rules</friend>
16.23 + <friend>org.netbeans.modules.java.hints</friend>
16.24 + <friend>org.netbeans.modules.java.source</friend>
16.25 + <friend>org.netbeans.modules.javadoc</friend>
16.26 + <friend>org.netbeans.modules.java.module.graph</friend>
16.27 + <friend>org.netbeans.lib.nbjshell</friend>
16.28 + <friend>org.netbeans.libs.jshell</friend>
16.29 + <friend>org.netbeans.libs.jshell.compile</friend>
16.30 + <friend>org.netbeans.modules.jdk.jshell</friend>
16.31 + <friend>org.netbeans.modules.jshell.support</friend>
16.32 + <package>com.sun.tools.javac</package>
16.33 + <package>com.sun.tools.javac.api</package>
16.34 + <package>com.sun.tools.javac.code</package>
16.35 + <package>com.sun.tools.javac.comp</package>
16.36 + <package>com.sun.tools.javac.jvm</package>
16.37 + <package>com.sun.tools.javac.main</package>
16.38 + <package>com.sun.tools.javac.model</package>
16.39 + <package>com.sun.tools.javac.parser</package>
16.40 + <package>com.sun.tools.javac.processing</package>
16.41 + <package>com.sun.tools.javac.tree</package>
16.42 + <package>com.sun.tools.javac.util</package>
16.43 + <package>com.sun.tools.javadoc</package>
16.44 + </friend-packages>
16.45 + <class-path-extension>
16.46 + <runtime-relative-path>ext/nb-javac-impl.jar</runtime-relative-path>
16.47 + <binary-origin>external/nb-javac-impl.jar</binary-origin>
16.48 + </class-path-extension>
16.49 + </data>
16.50 + </configuration>
16.51 +</project>
17.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
17.2 +++ b/make/netbeans/nb-javac-modules/impl/nbproject/suite.properties Fri Apr 20 16:02:37 2018 +0200
17.3 @@ -0,0 +1,1 @@
17.4 +suite.dir=${basedir}/..
18.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
18.2 +++ b/make/netbeans/nb-javac-modules/impl/src/org/netbeans/modules/nbjavac/impl/Bundle.properties Fri Apr 20 16:02:37 2018 +0200
18.3 @@ -0,0 +1,5 @@
18.4 +OpenIDE-Module-Display-Category=Java SE
18.5 +OpenIDE-Module-Long-Description=\
18.6 + nb-javac Library Impl
18.7 +OpenIDE-Module-Name=nb-javac impl
18.8 +OpenIDE-Module-Short-Description=nb-javac Library Impl
19.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
19.2 +++ b/make/netbeans/nb-javac-modules/kit/build.xml Fri Apr 20 16:02:37 2018 +0200
19.3 @@ -0,0 +1,8 @@
19.4 +<?xml version="1.0" encoding="UTF-8"?>
19.5 +<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
19.6 +<!-- for some information on what you could do (e.g. targets to override). -->
19.7 +<!-- If you delete this file and reopen the project it will be recreated. -->
19.8 +<project name="org.netbeans.modules.nbjavac" default="netbeans" basedir=".">
19.9 + <description>Builds, tests, and runs the project org.netbeans.modules.nbjavac.</description>
19.10 + <import file="nbproject/build-impl.xml"/>
19.11 +</project>
20.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
20.2 +++ b/make/netbeans/nb-javac-modules/kit/manifest.mf Fri Apr 20 16:02:37 2018 +0200
20.3 @@ -0,0 +1,6 @@
20.4 +Manifest-Version: 1.0
20.5 +AutoUpdate-Show-In-Client: true
20.6 +OpenIDE-Module: org.netbeans.modules.nbjavac/1
20.7 +OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/nbjavac/Bundle.properties
20.8 +OpenIDE-Module-Specification-Version: 1.0
20.9 +
21.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
21.2 +++ b/make/netbeans/nb-javac-modules/kit/nbproject/build-impl.xml Fri Apr 20 16:02:37 2018 +0200
21.3 @@ -0,0 +1,45 @@
21.4 +<?xml version="1.0" encoding="UTF-8"?>
21.5 +<!--
21.6 +*** GENERATED FROM project.xml - DO NOT EDIT ***
21.7 +*** EDIT ../build.xml INSTEAD ***
21.8 +-->
21.9 +<project name="org.netbeans.modules.nbjavac-impl" basedir="..">
21.10 + <fail message="Please build using Ant 1.7.1 or higher.">
21.11 + <condition>
21.12 + <not>
21.13 + <antversion atleast="1.7.1"/>
21.14 + </not>
21.15 + </condition>
21.16 + </fail>
21.17 + <property file="nbproject/private/suite-private.properties"/>
21.18 + <property file="nbproject/suite.properties"/>
21.19 + <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
21.20 + <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
21.21 + <property file="${suite.dir}/nbproject/platform.properties"/>
21.22 + <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
21.23 + <attribute name="name"/>
21.24 + <attribute name="value"/>
21.25 + <sequential>
21.26 + <property name="@{name}" value="${@{value}}"/>
21.27 + </sequential>
21.28 + </macrodef>
21.29 + <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
21.30 + <attribute name="property"/>
21.31 + <attribute name="value"/>
21.32 + <sequential>
21.33 + <property name="@{property}" value="@{value}"/>
21.34 + </sequential>
21.35 + </macrodef>
21.36 + <property file="${user.properties.file}"/>
21.37 + <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
21.38 + <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
21.39 + <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
21.40 + <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
21.41 + <condition>
21.42 + <not>
21.43 + <contains string="${cluster.path.evaluated}" substring="platform"/>
21.44 + </not>
21.45 + </condition>
21.46 + </fail>
21.47 + <import file="${harness.dir}/build.xml"/>
21.48 +</project>
22.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
22.2 +++ b/make/netbeans/nb-javac-modules/kit/nbproject/genfiles.properties Fri Apr 20 16:02:37 2018 +0200
22.3 @@ -0,0 +1,8 @@
22.4 +build.xml.data.CRC32=f58f2b74
22.5 +build.xml.script.CRC32=1f24dd7d
22.6 +build.xml.stylesheet.CRC32=a56c6a5b@2.73
22.7 +# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
22.8 +# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
22.9 +nbproject/build-impl.xml.data.CRC32=f58f2b74
22.10 +nbproject/build-impl.xml.script.CRC32=9a6ffcd4
22.11 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.73
23.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
23.2 +++ b/make/netbeans/nb-javac-modules/kit/nbproject/project.properties Fri Apr 20 16:02:37 2018 +0200
23.3 @@ -0,0 +1,5 @@
23.4 +javac.source=1.7
23.5 +javac.compilerargs=-Xlint -Xlint:-serial
23.6 +license.file=../../../../LICENSE
23.7 +nbm.module.author=Jan Lahoda
23.8 +nbm.needs.restart=true
24.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
24.2 +++ b/make/netbeans/nb-javac-modules/kit/nbproject/project.xml Fri Apr 20 16:02:37 2018 +0200
24.3 @@ -0,0 +1,25 @@
24.4 +<?xml version="1.0" encoding="UTF-8"?>
24.5 +<project xmlns="http://www.netbeans.org/ns/project/1">
24.6 + <type>org.netbeans.modules.apisupport.project</type>
24.7 + <configuration>
24.8 + <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
24.9 + <code-name-base>org.netbeans.modules.nbjavac</code-name-base>
24.10 + <suite-component/>
24.11 + <module-dependencies>
24.12 + <dependency>
24.13 + <code-name-base>org.netbeans.modules.nbjavac.api</code-name-base>
24.14 + <run-dependency>
24.15 + <specification-version>1.0</specification-version>
24.16 + </run-dependency>
24.17 + </dependency>
24.18 + <dependency>
24.19 + <code-name-base>org.netbeans.modules.nbjavac.impl</code-name-base>
24.20 + <run-dependency>
24.21 + <specification-version>1.0</specification-version>
24.22 + </run-dependency>
24.23 + </dependency>
24.24 + </module-dependencies>
24.25 + <public-packages/>
24.26 + </data>
24.27 + </configuration>
24.28 +</project>
25.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
25.2 +++ b/make/netbeans/nb-javac-modules/kit/nbproject/suite.properties Fri Apr 20 16:02:37 2018 +0200
25.3 @@ -0,0 +1,1 @@
25.4 +suite.dir=${basedir}/..
26.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
26.2 +++ b/make/netbeans/nb-javac-modules/kit/src/org/netbeans/modules/nbjavac/Bundle.properties Fri Apr 20 16:02:37 2018 +0200
26.3 @@ -0,0 +1,5 @@
26.4 +OpenIDE-Module-Display-Category=Java SE
26.5 +OpenIDE-Module-Name=nbjavac Library
26.6 +OpenIDE-Module-Short-Description=nbjavac Library
26.7 +OpenIDE-Module-Long-Description=\
26.8 + nb-javac Library
27.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
27.2 +++ b/make/netbeans/nb-javac-modules/nbproject/build-impl.xml Fri Apr 20 16:02:37 2018 +0200
27.3 @@ -0,0 +1,50 @@
27.4 +<?xml version="1.0" encoding="UTF-8"?>
27.5 +<!--
27.6 +*** GENERATED FROM project.xml - DO NOT EDIT ***
27.7 +*** EDIT ../build.xml INSTEAD ***
27.8 +-->
27.9 +<project name="nb-javac-modules-impl" basedir=".." xmlns:sproject="http://www.netbeans.org/ns/nb-module-suite-project/1">
27.10 + <fail message="Please build using Ant 1.7.1 or higher.">
27.11 + <condition>
27.12 + <not>
27.13 + <antversion atleast="1.7.1"/>
27.14 + </not>
27.15 + </condition>
27.16 + </fail>
27.17 + <property file="nbproject/private/platform-private.properties"/>
27.18 + <property file="nbproject/platform.properties"/>
27.19 + <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-suite-project/1">
27.20 + <attribute name="name"/>
27.21 + <attribute name="value"/>
27.22 + <sequential>
27.23 + <property name="@{name}" value="${@{value}}"/>
27.24 + </sequential>
27.25 + </macrodef>
27.26 + <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-suite-project/1">
27.27 + <attribute name="property"/>
27.28 + <attribute name="value"/>
27.29 + <sequential>
27.30 + <property name="@{property}" value="@{value}"/>
27.31 + </sequential>
27.32 + </macrodef>
27.33 + <property file="${user.properties.file}"/>
27.34 + <sproject:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir"/>
27.35 + <sproject:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir"/>
27.36 + <sproject:evalprops property="cluster.path.evaluated" value="${cluster.path}"/>
27.37 + <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
27.38 + <condition>
27.39 + <not>
27.40 + <contains string="${cluster.path.evaluated}" substring="platform"/>
27.41 + </not>
27.42 + </condition>
27.43 + </fail>
27.44 + <ant antfile="nbproject/platform.xml"/>
27.45 + <fail message="Cannot find NetBeans build harness. ${line.separator}Check that nbplatform.${nbplatform.active}.netbeans.dest.dir and nbplatform.${nbplatform.active}.harness.dir are defined. ${line.separator}On a developer machine these are normally defined in ${user.properties.file}=${netbeans.user}/build.properties ${line.separator}but for automated builds you should pass these properties to Ant explicitly. ${line.separator}You may instead download the harness and platform: -Dbootstrap.url=.../tasks.jar -Dautoupdate.catalog.url=.../updates.xml">
27.46 + <condition>
27.47 + <not>
27.48 + <available file="${harness.dir}/suite.xml"/>
27.49 + </not>
27.50 + </condition>
27.51 + </fail>
27.52 + <import file="${harness.dir}/suite.xml"/>
27.53 +</project>
28.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
28.2 +++ b/make/netbeans/nb-javac-modules/nbproject/genfiles.properties Fri Apr 20 16:02:37 2018 +0200
28.3 @@ -0,0 +1,11 @@
28.4 +build.xml.data.CRC32=1bde7260
28.5 +build.xml.script.CRC32=a1bee4d1
28.6 +build.xml.stylesheet.CRC32=eaf9f76a@2.73
28.7 +# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
28.8 +# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
28.9 +nbproject/build-impl.xml.data.CRC32=1bde7260
28.10 +nbproject/build-impl.xml.script.CRC32=35ff1f90
28.11 +nbproject/build-impl.xml.stylesheet.CRC32=0f381476@2.73
28.12 +nbproject/platform.xml.data.CRC32=1bde7260
28.13 +nbproject/platform.xml.script.CRC32=6dcbd131
28.14 +nbproject/platform.xml.stylesheet.CRC32=45ddf0e0@2.73
29.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
29.2 +++ b/make/netbeans/nb-javac-modules/nbproject/platform.properties Fri Apr 20 16:02:37 2018 +0200
29.3 @@ -0,0 +1,11 @@
29.4 +cluster.path=\
29.5 + ${nbplatform.active.dir}/apisupport:\
29.6 + ${nbplatform.active.dir}/extide:\
29.7 + ${nbplatform.active.dir}/harness:\
29.8 + ${nbplatform.active.dir}/ide:\
29.9 + ${nbplatform.active.dir}/java:\
29.10 + ${nbplatform.active.dir}/nb:\
29.11 + ${nbplatform.active.dir}/platform:\
29.12 + ${nbplatform.active.dir}/profiler:\
29.13 + ${nbplatform.active.dir}/websvccommon
29.14 +nbplatform.active=Apache_NetBeans_IDE_Dev_(Build_20180206-unknown-revn)
30.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
30.2 +++ b/make/netbeans/nb-javac-modules/nbproject/platform.xml Fri Apr 20 16:02:37 2018 +0200
30.3 @@ -0,0 +1,34 @@
30.4 +<?xml version="1.0" encoding="UTF-8"?>
30.5 +<project name="platform" default="download" basedir="..">
30.6 + <condition property="download.required">
30.7 + <and>
30.8 + <not>
30.9 + <available file="${harness.dir}/suite.xml"/>
30.10 + </not>
30.11 + <isset property="bootstrap.url"/>
30.12 + <isset property="autoupdate.catalog.url"/>
30.13 + </and>
30.14 + </condition>
30.15 + <target name="download" if="download.required">
30.16 + <mkdir dir="${harness.dir}"/>
30.17 + <pathconvert pathsep="|" property="download.clusters">
30.18 + <mapper type="flatten"/>
30.19 + <path path="${cluster.path}"/>
30.20 + </pathconvert>
30.21 + <property name="disabled.modules" value=""/>
30.22 + <pathconvert property="module.includes" pathsep="">
30.23 + <mapper type="glob" from="${basedir}${file.separator}*" to="(?!^\Q*\E$)"/>
30.24 + <path>
30.25 + <filelist files="${disabled.modules}" dir="."/>
30.26 + </path>
30.27 + </pathconvert>
30.28 + <echo message="Downloading clusters ${download.clusters}"/>
30.29 + <property name="tasks.jar" location="${java.io.tmpdir}/tasks.jar"/>
30.30 + <get src="${bootstrap.url}" dest="${tasks.jar}" usetimestamp="true" verbose="true"/>
30.31 + <taskdef name="autoupdate" classname="org.netbeans.nbbuild.AutoUpdate" classpath="${tasks.jar}"/>
30.32 + <autoupdate installdir="${nbplatform.active.dir}" updatecenter="${autoupdate.catalog.url}">
30.33 + <modules includes="${module.includes}.*" clusters="${download.clusters}"/>
30.34 + <modules includes="org[.]netbeans[.]modules[.]apisupport[.]harness" clusters="harness"/>
30.35 + </autoupdate>
30.36 + </target>
30.37 +</project>
31.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
31.2 +++ b/make/netbeans/nb-javac-modules/nbproject/project.properties Fri Apr 20 16:02:37 2018 +0200
31.3 @@ -0,0 +1,14 @@
31.4 +auxiliary.org-netbeans-modules-apisupport-installer.license-type=no
31.5 +auxiliary.org-netbeans-modules-apisupport-installer.os-linux=true
31.6 +auxiliary.org-netbeans-modules-apisupport-installer.os-macosx=false
31.7 +auxiliary.org-netbeans-modules-apisupport-installer.os-solaris=false
31.8 +auxiliary.org-netbeans-modules-apisupport-installer.os-windows=false
31.9 +auxiliary.org-netbeans-modules-apisupport-installer.pack200-enabled=false
31.10 +auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml
31.11 +modules=\
31.12 + ${project.org.netbeans.modules.nbjavac.api}:\
31.13 + ${project.org.netbeans.modules.nbjavac.impl}:\
31.14 + ${project.org.netbeans.modules.nbjavac}
31.15 +project.org.netbeans.modules.nbjavac=kit
31.16 +project.org.netbeans.modules.nbjavac.api=api
31.17 +project.org.netbeans.modules.nbjavac.impl=impl
32.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
32.2 +++ b/make/netbeans/nb-javac-modules/nbproject/project.xml Fri Apr 20 16:02:37 2018 +0200
32.3 @@ -0,0 +1,9 @@
32.4 +<?xml version="1.0" encoding="UTF-8"?>
32.5 +<project xmlns="http://www.netbeans.org/ns/project/1">
32.6 + <type>org.netbeans.modules.apisupport.project.suite</type>
32.7 + <configuration>
32.8 + <data xmlns="http://www.netbeans.org/ns/nb-module-suite-project/1">
32.9 + <name>nb-javac-modules</name>
32.10 + </data>
32.11 + </configuration>
32.12 +</project>