Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: tbttfox/TwistSpline
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f6d9954688a608be628714e92c3d280264c6f0a5
Choose a base ref
..
head repository: tbttfox/TwistSpline
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ec9adc446c25a42d33e40ec28452a7da43d718d7
Choose a head ref
Showing with 31 additions and 10 deletions.
  1. +0 −1 .github/workflows/main.yml
  2. +3 −0 .gitignore
  3. +24 −9 meson.build
  4. +1 −0 src/pluginMain.cpp
  5. +3 −0 src/version.h.in
1 change: 0 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -69,7 +69,6 @@ jobs:
setup-args: >
-Dmaya:maya_version=${{ matrix.maya }}
-Dmaya:maya_devkit_base=${{ steps.get-devkit.outputs.devkit-path }}
-DVERSION_STRING=${{ steps.previoustag.outputs.tag }}
--buildtype release
--backend ninja
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -57,3 +57,6 @@ $RECYCLE.BIN/
Network Trash Folder
Temporary Items
.apdisk

# Auto-created version files
version.h
33 changes: 24 additions & 9 deletions meson.build
Original file line number Diff line number Diff line change
@@ -4,16 +4,31 @@ maya_dep = dependency('maya')
maya_name_suffix = maya_dep.get_variable('name_suffix')
maya_version = maya_dep.get_variable('maya_version')

source_files = files([
'src/pluginMain.cpp',
'src/drawOverride.cpp',
'src/twistSplineData.cpp',
'src/twistSplineNode.cpp',
'src/riderConstraint.cpp',
'src/twistTangentNode.cpp',
'src/twistMultiTangentNode.cpp',
])
source_files = [
'src/pluginMain.cpp',
'src/drawOverride.cpp',
'src/twistSplineData.cpp',
'src/twistSplineNode.cpp',
'src/riderConstraint.cpp',
'src/twistTangentNode.cpp',
'src/twistMultiTangentNode.cpp',
]

# If a user-built version file exists, then just use that
# Otherwise grab the latest tag from git
fs = import('fs')
if fs.is_file('src/version.h')
message('Using existing version.h')
else
git = find_program('git', native: true, required: true)
version_h = vcs_tag(
command: [git, 'describe', '--tags', '--match', 'v[0-9]*', '--dirty=+'],
fallback: 'v0.0.1',
input: 'src/version.h.in',
output: 'version.h',
)
source_files = source_files + version_h
endif
harm_inc = include_directories(['src'])

outlib = shared_library(
1 change: 1 addition & 0 deletions src/pluginMain.cpp
Original file line number Diff line number Diff line change
@@ -29,6 +29,7 @@ SOFTWARE.
#include "twistMultiTangentNode.h"
#include "drawOverride.h"
#include <maya/MFnPlugin.h>
#include "version.h"

MStatus initializePlugin( MObject obj ) {
MStatus status;
3 changes: 3 additions & 0 deletions src/version.h.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#pragma once
#define VERSION_STRING "@VCS_TAG@"