Skip to content

Set version everywhere it needs to be set this time #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mparry merged 1 commit into from
Oct 6, 2020
Merged

Set version everywhere it needs to be set this time #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion projects/vc1x/vc1x-version.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="UserMacros">
<VersionString>2_60</VersionString>
<VersionString>2_06</VersionString>
Copy link

@ghost ghost Oct 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this right?

Copy link
Contributor Author

@mparry mparry Oct 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, not very intuitive, which is probably why I got it wrong the first time!

</PropertyGroup>
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
Expand Down
6 changes: 3 additions & 3 deletions protean/version.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
#define PROTEAN_VERSION_HPP

#define PROTEAN_MAJOR_VERSION 2
#define PROTEAN_MINOR_VERSION 3
#define PROTEAN_PATCH_VERSION 2
#define PROTEAN_MINOR_VERSION 6
#define PROTEAN_PATCH_VERSION 0

#define PROTEAN_VERSION ((PROTEAN_MAJOR_VERSION * 100000) + (PROTEAN_MINOR_VERSION * 100) + PROTEAN_PATCH_VERSION)

// PROTEAN_LIB_VERSION must be defined to be the same as PROTEAN_VERSION
// but as a *string* in the form "x_y[_z]" where x is the major version
// number, y is the minor version number, and z is the patch level if not 0.

#define PROTEAN_LIB_VERSION "2_03"
#define PROTEAN_LIB_VERSION "2_06"

#endif // PROTEAN_VERSION_HPP