diff options
| -rw-r--r-- | src/BUILD | 3 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java | 2 | ||||
| -rw-r--r-- | src/test/shell/bazel/apple/BUILD | 1 | ||||
| -rw-r--r-- | src/tools/xcode/environment/BUILD | 11 | ||||
| -rw-r--r-- | src/tools/xcode/environment/README | 5 | ||||
| -rwxr-xr-x | src/tools/xcode/environment/environment_plist.sh | 86 | ||||
| -rw-r--r-- | tools/objc/BUILD | 5 |
7 files changed, 0 insertions, 113 deletions
@@ -77,7 +77,6 @@ OSX_DUMMY_TARGETS = [ "src/tools/xcode/ibtoolwrapper/ibtoolwrapper", "src/tools/xcode/momcwrapper/momcwrapper", "src/tools/xcode/swiftstdlibtoolwrapper/swiftstdlibtoolwrapper", - "src/tools/xcode/environment/environment_plist", "src/objc_tools/bundlemerge/bundlemerge_deploy.jar", "src/objc_tools/plmerge/plmerge_deploy.jar", "src/tools/xcode/realpath/realpath", @@ -101,7 +100,6 @@ filegroup( "//src/tools/xcode/ibtoolwrapper:ibtoolwrapper", "//src/tools/xcode/momcwrapper:momcwrapper", "//src/tools/xcode/swiftstdlibtoolwrapper:swiftstdlibtoolwrapper", - "//src/tools/xcode/environment:environment_plist", "//src/objc_tools/bundlemerge:bundlemerge_deploy.jar", "//src/objc_tools/plmerge:plmerge_deploy.jar", "//src/tools/xcode/realpath:realpath", @@ -355,7 +353,6 @@ filegroup( "//src/tools/skylark/java/com/google/devtools/skylark/skylint:srcs", "//src/tools/skylark/javatests/com/google/devtools/skylark/skylint:srcs", "//src/tools/xcode/actoolwrapper:srcs", - "//src/tools/xcode/environment:srcs", "//src/tools/xcode/ibtoolwrapper:srcs", "//src/tools/xcode/momcwrapper:srcs", "//src/tools/xcode/realpath:srcs", diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java index aaf2428721..5bf57cfefa 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java +++ b/src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java @@ -81,7 +81,6 @@ public final class MockObjcSupport { "actoolwrapper", "bundlemerge", "objc_dummy.mm", - "environment_plist.sh", "device_debug_entitlements.plist", "gcov", "ibtoolwrapper", @@ -107,7 +106,6 @@ public final class MockObjcSupport { " name = 'protobuf_compiler_support',", " srcs = ['proto_support', 'protobuf_compiler_helper.py'],", ")", - "sh_binary(name = 'environment_plist', srcs = ['environment_plist.sh'])", "sh_binary(name = 'xcrunwrapper', srcs = ['xcrunwrapper.sh'])", "apple_binary(name = 'xctest_appbin', platform_type = 'ios', deps = [':dummy_lib'])", "filegroup(name = 'xctest_infoplist', srcs = ['xctest.plist'])", diff --git a/src/test/shell/bazel/apple/BUILD b/src/test/shell/bazel/apple/BUILD index 8681362c5c..accd61c616 100644 --- a/src/test/shell/bazel/apple/BUILD +++ b/src/test/shell/bazel/apple/BUILD @@ -19,7 +19,6 @@ filegroup( "//src/objc_tools/bundlemerge:bundlemerge_deploy.jar", "//src/objc_tools/plmerge:plmerge_deploy.jar", "//src/tools/xcode/actoolwrapper", - "//src/tools/xcode/environment:environment_plist", "//src/tools/xcode/ibtoolwrapper", "//src/tools/xcode/momcwrapper", "//src/tools/xcode/realpath", diff --git a/src/tools/xcode/environment/BUILD b/src/tools/xcode/environment/BUILD deleted file mode 100644 index 50ed625a56..0000000000 --- a/src/tools/xcode/environment/BUILD +++ /dev/null @@ -1,11 +0,0 @@ -package(default_visibility = ["//src:__subpackages__"]) - -filegroup( - name = "srcs", - srcs = glob(["**"]), -) - -sh_binary( - name = "environment_plist", - srcs = ["environment_plist.sh"], -) diff --git a/src/tools/xcode/environment/README b/src/tools/xcode/environment/README deleted file mode 100644 index 5f1592cdf5..0000000000 --- a/src/tools/xcode/environment/README +++ /dev/null @@ -1,5 +0,0 @@ -environment_plist generates a plist file that contains some -environment variables of the host machine (like DTPlatformBuild -or BuildMachineOSBuild) given a target platform. - -environment_plist only runs on Darwin. diff --git a/src/tools/xcode/environment/environment_plist.sh b/src/tools/xcode/environment/environment_plist.sh deleted file mode 100755 index c1b5d869c4..0000000000 --- a/src/tools/xcode/environment/environment_plist.sh +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash -# Copyright 2015 The Bazel Authors. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# environment_plist generates a plist file that contains some -# environment variables of the host machine (like DTPlatformBuild -# or BuildMachineOSBuild) given a target platform. -# -# This script only runs on darwin and you must have Xcode installed. -# -# --output - the path to place the output plist file. -# --platform - the target platform, e.g. 'iphoneos' or 'iphonesimulator8.3' -# - -set -eu - -while [[ $# -gt 1 ]] -do -key="$1" - -case $key in - --platform) - PLATFORM="$2" - shift - ;; - --output) - OUTPUT="$2" - shift - ;; - *) - # unknown option - ;; -esac -shift -done - -set +e -PLATFORM_DIR=$(/usr/bin/xcrun --sdk "${PLATFORM}" --show-sdk-platform-path) -XCRUN_EXITCODE=$? -set -e -if [[ ${XCRUN_EXITCODE} -ne 0 ]] ; then - echo "environment_plist: SDK not located. This may indicate that the xcode \ -and SDK version pair is not available." - # Since this already failed, assume this is going to fail again. With - # set -e, this will produce the appropriate stderr and error code. - /usr/bin/xcrun --sdk "${PLATFORM}" --show-sdk-platform-path 2>&1 -fi - -PLATFORM_PLIST="${PLATFORM_DIR}"/Info.plist -TEMPDIR=$(mktemp -d "${TMPDIR:-/tmp}/bazel_environment.XXXXXX") -PLIST="${TEMPDIR}/env.plist" -trap 'rm -rf "${TEMPDIR}"' ERR EXIT - -os_build=$(/usr/bin/sw_vers -buildVersion) -compiler=$(/usr/libexec/PlistBuddy -c "print :DefaultProperties:DEFAULT_COMPILER" "${PLATFORM_PLIST}") -# Parses 'PlatformVersion N.N' into N.N. -platform_version=$(/usr/bin/xcodebuild -version -sdk "${PLATFORM}" PlatformVersion) -# Parses 'ProductBuildVersion NNNN' into NNNN. -sdk_build=$(/usr/bin/xcodebuild -version -sdk "${PLATFORM}" ProductBuildVersion) -platform_build=$"${sdk_build}" -# Parses 'Build version NNNN' into NNNN. -xcode_build=$(/usr/bin/xcodebuild -version | grep Build | cut -d ' ' -f3) -# Parses 'Xcode N.N' into N.N. -xcode_version_string=$(/usr/bin/xcodebuild -version | grep Xcode | cut -d ' ' -f2) -# Converts '7.1' -> 0710, and '7.1.1' -> 0711. -xcode_version=$(/usr/bin/printf '%02d%d%d\n' $(echo "${xcode_version_string//./ }")) - -/usr/bin/defaults write "${PLIST}" DTPlatformBuild -string ${platform_build:-""} -/usr/bin/defaults write "${PLIST}" DTSDKBuild -string ${sdk_build:-""} -/usr/bin/defaults write "${PLIST}" DTPlatformVersion -string ${platform_version:-""} -/usr/bin/defaults write "${PLIST}" DTXcode -string ${xcode_version:-""} -/usr/bin/defaults write "${PLIST}" DTXcodeBuild -string ${xcode_build:-""} -/usr/bin/defaults write "${PLIST}" DTCompiler -string ${compiler:-""} -/usr/bin/defaults write "${PLIST}" BuildMachineOSBuild -string ${os_build:-""} -cat "${PLIST}" > "${OUTPUT}" diff --git a/tools/objc/BUILD b/tools/objc/BUILD index 3423837743..10c10dec94 100644 --- a/tools/objc/BUILD +++ b/tools/objc/BUILD @@ -98,11 +98,6 @@ filegroup( srcs = ["XCTest-Info.plist"], ) -sh_binary( - name = "environment_plist", - srcs = [":environment_plist.sh"], -) - filegroup( name = "gcov", srcs = [":gcov_stub"], |