Mercurial > hg > openjdk > aarch64-port
changeset 1474:b667572a24c5
Merge up to jdk8u60-b21
| author | enevill |
|---|---|
| date | Tue, 30 Jun 2015 16:16:21 +0100 |
| parents | e9afe4de1efe (current diff) 99d323d5830f (diff) |
| children | d00df0227041 |
| files | .hgtags common/autoconf/basics.m4 common/autoconf/basics_windows.m4 common/autoconf/build-aux/autoconf-config.sub common/autoconf/build-aux/config.sub common/autoconf/configure common/autoconf/configure.ac common/autoconf/generated-configure.sh common/autoconf/hotspot-spec.gmk.in common/autoconf/jdk-options.m4 common/autoconf/libraries.m4 common/autoconf/platform.m4 common/autoconf/spec.gmk.in common/autoconf/toolchain.m4 make/Javadoc.gmk make/Main.gmk make/common/NON_CORE_PKGS.gmk make/jprt.properties |
| diffstat | 19 files changed, 925 insertions(+), 430 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Apr 16 11:35:37 2015 +0100 +++ b/.hgtags Tue Jun 30 16:16:21 2015 +0100 @@ -405,3 +405,25 @@ 6738b8755c80905e3eecedf94e27f03d23f02ba9 jdk8u45-b11 54709b761404dd3bc1b58acf5582fa9bd70ff59a jdk8u45-b12 6b2f1bf5c72873d01b37103fc20ac7a63e7881dd jdk8u45-b13 +15b679d327da9ee99c05d7ddd75512ce335d5994 jdk8u45-b14 +ae4980d195b64eec58884b233d7efd312205bac8 jdk8u60-b00 +acf81f6fb265c1564b16fd8202a324a9022e204b jdk8u60-b01 +2ca2e2430370d441cbe7999b76b57cadf0060327 jdk8u60-b02 +590cc3ca1fec083de3543b18b0062651b597e376 jdk8u60-b03 +d8d408861c2094c24e9757a67bf2941ed37ce01f jdk8u60-b04 +e532f3672f635bd83c673c349b7563db6dd470bb jdk8u60-b05 +74dbdbcb6aac9fd62f3599ad4e0a1f930b1e9ac1 jdk8u60-b06 +ea714a39e902fb8729f71f2d0f634855646e297d jdk8u60-b07 +0785e45b19c864264f2054a8130c49fe6f70925c jdk8u60-b08 +da6d0717c74a1e2ae4498bf4dc230e20686517ed jdk8u60-b09 +39cd90aa447ae87ed3b2968dcf1a90d08fff964d jdk8u60-b10 +db15b96c78126b2c8a8e19dcc65cdd0b246bd12b jdk8u60-b11 +ba0772198525025803b0fddd6a628fc2416b3b85 jdk8u60-b12 +6ff963c0dd414da5973a00c59b9ce7feb327a8ed jdk8u60-b13 +455a74ebdf59e91116e58d1545b15fd143624e36 jdk8u60-b14 +7ed130e10665ae5bed82aa8c4cdc18373292a6d7 jdk8u60-b15 +08a417ec9b3eea2f02eb02c7b7635f9701813f65 jdk8u60-b16 +ec24cc303a2cfeb10ff0a5fb7b3d49ef47bb66f7 jdk8u60-b17 +d1d9eb953fbbe1f63a6badb0742508ae5f0d3ab5 jdk8u60-b18 +ff2ddaa4ea3292e2f0931a9a0c3feb33288d7d7f jdk8u60-b19 +c641f979dff0d28dcdc4f303e9d93dda3079a456 jdk8u60-b20
--- a/common/autoconf/basics.m4 Thu Apr 16 11:35:37 2015 +0100 +++ b/common/autoconf/basics.m4 Tue Jun 30 16:16:21 2015 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -386,6 +386,12 @@ [TOOLS_DIR=$with_tools_dir] ) + # Xcode version will be validated later + AC_ARG_WITH([xcode-path], [AS_HELP_STRING([--with-xcode-path], + [explicit path to Xcode 4 (generally for building on 10.9 and later)])], + [XCODE_PATH=$with_xcode_path] + ) + AC_ARG_WITH([devkit], [AS_HELP_STRING([--with-devkit], [use this directory as base for tools-dir and sys-root (for cross-compiling)])], [ @@ -634,10 +640,6 @@ # We can build without it. LDD="true" fi - AC_PATH_PROG(OTOOL, otool) - if test "x$OTOOL" = "x"; then - OTOOL="true" - fi AC_PATH_PROGS(READELF, [readelf greadelf]) AC_PATH_PROG(HG, hg) AC_PATH_PROG(STAT, stat)
--- a/common/autoconf/basics_windows.m4 Thu Apr 16 11:35:37 2015 +0100 +++ b/common/autoconf/basics_windows.m4 Tue Jun 30 16:16:21 2015 +0100 @@ -312,8 +312,8 @@ WINDOWS_ENV_VENDOR='cygwin' WINDOWS_ENV_VERSION="$CYGWIN_VERSION" - CYGWIN_VERSION_OK=`$ECHO $CYGWIN_VERSION | $GREP ^1.7.` - if test "x$CYGWIN_VERSION_OK" = x; then + CYGWIN_VERSION_OLD=`$ECHO $CYGWIN_VERSION | $GREP -e '^1\.[0-6]'` + if test "x$CYGWIN_VERSION_OLD" != x; then AC_MSG_NOTICE([Your cygwin is too old. You are running $CYGWIN_VERSION, but at least cygwin 1.7 is required. Please upgrade.]) AC_MSG_ERROR([Cannot continue]) fi
--- a/common/autoconf/configure Thu Apr 16 11:35:37 2015 +0100 +++ b/common/autoconf/configure Tue Jun 30 16:16:21 2015 +0100 @@ -28,6 +28,10 @@ exit 1 fi +# Force autoconf to use bash. This also means we must disable autoconf re-exec. +export CONFIG_SHELL=$BASH +export _as_can_reexec=no + CONFIGURE_COMMAND_LINE="$@" conf_script_dir=`dirname $0`
--- a/common/autoconf/configure.ac Thu Apr 16 11:35:37 2015 +0100 +++ b/common/autoconf/configure.ac Tue Jun 30 16:16:21 2015 +0100 @@ -53,6 +53,7 @@ AC_DEFUN_ONCE([CUSTOM_EARLY_HOOK]) AC_DEFUN_ONCE([CUSTOM_LATE_HOOK]) +AC_DEFUN_ONCE([CUSTOM_CONFIG_OUTPUT_GENERATED_HOOK]) # This line needs to be here, verbatim, after all includes and the dummy hook # definitions. It is replaced with custom functionality when building @@ -237,6 +238,7 @@ # Create the actual output files. Now the main work of configure is done. AC_OUTPUT +CUSTOM_CONFIG_OUTPUT_GENERATED_HOOK # Try to move the config.log file to the output directory. if test -e ./config.log; then
--- a/common/autoconf/generated-configure.sh Thu Apr 16 11:35:37 2015 +0100 +++ b/common/autoconf/generated-configure.sh Tue Jun 30 16:16:21 2015 +0100 @@ -710,11 +710,11 @@ COMPILER_NAME JT_HOME JTREGEXE -LIPO ac_ct_OBJDUMP OBJDUMP ac_ct_OBJCOPY OBJCOPY +OTOOL MCS STRIP GNM @@ -761,6 +761,9 @@ PROPER_COMPILER_CC POTENTIAL_CC TOOLS_DIR_CC +SDKPATH +XCODEBUILD +SET_DEVELOPER_DIR BUILD_LD BUILD_CXX BUILD_CC @@ -796,6 +799,7 @@ JAVA_CHECK JAVAC_CHECK COOKED_BUILD_NUMBER +COOKED_JDK_UPDATE_VERSION JDK_VERSION COPYRIGHT_YEAR MACOSX_BUNDLE_ID_BASE @@ -833,7 +837,6 @@ STAT HG READELF -OTOOL LDD ZIP UNZIP @@ -1005,6 +1008,7 @@ with_target_bits with_sys_root with_tools_dir +with_xcode_path with_devkit enable_openjdk_only with_jdk_variant @@ -1750,6 +1754,8 @@ cross-compiling) --with-tools-dir search this directory for compilers and tools (for cross-compiling) + --with-xcode-path explicit path to Xcode 4 (generally for building on + 10.9 and later) --with-devkit use this directory as base for tools-dir and sys-root (for cross-compiling) --with-jdk-variant JDK variant to build (normal) [normal] @@ -3098,7 +3104,7 @@ # Include these first... # -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -3614,7 +3620,7 @@ # -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -3754,7 +3760,7 @@ # -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -3856,13 +3862,14 @@ + # This line needs to be here, verbatim, after all includes and the dummy hook # definitions. It is replaced with custom functionality when building # custom sources. #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1416326200 +DATE_WHEN_GENERATED=1433258489 ############################################################################### # @@ -7210,7 +7217,8 @@ # ZERO_ARCHDEF is used to enable architecture-specific code case "${OPENJDK_TARGET_CPU}" in - ppc*) ZERO_ARCHDEF=PPC ;; + ppc) ZERO_ARCHDEF=PPC32 ;; + ppc64) ZERO_ARCHDEF=PPC64 ;; s390*) ZERO_ARCHDEF=S390 ;; sparc*) ZERO_ARCHDEF=SPARC ;; x86_64*) ZERO_ARCHDEF=AMD64 ;; @@ -7249,8 +7257,8 @@ WINDOWS_ENV_VENDOR='cygwin' WINDOWS_ENV_VERSION="$CYGWIN_VERSION" - CYGWIN_VERSION_OK=`$ECHO $CYGWIN_VERSION | $GREP ^1.7.` - if test "x$CYGWIN_VERSION_OK" = x; then + CYGWIN_VERSION_OLD=`$ECHO $CYGWIN_VERSION | $GREP -e '^1\.0-6'` + if test "x$CYGWIN_VERSION_OLD" != x; then { $as_echo "$as_me:${as_lineno-$LINENO}: Your cygwin is too old. You are running $CYGWIN_VERSION, but at least cygwin 1.7 is required. Please upgrade." >&5 $as_echo "$as_me: Your cygwin is too old. You are running $CYGWIN_VERSION, but at least cygwin 1.7 is required. Please upgrade." >&6;} as_fn_error $? "Cannot continue" "$LINENO" 5 @@ -7606,6 +7614,15 @@ fi + # Xcode version will be validated later + +# Check whether --with-xcode-path was given. +if test "${with_xcode_path+set}" = set; then : + withval=$with_xcode_path; XCODE_PATH=$with_xcode_path + +fi + + # Check whether --with-devkit was given. if test "${with_devkit+set}" = set; then : @@ -7961,7 +7978,7 @@ if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then - MACOSX_UNIVERSAL="true" + MACOSX_UNIVERSAL="false" fi @@ -10322,49 +10339,6 @@ # We can build without it. LDD="true" fi - # Extract the first word of "otool", so it can be a program name with args. -set dummy otool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_OTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $OTOOL in - [\\/]* | ?:[\\/]*) - ac_cv_path_OTOOL="$OTOOL" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_OTOOL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -OTOOL=$ac_cv_path_OTOOL -if test -n "$OTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 -$as_echo "$OTOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - if test "x$OTOOL" = "x"; then - OTOOL="true" - fi for ac_prog in readelf greadelf do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -11307,6 +11281,12 @@ fi +# The cooked update version used to encode trailing letters in the update + # version into a trailing number. That is no longer needed, but need to + # keep the format in 8u for compatibility. + COOKED_JDK_UPDATE_VERSION="${JDK_UPDATE_VERSION}0" + + COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'` @@ -16792,7 +16772,7 @@ # jtreg win32 script works for everybody - JTREGEXE="$JT_HOME/win32/bin/jtreg" + JTREGEXE="$JT_HOME/bin/jtreg" if test ! -f "$JTREGEXE"; then as_fn_error $? "JTReg executable does not exist: $JTREGEXE" "$LINENO" 5 @@ -19248,6 +19228,132 @@ PATH=$TOOLS_DIR:$PATH fi + # Before we locate the compilers, we need to sanitize the Xcode build environment + if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then + # determine path to Xcode developer directory + # can be empty in which case all the tools will rely on a sane Xcode 4 installation + SET_DEVELOPER_DIR= + + if test -n "$XCODE_PATH"; then + DEVELOPER_DIR="$XCODE_PATH"/Contents/Developer + fi + + # DEVELOPER_DIR could also be provided directly + { $as_echo "$as_me:${as_lineno-$LINENO}: checking Determining if we need to set DEVELOPER_DIR" >&5 +$as_echo_n "checking Determining if we need to set DEVELOPER_DIR... " >&6; } + if test -n "$DEVELOPER_DIR"; then + if test ! -d "$DEVELOPER_DIR"; then + as_fn_error $? "Xcode Developer path does not exist: $DEVELOPER_DIR, please provide a path to the Xcode 4 application bundle using --with-xcode-path" "$LINENO" 5 + fi + if test ! -f "$DEVELOPER_DIR"/usr/bin/xcodebuild; then + as_fn_error $? "Xcode Developer path is not valid: $DEVELOPER_DIR, it must point to Contents/Developer inside an Xcode application bundle" "$LINENO" 5 + fi + # make it visible to all the tools immediately + export DEVELOPER_DIR + SET_DEVELOPER_DIR="export DEVELOPER_DIR := $DEVELOPER_DIR" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($DEVELOPER_DIR)" >&5 +$as_echo "yes ($DEVELOPER_DIR)" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + + + # Extract the first word of "xcodebuild", so it can be a program name with args. +set dummy xcodebuild; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_XCODEBUILD+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $XCODEBUILD in + [\\/]* | ?:[\\/]*) + ac_cv_path_XCODEBUILD="$XCODEBUILD" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_XCODEBUILD="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +XCODEBUILD=$ac_cv_path_XCODEBUILD +if test -n "$XCODEBUILD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XCODEBUILD" >&5 +$as_echo "$XCODEBUILD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test -z "$XCODEBUILD"; then + as_fn_error $? "The xcodebuild tool was not found, the Xcode command line tools are required to build on Mac OS X" "$LINENO" 5 + fi + + # Fail-fast: verify we're building on Xcode 4, we cannot build with Xcode 5 or later + XCODE_VERSION=`$XCODEBUILD -version | grep '^Xcode ' | sed 's/Xcode //'` + XC_VERSION_PARTS=( ${XCODE_VERSION//./ } ) + if test ! "${XC_VERSION_PARTS[0]}" = "4"; then + as_fn_error $? "Xcode 4 is required to build JDK 8, the version found was $XCODE_VERSION. Use --with-xcode-path to specify the location of Xcode 4 or make Xcode 4 active by using xcode-select." "$LINENO" 5 + fi + + # Some versions of Xcode 5 command line tools install gcc and g++ as symlinks to + # clang and clang++, which will break the build. So handle that here if we need to. + if test -L "/usr/bin/gcc" -o -L "/usr/bin/g++"; then + # use xcrun to find the real gcc and add it's directory to PATH + # then autoconf magic will find it + { $as_echo "$as_me:${as_lineno-$LINENO}: Found gcc symlinks to clang in /usr/bin, adding path to real gcc to PATH" >&5 +$as_echo "$as_me: Found gcc symlinks to clang in /usr/bin, adding path to real gcc to PATH" >&6;} + XCODE_BIN_PATH=$(dirname `xcrun -find gcc`) + PATH="$XCODE_BIN_PATH":$PATH + fi + + # Determine appropriate SDKPATH, don't use SDKROOT as it interferes with the stub tools + { $as_echo "$as_me:${as_lineno-$LINENO}: checking Determining Xcode SDK path" >&5 +$as_echo_n "checking Determining Xcode SDK path... " >&6; } + # allow SDKNAME to be set to override the default SDK selection + SDKPATH=`"$XCODEBUILD" -sdk ${SDKNAME:-macosx} -version | grep '^Path: ' | sed 's/Path: //'` + if test -n "$SDKPATH"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SDKPATH" >&5 +$as_echo "$SDKPATH" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: (none, will use system headers and frameworks)" >&5 +$as_echo "(none, will use system headers and frameworks)" >&6; } + fi + + + # Perform a basic sanity test + if test ! -f "$SDKPATH/System/Library/Frameworks/Foundation.framework/Headers/Foundation.h"; then + as_fn_error $? "Unable to find required framework headers, provide a valid path to Xcode 4 using --with-xcode-path" "$LINENO" 5 + fi + + # if SDKPATH is non-empty then we need to add -isysroot and -iframework for gcc and g++ + if test -n "$SDKPATH"; then + # We need -isysroot <path> and -iframework<path>/System/Library/Frameworks + CFLAGS_JDK="${CFLAGS_JDK} -isysroot \"$SDKPATH\" -iframework\"$SDKPATH/System/Library/Frameworks\"" + CXXFLAGS_JDK="${CXXFLAGS_JDK} -isysroot \"$SDKPATH\" -iframework\"$SDKPATH/System/Library/Frameworks\"" + LDFLAGS_JDK="${LDFLAGS_JDK} -isysroot \"$SDKPATH\" -iframework\"$SDKPATH/System/Library/Frameworks\"" + fi + + # These always need to be set, or we can't find the frameworks embedded in JavaVM.framework + # setting this here means it doesn't have to be peppered throughout the forest + CFLAGS_JDK="$CFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\"" + CXXFLAGS_JDK="$CXXFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\"" + LDFLAGS_JDK="$LDFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\"" + fi ### Locate C compiler (CC) @@ -24081,10 +24187,10 @@ -d \"JDK_BUILD_ID=\$(FULL_VERSION)\" \ -d \"JDK_COMPANY=\$(COMPANY_NAME)\" \ -d \"JDK_COMPONENT=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) binary\" \ - -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0).\$(COOKED_BUILD_NUMBER)\" \ + -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(COOKED_JDK_UPDATE_VERSION).\$(COOKED_BUILD_NUMBER)\" \ -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \ -d \"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(JDK_MINOR_VERSION) \$(JDK_UPDATE_META_TAG)\" \ - -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\"" + -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(COOKED_JDK_UPDATE_VERSION),\$(COOKED_BUILD_NUMBER)\"" # lib.exe is used to create static libraries. # Extract the first word of "lib", so it can be a program name with args. @@ -27067,6 +27173,49 @@ fi elif test "x$OPENJDK_TARGET_OS" != xwindows; then + # Extract the first word of "otool", so it can be a program name with args. +set dummy otool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_OTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $OTOOL in + [\\/]* | ?:[\\/]*) + ac_cv_path_OTOOL="$OTOOL" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_OTOOL="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +OTOOL=$ac_cv_path_OTOOL +if test -n "$OTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 +$as_echo "$OTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test "x$OTOOL" = "x"; then + OTOOL="true" + fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args. set dummy ${ac_tool_prefix}nm; ac_word=$2 @@ -28531,315 +28680,6 @@ fi - if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then - # Extract the first word of "lipo", so it can be a program name with args. -set dummy lipo; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_LIPO+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $LIPO in - [\\/]* | ?:[\\/]*) - ac_cv_path_LIPO="$LIPO" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_LIPO="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -LIPO=$ac_cv_path_LIPO -if test -n "$LIPO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 -$as_echo "$LIPO" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then - - # First separate the path from the arguments. This will split at the first - # space. - complete="$LIPO" - path="${complete%% *}" - tmp="$complete EOL" - arguments="${tmp#* }" - - # Input might be given as Windows format, start by converting to - # unix format. - new_path=`$CYGPATH -u "$path"` - - # Now try to locate executable using which - new_path=`$WHICH "$new_path" 2> /dev/null` - # bat and cmd files are not always considered executable in cygwin causing which - # to not find them - if test "x$new_path" = x \ - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ - && test "x`$LS \"$path\" 2>/dev/null`" != x; then - new_path=`$CYGPATH -u "$path"` - fi - if test "x$new_path" = x; then - # Oops. Which didn't find the executable. - # The splitting of arguments from the executable at a space might have been incorrect, - # since paths with space are more likely in Windows. Give it another try with the whole - # argument. - path="$complete" - arguments="EOL" - new_path=`$CYGPATH -u "$path"` - new_path=`$WHICH "$new_path" 2> /dev/null` - # bat and cmd files are not always considered executable in cygwin causing which - # to not find them - if test "x$new_path" = x \ - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ - && test "x`$LS \"$path\" 2>/dev/null`" != x; then - new_path=`$CYGPATH -u "$path"` - fi - if test "x$new_path" = x; then - # It's still not found. Now this is an unrecoverable error. - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of LIPO, which resolves as \"$complete\", is not found." >&5 -$as_echo "$as_me: The path of LIPO, which resolves as \"$complete\", is not found." >&6;} - has_space=`$ECHO "$complete" | $GREP " "` - if test "x$has_space" != x; then - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;} - fi - as_fn_error $? "Cannot locate the the path of LIPO" "$LINENO" 5 - fi - fi - - # Cygwin tries to hide some aspects of the Windows file system, such that binaries are - # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered - # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then - # "foo.exe" is OK but "foo" is an error. - # - # This test is therefore slightly more accurate than "test -f" to check for file presence. - # It is also a way to make sure we got the proper file name for the real test later on. - test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null` - if test "x$test_shortpath" = x; then - # Short path failed, file does not exist as specified. - # Try adding .exe or .cmd - if test -f "${new_path}.exe"; then - input_to_shortpath="${new_path}.exe" - elif test -f "${new_path}.cmd"; then - input_to_shortpath="${new_path}.cmd" - else - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of LIPO, which resolves as \"$new_path\", is invalid." >&5 -$as_echo "$as_me: The path of LIPO, which resolves as \"$new_path\", is invalid." >&6;} - { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5 -$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;} - as_fn_error $? "Cannot locate the the path of LIPO" "$LINENO" 5 - fi - else - input_to_shortpath="$new_path" - fi - - # Call helper function which possibly converts this using DOS-style short mode. - # If so, the updated path is stored in $new_path. - new_path="$input_to_shortpath" - - input_path="$input_to_shortpath" - # Check if we need to convert this using DOS-style short mode. If the path - # contains just simple characters, use it. Otherwise (spaces, weird characters), - # take no chances and rewrite it. - # Note: m4 eats our [], so we need to use [ and ] instead. - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]` - if test "x$has_forbidden_chars" != x; then - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \) - shortmode_path=`$CYGPATH -s -m -a "$input_path"` - path_after_shortmode=`$CYGPATH -u "$shortmode_path"` - if test "x$path_after_shortmode" != "x$input_to_shortpath"; then - # Going to short mode and back again did indeed matter. Since short mode is - # case insensitive, let's make it lowercase to improve readability. - shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - # Now convert it back to Unix-stile (cygpath) - input_path=`$CYGPATH -u "$shortmode_path"` - new_path="$input_path" - fi - fi - - test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/` - if test "x$test_cygdrive_prefix" = x; then - # As a simple fix, exclude /usr/bin since it's not a real path. - if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then - # The path is in a Cygwin special directory (e.g. /home). We need this converted to - # a path prefixed by /cygdrive for fixpath to work. - new_path="$CYGWIN_ROOT_PATH$input_path" - fi - fi - - # remove trailing .exe if any - new_path="${new_path/%.exe/}" - - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then - - # First separate the path from the arguments. This will split at the first - # space. - complete="$LIPO" - path="${complete%% *}" - tmp="$complete EOL" - arguments="${tmp#* }" - - # Input might be given as Windows format, start by converting to - # unix format. - new_path="$path" - - windows_path="$new_path" - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then - unix_path=`$CYGPATH -u "$windows_path"` - new_path="$unix_path" - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` - new_path="$unix_path" - fi - - - # Now try to locate executable using which - new_path=`$WHICH "$new_path" 2> /dev/null` - - if test "x$new_path" = x; then - # Oops. Which didn't find the executable. - # The splitting of arguments from the executable at a space might have been incorrect, - # since paths with space are more likely in Windows. Give it another try with the whole - # argument. - path="$complete" - arguments="EOL" - new_path="$path" - - windows_path="$new_path" - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then - unix_path=`$CYGPATH -u "$windows_path"` - new_path="$unix_path" - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` - new_path="$unix_path" - fi - - - new_path=`$WHICH "$new_path" 2> /dev/null` - - if test "x$new_path" = x; then - # It's still not found. Now this is an unrecoverable error. - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of LIPO, which resolves as \"$complete\", is not found." >&5 -$as_echo "$as_me: The path of LIPO, which resolves as \"$complete\", is not found." >&6;} - has_space=`$ECHO "$complete" | $GREP " "` - if test "x$has_space" != x; then - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;} - fi - as_fn_error $? "Cannot locate the the path of LIPO" "$LINENO" 5 - fi - fi - - # Now new_path has a complete unix path to the binary - if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then - # Keep paths in /bin as-is, but remove trailing .exe if any - new_path="${new_path/%.exe/}" - # Do not save /bin paths to all_fixpath_prefixes! - else - # Not in mixed or Windows style, start by that. - new_path=`cmd //c echo $new_path` - - input_path="$new_path" - # Check if we need to convert this using DOS-style short mode. If the path - # contains just simple characters, use it. Otherwise (spaces, weird characters), - # take no chances and rewrite it. - # Note: m4 eats our [], so we need to use [ and ] instead. - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]` - if test "x$has_forbidden_chars" != x; then - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \) - new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - fi - - # Output is in $new_path - - windows_path="$new_path" - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then - unix_path=`$CYGPATH -u "$windows_path"` - new_path="$unix_path" - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` - new_path="$unix_path" - fi - - # remove trailing .exe if any - new_path="${new_path/%.exe/}" - - # Save the first 10 bytes of this path to the storage, so fixpath can work. - all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}") - fi - - else - # We're on a posix platform. Hooray! :) - # First separate the path from the arguments. This will split at the first - # space. - complete="$LIPO" - path="${complete%% *}" - tmp="$complete EOL" - arguments="${tmp#* }" - - # Cannot rely on the command "which" here since it doesn't always work. - is_absolute_path=`$ECHO "$path" | $GREP ^/` - if test -z "$is_absolute_path"; then - # Path to executable is not absolute. Find it. - IFS_save="$IFS" - IFS=: - for p in $PATH; do - if test -f "$p/$path" && test -x "$p/$path"; then - new_path="$p/$path" - break - fi - done - IFS="$IFS_save" - else - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving LIPO (as $path) failed, using $path directly." >&5 -$as_echo "$as_me: Resolving LIPO (as $path) failed, using $path directly." >&6;} - new_path="$path" - fi - - if test "x$new_path" = x; then - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of LIPO, which resolves as \"$complete\", is not found." >&5 -$as_echo "$as_me: The path of LIPO, which resolves as \"$complete\", is not found." >&6;} - has_space=`$ECHO "$complete" | $GREP " "` - if test "x$has_space" != x; then - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5 -$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;} - fi - as_fn_error $? "Cannot locate the the path of LIPO" "$LINENO" 5 - fi - fi - - # Now join together the path and the arguments once again - if test "x$arguments" != xEOL; then - new_complete="$new_path ${arguments% *}" - else - new_complete="$new_path" - fi - - if test "x$complete" != "x$new_complete"; then - LIPO="$new_complete" - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting LIPO to \"$new_complete\"" >&5 -$as_echo "$as_me: Rewriting LIPO to \"$new_complete\"" >&6;} - fi - - fi - # Restore old path without tools dir @@ -30392,8 +30232,6 @@ ALSA_NOT_NEEDED=yes PULSE_NOT_NEEDED=yes X11_NOT_NEEDED=yes - # If the java runtime framework is disabled, then we need X11. - # This will be adjusted below. { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse x11" >&5 $as_echo "alsa pulse x11" >&6; } fi @@ -30414,11 +30252,7 @@ X11_NOT_NEEDED=yes fi - ############################################################################### - # - # Check for MacOSX support for OpenJDK. - # - + # Deprecated and now ignored # Check whether --enable-macosx-runtime-support was given. if test "${enable_macosx_runtime_support+set}" = set; then : @@ -30431,16 +30265,6 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mac OS X Java Framework" >&5 -$as_echo_n "checking for Mac OS X Java Framework... " >&6; } - if test -f /System/Library/Frameworks/JavaVM.framework/Frameworks/JavaRuntimeSupport.framework/Headers/JavaRuntimeSupport.h; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: /System/Library/Frameworks/JavaVM.framework" >&5 -$as_echo "/System/Library/Frameworks/JavaVM.framework" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - ############################################################################### @@ -37655,6 +37479,7 @@ fi + # Try to move the config.log file to the output directory. if test -e ./config.log; then $MV -f ./config.log "$OUTPUT_ROOT/config.log" 2> /dev/null
--- a/common/autoconf/hotspot-spec.gmk.in Thu Apr 16 11:35:37 2015 +0100 +++ b/common/autoconf/hotspot-spec.gmk.in Tue Jun 30 16:16:21 2015 +0100 @@ -115,6 +115,9 @@ USE_PRECOMPILED_HEADER=@USE_PRECOMPILED_HEADER@ +# Universal binaries on macosx, mirror MACOSX_UNIVERSAL +ALT_MACOSX_UNIVERSAL=@MACOSX_UNIVERSAL@ + # Hotspot expects the variable FULL_DEBUG_SYMBOLS=1/0 to control debug symbols # creation. ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
--- a/common/autoconf/jdk-options.m4 Thu Apr 16 11:35:37 2015 +0100 +++ b/common/autoconf/jdk-options.m4 Tue Jun 30 16:16:21 2015 +0100 @@ -162,7 +162,7 @@ AC_SUBST(INCLUDE_SA) if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then - MACOSX_UNIVERSAL="true" + MACOSX_UNIVERSAL="false" fi AC_SUBST(MACOSX_UNIVERSAL) @@ -526,6 +526,12 @@ fi AC_SUBST(JDK_VERSION) + # The cooked update version used to encode trailing letters in the update + # version into a trailing number. That is no longer needed, but need to + # keep the format in 8u for compatibility. + COOKED_JDK_UPDATE_VERSION="${JDK_UPDATE_VERSION}0" + AC_SUBST(COOKED_JDK_UPDATE_VERSION) + COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'` AC_SUBST(COOKED_BUILD_NUMBER) ])
--- a/common/autoconf/libraries.m4 Thu Apr 16 11:35:37 2015 +0100 +++ b/common/autoconf/libraries.m4 Tue Jun 30 16:16:21 2015 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -65,8 +65,6 @@ ALSA_NOT_NEEDED=yes PULSE_NOT_NEEDED=yes X11_NOT_NEEDED=yes - # If the java runtime framework is disabled, then we need X11. - # This will be adjusted below. AC_MSG_RESULT([alsa pulse x11]) fi @@ -84,19 +82,8 @@ X11_NOT_NEEDED=yes fi - ############################################################################### - # - # Check for MacOSX support for OpenJDK. - # - + # Deprecated and now ignored BASIC_DEPRECATED_ARG_ENABLE(macosx-runtime-support, macosx_runtime_support) - - AC_MSG_CHECKING([for Mac OS X Java Framework]) - if test -f /System/Library/Frameworks/JavaVM.framework/Frameworks/JavaRuntimeSupport.framework/Headers/JavaRuntimeSupport.h; then - AC_MSG_RESULT([/System/Library/Frameworks/JavaVM.framework]) - else - AC_MSG_RESULT([no]) - fi ]) AC_DEFUN_ONCE([LIB_SETUP_X11],
--- a/common/autoconf/platform.m4 Thu Apr 16 11:35:37 2015 +0100 +++ b/common/autoconf/platform.m4 Tue Jun 30 16:16:21 2015 +0100 @@ -371,7 +371,8 @@ # ZERO_ARCHDEF is used to enable architecture-specific code case "${OPENJDK_TARGET_CPU}" in - ppc*) ZERO_ARCHDEF=PPC ;; + ppc) ZERO_ARCHDEF=PPC32 ;; + ppc64) ZERO_ARCHDEF=PPC64 ;; s390*) ZERO_ARCHDEF=S390 ;; sparc*) ZERO_ARCHDEF=SPARC ;; x86_64*) ZERO_ARCHDEF=AMD64 ;;
--- a/common/autoconf/spec.gmk.in Thu Apr 16 11:35:37 2015 +0100 +++ b/common/autoconf/spec.gmk.in Tue Jun 30 16:16:21 2015 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -167,6 +167,7 @@ # Different version strings generated from the above information. JDK_VERSION:=@JDK_VERSION@ RUNTIME_NAME=$(PRODUCT_NAME) $(PRODUCT_SUFFIX) +COOKED_JDK_UPDATE_VERSION:=@COOKED_JDK_UPDATE_VERSION@ COOKED_BUILD_NUMBER:=@COOKED_BUILD_NUMBER@ # These variables need to be generated here so that MILESTONE and # JDK_BUILD_NUMBER can be overridden on the make command line. @@ -342,6 +343,12 @@ # The linker can be gcc or ld on posix systems, or link.exe on windows systems. LD:=@FIXPATH@ @LD@ +ifeq ($(OPENJDK_TARGET_OS), macosx) + # Xcode SDK and tools path + SDKPATH:=@SDKPATH@ + @SET_DEVELOPER_DIR@ +endif + # The linker on older SuSE distros (e.g. on SLES 10) complains with: # "Invalid version tag `SUNWprivate_1.1'. Only anonymous version tag is allowed in executable." # if feeded with a version script which contains named tags. @@ -386,8 +393,6 @@ STRIP:=@STRIP@ MCS:=@MCS@ -LIPO:=@LIPO@ - # Command to create a shared library SHARED_LIBRARY_FLAGS:=@SHARED_LIBRARY_FLAGS@ @@ -539,6 +544,7 @@ JT_HOME:=@JT_HOME@ JTREGEXE:=@JTREGEXE@ +XCODEBUILD=@XCODEBUILD@ FIXPATH:=@FIXPATH@ # Where the build output is stored for your convenience.
--- a/common/autoconf/toolchain.m4 Thu Apr 16 11:35:37 2015 +0100 +++ b/common/autoconf/toolchain.m4 Tue Jun 30 16:16:21 2015 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -254,6 +254,86 @@ PATH=$TOOLS_DIR:$PATH fi + # Before we locate the compilers, we need to sanitize the Xcode build environment + if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then + # determine path to Xcode developer directory + # can be empty in which case all the tools will rely on a sane Xcode 4 installation + SET_DEVELOPER_DIR= + + if test -n "$XCODE_PATH"; then + DEVELOPER_DIR="$XCODE_PATH"/Contents/Developer + fi + + # DEVELOPER_DIR could also be provided directly + AC_MSG_CHECKING([Determining if we need to set DEVELOPER_DIR]) + if test -n "$DEVELOPER_DIR"; then + if test ! -d "$DEVELOPER_DIR"; then + AC_MSG_ERROR([Xcode Developer path does not exist: $DEVELOPER_DIR, please provide a path to the Xcode 4 application bundle using --with-xcode-path]) + fi + if test ! -f "$DEVELOPER_DIR"/usr/bin/xcodebuild; then + AC_MSG_ERROR([Xcode Developer path is not valid: $DEVELOPER_DIR, it must point to Contents/Developer inside an Xcode application bundle]) + fi + # make it visible to all the tools immediately + export DEVELOPER_DIR + SET_DEVELOPER_DIR="export DEVELOPER_DIR := $DEVELOPER_DIR" + AC_MSG_RESULT([yes ($DEVELOPER_DIR)]) + else + AC_MSG_RESULT([no]) + fi + AC_SUBST(SET_DEVELOPER_DIR) + + AC_PATH_PROG(XCODEBUILD, xcodebuild) + if test -z "$XCODEBUILD"; then + AC_MSG_ERROR([The xcodebuild tool was not found, the Xcode command line tools are required to build on Mac OS X]) + fi + + # Fail-fast: verify we're building on Xcode 4, we cannot build with Xcode 5 or later + XCODE_VERSION=`$XCODEBUILD -version | grep '^Xcode ' | sed 's/Xcode //'` + XC_VERSION_PARTS=( ${XCODE_VERSION//./ } ) + if test ! "${XC_VERSION_PARTS[[0]]}" = "4"; then + AC_MSG_ERROR([Xcode 4 is required to build JDK 8, the version found was $XCODE_VERSION. Use --with-xcode-path to specify the location of Xcode 4 or make Xcode 4 active by using xcode-select.]) + fi + + # Some versions of Xcode 5 command line tools install gcc and g++ as symlinks to + # clang and clang++, which will break the build. So handle that here if we need to. + if test -L "/usr/bin/gcc" -o -L "/usr/bin/g++"; then + # use xcrun to find the real gcc and add it's directory to PATH + # then autoconf magic will find it + AC_MSG_NOTICE([Found gcc symlinks to clang in /usr/bin, adding path to real gcc to PATH]) + XCODE_BIN_PATH=$(dirname `xcrun -find gcc`) + PATH="$XCODE_BIN_PATH":$PATH + fi + + # Determine appropriate SDKPATH, don't use SDKROOT as it interferes with the stub tools + AC_MSG_CHECKING([Determining Xcode SDK path]) + # allow SDKNAME to be set to override the default SDK selection + SDKPATH=`"$XCODEBUILD" -sdk ${SDKNAME:-macosx} -version | grep '^Path: ' | sed 's/Path: //'` + if test -n "$SDKPATH"; then + AC_MSG_RESULT([$SDKPATH]) + else + AC_MSG_RESULT([(none, will use system headers and frameworks)]) + fi + AC_SUBST(SDKPATH) + + # Perform a basic sanity test + if test ! -f "$SDKPATH/System/Library/Frameworks/Foundation.framework/Headers/Foundation.h"; then + AC_MSG_ERROR([Unable to find required framework headers, provide a valid path to Xcode 4 using --with-xcode-path]) + fi + + # if SDKPATH is non-empty then we need to add -isysroot and -iframework for gcc and g++ + if test -n "$SDKPATH"; then + # We need -isysroot <path> and -iframework<path>/System/Library/Frameworks + CFLAGS_JDK="${CFLAGS_JDK} -isysroot \"$SDKPATH\" -iframework\"$SDKPATH/System/Library/Frameworks\"" + CXXFLAGS_JDK="${CXXFLAGS_JDK} -isysroot \"$SDKPATH\" -iframework\"$SDKPATH/System/Library/Frameworks\"" + LDFLAGS_JDK="${LDFLAGS_JDK} -isysroot \"$SDKPATH\" -iframework\"$SDKPATH/System/Library/Frameworks\"" + fi + + # These always need to be set, or we can't find the frameworks embedded in JavaVM.framework + # setting this here means it doesn't have to be peppered throughout the forest + CFLAGS_JDK="$CFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\"" + CXXFLAGS_JDK="$CXXFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\"" + LDFLAGS_JDK="$LDFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\"" + fi ### Locate C compiler (CC) @@ -412,10 +492,10 @@ -d \"JDK_BUILD_ID=\$(FULL_VERSION)\" \ -d \"JDK_COMPANY=\$(COMPANY_NAME)\" \ -d \"JDK_COMPONENT=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) binary\" \ - -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0).\$(COOKED_BUILD_NUMBER)\" \ + -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(COOKED_JDK_UPDATE_VERSION).\$(COOKED_BUILD_NUMBER)\" \ -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \ -d \"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(JDK_MINOR_VERSION) \$(JDK_UPDATE_META_TAG)\" \ - -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\"" + -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(COOKED_JDK_UPDATE_VERSION),\$(COOKED_BUILD_NUMBER)\"" # lib.exe is used to create static libraries. AC_CHECK_PROG([WINAR], [lib],[lib],,,) @@ -477,6 +557,10 @@ AC_PATH_PROG(MCS, mcs) BASIC_FIXUP_EXECUTABLE(MCS) elif test "x$OPENJDK_TARGET_OS" != xwindows; then + AC_PATH_PROG(OTOOL, otool) + if test "x$OTOOL" = "x"; then + OTOOL="true" + fi AC_CHECK_TOOL(NM, nm) BASIC_FIXUP_EXECUTABLE(NM) GNM="$NM" @@ -501,11 +585,6 @@ BASIC_FIXUP_EXECUTABLE(OBJDUMP) fi - if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then - AC_PATH_PROG(LIPO, lipo) - BASIC_FIXUP_EXECUTABLE(LIPO) - fi - TOOLCHAIN_SETUP_JTREG # Restore old path without tools dir @@ -1218,7 +1297,7 @@ BASIC_FIXUP_PATH([JT_HOME]) # jtreg win32 script works for everybody - JTREGEXE="$JT_HOME/win32/bin/jtreg" + JTREGEXE="$JT_HOME/bin/jtreg" if test ! -f "$JTREGEXE"; then AC_MSG_ERROR([JTReg executable does not exist: $JTREGEXE])
--- a/make/Javadoc.gmk Thu Apr 16 11:35:37 2015 +0100 +++ b/make/Javadoc.gmk Tue Jun 30 16:16:21 2015 +0100 @@ -1,4 +1,4 @@ -# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -74,6 +74,7 @@ JNLP_FIRST_COPYRIGHT_YEAR = 1998 PLUGIN2_FIRST_COPYRIGHT_YEAR = 2007 JDKNET_FIRST_COPYRIGHT_YEAR = 2014 +JACCESSAPI_FIRST_COPYRIGHT_YEAR = 2002 # Oracle name FULL_COMPANY_NAME = Oracle and/or its affiliates @@ -1208,6 +1209,56 @@ ############################################################# # +# jaccessdocs - Java Accessibility Utilities +# + +ALL_OTHER_TARGETS += jaccessdocs + +JACCESSAPI_DOCDIR := $(JRE_API_DOCSDIR)/accessibility/jaccess/spec +JACCESSAPI2COREAPI := ../../../$(JDKJRE2COREAPI) +JACCESSAPI_DOCTITLE := JACCESS API +JACCESSAPI_WINDOWTITLE := JACCESS API +JACCESSAPI_HEADER := <strong>JACCESS API</strong> +JACCESSAPI_BOTTOM := $(call CommonBottom,$(JACCESSAPI_FIRST_COPYRIGHT_YEAR)) +# JACCESSAPI_PKGS is located in NON_CORE_PKGS.gmk + +JACCESSAPI_INDEX_HTML = $(JACCESSAPI_DOCDIR)/index.html +JACCESSAPI_OPTIONS_FILE = $(DOCSTMPDIR)/jaccess.options +JACCESSAPI_PACKAGES_FILE = $(DOCSTMPDIR)/jaccess.packages + +jaccessdocs: $(JACCESSAPI_INDEX_HTML) + +# Set relative location to core api document root +$(JACCESSAPI_INDEX_HTML): GET2DOCSDIR=$(JACCESSAPI2COREAPI)/.. + +# Run javadoc if the index file is out of date or missing +$(JACCESSAPI_INDEX_HTML): $(JACCESSAPI_OPTIONS_FILE) $(JACCESSAPI_PACKAGES_FILE) coredocs + $(prep-javadoc) + $(call JavadocSummary,$(JACCESSAPI_OPTIONS_FILE),$(JACCESSAPI_PACKAGES_FILE)) + $(JAVADOC_CMD) -d $(@D) \ + @$(JACCESSAPI_OPTIONS_FILE) @$(JACCESSAPI_PACKAGES_FILE) + +# Create file with javadoc options in it +$(JACCESSAPI_OPTIONS_FILE): + $(prep-target) + @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \ + $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \ + $(call OptionPair,-encoding,ascii) ; \ + $(call OptionOnly,-nodeprecatedlist) ; \ + $(call OptionPair,-doctitle,$(JACCESSAPI_DOCTITLE)) ; \ + $(call OptionPair,-windowtitle,$(JACCESSAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \ + $(call OptionPair,-header,$(JACCESSAPI_HEADER)$(DRAFT_HEADER)) ; \ + $(call OptionPair,-bottom,$(JACCESSAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \ + $(call OptionTrip,-linkoffline,$(JACCESSAPI2COREAPI),$(COREAPI_DOCSDIR)/); \ + ) >> $@ + +# Create a file with the package names in it +$(JACCESSAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JACCESSAPI_PKGS)) + $(prep-target) + $(call PackageFilter,$(JACCESSAPI_PKGS)) + +############################################################# +# # jdk.net docs #
--- a/make/Main.gmk Thu Apr 16 11:35:37 2015 +0100 +++ b/make/Main.gmk Tue Jun 30 16:16:21 2015 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -142,17 +142,12 @@ @($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk overlay-images) @$(call TargetExit) -profiles: profiles-oscheck source-tips jdk hotspot profiles-only +profiles: source-tips jdk hotspot profiles-only profiles-only: start-make @$(call TargetEnter) @($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk profiles) @$(call TargetExit) -profiles-oscheck: - ifneq ($(OPENJDK_TARGET_OS), linux) - @echo "Error: The Java SE 8 Compact Profiles are only implemented for Linux at this time" && exit 1 - endif - install: images install-only install-only: start-make @$(call TargetEnter) @@ -240,7 +235,7 @@ .PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only test-only docs-only .PHONY: default all clean dist-clean bootcycle-images start-make .PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-docs clean-test clean-overlay-images clean-bootcycle-build -.PHONY: profiles profiles-only profiles-oscheck +.PHONY: profiles profiles-only include $(root_dir)/make/Jprt.gmk
--- a/make/common/NON_CORE_PKGS.gmk Thu Apr 16 11:35:37 2015 +0100 +++ b/make/common/NON_CORE_PKGS.gmk Tue Jun 30 16:16:21 2015 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -100,6 +100,8 @@ jdk.net \ jdk.management.cmm +JACCESSAPI_PKGS = com.sun.java.accessibility.util + # non-core packages in rt.jar NON_CORE_PKGS = $(DOMAPI_PKGS) \ $(MGMT_PKGS) \ @@ -111,4 +113,5 @@ $(SMARTCARDIO_PKGS) \ $(SCTPAPI_PKGS) \ $(APPLE_EXT_PKGS) \ - $(JDK_PKGS) + $(JDK_PKGS) \ + $(JACCESSAPI_PKGS)
--- a/make/jprt.properties Thu Apr 16 11:35:37 2015 +0100 +++ b/make/jprt.properties Tue Jun 30 16:16:21 2015 +0100 @@ -29,7 +29,7 @@ # # The current release name -my.jdk.update.version=40 +my.jdk.update.version=60 jprt.tools.default.release=jdk8u${my.jdk.update.version} # Check if this is the equivalent of a hotspot push job
--- a/test/Makefile Thu Apr 16 11:35:37 2015 +0100 +++ b/test/Makefile Tue Jun 30 16:16:21 2015 +0100 @@ -66,6 +66,32 @@ hotspot_%: @$(NO_STOPPING)$(call SUBDIR_TEST, $(HOTSPOT_DIR), TEST="$@" $@) +# +# jtreg_tests +# +# Invocation: +# +# make jtreg_tests TESTDIRS=<test-dirs> +# +# where <test-dirs> is something like '../<component>/test/runtime', +# <component> in turn being one of the top level directories (for +# example 'hotspot'). +# +# The below will strip the path prefix and delegate to the +# corresponding ../<component>/test/Makefile. + +ifneq ($(TESTDIRS),) +# Extract the component from ../<component>/... +COMPONENT=$(word 2,$(subst /, ,$(TESTDIRS))) + +# Strip off the ../<component>/test prefix and pass the rest as TESTDIRS +# to the delegate Makefile +TESTDIRS_TESTS=$(patsubst ../$(COMPONENT)/test/%,%,$(TESTDIRS)) +endif + +jtreg_tests: + @$(NO_STOPPING)$(call SUBDIR_TEST, $(TOPDIR)/$(COMPONENT), TESTDIRS=$(TESTDIRS_TESTS) $@) + ################################################################ # Phony targets (e.g. these are not filenames)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/projects/mac/javaws/javaws.xcodeproj/project.pbxproj Tue Jun 30 16:16:21 2015 +0100 @@ -0,0 +1,476 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + DE113B7C1A365449007808D0 /* javaws.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = DE113B7B1A365449007808D0 /* javaws.1 */; }; + DE6DD4481A3654F200B8A465 /* applicationIcon.c in Sources */ = {isa = PBXBuildFile; fileRef = DE6DD43C1A3654F100B8A465 /* applicationIcon.c */; }; + DE6DD4491A3654F200B8A465 /* base64.c in Sources */ = {isa = PBXBuildFile; fileRef = DE6DD43E1A3654F100B8A465 /* base64.c */; }; + DE6DD44A1A3654F200B8A465 /* configurationFile.c in Sources */ = {isa = PBXBuildFile; fileRef = DE6DD4401A3654F100B8A465 /* configurationFile.c */; }; + DE6DD44B1A3654F200B8A465 /* jfx_runtime.c in Sources */ = {isa = PBXBuildFile; fileRef = DE6DD4421A3654F100B8A465 /* jfx_runtime.c */; }; + DE6DD44C1A3654F200B8A465 /* launcher.c in Sources */ = {isa = PBXBuildFile; fileRef = DE6DD4441A3654F200B8A465 /* launcher.c */; }; + DE6DD44D1A3654F200B8A465 /* launchFile.c in Sources */ = {isa = PBXBuildFile; fileRef = DE6DD4461A3654F200B8A465 /* launchFile.c */; }; + DE6DD4581A3654FA00B8A465 /* msgString.c in Sources */ = {isa = PBXBuildFile; fileRef = DE6DD44E1A3654FA00B8A465 /* msgString.c */; }; + DE6DD4591A3654FA00B8A465 /* propertyParser.c in Sources */ = {isa = PBXBuildFile; fileRef = DE6DD4501A3654FA00B8A465 /* propertyParser.c */; }; + DE6DD45A1A3654FA00B8A465 /* splashFile.c in Sources */ = {isa = PBXBuildFile; fileRef = DE6DD4521A3654FA00B8A465 /* splashFile.c */; }; + DE6DD45B1A3654FA00B8A465 /* system.c in Sources */ = {isa = PBXBuildFile; fileRef = DE6DD4541A3654FA00B8A465 /* system.c */; }; + DE6DD45C1A3654FA00B8A465 /* util.c in Sources */ = {isa = PBXBuildFile; fileRef = DE6DD4561A3654FA00B8A465 /* util.c */; }; + DE6DD4611A36550100B8A465 /* versionId.c in Sources */ = {isa = PBXBuildFile; fileRef = DE6DD45D1A36550100B8A465 /* versionId.c */; }; + DE6DD4621A36550100B8A465 /* xmlparser.c in Sources */ = {isa = PBXBuildFile; fileRef = DE6DD45F1A36550100B8A465 /* xmlparser.c */; }; + DE6DD4681A36555100B8A465 /* launcher_md.c in Sources */ = {isa = PBXBuildFile; fileRef = DE6DD4631A36555100B8A465 /* launcher_md.c */; }; + DE6DD4691A36555100B8A465 /* splash_md.c in Sources */ = {isa = PBXBuildFile; fileRef = DE6DD4641A36555100B8A465 /* splash_md.c */; }; + DE6DD46B1A36555100B8A465 /* system_md.c in Sources */ = {isa = PBXBuildFile; fileRef = DE6DD4661A36555100B8A465 /* system_md.c */; }; + DE8B3C7A1A37A51900316F1D /* config.c in Sources */ = {isa = PBXBuildFile; fileRef = DE8B3C621A37A51900316F1D /* config.c */; }; + DE8B3C7B1A37A51900316F1D /* configcache_pd.c in Sources */ = {isa = PBXBuildFile; fileRef = DE8B3C641A37A51900316F1D /* configcache_pd.c */; }; + DE8B3C7C1A37A51900316F1D /* console.c in Sources */ = {isa = PBXBuildFile; fileRef = DE8B3C661A37A51900316F1D /* console.c */; }; + DE8B3C7D1A37A51900316F1D /* dialogutils.c in Sources */ = {isa = PBXBuildFile; fileRef = DE8B3C681A37A51900316F1D /* dialogutils.c */; }; + DE8B3C7E1A37A51900316F1D /* expirationdialog.c in Sources */ = {isa = PBXBuildFile; fileRef = DE8B3C6A1A37A51900316F1D /* expirationdialog.c */; }; + DE8B3C811A37A51900316F1D /* MSystemProxyHandler.c in Sources */ = {isa = PBXBuildFile; fileRef = DE8B3C711A37A51900316F1D /* MSystemProxyHandler.c */; }; + DE8B3C821A37A51900316F1D /* NetworkUtil.c in Sources */ = {isa = PBXBuildFile; fileRef = DE8B3C721A37A51900316F1D /* NetworkUtil.c */; }; + DE8B3C831A37A51900316F1D /* Platform.c in Sources */ = {isa = PBXBuildFile; fileRef = DE8B3C741A37A51900316F1D /* Platform.c */; }; + DE8B3C841A37A51900316F1D /* UnixDomainSocket.c in Sources */ = {isa = PBXBuildFile; fileRef = DE8B3C761A37A51900316F1D /* UnixDomainSocket.c */; }; + DE8B3C851A37A51900316F1D /* UnixTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE8B3C771A37A51900316F1D /* UnixTime.cpp */; }; + DE8B3C861A37A51900316F1D /* webstartblockdialog.c in Sources */ = {isa = PBXBuildFile; fileRef = DE8B3C791A37A51900316F1D /* webstartblockdialog.c */; }; + DE8B3C961A37A7BF00316F1D /* BasicPerfStore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE8B3C881A37A7BF00316F1D /* BasicPerfStore.cpp */; }; + DE8B3C971A37A7BF00316F1D /* DeployPerf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE8B3C8B1A37A7BF00316F1D /* DeployPerf.cpp */; }; + DE8B3C981A37A7BF00316F1D /* PerfHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE8B3C901A37A7BF00316F1D /* PerfHelper.cpp */; }; + DE8B3C991A37A7BF00316F1D /* PerfLabel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE8B3C921A37A7BF00316F1D /* PerfLabel.cpp */; }; + DE8B3C9D1A37A7C600316F1D /* secureArgs.c in Sources */ = {isa = PBXBuildFile; fileRef = DE8B3C9A1A37A7C600316F1D /* secureArgs.c */; }; + DE8B3CA01A37A81000316F1D /* jfx_runtime.c in Sources */ = {isa = PBXBuildFile; fileRef = DE8B3C9E1A37A81000316F1D /* jfx_runtime.c */; }; + DE8B3CA21A37BFA300316F1D /* jfx_runtime_md.c in Sources */ = {isa = PBXBuildFile; fileRef = DE8B3CA11A37BFA300316F1D /* jfx_runtime_md.c */; }; + DE8B3CA41A37C10000316F1D /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE8B3CA31A37C10000316F1D /* SystemConfiguration.framework */; }; + DE8B3CA61A37D04900316F1D /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE8B3CA51A37D04900316F1D /* Security.framework */; }; + DE8B3CA81A37D05300316F1D /* ServiceManagement.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE8B3CA71A37D05300316F1D /* ServiceManagement.framework */; }; + DE8B3CAA1A38C48B00316F1D /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DE8B3CA91A38C48B00316F1D /* libiconv.dylib */; }; +/* End PBXBuildFile section */ + +/* Begin PBXCopyFilesBuildPhase section */ + DE113B741A365449007808D0 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = /usr/share/man/man1/; + dstSubfolderSpec = 0; + files = ( + DE113B7C1A365449007808D0 /* javaws.1 in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 1; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + DE113B761A365449007808D0 /* javaws */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = javaws; sourceTree = BUILT_PRODUCTS_DIR; }; + DE113B7B1A365449007808D0 /* javaws.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; path = javaws.1; sourceTree = "<group>"; }; + DE6DD43C1A3654F100B8A465 /* applicationIcon.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = applicationIcon.c; path = ../../../../../src/javaws/share/native/applicationIcon.c; sourceTree = "<group>"; }; + DE6DD43D1A3654F100B8A465 /* applicationIcon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = applicationIcon.h; path = ../../../../../src/javaws/share/native/applicationIcon.h; sourceTree = "<group>"; }; + DE6DD43E1A3654F100B8A465 /* base64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = base64.c; path = ../../../../../src/javaws/share/native/base64.c; sourceTree = "<group>"; }; + DE6DD43F1A3654F100B8A465 /* base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = base64.h; path = ../../../../../src/javaws/share/native/base64.h; sourceTree = "<group>"; }; + DE6DD4401A3654F100B8A465 /* configurationFile.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = configurationFile.c; path = ../../../../../src/javaws/share/native/configurationFile.c; sourceTree = "<group>"; }; + DE6DD4411A3654F100B8A465 /* configurationFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = configurationFile.h; path = ../../../../../src/javaws/share/native/configurationFile.h; sourceTree = "<group>"; }; + DE6DD4421A3654F100B8A465 /* jfx_runtime.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jfx_runtime.c; path = ../../../../../src/javaws/share/native/jfx_runtime.c; sourceTree = "<group>"; }; + DE6DD4431A3654F200B8A465 /* jfx_runtime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = jfx_runtime.h; path = ../../../../../src/javaws/share/native/jfx_runtime.h; sourceTree = "<group>"; }; + DE6DD4441A3654F200B8A465 /* launcher.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = launcher.c; path = ../../../../../src/javaws/share/native/launcher.c; sourceTree = "<group>"; }; + DE6DD4451A3654F200B8A465 /* launcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = launcher.h; path = ../../../../../src/javaws/share/native/launcher.h; sourceTree = "<group>"; }; + DE6DD4461A3654F200B8A465 /* launchFile.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = launchFile.c; path = ../../../../../src/javaws/share/native/launchFile.c; sourceTree = "<group>"; }; + DE6DD4471A3654F200B8A465 /* launchFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = launchFile.h; path = ../../../../../src/javaws/share/native/launchFile.h; sourceTree = "<group>"; }; + DE6DD44E1A3654FA00B8A465 /* msgString.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = msgString.c; path = ../../../../../src/javaws/share/native/msgString.c; sourceTree = "<group>"; }; + DE6DD44F1A3654FA00B8A465 /* msgString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = msgString.h; path = ../../../../../src/javaws/share/native/msgString.h; sourceTree = "<group>"; }; + DE6DD4501A3654FA00B8A465 /* propertyParser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = propertyParser.c; path = ../../../../../src/javaws/share/native/propertyParser.c; sourceTree = "<group>"; }; + DE6DD4511A3654FA00B8A465 /* propertyParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = propertyParser.h; path = ../../../../../src/javaws/share/native/propertyParser.h; sourceTree = "<group>"; }; + DE6DD4521A3654FA00B8A465 /* splashFile.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = splashFile.c; path = ../../../../../src/javaws/share/native/splashFile.c; sourceTree = "<group>"; }; + DE6DD4531A3654FA00B8A465 /* splashFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = splashFile.h; path = ../../../../../src/javaws/share/native/splashFile.h; sourceTree = "<group>"; }; + DE6DD4541A3654FA00B8A465 /* system.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = system.c; path = ../../../../../src/javaws/share/native/system.c; sourceTree = "<group>"; }; + DE6DD4551A3654FA00B8A465 /* system.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = system.h; path = ../../../../../src/javaws/share/native/system.h; sourceTree = "<group>"; }; + DE6DD4561A3654FA00B8A465 /* util.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = util.c; path = ../../../../../src/javaws/share/native/util.c; sourceTree = "<group>"; }; + DE6DD4571A3654FA00B8A465 /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = util.h; path = ../../../../../src/javaws/share/native/util.h; sourceTree = "<group>"; }; + DE6DD45D1A36550100B8A465 /* versionId.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = versionId.c; path = ../../../../../src/javaws/share/native/versionId.c; sourceTree = "<group>"; }; + DE6DD45E1A36550100B8A465 /* versionId.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = versionId.h; path = ../../../../../src/javaws/share/native/versionId.h; sourceTree = "<group>"; }; + DE6DD45F1A36550100B8A465 /* xmlparser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = xmlparser.c; path = ../../../../../src/javaws/share/native/xmlparser.c; sourceTree = "<group>"; }; + DE6DD4601A36550100B8A465 /* xmlparser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = xmlparser.h; path = ../../../../../src/javaws/share/native/xmlparser.h; sourceTree = "<group>"; }; + DE6DD4631A36555100B8A465 /* launcher_md.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = launcher_md.c; path = ../../../../../src/javaws/macosx/native/launcher_md.c; sourceTree = "<group>"; }; + DE6DD4641A36555100B8A465 /* splash_md.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = splash_md.c; path = ../../../../../src/javaws/macosx/native/splash_md.c; sourceTree = "<group>"; }; + DE6DD4661A36555100B8A465 /* system_md.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = system_md.c; path = ../../../../../src/javaws/macosx/native/system_md.c; sourceTree = "<group>"; }; + DE6DD4671A36555100B8A465 /* system_md.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = system_md.h; path = ../../../../../src/javaws/macosx/native/system_md.h; sourceTree = "<group>"; }; + DE8B3C5F1A3760E700316F1D /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = SDKROOT; }; + DE8B3C611A37A51900316F1D /* com_sun_deploy_net_proxy_MSystemProxyHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = com_sun_deploy_net_proxy_MSystemProxyHandler.h; path = ../../../../../src/common/unix/native/com_sun_deploy_net_proxy_MSystemProxyHandler.h; sourceTree = "<group>"; }; + DE8B3C621A37A51900316F1D /* config.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = config.c; path = ../../../../../src/common/unix/native/config.c; sourceTree = "<group>"; }; + DE8B3C631A37A51900316F1D /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = ../../../../../src/common/unix/native/config.h; sourceTree = "<group>"; }; + DE8B3C641A37A51900316F1D /* configcache_pd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = configcache_pd.c; path = ../../../../../src/common/unix/native/configcache_pd.c; sourceTree = "<group>"; }; + DE8B3C651A37A51900316F1D /* configcache_pd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = configcache_pd.h; path = ../../../../../src/common/unix/native/configcache_pd.h; sourceTree = "<group>"; }; + DE8B3C661A37A51900316F1D /* console.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = console.c; path = ../../../../../src/common/unix/native/console.c; sourceTree = "<group>"; }; + DE8B3C671A37A51900316F1D /* DeployPlatform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DeployPlatform.h; path = ../../../../../src/common/unix/native/DeployPlatform.h; sourceTree = "<group>"; }; + DE8B3C681A37A51900316F1D /* dialogutils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dialogutils.c; path = ../../../../../src/common/unix/native/dialogutils.c; sourceTree = "<group>"; }; + DE8B3C691A37A51900316F1D /* dialogutils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dialogutils.h; path = ../../../../../src/common/unix/native/dialogutils.h; sourceTree = "<group>"; }; + DE8B3C6A1A37A51900316F1D /* expirationdialog.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = expirationdialog.c; path = ../../../../../src/common/unix/native/expirationdialog.c; sourceTree = "<group>"; }; + DE8B3C6B1A37A51900316F1D /* gnomevfs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gnomevfs.h; path = ../../../../../src/common/unix/native/gnomevfs.h; sourceTree = "<group>"; }; + DE8B3C711A37A51900316F1D /* MSystemProxyHandler.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = MSystemProxyHandler.c; path = ../../../../../src/common/unix/native/MSystemProxyHandler.c; sourceTree = "<group>"; }; + DE8B3C721A37A51900316F1D /* NetworkUtil.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = NetworkUtil.c; path = ../../../../../src/common/unix/native/NetworkUtil.c; sourceTree = "<group>"; }; + DE8B3C731A37A51900316F1D /* NetworkUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkUtil.h; path = ../../../../../src/common/unix/native/NetworkUtil.h; sourceTree = "<group>"; }; + DE8B3C741A37A51900316F1D /* Platform.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Platform.c; path = ../../../../../src/common/unix/native/Platform.c; sourceTree = "<group>"; }; + DE8B3C751A37A51900316F1D /* SharedMemPerfHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SharedMemPerfHelper.h; path = ../../../../../src/common/unix/native/SharedMemPerfHelper.h; sourceTree = "<group>"; }; + DE8B3C761A37A51900316F1D /* UnixDomainSocket.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = UnixDomainSocket.c; path = ../../../../../src/common/unix/native/UnixDomainSocket.c; sourceTree = "<group>"; }; + DE8B3C771A37A51900316F1D /* UnixTime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UnixTime.cpp; path = ../../../../../src/common/unix/native/UnixTime.cpp; sourceTree = "<group>"; }; + DE8B3C781A37A51900316F1D /* UnixTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UnixTime.h; path = ../../../../../src/common/unix/native/UnixTime.h; sourceTree = "<group>"; }; + DE8B3C791A37A51900316F1D /* webstartblockdialog.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = webstartblockdialog.c; path = ../../../../../src/common/unix/native/webstartblockdialog.c; sourceTree = "<group>"; }; + DE8B3C871A37A7BF00316F1D /* BasicPerfHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BasicPerfHelper.h; path = ../../../../../src/common/share/native/BasicPerfHelper.h; sourceTree = "<group>"; }; + DE8B3C881A37A7BF00316F1D /* BasicPerfStore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BasicPerfStore.cpp; path = ../../../../../src/common/share/native/BasicPerfStore.cpp; sourceTree = "<group>"; }; + DE8B3C891A37A7BF00316F1D /* BasicPerfStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BasicPerfStore.h; path = ../../../../../src/common/share/native/BasicPerfStore.h; sourceTree = "<group>"; }; + DE8B3C8A1A37A7BF00316F1D /* configcache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = configcache.h; path = ../../../../../src/common/share/native/configcache.h; sourceTree = "<group>"; }; + DE8B3C8B1A37A7BF00316F1D /* DeployPerf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DeployPerf.cpp; path = ../../../../../src/common/share/native/DeployPerf.cpp; sourceTree = "<group>"; }; + DE8B3C8C1A37A7BF00316F1D /* DeployPerf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DeployPerf.h; path = ../../../../../src/common/share/native/DeployPerf.h; sourceTree = "<group>"; }; + DE8B3C8D1A37A7BF00316F1D /* DeployVersion.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = DeployVersion.hpp; path = ../../../../../src/common/share/native/DeployVersion.hpp; sourceTree = "<group>"; }; + DE8B3C8E1A37A7BF00316F1D /* NativeLock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NativeLock.h; path = ../../../../../src/common/share/native/NativeLock.h; sourceTree = "<group>"; }; + DE8B3C8F1A37A7BF00316F1D /* NativeLocker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NativeLocker.h; path = ../../../../../src/common/share/native/NativeLocker.h; sourceTree = "<group>"; }; + DE8B3C901A37A7BF00316F1D /* PerfHelper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PerfHelper.cpp; path = ../../../../../src/common/share/native/PerfHelper.cpp; sourceTree = "<group>"; }; + DE8B3C911A37A7BF00316F1D /* PerfHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PerfHelper.h; path = ../../../../../src/common/share/native/PerfHelper.h; sourceTree = "<group>"; }; + DE8B3C921A37A7BF00316F1D /* PerfLabel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PerfLabel.cpp; path = ../../../../../src/common/share/native/PerfLabel.cpp; sourceTree = "<group>"; }; + DE8B3C931A37A7BF00316F1D /* PerfLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PerfLabel.h; path = ../../../../../src/common/share/native/PerfLabel.h; sourceTree = "<group>"; }; + DE8B3C941A37A7BF00316F1D /* PerfLib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PerfLib.h; path = ../../../../../src/common/share/native/PerfLib.h; sourceTree = "<group>"; }; + DE8B3C951A37A7BF00316F1D /* PerfStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PerfStore.h; path = ../../../../../src/common/share/native/PerfStore.h; sourceTree = "<group>"; }; + DE8B3C9A1A37A7C600316F1D /* secureArgs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = secureArgs.c; path = ../../../../../src/common/share/native/secureArgs.c; sourceTree = "<group>"; }; + DE8B3C9B1A37A7C600316F1D /* secureArgs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = secureArgs.h; path = ../../../../../src/common/share/native/secureArgs.h; sourceTree = "<group>"; }; + DE8B3C9C1A37A7C600316F1D /* SystemTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SystemTime.h; path = ../../../../../src/common/share/native/SystemTime.h; sourceTree = "<group>"; }; + DE8B3C9E1A37A81000316F1D /* jfx_runtime.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jfx_runtime.c; path = ../../../../../src/javaws/share/native/jfx_runtime.c; sourceTree = "<group>"; }; + DE8B3C9F1A37A81000316F1D /* jfx_runtime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = jfx_runtime.h; path = ../../../../../src/javaws/share/native/jfx_runtime.h; sourceTree = "<group>"; }; + DE8B3CA11A37BFA300316F1D /* jfx_runtime_md.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jfx_runtime_md.c; path = ../../../../../src/javaws/unix/native/jfx_runtime_md.c; sourceTree = "<group>"; }; + DE8B3CA31A37C10000316F1D /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; + DE8B3CA51A37D04900316F1D /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; + DE8B3CA71A37D05300316F1D /* ServiceManagement.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ServiceManagement.framework; path = System/Library/Frameworks/ServiceManagement.framework; sourceTree = SDKROOT; }; + DE8B3CA91A38C48B00316F1D /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = usr/lib/libiconv.dylib; sourceTree = SDKROOT; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + DE113B731A365449007808D0 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + DE8B3CAA1A38C48B00316F1D /* libiconv.dylib in Frameworks */, + DE8B3CA81A37D05300316F1D /* ServiceManagement.framework in Frameworks */, + DE8B3CA61A37D04900316F1D /* Security.framework in Frameworks */, + DE8B3CA41A37C10000316F1D /* SystemConfiguration.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + DE113B6D1A365449007808D0 = { + isa = PBXGroup; + children = ( + DE8B3CA91A38C48B00316F1D /* libiconv.dylib */, + DE8B3CA71A37D05300316F1D /* ServiceManagement.framework */, + DE8B3CA51A37D04900316F1D /* Security.framework */, + DE8B3CA31A37C10000316F1D /* SystemConfiguration.framework */, + DE8B3C5F1A3760E700316F1D /* ApplicationServices.framework */, + DE113B781A365449007808D0 /* javaws */, + DE113B771A365449007808D0 /* Products */, + ); + sourceTree = "<group>"; + }; + DE113B771A365449007808D0 /* Products */ = { + isa = PBXGroup; + children = ( + DE113B761A365449007808D0 /* javaws */, + ); + name = Products; + sourceTree = "<group>"; + }; + DE113B781A365449007808D0 /* javaws */ = { + isa = PBXGroup; + children = ( + DE8B3C611A37A51900316F1D /* com_sun_deploy_net_proxy_MSystemProxyHandler.h */, + DE8B3C621A37A51900316F1D /* config.c */, + DE8B3C631A37A51900316F1D /* config.h */, + DE8B3C641A37A51900316F1D /* configcache_pd.c */, + DE8B3C651A37A51900316F1D /* configcache_pd.h */, + DE8B3C661A37A51900316F1D /* console.c */, + DE8B3C671A37A51900316F1D /* DeployPlatform.h */, + DE8B3C681A37A51900316F1D /* dialogutils.c */, + DE8B3C691A37A51900316F1D /* dialogutils.h */, + DE8B3C6A1A37A51900316F1D /* expirationdialog.c */, + DE8B3C6B1A37A51900316F1D /* gnomevfs.h */, + DE8B3C9A1A37A7C600316F1D /* secureArgs.c */, + DE8B3C9B1A37A7C600316F1D /* secureArgs.h */, + DE8B3C9C1A37A7C600316F1D /* SystemTime.h */, + DE8B3C711A37A51900316F1D /* MSystemProxyHandler.c */, + DE8B3C721A37A51900316F1D /* NetworkUtil.c */, + DE8B3C9E1A37A81000316F1D /* jfx_runtime.c */, + DE8B3C9F1A37A81000316F1D /* jfx_runtime.h */, + DE8B3C731A37A51900316F1D /* NetworkUtil.h */, + DE8B3C741A37A51900316F1D /* Platform.c */, + DE8B3C751A37A51900316F1D /* SharedMemPerfHelper.h */, + DE8B3C761A37A51900316F1D /* UnixDomainSocket.c */, + DE8B3C771A37A51900316F1D /* UnixTime.cpp */, + DE8B3C781A37A51900316F1D /* UnixTime.h */, + DE8B3C791A37A51900316F1D /* webstartblockdialog.c */, + DE6DD4631A36555100B8A465 /* launcher_md.c */, + DE6DD4641A36555100B8A465 /* splash_md.c */, + DE6DD4661A36555100B8A465 /* system_md.c */, + DE6DD4671A36555100B8A465 /* system_md.h */, + DE6DD45D1A36550100B8A465 /* versionId.c */, + DE6DD45E1A36550100B8A465 /* versionId.h */, + DE6DD45F1A36550100B8A465 /* xmlparser.c */, + DE6DD4601A36550100B8A465 /* xmlparser.h */, + DE6DD44E1A3654FA00B8A465 /* msgString.c */, + DE6DD44F1A3654FA00B8A465 /* msgString.h */, + DE6DD4501A3654FA00B8A465 /* propertyParser.c */, + DE6DD4511A3654FA00B8A465 /* propertyParser.h */, + DE6DD4521A3654FA00B8A465 /* splashFile.c */, + DE6DD4531A3654FA00B8A465 /* splashFile.h */, + DE6DD4541A3654FA00B8A465 /* system.c */, + DE6DD4551A3654FA00B8A465 /* system.h */, + DE6DD4561A3654FA00B8A465 /* util.c */, + DE6DD4571A3654FA00B8A465 /* util.h */, + DE6DD43C1A3654F100B8A465 /* applicationIcon.c */, + DE6DD43D1A3654F100B8A465 /* applicationIcon.h */, + DE6DD43E1A3654F100B8A465 /* base64.c */, + DE6DD43F1A3654F100B8A465 /* base64.h */, + DE6DD4401A3654F100B8A465 /* configurationFile.c */, + DE6DD4411A3654F100B8A465 /* configurationFile.h */, + DE8B3CA11A37BFA300316F1D /* jfx_runtime_md.c */, + DE6DD4421A3654F100B8A465 /* jfx_runtime.c */, + DE6DD4431A3654F200B8A465 /* jfx_runtime.h */, + DE6DD4441A3654F200B8A465 /* launcher.c */, + DE6DD4451A3654F200B8A465 /* launcher.h */, + DE6DD4461A3654F200B8A465 /* launchFile.c */, + DE6DD4471A3654F200B8A465 /* launchFile.h */, + DE8B3C871A37A7BF00316F1D /* BasicPerfHelper.h */, + DE8B3C881A37A7BF00316F1D /* BasicPerfStore.cpp */, + DE8B3C891A37A7BF00316F1D /* BasicPerfStore.h */, + DE8B3C8A1A37A7BF00316F1D /* configcache.h */, + DE8B3C8B1A37A7BF00316F1D /* DeployPerf.cpp */, + DE8B3C8C1A37A7BF00316F1D /* DeployPerf.h */, + DE8B3C8D1A37A7BF00316F1D /* DeployVersion.hpp */, + DE8B3C8E1A37A7BF00316F1D /* NativeLock.h */, + DE8B3C8F1A37A7BF00316F1D /* NativeLocker.h */, + DE8B3C901A37A7BF00316F1D /* PerfHelper.cpp */, + DE8B3C911A37A7BF00316F1D /* PerfHelper.h */, + DE8B3C921A37A7BF00316F1D /* PerfLabel.cpp */, + DE8B3C931A37A7BF00316F1D /* PerfLabel.h */, + DE8B3C941A37A7BF00316F1D /* PerfLib.h */, + DE8B3C951A37A7BF00316F1D /* PerfStore.h */, + DE113B7B1A365449007808D0 /* javaws.1 */, + ); + path = javaws; + sourceTree = "<group>"; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + DE113B751A365449007808D0 /* javaws */ = { + isa = PBXNativeTarget; + buildConfigurationList = DE113B7F1A365449007808D0 /* Build configuration list for PBXNativeTarget "javaws" */; + buildPhases = ( + DE113B721A365449007808D0 /* Sources */, + DE113B731A365449007808D0 /* Frameworks */, + DE113B741A365449007808D0 /* CopyFiles */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = javaws; + productName = javaws; + productReference = DE113B761A365449007808D0 /* javaws */; + productType = "com.apple.product-type.tool"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + DE113B6E1A365449007808D0 /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0510; + ORGANIZATIONNAME = "___FULLUSERNAME___"; + }; + buildConfigurationList = DE113B711A365449007808D0 /* Build configuration list for PBXProject "javaws" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = DE113B6D1A365449007808D0; + productRefGroup = DE113B771A365449007808D0 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + DE113B751A365449007808D0 /* javaws */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXSourcesBuildPhase section */ + DE113B721A365449007808D0 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + DE8B3C851A37A51900316F1D /* UnixTime.cpp in Sources */, + DE8B3C831A37A51900316F1D /* Platform.c in Sources */, + DE6DD4491A3654F200B8A465 /* base64.c in Sources */, + DE8B3C7E1A37A51900316F1D /* expirationdialog.c in Sources */, + DE6DD45A1A3654FA00B8A465 /* splashFile.c in Sources */, + DE6DD4581A3654FA00B8A465 /* msgString.c in Sources */, + DE8B3C971A37A7BF00316F1D /* DeployPerf.cpp in Sources */, + DE6DD4611A36550100B8A465 /* versionId.c in Sources */, + DE6DD46B1A36555100B8A465 /* system_md.c in Sources */, + DE6DD44C1A3654F200B8A465 /* launcher.c in Sources */, + DE6DD4591A3654FA00B8A465 /* propertyParser.c in Sources */, + DE8B3C7D1A37A51900316F1D /* dialogutils.c in Sources */, + DE8B3C861A37A51900316F1D /* webstartblockdialog.c in Sources */, + DE6DD4621A36550100B8A465 /* xmlparser.c in Sources */, + DE6DD44B1A3654F200B8A465 /* jfx_runtime.c in Sources */, + DE6DD44A1A3654F200B8A465 /* configurationFile.c in Sources */, + DE8B3CA21A37BFA300316F1D /* jfx_runtime_md.c in Sources */, + DE8B3C7C1A37A51900316F1D /* console.c in Sources */, + DE8B3C9D1A37A7C600316F1D /* secureArgs.c in Sources */, + DE8B3CA01A37A81000316F1D /* jfx_runtime.c in Sources */, + DE6DD44D1A3654F200B8A465 /* launchFile.c in Sources */, + DE8B3C841A37A51900316F1D /* UnixDomainSocket.c in Sources */, + DE8B3C811A37A51900316F1D /* MSystemProxyHandler.c in Sources */, + DE6DD4681A36555100B8A465 /* launcher_md.c in Sources */, + DE6DD45C1A3654FA00B8A465 /* util.c in Sources */, + DE6DD4691A36555100B8A465 /* splash_md.c in Sources */, + DE8B3C7B1A37A51900316F1D /* configcache_pd.c in Sources */, + DE8B3C981A37A7BF00316F1D /* PerfHelper.cpp in Sources */, + DE8B3C961A37A7BF00316F1D /* BasicPerfStore.cpp in Sources */, + DE8B3C821A37A51900316F1D /* NetworkUtil.c in Sources */, + DE8B3C991A37A7BF00316F1D /* PerfLabel.cpp in Sources */, + DE8B3C7A1A37A51900316F1D /* config.c in Sources */, + DE6DD45B1A3654FA00B8A465 /* system.c in Sources */, + DE6DD4481A3654F200B8A465 /* applicationIcon.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + DE113B7D1A365449007808D0 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.9; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx; + }; + name = Debug; + }; + DE113B7E1A365449007808D0 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.9; + SDKROOT = macosx; + }; + name = Release; + }; + DE113B801A365449007808D0 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CONFIGURATION_BUILD_DIR = "../../../../../build/macosx-x86_64-normal-server-fastdebug/deploy/jre/bin"; + FRAMEWORK_SEARCH_PATHS = ""; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, + /System/Library/Frameworks/JavaVM.framework/Headers, + ); + LIBRARY_SEARCH_PATHS = /System/Library/Frameworks/JavaVM.framework/Headers; + PRODUCT_NAME = "$(TARGET_NAME)"; + USER_HEADER_SEARCH_PATHS = "../../../../src/common/macosx/native ../../../../src/javaws/share/native/version ../../../../src/common/share/native ../../../../../build/macosx-x86_64-normal-server-fastdebug/deploy/headers/common"; + }; + name = Debug; + }; + DE113B811A365449007808D0 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + FRAMEWORK_SEARCH_PATHS = ""; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, + /System/Library/Frameworks/JavaVM.framework/Headers, + ); + LIBRARY_SEARCH_PATHS = /System/Library/Frameworks/JavaVM.framework/Headers; + PRODUCT_NAME = "$(TARGET_NAME)"; + USER_HEADER_SEARCH_PATHS = "../../../../src/common/macosx/native ../../../../src/javaws/share/native/version ../../../../src/common/share/native ../../../../../build/macosx-x86_64-normal-server-fastdebug/deploy/headers/common"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + DE113B711A365449007808D0 /* Build configuration list for PBXProject "javaws" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + DE113B7D1A365449007808D0 /* Debug */, + DE113B7E1A365449007808D0 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + DE113B7F1A365449007808D0 /* Build configuration list for PBXNativeTarget "javaws" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + DE113B801A365449007808D0 /* Debug */, + DE113B811A365449007808D0 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = DE113B6E1A365449007808D0 /* Project object */; +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/projects/mac/javaws/javaws.xcodeproj/project.xcworkspace/contents.xcworkspacedata Tue Jun 30 16:16:21 2015 +0100 @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Workspace + version = "1.0"> + <FileRef + location = "self:javaws.xcodeproj"> + </FileRef> +</Workspace>