[Jrisk-cvs] SF.net SVN: domination-code:[2711] Domination/ios

[<yu...@us...>]

Revision: 2711
          http://sourceforge.net/p/domination/code/2711
Author:   yuranet
Date:     2025-12-09 19:13:57 +0000 (Tue, 09 Dec 2025)
Log Message:
-----------
update 'Compile Sources (MOE)' for Simple target

Modified Paths:
--------------
    Domination/ios/build.gradle
    Domination/ios/xcode/Domination.xcodeproj/project.pbxproj

Modified: Domination/ios/build.gradle
===================================================================
--- Domination/ios/build.gradle	2025-12-09 18:49:55 UTC (rev 2710)
+++ Domination/ios/build.gradle	2025-12-09 19:13:57 UTC (rev 2711)
@@ -93,6 +93,28 @@
     }
 }
 
+import org.moe.generator.project.writer.XcodeEditor
+// by default "./gradlew moeUpdateXcodeSettings" ONLY updates the main 2 targets
+// but we have a 3rd target also, so we want to make sure we also update that
+moeUpdateXcodeSettings {
+    doLast {
+        def mainTargets = ["Simple"]
+        def xcodeProj = file(moe.xcode.project)
+        mainTargets.forEach {
+            def settings = new XcodeEditor.Settings()
+            settings.mainTarget = it
+            //settings.testTarget = moe.xcode.testTarget
+            settings.moeProject = getProjectDir()
+            settings.xcodeProject = xcodeProj
+            //settings.useLLVM = moe.nativeImage.useLLVM
+
+            XcodeEditor xcodeEditor = new XcodeEditor(xcodeProj)
+            xcodeEditor.update(settings)
+            xcodeEditor.getProjectFile().save()
+        }
+    }
+}
+
 // Set dependencies
 dependencies {
     implementation rootProject

Modified: Domination/ios/xcode/Domination.xcodeproj/project.pbxproj
===================================================================
--- Domination/ios/xcode/Domination.xcodeproj/project.pbxproj	2025-12-09 18:49:55 UTC (rev 2710)
+++ Domination/ios/xcode/Domination.xcodeproj/project.pbxproj	2025-12-09 19:13:57 UTC (rev 2711)
@@ -792,7 +792,9 @@
 				MOE_COPY_ANDROID_CACERTS = NO;
 				MOE_FRAMEWORK_PATH = "${MOE_SDK_PATH}/sdk/${PLATFORM_NAME}";
 				MOE_JAVA_VERSION_OVERRIDE = "";
-				MOE_OTHER_LDFLAGS = "${MOE_SECT_OAT} ${MOE_SECT_ART} ${MOE_SEGPROT} ${MOE_PAGEZERO} ${MOE_CUSTOM_OTHER_LDFLAGS} -lc++ -framework MOE";
+				MOE_OAT_ALIGN = "-Xlinker -sectalign -Xlinker __TEXT -Xlinker __oatdata -Xlinker 0x8000";
+				"MOE_OAT_ALIGN[arch=x86_64]" = "";
+				MOE_OTHER_LDFLAGS = "${MOE_SECT_OAT} ${MOE_OAT_ALIGN} ${MOE_SECT_ART} ${MOE_SEGPROT} ${MOE_PAGEZERO} ${MOE_CUSTOM_OTHER_LDFLAGS} -lc++ -framework MOE";
 				MOE_PAGEZERO = "";
 				"MOE_PAGEZERO[arch=x86_64]" = "-pagezero_size 4096";
 				MOE_PROJECT_BUILD_DIR = "${MOE_PROJECT_DIR}/build";
@@ -799,8 +801,9 @@
 				MOE_PROJECT_DIR = "${SRCROOT}/../";
 				MOE_SDK_PATH = "${MOE_PROJECT_BUILD_DIR}/moe/sdk";
 				MOE_SECT_ART = "-sectcreate __ARTDATA __artdata \"${MOE_PROJECT_BUILD_DIR}/moe/main/xcode/${CONFIGURATION}${EFFECTIVE_PLATFORM_NAME}/${arch}.art\"";
-				MOE_SECT_OAT = "-sectcreate __OATDATA __oatdata \"${MOE_PROJECT_BUILD_DIR}/moe/main/xcode/${CONFIGURATION}${EFFECTIVE_PLATFORM_NAME}/${arch}.oat\"";
-				MOE_SEGPROT = "-segprot __OATDATA rx rx -segprot __ARTDATA rw rw";
+				MOE_SECT_OAT = "-sectcreate __TEXT __oatdata \"${MOE_PROJECT_BUILD_DIR}/moe/main/xcode/${CONFIGURATION}${EFFECTIVE_PLATFORM_NAME}/${arch}.oat\"";
+				"MOE_SECT_OAT[arch=x86_64]" = "-sectcreate __OATDATA __oatdata \"${MOE_PROJECT_BUILD_DIR}/moe/main/xcode/${CONFIGURATION}${EFFECTIVE_PLATFORM_NAME}/${arch}.oat\"";
+				MOE_SEGPROT = "-segprot __ARTDATA rw rw";
 				"MOE_SEGPROT[arch=x86_64]" = "-segprot __OATDATA rwx rx -segprot __ARTDATA rwx rw";
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
@@ -830,7 +833,9 @@
 				MOE_COPY_ANDROID_CACERTS = NO;
 				MOE_FRAMEWORK_PATH = "${MOE_SDK_PATH}/sdk/${PLATFORM_NAME}";
 				MOE_JAVA_VERSION_OVERRIDE = "";
-				MOE_OTHER_LDFLAGS = "${MOE_SECT_OAT} ${MOE_SECT_ART} ${MOE_SEGPROT} ${MOE_PAGEZERO} ${MOE_CUSTOM_OTHER_LDFLAGS} -lc++ -framework MOE";
+				MOE_OAT_ALIGN = "-Xlinker -sectalign -Xlinker __TEXT -Xlinker __oatdata -Xlinker 0x8000";
+				"MOE_OAT_ALIGN[arch=x86_64]" = "";
+				MOE_OTHER_LDFLAGS = "${MOE_SECT_OAT} ${MOE_OAT_ALIGN} ${MOE_SECT_ART} ${MOE_SEGPROT} ${MOE_PAGEZERO} ${MOE_CUSTOM_OTHER_LDFLAGS} -lc++ -framework MOE";
 				MOE_PAGEZERO = "";
 				"MOE_PAGEZERO[arch=x86_64]" = "-pagezero_size 4096";
 				MOE_PROJECT_BUILD_DIR = "${MOE_PROJECT_DIR}/build";
@@ -837,8 +842,9 @@
 				MOE_PROJECT_DIR = "${SRCROOT}/../";
 				MOE_SDK_PATH = "${MOE_PROJECT_BUILD_DIR}/moe/sdk";
 				MOE_SECT_ART = "-sectcreate __ARTDATA __artdata \"${MOE_PROJECT_BUILD_DIR}/moe/main/xcode/${CONFIGURATION}${EFFECTIVE_PLATFORM_NAME}/${arch}.art\"";
-				MOE_SECT_OAT = "-sectcreate __OATDATA __oatdata \"${MOE_PROJECT_BUILD_DIR}/moe/main/xcode/${CONFIGURATION}${EFFECTIVE_PLATFORM_NAME}/${arch}.oat\"";
-				MOE_SEGPROT = "-segprot __OATDATA rx rx -segprot __ARTDATA rw rw";
+				MOE_SECT_OAT = "-sectcreate __TEXT __oatdata \"${MOE_PROJECT_BUILD_DIR}/moe/main/xcode/${CONFIGURATION}${EFFECTIVE_PLATFORM_NAME}/${arch}.oat\"";
+				"MOE_SECT_OAT[arch=x86_64]" = "-sectcreate __OATDATA __oatdata \"${MOE_PROJECT_BUILD_DIR}/moe/main/xcode/${CONFIGURATION}${EFFECTIVE_PLATFORM_NAME}/${arch}.oat\"";
+				MOE_SEGPROT = "-segprot __ARTDATA rw rw";
 				"MOE_SEGPROT[arch=x86_64]" = "-segprot __OATDATA rwx rx -segprot __ARTDATA rwx rw";
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (