diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a754feb..6423d6a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,8 +3,8 @@ name: build on: push: branches: [ master ] - tags: - - v* + #tags: + # - v* pull_request: branches: [ master ] @@ -33,16 +33,16 @@ jobs: matrix: include: - #- maya: "2018" - # devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2018/Autodesk_Maya_2018_7_Update_DEVKIT_Windows.zip" - #- maya: "2019" - # devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2019/Autodesk_Maya_2019_3_Update_DEVKIT_Windows.zip" + - maya: "2018" + devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2018/Autodesk_Maya_2018_7_Update_DEVKIT_Windows.zip" + - maya: "2019" + devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2019/Autodesk_Maya_2019_3_Update_DEVKIT_Windows.zip" - maya: "2020" devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2020/Autodesk_Maya_2020_4_Update_DEVKIT_Windows.zip" - #- maya: "2022" - # devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2022/Autodesk_Maya_2022_3_Update_DEVKIT_Windows.zip" - #- maya: "2023" - # devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2023/Autodesk_Maya_2023_DEVKIT_Windows.zip" + - maya: "2022" + devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2022/Autodesk_Maya_2022_3_Update_DEVKIT_Windows.zip" + - maya: "2023" + devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2023/Autodesk_Maya_2023_DEVKIT_Windows.zip" steps: - name: Checkout code @@ -83,16 +83,16 @@ jobs: matrix: include: - #- maya: "2018" - # devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2018/Autodesk_Maya_2018_7_Update_DEVKIT_Mac.dmg" - #- maya: "2019" - # devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2019/Autodesk_Maya_2019_3_Update_DEVKIT_Mac.dmg" + - maya: "2018" + devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2018/Autodesk_Maya_2018_7_Update_DEVKIT_Mac.dmg" + - maya: "2019" + devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2019/Autodesk_Maya_2019_3_Update_DEVKIT_Mac.dmg" - maya: "2020" devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2020/Autodesk_Maya_2020_4_Update_DEVKIT_Mac.dmg" - #- maya: "2022" - # devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2022/Autodesk_Maya_2022_3_Update_DEVKIT_Mac.dmg" - #- maya: "2023" - # devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2023/Autodesk_Maya_2023_DEVKIT_Mac.dmg" + - maya: "2022" + devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2022/Autodesk_Maya_2022_3_Update_DEVKIT_Mac.dmg" + - maya: "2023" + devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2023/Autodesk_Maya_2023_DEVKIT_Mac.dmg" steps: - name: Checkout code @@ -137,17 +137,16 @@ jobs: matrix: include: - # The 2018 and 2019 containers use cmake 3.9, and I'm using functions introduced in 3.16 - #- maya: "2018.7" - # year: "2018" - #- maya: "2019.3" - # year: "2019" + - maya: "2018.7" + year: "2018" + - maya: "2019.3" + year: "2019" - maya: "2020.4" year: "2020" - #- maya: "2022.3" - # year: "2022" - #- maya: "2023" - # year: "2023" + - maya: "2022.3" + year: "2022" + - maya: "2023" + year: "2023" steps: - name: Checkout code @@ -176,6 +175,7 @@ jobs: path: | artifacts/plug-ins/TwistSpline.so + # # Shipping # @@ -193,7 +193,7 @@ jobs: runs-on: ubuntu-latest # Only run on e.g. v0.1.0 - if: startsWith(github.ref, 'refs/tags/v') + #if: startsWith(github.ref, 'refs/tags/v') steps: - name: Checkout code @@ -223,7 +223,7 @@ jobs: run: | cp ./TwistSpline.mod modules/ mkdir -p modules/TwistSpline/scripts - cp -r ./scripts/TwistSpline modules/TwistSpline/scripts + cp -r ./scripts modules/TwistSpline zip -r TwistSpline-${{env.RELEASE_VERSION}}.zip modules/ - name: Upload distribution diff --git a/CMakeLists.txt b/CMakeLists.txt index fee6e8c..25ff7b7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,10 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) project(TwistSpline) set(CMAKE_CXX_STANDARD 14) -cmake_policy(SET CMP0072 NEW) + +if (${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.11) + cmake_policy(SET CMP0072 NEW) +endif() set(MAYA_VERSION 2020 CACHE STRING "Maya version") diff --git a/TwistSpline.mod b/TwistSpline.mod new file mode 100644 index 0000000..5802ae6 --- /dev/null +++ b/TwistSpline.mod @@ -0,0 +1,44 @@ ++ PLATFORM:win64 MAYAVERSION:2018 TwistSpline 1.0.0 TwistSpline +plug-ins: windows-2018 + ++ PLATFORM:linux MAYAVERSION:2018 TwistSpline 1.0.0 TwistSpline +plug-ins: linux-2018 + ++ PLATFORM:mac MAYAVERSION:2018 TwistSpline 1.0.0 TwistSpline +plug-ins: mac-2018 + ++ PLATFORM:win64 MAYAVERSION:2019 TwistSpline 1.0.0 TwistSpline +plug-ins: windows-2019 + ++ PLATFORM:linux MAYAVERSION:2019 TwistSpline 1.0.0 TwistSpline +plug-ins: linux-2019 + ++ PLATFORM:mac MAYAVERSION:2019 TwistSpline 1.0.0 TwistSpline +plug-ins: mac-2019 + ++ PLATFORM:win64 MAYAVERSION:2020 TwistSpline 1.0.0 TwistSpline +plug-ins: windows-2020 + ++ PLATFORM:linux MAYAVERSION:2020 TwistSpline 1.0.0 TwistSpline +plug-ins: linux-2020 + ++ PLATFORM:mac MAYAVERSION:2020 TwistSpline 1.0.0 TwistSpline +plug-ins: mac-2020 + ++ PLATFORM:win64 MAYAVERSION:2022 TwistSpline 1.0.0 TwistSpline +plug-ins: windows-2022 + ++ PLATFORM:linux MAYAVERSION:2022 TwistSpline 1.0.0 TwistSpline +plug-ins: linux-2022 + ++ PLATFORM:mac MAYAVERSION:2022 TwistSpline 1.0.0 TwistSpline +plug-ins: mac-2022 + ++ PLATFORM:win64 MAYAVERSION:2023 TwistSpline 1.0.0 TwistSpline +plug-ins: windows-2023 + ++ PLATFORM:linux MAYAVERSION:2023 TwistSpline 1.0.0 TwistSpline +plug-ins: linux-2023 + ++ PLATFORM:mac MAYAVERSION:2023 TwistSpline 1.0.0 TwistSpline +plug-ins: mac-2023