@@ -12,11 +12,12 @@ XCODE_RAW_VERSION=$(xcodebuild -version | head -n 1)
12
12
13
13
# Define toolchain names
14
14
TOOLCHAIN_NAME=" ${TOOLCHAIN_NAME_BASE} "
15
- HOME_TOOLCHAIN_NAME=" BazelRulesXcodeProj ${XCODE_VERSION} "
15
+ HOME_TOOLCHAIN_NAME=" BazelRulesXcodeProj${XCODE_VERSION} "
16
16
USER_TOOLCHAIN_PATH=" /Users/$( id -un) /Library/Developer/Toolchains/${HOME_TOOLCHAIN_NAME} .xctoolchain"
17
17
BUILT_TOOLCHAIN_PATH=" $PWD /$TOOLCHAIN_DIR "
18
18
19
- mkdir -p " $TOOLCHAIN_DIR "
19
+ mkdir -p " $USER_TOOLCHAIN_PATH "
20
+ mkdir -p " $BUILT_TOOLCHAIN_PATH "
20
21
21
22
while IFS=' =' read -r key value; do
22
23
value=" $PWD /$value "
@@ -63,29 +64,24 @@ cat > "$TOOLCHAIN_DIR/ToolchainInfo.plist" << EOF
63
64
<dict>
64
65
<key>Aliases</key>
65
66
<array>
66
- <string>BazelRulesXcodeProj </string>
67
+ <string>${HOME_TOOLCHAIN_NAME} </string>
67
68
</array>
68
69
<key>CFBundleIdentifier</key>
69
- <string>com.rules_xcodeproj.BazelRulesXcodeProj</string>
70
+ <string>com.rules_xcodeproj.BazelRulesXcodeProj.{ $XCODE_VERSION } </string>
70
71
<key>CompatibilityVersion</key>
71
72
<integer>2</integer>
72
73
<key>CompatibilityVersionDisplayString</key>
73
74
<string>${XCODE_RAW_VERSION} </string>
74
75
<key>DisplayName</key>
75
- <string>BazelRulesXcodeProj ( ${XCODE_RAW_VERSION} ) </string>
76
+ <string>${HOME_TOOLCHAIN_NAME} </string>
76
77
<key>ReportProblemURL</key>
77
78
<string>https://github.com/MobileNativeFoundation/rules_xcodeproj</string>
78
79
<key>ShortDisplayName</key>
79
- <string>BazelRulesXcodeProj </string>
80
+ <string>${HOME_TOOLCHAIN_NAME} </string>
80
81
<key>Version</key>
81
82
<string>0.1.0</string>
82
83
</dict>
83
84
</plist>
84
85
EOF
85
86
86
- # Remove existing symlink if present and create a new one in the user directory
87
- if [ -e " $USER_TOOLCHAIN_PATH " ]; then
88
- rm -f " $USER_TOOLCHAIN_PATH "
89
- fi
90
87
ln -s " $BUILT_TOOLCHAIN_PATH " " $USER_TOOLCHAIN_PATH "
91
-
0 commit comments