Update to Omnis Studio 11

.github/workflows/build_on_push.yml

@@ -17,8 +17,8 @@ jobs:
       matrix:
         include:
           # faster testing by disabling the others...
-          - os: macos-latest
-            platform: macos
+          #- os: macos-latest
+          #  platform: macos
           - os: windows-latest
             platform: windows
 
@@ -36,15 +36,23 @@ jobs:
 
       - name: Get SDK (MacOS)
         run: |
-          hdiutil attach thirdparty/omnis.sdk.source/OSX-SDK-10.22.dmg
-          cp -a /volumes/OSX-SDK-10.22/OSX_SDK_10.22/. thirdparty/omnis.sdk/mac/
-          hdiutil detach /volumes/OSX-SDK-10.22
+          omnis_sdk=$(curl -s "https://filestore.omnis.net/omnisrestservlet/ws/5975/api/file_browser/browser/file?file=/OmnisStudio/Studio1100_36251/SDK/macOS-SDK-11-36251.dmg&browsertype=0&odppid=blank" | awk {'print $1'})
+          curl -O "$omnis_sdk"
+          hdiutil attach macOS-SDK-11-36251.dmg
+          cp -a /volumes/macOS-SDK-11-36251/macOS_SDK_11_36251/. thirdparty/omnis.sdk/mac/
+          hdiutil detach /volumes/macOS-SDK-11-36251
         if: matrix.platform == 'macos'
 
       - name: Get SDK (Windows)
         run: |
-          tar -xf thirdparty/omnis.sdk.source/Windows-SDK-10.22-x86-x64.zip
-          xcopy /E /I Windows-SDK-10.22-x86-x64\* thirdparty\omnis.sdk\win\
+          $response = Invoke-WebRequest -uri "https://filestore.omnis.net/omnisrestservlet/ws/5975/api/file_browser/browser/file?file=/OmnisStudio/Studio1100_36251/SDK/Windows-SDK-11-36251-x64.zip&browsertype=0&odppid=blank"
+          $omnissdk = [System.Text.Encoding]::UTF8.GetString($response.content)
+          Invoke-WebRequest -uri $omnissdk -OutFile WindowsSDK.zip
+          mkdir WindowsSDK
+          cd WindowsSDK
+          tar -xf ../WindowsSDK.zip
+          cd ..
+          xcopy /E /I WindowsSDK\* thirdparty\omnis.sdk\win\
         if: matrix.platform == 'windows'
 
       - name: Build (MacOS)
@@ -54,23 +62,23 @@ jobs:
 
       - name: Build (Windows)
         run: |
-          MSBuild oWidget.vcxproj /property:Platform=x64 /property:Configuration="UNICODE Release"
+          MSBuild oWidget.vcxproj /property:Platform=x64 /property:Configuration="Release"
         if: matrix.platform == 'windows'
 
       - name: Upload build files (artifacts) (MacOS)
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: xcomp-macos
           path: |
-            _OSXUnicode
+            build/release
         if: matrix.platform == 'macos'
 
       - name: Upload build files (artifacts) (Windows)
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: xcomp-windows
           path: |
-            URel64/oWidget.dll
+            build/Release_x64/xcomp/oWidget.dll
         if: matrix.platform == 'windows'
 
 # This job collects the build output and assembles the final asset (artifact)
@@ -83,7 +91,7 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       - name: Download all workflow run artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
       - name: Copy files to destination
         run: |
           mkdir oWidget

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Changelog
 Notable changes to versions in this repository
 
+## [1.26] - 2024-07-20
+- Update to Studio 11
+
 ## [1.25] - 2023-10-31
 - Fixing word wrap issue
 - Update to Studio 10.22

Src/widget.cpp

@@ -20,7 +20,7 @@ qshort mainlib::major() {
 };
 
 qshort mainlib::minor() {
-	return 125;
+	return 126;
 };
 
 ECOmethodEvent widgetStaticFuncs[] = {

mac/omnis.xcconfig

@@ -0,0 +1,61 @@
+//
+//  omnis.xcconfig
+//  build_all
+//
+//  Copyright © 2023 Omnis Software Ltd. All rights reserved.
+//
+
+// Configuration settings file format documentation can be found at:
+// https://help.apple.com/xcode/#/dev745c5c974
+
+XCOMP_BUNDLE_IDENTIFIER = omnis.xcomp.widget
+XCOMP_PRODUCT_NAME = oWidget
+
+OMNIS_SDK_ROOT = macosx
+OMNIS_DEPLOYMENT_TARGET = 10.14
+OMNIS_BUILD_ROOT = $(SRCROOT)/build
+CPP_LANG_DIALECT = c++17
+CPP_STD_LIBRARY = libc++
+
+MACOSX_DEPLOYMENT_TARGET = $OMNIS_DEPLOYMENT_TARGET
+OMNIS_ACTIVE_ARCH_ONLY[config=Deployment] = NO
+OMNIS_ACTIVE_ARCH_ONLY[config=Development] = YES
+ONLY_ACTIVE_ARCH = $OMNIS_ACTIVE_ARCH_ONLY
+ARCHS = $(ARCHS_STANDARD)
+DEPLOYMENT_LOCATION = YES
+SKIP_INSTALL = NO
+INSTALL_ROOT = /
+INSTALL_PATH = /
+ALWAYS_SEARCH_USER_PATHS = NO
+CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO
+CODE_SIGN_STYLE = Manual
+
+OMNIS_CODE_SIGNING_IDENTITY[config=Deployment] = -
+OMNIS_CODE_SIGNING_IDENTITY[config=Development] = -
+
+OMNIS_CONFIG[config=Deployment] = Release
+OMNIS_CONFIG[config=Development] = Debug
+
+OMNIS_FILES_ROOT = $OMNIS_BUILD_ROOT/$OMNIS_CONFIG
+
+COMPLIB_DIR[config=Deployment] = $(SRCROOT)/thirdparty/omnis.sdk/mac/complib
+COMPLIB_DIR[config=Development] = $(SRCROOT)/thirdparty/omnis.sdk/mac/complib_debug
+
+OMNISRC_DIR = $(SRCROOT)/thirdparty/omnis.sdk/mac/tools
+
+DWARF_DSYM_FOLDER_PATH_PREFIX = $(OMNIS_BUILD_ROOT)/DebugSymbols
+
+// jscomp
+OMNIS_JSCOMP_DIR = jscomp
+OMNIS_JSCOMP_INSTALL_DIR = $OMNIS_FILES_ROOT/$OMNIS_JSCOMP_DIR
+OMNIS_JSCOMP_PREFIX_PATH = $COMPLIB_DIR/complib.framework/Versions/A/Headers/carbnuni.h
+
+// xcomp
+OMNIS_XCOMP_DIR = xcomp
+OMNIS_XCOMP_INSTALL_DIR = $OMNIS_FILES_ROOT/$OMNIS_XCOMP_DIR
+OMNIS_XCOMP_HEADER_PATHS = $COMPLIB_DIR/complib.framework/Headers
+OMNIS_XCOMP_REZ_PATHS = $COMPLIB_DIR/complib.framework/Versions/A/Resources
+OMNIS_XCOMP_PREFIX_PATH = $COMPLIB_DIR/complib.framework/Versions/A/Headers/carbnuni.h
+OMNIS_XCOMP_FRAMEWORK_PATH = $COMPLIB_DIR/
+
+OMNIS_C_FLAGS = "-DOMNISSDK=110"

mac/prefix_d.h

@@ -0,0 +1,9 @@
+#define TESTVER 0
+#define _DEBUG
+
+#define mach_o_unicode
+#define isunicode
+#define UNICODE
+#define _UNICODE
+
+#include "carbnuni.h"

mac/prefix_r.h

@@ -0,0 +1,8 @@
+#define TESTVER 0
+
+#define mach_o_unicode
+#define isunicode
+#define UNICODE
+#define _UNICODE
+
+#include "carbnuni.h"