Skip to content

Commit 8a65ac7

Browse files
Merge pull request livecode#5466 from alexbrisan/bugfix_symlinks
Bugfix symlinks
2 parents 65dfbd8 + 8f141de commit 8a65ac7

File tree

2 files changed

+19
-7
lines changed

2 files changed

+19
-7
lines changed

docs/development/build-mac.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ Download and install each of the following versions of Xcode, placing their app
2626

2727
| Xcode version | App path |
2828
| ------------- | --------------------------------------- |
29-
| 8.0 | /Applications/Xcode-Dev/Xcode_8_0.app |
29+
| 8.3 | /Applications/Xcode-Dev/Xcode_8_3.app |
30+
| 8.2 | /Applications/Xcode-Dev/Xcode_8_2.app |
3031
| 7.2.1 | /Applications/Xcode-Dev/Xcode_7_2_1.app |
3132
| 6.2 [1] | /Applications/Xcode-Dev/Xcode_6_2.app |
3233

tools/setup_xcode_sdks.py

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22

33
# Update these lists if you need different SDK versions!
44

5-
iphoneos_versions = ["10.3", "10.2", "9.2"]
6-
iphonesimulator_versions = ["10.3", "10.2", "9.2", "8.2"]
7-
macosx_versions = ["10.9", "10.6"]
5+
iphoneos_versions = ["10.3", "10.2","9.2"]
6+
iphonesimulator_versions = ["10.3", "10.2","9.2", "8.2"]
7+
macosx_versions = ["10.9"]
8+
9+
810

911
# This tool creates the symlinks required for Xcode builds of LiveCode.
1012
#
@@ -67,9 +69,18 @@ def is_sdk_present(xcode_app, platform, version):
6769
return check_sdk_path(xcode_app, platform, version) is not None
6870

6971
def xcode_paths(base_dir):
70-
return [entry
71-
for entry in os.listdir(base_dir)
72-
if re.match(r"^Xcode_.*\.app$", entry) is not None]
72+
return_list = []
73+
level_0 = os.listdir(base_dir)
74+
for entry in level_0:
75+
if(re.match(r"Xcode.*\.app", entry)):
76+
return_list.append(entry)
77+
if(not os.path.isdir(entry)):
78+
continue
79+
level_1 = os.listdir(entry)
80+
for l1_entry in level_1:
81+
if(re.match(r"Xcode.*\.app", l1_entry)):
82+
return_list.append(entry + "/" + l1_entry)
83+
return return_list
7384

7485
def target_xcode(base_dir):
7586
return "{}/{}".format(base_dir, "Xcode.app")

0 commit comments

Comments
 (0)