Fix ios-demo script and remove the TaskTest that alway randomly fails.

Tencent · Nov 1, 2023 · 44ed8c4 · 44ed8c4
1 parent 4d2b060
commit 44ed8c4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 59 deletions.
diff --git a/ios/TGFXDemo.xcodeproj/project.pbxproj b/ios/TGFXDemo.xcodeproj/project.pbxproj
@@ -312,7 +312,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 3A75DREAB8;
+				DEVELOPMENT_TEAM = 36588GHG2N;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -348,7 +348,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 3A75DREAB8;
+				DEVELOPMENT_TEAM = 36588GHG2N;
 				GCC_PREPROCESSOR_DEFINITIONS = "GLES_SILENCE_DEPRECATION=1";
 				GENERATE_INFOPLIST_FILE = YES;
 				HEADER_SEARCH_PATHS = "";

diff --git a/ios/generate_tgfx_demo.sh → ios/tgfx_install.sh b/ios/generate_tgfx_demo.sh → ios/tgfx_install.sh
@@ -5,7 +5,7 @@ set -eo pipefail
 ../sync_deps.sh
 
 # generate tgfx's xcode project.
-cmake ../CMakeLists.txt -G Xcode -B tgfx -DCMAKE_TOOLCHAIN_FILE=./vendor_tools/ios.toolchain.cmake -DPLATFORM=OS64 -DENABLE_ARC=OFF -DENABLE_BITCODE=OFF
+cmake ../CMakeLists.txt -G Xcode -B tgfx -DCMAKE_TOOLCHAIN_FILE=../third-party/vendor_tools/ios.toolchain.cmake -DPLATFORM=OS64 -DENABLE_ARC=OFF -DENABLE_BITCODE=OFF
 
 # Prepare the workspace in the TEMP directory
 NAME="TGFXDemo.xcworkspace"

diff --git a/test/src/TaskTest.cpp b/test/src/TaskTest.cpp