Merge pull request #14 from BastiaanOlij/omnis_studio_102

Changing build system to Studio 10.2 with M1 support

.github/workflows/build_on_push.yml

@@ -0,0 +1,109 @@
+# Workflow to automatically compile a Linux/Windows library on commit/push
+name: Build on push
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events, but only for the master branch we'll create .zip files
+on:
+  [push, pull_request]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This job builds the plugin for our target platforms
+  build:
+    name: Building for ${{ matrix.platform }} (${{ matrix.os }})
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: true
+      matrix:
+        include:
+          # faster testing by disabling the others...
+          - os: macos-latest
+            platform: macos
+          - os: windows-latest
+            platform: windows
+
+    steps:
+      - name: Setup actions
+        uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
+
+      - name: Add msbuild to PATH (Windows)
+        uses: microsoft/setup-msbuild@v1.1
+        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
+        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\
+        if: matrix.platform == 'windows'
+
+      - name: Build (MacOS)
+        run: |
+          xcodebuild -project oWidget.xcodeproj build 
+        if: matrix.platform == 'macos'
+
+      - name: Build (Windows)
+        run: |
+          MSBuild oWidget.vcxproj /property:Platform=x64 /property:Configuration="UNICODE Release"
+        if: matrix.platform == 'windows'
+
+      - name: Upload build files (artifacts) (MacOS)
+        uses: actions/upload-artifact@v2
+        with:
+          name: xcomp-macos
+          path: |
+            _OSXUnicode
+        if: matrix.platform == 'macos'
+
+      - name: Upload build files (artifacts) (Windows)
+        uses: actions/upload-artifact@v2
+        with:
+          name: xcomp-windows
+          path: |
+            URel64/oWidget.dll
+        if: matrix.platform == 'windows'
+
+# This job collects the build output and assembles the final asset (artifact)
+  asset:
+    name: Assembling the asset (artifact)
+    runs-on: ubuntu-20.04
+    needs: build
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
+
+    # 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
+      - name: Copy files to destination
+        run: |
+          mkdir oWidget
+          mkdir oWidget/macos
+          mkdir oWidget/windows
+          cp -a xcomp-macos/. oWidget/macos/
+          cp xcomp-windows/oWidget.dll oWidget/windows/
+      - name: Get tag name
+        run: |
+          echo "GITHUB_SHA_SHORT=$(echo ${GITHUB_REF##*/})" >> $GITHUB_ENV
+        if: startsWith(github.ref, 'refs/tags')
+      - name: Zip asset
+        run: |
+          zip -qq -r oWidget.zip oWidget/.
+      - name: Create and upload asset
+        uses: ncipollo/release-action@v1
+        with:
+          allowUpdates: true
+          artifacts: "oWidget.zip"
+          token: ${{ secrets.GITHUB_TOKEN }}
+

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "thirdparty/omnis.xcomp.framework"]
+	path = thirdparty/omnis.xcomp.framework
+	url = https://github.com/BastiaanOlij/omnis.xcomp.framework

English.lproj/Bitmap.strings

@@ -0,0 +1,3 @@
+{
+"COMP_RES_1" = "OWIDGET.PNG";
+}

English.lproj/Localizable.strings

@@ -0,0 +1,73 @@
+{
+"COMP_RES_1000" = "Widget Library";
+"COMP_RES_2000" = "oDateTime";
+"COMP_RES_2001" = "oCountButton";
+"COMP_RES_2002" = "oDataList";
+"COMP_RES_2003" = "oDropDown";
+"COMP_RES_2004" = "oImage";
+"COMP_RES_2005" = "oFontDropDown";
+"COMP_RES_2006" = "oRoundedButton";
+"COMP_RES_4000" = "$localtime:our datetime in the local timezone";
+"COMP_RES_4001" = "$utc:our datetime as UTC";
+"COMP_RES_4100" = "$counter:counter to display";
+"COMP_RES_4101" = "$radius:radius";
+"COMP_RES_4102" = "$spacing:spacing";
+"COMP_RES_4103" = "$countColor:Background color of our counter";
+"COMP_RES_4104" = "$fillColor:Fill color for our button";
+"COMP_RES_4105" = "$iconPos:0 = left, 1 = right";
+"COMP_RES_4110" = "$columncount:Number of columns we display";
+"COMP_RES_4111" = "$columncalcs:Our column calculations, tab delimited";
+"COMP_RES_4112" = "$columnwidths:Our columns widths";
+"COMP_RES_4113" = "$columnaligns:Our column alignment";
+"COMP_RES_4114" = "$maxrowheight:Maximum row height";
+"COMP_RES_4115" = "$columnPrefix:This calculation gets added to every line";
+"COMP_RES_4116" = "$verticalExtends:Limits which columns wrapping text will increase the row height";
+"COMP_RES_4117" = "$evenColor:Alternative background color for even lines (default color = ignore)";
+"COMP_RES_4118" = "$selectColor:Background color for selected lines (default color = use system)";
+"COMP_RES_4120" = "$groupcalcs:calculations by which we group";
+"COMP_RES_4121" = "$treeIndent:Number of pixels we indent our nodes in our treelist with";
+"COMP_RES_4122" = "$filtercalc:calculation by which to filter which lines we show";
+"COMP_RES_4123" = "$deselectOnGroupClick:Deselect lines when we click on a node";
+"COMP_RES_4124" = "$parentCalcs:calculations that identify a group as a parent group";
+"COMP_RES_4200" = "$displaycalc:If set, alternative display calculation";
+"COMP_RES_4201" = "$fontColumn:Column number containing our font name";
+"COMP_RES_4300" = "$layercount:Number of layers";
+"COMP_RES_4301" = "$currentLayer:Layer we have selected";
+"COMP_RES_4302" = "$layertype:Type of layer";
+"COMP_RES_4303" = "$layerleft:Left of layer";
+"COMP_RES_4304" = "$layertop:Top of layer";
+"COMP_RES_4305" = "$layerwidth:Width of layer";
+"COMP_RES_4306" = "$layerheight:Height of layer";
+"COMP_RES_4307" = "$layercontents:Contents of the layer";
+"COMP_RES_4308" = "$layerenabled:Layer is enabled";
+"COMP_RES_4309" = "$image:Our image";
+"COMP_RES_4310" = "$imageWidth:Width of our image (0 = use layer 1)";
+"COMP_RES_4311" = "$imageHeight:Height of our image (0 = use layer 1)";
+"COMP_RES_5000" = "click:User clicked on our field";
+"COMP_RES_5001" = "HScrolled:Field was horizontally scrolled";
+"COMP_RES_5002" = "VScrolled:Field was vertically scrolled";
+"COMP_RES_5003" = "ColumnResized:Column was resized";
+"COMP_RES_5004" = "DoubleClick:User double clicked on our field";
+"COMP_RES_7000" = "seconds:Seconds";
+"COMP_RES_7001" = "lineNo:Line number";
+"COMP_RES_7002" = "X:X-coord";
+"COMP_RES_7003" = "Y:Y-coord";
+"COMP_RES_7100" = "layer:Layer";
+"COMP_RES_8000" = "$addSeconds:$addSeconds() Add seconds to datetime.";
+"COMP_RES_8010" = "$isvisible:$isVisible(pvLineNo) Is line visible?";
+"COMP_RES_8011" = "$lineAtPos:$lineAtPos(pvY) which line is at this Y coord";
+"COMP_RES_8012" = "$lineAtMouse:$lineAtMouse() which line is below the mouse";
+"COMP_RES_8100" = "$addLayer:$addLayer() add a layer to our image.";
+"COMP_RES_8101" = "$remLayer:$remLayer(pLayer) removes a layer from our image";
+"COMP_RES_9000" = "$monitors:$monitors() returns detailed info about connected monitors";
+"COMP_RES_10000" = "on evClick ;; Button has been clicked";
+"COMP_RES_10001" = "Quit event handler (Pass to next handler)";
+"COMP_RES_10002" = " ";
+"COMP_RES_10010" = "on evClick ;; line (pLineNo) has been clicked";
+"COMP_RES_10011" = "Quit event handler (Pass to next handler)";
+"COMP_RES_10012" = " ";
+"COMP_RES_10020" = "on evClick ;; Line has been clicked";
+"COMP_RES_10021" = "Quit event handler (Pass to next handler)";
+"COMP_RES_10022" = " ";
+"COMP_RES_31000" = "FrameworkWndProc";
+}

_OSXUnicodeDbg/oWidget.u_xcomp/Contents/Info.plist

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildMachineOSBuild</key>
+	<string>18G9323</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>oWidget</string>
+	<key>CFBundleIdentifier</key>
+	<string>omnix.xcomp.owidget</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>OO$</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>CSResourcesFileMapped</key>
+	<true/>
+	<key>DTCompiler</key>
+	<string>com.apple.compilers.llvm.clang.1_0</string>
+	<key>DTPlatformBuild</key>
+	<string>11C504</string>
+	<key>DTPlatformVersion</key>
+	<string>GM</string>
+	<key>DTSDKBuild</key>
+	<string>19B90</string>
+	<key>DTSDKName</key>
+	<string>macosx10.15</string>
+	<key>DTXcode</key>
+	<string>1130</string>
+	<key>DTXcodeBuild</key>
+	<string>11C504</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.11</string>
+</dict>
+</plist>

_OSXUnicodeDbg/oWidget.u_xcomp/Contents/PkgInfo

@@ -0,0 +1 @@
+BNDL????

_OSXUnicodeDbg/oWidget.u_xcomp/Contents/Resources/Bitmap.strings

@@ -0,0 +1,3 @@
+{
+"COMP_RES_1" = "OWIDGET.PNG";
+}