Update to studio 11

.github/workflows/build_on_push.yml

@@ -21,34 +21,40 @@ jobs:
           # faster testing by disabling the others...
           - os: macos-latest
             platform: macos
-          - os: windows-latest
-            platform: windows
+          # - os: windows-latest
+          #   platform: windows
 
     steps:
       - name: Setup actions
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           submodules: 'recursive'
 
       - name: Add msbuild to PATH (Windows)
-        uses: microsoft/setup-msbuild@v1.1
+        uses: microsoft/setup-msbuild@v2
         with:
           msbuild-architecture: x64
         if: matrix.platform == 'windows'
 
       - name: Get SDK (MacOS)
         run: |
-          curl -O "ftp://ftp.omnis.net/OmnisStudio/Studio102_31315/SDK/osx64/OSX-SDK-10.2-31315.dmg"
-          hdiutil attach OSX-SDK-10.2-31315.dmg
-          cp -a /volumes/OSX-SDK-10.2-31315/OSX-SDK-10.2-31315/. thirdparty/omnis.sdk/mac/
-          hdiutil detach /volumes/OSX-SDK-10.2-31315
+          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: |
-          curl -O "ftp://ftp.omnis.net/OmnisStudio/Studio102_31315/SDK/windows/Windows-SDK-10.2-31315-x86-x64.zip"
-          tar -xf Windows-SDK-10.2-31315-x86-x64.zip
-          xcopy /E /I Windows-SDK-10.2-31315-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)
@@ -58,23 +64,23 @@ jobs:
 
       - name: Build (Windows)
         run: |
-          MSBuild bgwidgets.vcxproj /property:Platform=x64 /property:Configuration="UNICODE Release"
+          MSBuild bgwidgets.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/bgwidgets.dll
+            build/Release_x64/xcomp/bgwidgets.dll
         if: matrix.platform == 'windows'
 
 # This job collects the build output and assembles the final asset (artifact)
@@ -87,7 +93,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 bgwidgets

build/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

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.bgwidgets
+XCOMP_PRODUCT_NAME = bgwidgets
+
+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"

windows/omnis_environment.props

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros">
+    <OMNIS_BUILD_ROOT>build\$(Configuration)_$(PlatformShortName)</OMNIS_BUILD_ROOT>
+    <OMNIS_INTBUILD_DIR>intbuild</OMNIS_INTBUILD_DIR>
+    <DEBUGSYMBOLS_LOCATION>$(OMNIS_INTBUILD_DIR)\debugsymbols_$(PlatformShortName)</DEBUGSYMBOLS_LOCATION>
+    <SDK_LOCATION>thirdparty\omnis.sdk\win</SDK_LOCATION>
+    <CONFIG>$(Configuration)</CONFIG>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OutDir>$(OMNIS_BUILD_ROOT)\</OutDir>
+    <IntDir>$(OMNIS_INTBUILD_DIR)\$(ProjectName)\$(Configuration)_$(PlatformShortName)\</IntDir>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
+      <StructMemberAlignment>$(BYTE_PACKING)</StructMemberAlignment>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <IgnoreSpecificDefaultLibraries>libc.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile Condition="'$(Configuration.Contains(`Release`))' == 'true'">$(DEBUGSYMBOLS_LOCATION)\$(TargetName).pdb</ProgramDatabaseFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <BuildMacro Include="OMNIS_BUILD_ROOT">
+      <Value>$(OMNIS_BUILD_ROOT)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="OMNIS_INTBUILD_DIR">
+      <Value>$(OMNIS_INTBUILD_DIR)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="DEBUGSYMBOLS_LOCATION">
+      <Value>$(DEBUGSYMBOLS_LOCATION)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="SDK_LOCATION">
+      <Value>$(SDK_LOCATION)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="CONFIG">
+      <Value>$(CONFIG)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+  </ItemGroup>
+</Project>

windows/xcomp.props

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup>
+    <OutDir>$(OMNIS_BUILD_ROOT)\xcomp\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>source\shared;source;..\source;..\source\shared;$(SDK_LOCATION)\include;thirdparty\omnis.xcomp.framework;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>$(SDK_LOCATION)\libs\$(Configuration)_$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>complib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ModuleDefinitionFile>$(TargetName).def</ModuleDefinitionFile>
+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+      <IgnoreSpecificDefaultLibraries>libc.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <ProgramDatabaseFile Condition="'$(Configuration.Contains(`Release`))' == 'true'">$(DEBUGSYMBOLS_LOCATION)\xcomp\$(TargetName).pdb</ProgramDatabaseFile>
+    </Link>
+  </ItemDefinitionGroup>
+</Project>