Skip to content

Commit

Permalink
Merge pull request #3 from BastiaanOlij/omnis_studio_102
Browse files Browse the repository at this point in the history
Changing build system to Studio 10.2 with M1 support
  • Loading branch information
BastiaanOlij authored Mar 13, 2022
2 parents b3ef6f0 + 4b15205 commit 8013a1d
Show file tree
Hide file tree
Showing 16 changed files with 240 additions and 199 deletions.
111 changes: 111 additions & 0 deletions .github/workflows/build_on_push.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@


# 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/[email protected]
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 bgwidgets.xcodeproj build
if: matrix.platform == 'macos'

- name: Build (Windows)
run: |
MSBuild bgwidgets.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/bgwidgets.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 bgwidgets
mkdir bgwidgets/macos
mkdir bgwidgets/windows
cp -a xcomp-macos/. bgwidgets/macos/
cp xcomp-windows/bgwidgets.dll bgwidgets/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 bgwidgets.zip bgwidgets/.
- name: Create and upload asset
uses: ncipollo/release-action@v1
with:
allowUpdates: true
artifacts: "bgwidgets.zip"
token: ${{ secrets.GITHUB_TOKEN }}

25 changes: 16 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
bgwidgets.xcodeproj/xcuserdata
bgwidgets.xcodeproj/project.xcworkspace
# mac
_OSXUnicodeDbg
_OSXUnicode
UnicodeCore.build
bgwidgets.xcodeproj/*
!bgwidgets.xcodeproj/project.pbxproj
.DS_Store

#windows
Release
UDeb
UDeb64
URel
URel64
UnicodeCore.build
*.opensdf
*.sdf
*.suo
*.user
UDeb64
.vs
.DS_Store
*.ncb
/*.suo
/*.sln
/*.user
/*.sdf
26 changes: 13 additions & 13 deletions bgwidgets_OS10.0.vcxproj → bgwidgets.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,28 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{D377AD87-8C8E-47F3-987D-428CF82E73FF}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
<ProjectName>bgwidgets</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UNICODE Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UNICODE Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UNICODE Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UNICODE Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
Expand Down Expand Up @@ -99,7 +99,7 @@
<ClCompile>
<Optimization>MinSpace</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\complib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>thirdparty\omnis.sdk\win\complib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;iswin32;isXCOMPLIB;NO_STRICT;isunicode;UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_DEPRECATE;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
Expand All @@ -121,7 +121,7 @@
<AdditionalDependencies>odbc32.lib;odbccp32.lib;omnisu.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>.\URel/generic.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\ulibs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>thirdparty\omnis.sdk\win\ulibs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>libc.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<ModuleDefinitionFile>.\Generic.def</ModuleDefinitionFile>
<ProgramDatabaseFile>.\URel/GENERIC.pdb</ProgramDatabaseFile>
Expand All @@ -148,7 +148,7 @@
<ClCompile>
<Optimization>MinSpace</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\complib;..\omnis.xcomp.framework;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>thirdparty\omnis.sdk\win\complib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;is64bit;_WINDOWS;iswin32;isXCOMPLIB;NO_STRICT;isunicode;UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_DEPRECATE;_UNICODE;OMNISSDK=102;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
Expand All @@ -170,7 +170,7 @@
<AdditionalDependencies>odbc32.lib;odbccp32.lib;omnisu64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutputPath)$(ProjectName).dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\ulibs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>thirdparty\omnis.sdk\win\ulibs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>libc.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<ModuleDefinitionFile>.\$(ProjectName).def</ModuleDefinitionFile>
<ProgramDatabaseFile>$(OutputPath)$(ProjectName).pdb</ProgramDatabaseFile>
Expand All @@ -196,7 +196,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\complib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>thirdparty\omnis.sdk\win\complib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;iswin32;isXCOMPLIB;NO_STRICT;isunicode;_UNICODE;UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
Expand All @@ -218,7 +218,7 @@
<AdditionalDependencies>odbc32.lib;odbccp32.lib;omnisu.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>.\UDeb/generic.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\ulibs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>thirdparty\omnis.sdk\win\ulibs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>libc.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<ModuleDefinitionFile>.\Generic.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
Expand All @@ -244,7 +244,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\complib;..\omnis.xcomp.framework;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>thirdparty\omnis.sdk\win\complib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;is64bit;_WINDOWS;iswin32;isXCOMPLIB;NO_STRICT;isunicode;_UNICODE;UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_DEPRECATE;OMNISSDK=102;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<StructMemberAlignment>Default</StructMemberAlignment>
Expand All @@ -265,7 +265,7 @@
<AdditionalDependencies>odbc32.lib;odbccp32.lib;omnisu64_debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutputPath)$(ProjectName).dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\ulibs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>thirdparty\omnis.sdk\win\ulibs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>libc.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<ModuleDefinitionFile>.\$(ProjectName).def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
Expand Down
Loading

0 comments on commit 8013a1d

Please sign in to comment.