[unreal]修复mini引擎在新xcode的编译问题，重新打开mac的ci，并修复mac的编译报错

Tencent · Aug 7, 2024 · 58357b1 · 58357b1
1 parent 8ab6062
commit 58357b1
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 36 deletions.
diff --git a/.github/workflows/unreal_ci.yml b/.github/workflows/unreal_ci.yml
@@ -14,7 +14,7 @@ on:
       - .github/workflows/unreal_ci.yml
 
 env:
-  Engine: "https://github.com/chexiongsheng/Mini427/releases/download/v1.0.0/Mini427_wami.tgz"
+  Engine: "https://github.com/chexiongsheng/Mini427/releases/download/v1.0.1/Mini427_wami_new_xcode.tgz"
   V8_URL: "https://github.com/puerts/backend-v8/releases/download/V8_9.4.146.24_240709/v8_bin_9.4.146.24.tgz"
   QJS_URL: "https://github.com/puerts/backend-quickjs/releases/download/QJS_240603/qjs_v8_bin.tgz"
   NODE_URL: "https://github.com/puerts/backend-nodejs/releases/download/NodeJS_16.16.0_221228/nodejs_bin_16.16.0.tgz"
@@ -97,32 +97,32 @@ jobs:
       run: |
         Engine\Build\BatchFiles\RunUAT.bat BuildPlugin -Plugin="unreal\Puerts\Puerts.uplugin" -Package="output" -Rocket -TargetPlatforms=Android -VS2019
 
-#  mac_ios_ci:
-#    needs: urls
-#    name: Mac and IOS
-#    runs-on: macos-12
-#    strategy:
-#      matrix:
-#        cmdinfo:
-#          - jslib_path: ${{ needs.urls.outputs.v8 }}
-#            change_backend: ''
-#          - jslib_path: ${{ needs.urls.outputs.qjs }}
-#            change_backend: "sed -i '' 's/UseQuickjs = false/UseQuickjs = true/g' unreal/Puerts/Source/JsEnv/JsEnv.Build.cs"
-#          - jslib_path: ${{ needs.urls.outputs.node }}
-#            change_backend: "sed -i '' 's/UseNodejs = false/UseNodejs = true/g' unreal/Puerts/Source/JsEnv/JsEnv.Build.cs"
-#    steps:
-#    - uses: actions/checkout@v3
-#    - name: Prepare
-#      shell: bash
-#      run: |
-#        wget -O jslib.tgz -q  ${{ matrix.cmdinfo['jslib_path'] }}
-#        tar xvfz jslib.tgz -C unreal/Puerts/ThirdParty
-#        ${{ matrix.cmdinfo['change_backend'] }}
-#        wget -O temp.tgz -q  ${{env.Engine}} 
-#        tar xfz temp.tgz
-#        mkdir output
-#        sudo xcode-select -s /Applications/Xcode_13.1.app
-#    - name: Build
-#      shell: bash
-#      run: |
-#        Engine/Build/BatchFiles/RunUAT.sh BuildPlugin -Plugin=unreal/Puerts/Puerts.uplugin -Package=output -Rocket -TargetPlatforms=Mac+IOS
+  mac_ios_ci:
+    needs: urls
+    name: Mac and IOS
+    runs-on: macos-12
+    strategy:
+      matrix:
+        cmdinfo:
+          - jslib_path: ${{ needs.urls.outputs.v8 }}
+            change_backend: ''
+          - jslib_path: ${{ needs.urls.outputs.qjs }}
+            change_backend: "sed -i '' 's/UseQuickjs = false/UseQuickjs = true/g' unreal/Puerts/Source/JsEnv/JsEnv.Build.cs"
+          - jslib_path: ${{ needs.urls.outputs.node }}
+            change_backend: "sed -i '' 's/UseNodejs = false/UseNodejs = true/g' unreal/Puerts/Source/JsEnv/JsEnv.Build.cs"
+    steps:
+    - uses: actions/checkout@v3
+    - name: Prepare
+      shell: bash
+      run: |
+        wget -O jslib.tgz -q  ${{ matrix.cmdinfo['jslib_path'] }}
+        tar xvfz jslib.tgz -C unreal/Puerts/ThirdParty
+        ${{ matrix.cmdinfo['change_backend'] }}
+        wget -O temp.tgz -q  ${{env.Engine}} 
+        tar xfz temp.tgz
+        mkdir output
+        sudo xcode-select -s /Applications/Xcode_13.1.app
+    - name: Build
+      shell: bash
+      run: |
+        Engine/Build/BatchFiles/RunUAT.sh BuildPlugin -Plugin=unreal/Puerts/Puerts.uplugin -Package=output -Rocket -TargetPlatforms=Mac+IOS
diff --git a/unreal/Puerts/Source/JsEnv/Private/JsEnvImpl.cpp b/unreal/Puerts/Source/JsEnv/Private/JsEnvImpl.cpp
@@ -1072,19 +1072,15 @@ void FJsEnvImpl::NewObjectByClass(const v8::FunctionCallbackInfo<v8::Value>& Inf
         UObject* Object = NewObject<UObject>(Outer, Class, Name, ObjectFlags);
 
         auto Result = FV8Utils::IsolateData<IObjectMapper>(Isolate)->FindOrAdd(Isolate, Context, Object->GetClass(), Object);
+#if !PUERTS_KEEP_UOBJECT_REFERENCE
         bool NeedJsTakeRef = true;
         if (Info.Length() > 4 && !Info[4]->IsNullOrUndefined())
         {
-            if (Info[4]->BooleanValue(Isolate))
-            {
-            }
-            else
+            if (!Info[4]->BooleanValue(Isolate))
             {
                 NeedJsTakeRef = false;
             }
         }
-#if PUERTS_KEEP_UOBJECT_REFERENCE
-#else
         if (NeedJsTakeRef)
         {
             bool Existed;