stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8011814: Add testng.jar to Netbeans projects test compile classpath

Browse Source 
8013271: Add MacOS sources to J2SE Netbeans project
8013272: JDK Netbeans projects should use ASCII encoding for sources

Reviewed-by: lancea
This commit is contained in:
Mike Duigou 2013-04-30 12:31:51 -07:00
parent 2aaf545877
commit 10f955e370
14 changed files with 119 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jdk/make/netbeans/common/closed-share-sources.ent
View File

@ -37,6 +37,7 @@
<location>${root}/src/closed/share/classes</location>
<includes>${includes}</includes>
<excludes>${excludes}</excludes>
<encoding>US-ASCII</encoding>
</source-folder>
<source-folder>
<label>Closed-Source Packages</label>

2
jdk/make/netbeans/common/demo-view.ent
View File

@ -31,7 +31,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->
<source-folder style="tree">
<source-folder style="tree"> <!-- hierarchy in demo/ dir isn't packages -->
<label>Demos</label>
<location>${root}/src/share/demo</location>
<includes>${demos}</includes>

6
jdk/make/netbeans/common/java-data-native.ent
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
@ -34,8 +34,9 @@
<java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/3">
<compilation-unit>
<package-root>${root}/src/share/classes</package-root>
<package-root>${root}/src/windows/classes</package-root>
<package-root>${root}/src/macosx/classes</package-root>
<package-root>${root}/src/solaris/classes</package-root>
<package-root>${root}/src/windows/classes</package-root>
<classpath mode="boot">${bootstrap.jdk}/jre/lib/rt.jar</classpath>
<built-to>${root}/build/${platform}-${arch}/classes</built-to>
<javadoc-built-to>${root}/build/${platform}-${arch}/docs/api</javadoc-built-to>
@ -44,6 +45,7 @@
<compilation-unit>
<package-root>${root}/test</package-root>
<unit-tests/>
<classpath mode="compile">${jtreg.home}/lib/testng.jar</classpath>
<source-level>1.8</source-level>
</compilation-unit>
</java-data>

3
jdk/make/netbeans/common/java-data-no-native.ent
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
@ -42,6 +42,7 @@
<compilation-unit>
<package-root>${root}/test</package-root>
<unit-tests/>
<classpath mode="compile">${jtreg.home}/lib/testng.jar</classpath>
<source-level>1.8</source-level>
</compilation-unit>
</java-data>

4
jdk/make/netbeans/common/jtreg-view.ent
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
@ -31,7 +31,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->
<source-folder style="tree">
<source-folder style="tree"> <!-- hierarchy in test/ dir isn't packages -->
<label>Tests</label>
<location>${root}/test</location>
<includes>${jtreg.tests}</includes>

49
jdk/make/netbeans/common/macosx-sources.ent Normal file
View File

@ -0,0 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
- Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
- Neither the name of Oracle nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->
<!--
OS X is a trademark in the United States and other countries,
exclusively licensed through Apple Inc.
-->
<source-folder>
<label>Sources for OS X™ Platform</label>
<type>java</type>
<location>${root}/src/macosx/classes</location>
<includes>${includes}</includes>
<excludes>${excludes}</excludes>
<encoding>US-ASCII</encoding>
</source-folder>
<source-folder>
<label>Sources for OS X™ Platform</label>
<location>${root}/src/macosx/classes</location>
</source-folder>

43
jdk/make/netbeans/common/macosx-view.ent Normal file
View File

@ -0,0 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
- Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
- Neither the name of Oracle nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->
<!--
OS X is a trademark in the United States and other countries,
exclusively licensed through Apple Inc.
-->
<source-folder style="tree">
<label>Sources for OS X™ Platform</label>
<location>${root}/src/macosx/classes</location>
<includes>${includes}</includes>
<excludes>${excludes}</excludes>
</source-folder>

2
jdk/make/netbeans/common/properties.ent
View File

@ -41,3 +41,5 @@
<property-file>${user.home}/.openjdk/build.properties</property-file>
<property-file>build.properties</property-file>
<property name="bootstrap.jdk">${java.home}/..</property>
<property name="jtreg.home">${env.JT_HOME}</property>
<property name="jtreg.tests">**</property>

4
jdk/make/netbeans/common/sample-view.ent
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
@ -31,7 +31,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->
<source-folder style="tree">
<source-folder style="tree"> <!-- hierarchy in sample/ dir isn't packages -->
<label>Samples</label>
<location>${root}/src/share/sample</location>
<includes>${samples}</includes>

1
jdk/make/netbeans/common/share-sources.ent
View File

@ -37,6 +37,7 @@
<location>${root}/src/share/classes</location>
<includes>${includes}</includes>
<excludes>${excludes}</excludes>
<encoding>US-ASCII</encoding>
</source-folder>
<source-folder>
<label>Sources for All Platforms</label>

1
jdk/make/netbeans/common/unix-sources.ent
View File

@ -41,6 +41,7 @@
<location>${root}/src/solaris/classes</location>
<includes>${includes}</includes>
<excludes>${excludes}</excludes>
<encoding>US-ASCII</encoding>
</source-folder>
<source-folder>
<label>Sources for Unix® Platform</label>

1
jdk/make/netbeans/common/windows-sources.ent
View File

@ -37,6 +37,7 @@
<location>${root}/src/windows/classes</location>
<includes>${includes}</includes>
<excludes>${excludes}</excludes>
<encoding>US-ASCII</encoding>
</source-folder>
<source-folder>
<label>Sources for Windows Platform</label>

6
jdk/make/netbeans/j2se/nbproject/project.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
@ -34,12 +34,14 @@
<!DOCTYPE project [
<!ENTITY properties SYSTEM "../../common/properties.ent">
<!ENTITY share-sources SYSTEM "../../common/share-sources.ent">
<!ENTITY macosx-sources SYSTEM "../../common/macosx-sources.ent">
<!ENTITY unix-sources SYSTEM "../../common/unix-sources.ent">
<!ENTITY windows-sources SYSTEM "../../common/windows-sources.ent">
<!ENTITY jtreg-sources SYSTEM "../../common/jtreg-sources.ent">
<!ENTITY build-folder SYSTEM "../../common/build-folder.ent">
<!ENTITY standard-bindings SYSTEM "../../common/standard-bindings.ent">
<!ENTITY share-view SYSTEM "../../common/share-view.ent">
<!ENTITY macosx-view SYSTEM "../../common/macosx-view.ent">
<!ENTITY unix-view SYSTEM "../../common/unix-view.ent">
<!ENTITY windows-view SYSTEM "../../common/windows-view.ent">
<!ENTITY jtreg-view SYSTEM "../../common/jtreg-view.ent">
@ -58,6 +60,7 @@
</properties>
<folders>
&share-sources;
&macosx-sources;
&unix-sources;
&windows-sources;
&build-folder;
@ -83,6 +86,7 @@
<view>
<items>
&share-view;
&macosx-view;
&unix-view;
&windows-view;
&jtreg-view;

6
jdk/make/netbeans/world/nbproject/project.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
@ -34,11 +34,13 @@
<!DOCTYPE project [
<!ENTITY properties SYSTEM "../../common/properties.ent">
<!ENTITY share-sources SYSTEM "../../common/share-sources.ent">
<!ENTITY macosx-sources SYSTEM "../../common/macosx-sources.ent">
<!ENTITY unix-sources SYSTEM "../../common/unix-sources.ent">
<!ENTITY windows-sources SYSTEM "../../common/windows-sources.ent">
<!ENTITY build-folder SYSTEM "../../common/build-folder.ent">
<!ENTITY standard-bindings SYSTEM "../../common/standard-bindings.ent">
<!ENTITY share-view SYSTEM "../../common/share-view.ent">
<!ENTITY macosx-view SYSTEM "../../common/macosx-view.ent">
<!ENTITY unix-view SYSTEM "../../common/unix-view.ent">
<!ENTITY windows-view SYSTEM "../../common/windows-view.ent">
<!ENTITY file-view SYSTEM "../../common/file-view.ent">
@ -56,6 +58,7 @@
</properties>
<folders>
&share-sources;
&macosx-sources;
&unix-sources;
&windows-sources;
&build-folder;
@ -66,6 +69,7 @@
<view>
<items>
&share-view;
&macosx-view;
&unix-view;
&windows-view;
&file-view;