mirror of
https://github.com/openjdk/jdk.git
synced 2026-03-11 08:23:26 +00:00
8006709: Add minimal support of MacOSX platform for NetBeans Projects
Adds support for MacOSX platform and architecture detection. Other minor updates (-source/target 1.8) Reviewed-by: ohair
This commit is contained in:
Mike Duigou
parent
320ce960ce
commit
665fca9d60
@ -0,0 +1,32 @@
|
||||
#
|
||||
# Copyright (c) 2007, 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.
|
||||
#
|
||||
|
||||
arch=x86_64
|
||||
@ -0,0 +1,32 @@
|
||||
#
|
||||
# Copyright (c) 2007, 2012, 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.
|
||||
#
|
||||
|
||||
platform=macosx
|
||||
@ -39,11 +39,11 @@
|
||||
<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>
|
||||
<source-level>1.7</source-level>
|
||||
<source-level>1.8</source-level>
|
||||
</compilation-unit>
|
||||
<compilation-unit>
|
||||
<package-root>${root}/test</package-root>
|
||||
<unit-tests/>
|
||||
<source-level>1.7</source-level>
|
||||
<source-level>1.8</source-level>
|
||||
</compilation-unit>
|
||||
</java-data>
|
||||
|
||||
@ -37,11 +37,11 @@
|
||||
<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>
|
||||
<source-level>1.7</source-level>
|
||||
<source-level>1.8</source-level>
|
||||
</compilation-unit>
|
||||
<compilation-unit>
|
||||
<package-root>${root}/test</package-root>
|
||||
<unit-tests/>
|
||||
<source-level>1.7</source-level>
|
||||
<source-level>1.8</source-level>
|
||||
</compilation-unit>
|
||||
</java-data>
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
|
||||
<project name="make" basedir="..">
|
||||
|
||||
<target name="-make.init" depends="-init,-pre-init.linux,-pre-init.solaris,-pre-init.windows">
|
||||
<target name="-make.init" depends="-init,-pre-init.linux,-pre-init.macosx,-pre-init.solaris,-pre-init.windows,-pre-init.macosx">
|
||||
<property name="make.options" value=""/> <!-- default, can be overridden per user or per project -->
|
||||
</target>
|
||||
|
||||
@ -42,6 +42,11 @@
|
||||
<property name="make" value="make"/>
|
||||
</target>
|
||||
|
||||
<target name="-pre-init.macosx" if="os.macosx">
|
||||
<property name="platform" value="macosx"/>
|
||||
<property name="make" value="make"/>
|
||||
</target>
|
||||
|
||||
<target name="-pre-init.solaris" if="os.solaris">
|
||||
<property name="platform" value="solaris"/>
|
||||
<property name="make" value="gmake"/>
|
||||
|
||||
@ -85,6 +85,9 @@
|
||||
<property name="includes" value="(nothing)"/>
|
||||
<property name="excludes" value=""/>
|
||||
<property name="javadoc.dir" location="${build.dir}/javadoc/${ant.project.name}"/>
|
||||
<condition property="os.macosx">
|
||||
<os family="mac"/>
|
||||
</condition>
|
||||
<condition property="os.linux">
|
||||
<os name="linux"/>
|
||||
</condition>
|
||||
@ -126,10 +129,6 @@
|
||||
<javac srcdir="@{srcdir}" includes="@{includes}" excludes="@{excludes}" sourcepath=""
|
||||
destdir="@{classesdir}" fork="true" executable="${bootstrap.javac}"
|
||||
debug="${javac.debug}" debuglevel="${javac.debuglevel}">
|
||||
<compilerarg value="-source"/>
|
||||
<compilerarg value="1.5"/>
|
||||
<compilerarg value="-target"/>
|
||||
<compilerarg value="1.6"/> <!-- for usability of JDK 6 as snapshot; change to 1.7 when JSR 294 put back -->
|
||||
<!-- Mandatory for compiling partial JDK sources against a snapshot; should NEVER be used for any other purpose: -->
|
||||
<compilerarg value="-XDignore.symbol.file=true"/>
|
||||
<compilerarg line="${javac.options}"/>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user