DEF-2569 Renamed ios sdk to iPhoneOS9.3.sdk (#32)

defold · Mar 20, 2017 · a1a2053 · a1a2053
1 parent 30d6fcb
commit a1a2053
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/server/docker/Dockerfile b/server/docker/Dockerfile
@@ -100,7 +100,13 @@ ADD test.sh /tmp
 ADD build-darwin-toolchain.sh /tmp
 RUN /tmp/build-darwin-toolchain.sh 84ce22dbb22a26ce7f392e9de0ee39c2efe6fd68
 
+# Right now, the package contains iPhoneOS.sdk, in the future, we want iPhoneOS9.3.sdk
 RUN wget -q -O - ${S3_URL}/iPhoneOS9.3.sdk.tar.gz | tar xz -C /opt
+# Until we've fixed the package
+RUN mv /opt/iPhoneOS.sdk /opt/iPhoneOS9.3.sdk
+# backwards compatible
+RUN ln -s /opt/iPhoneOS9.3.sdk /opt/iPhoneOS.sdk
+
 RUN wget -q -O - ${S3_URL}/MacOSX10.11.sdk.tar.gz | tar xz -C /opt
 
 RUN ln -s /usr/local/bin/llvm-dsymutil /usr/local/bin/dsymutil

diff --git a/server/src/main/java/com/defold/extender/WhitelistConfig.java b/server/src/main/java/com/defold/extender/WhitelistConfig.java
@@ -8,7 +8,6 @@ class WhitelistConfig {
     public Map<String, Object> context = new HashMap<>();
 
     // Used to verify C++ defines before adding them on the command line
-    //public Pattern defineRe = WhitelistConfig.compile();
     public String defineRe = "[A-Za-z]+[A-Za-z0-9_]+=?[A-Za-z0-9_]+";
 
     public WhitelistConfig() {