[cpp-sp] branch main updated: Bump version to 3.3.0, DLL names to 3_3
Scott Cantor
cantor.2 at osu.edu
Tue Oct 19 18:13:07 UTC 2021
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository cpp-sp.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=9ce8e3aa16aa102e7c0c90f68f37b5da0fcaf9b1
The following commit(s) were added to refs/heads/main by this push:
new 9ce8e3aa Bump version to 3.3.0, DLL names to 3_3
9ce8e3aa is described below
commit 9ce8e3aa16aa102e7c0c90f68f37b5da0fcaf9b1
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Oct 19 14:12:53 2021 -0400
Bump version to 3.3.0, DLL names to 3_3
---
Projects/vc15/shibsp/shibsp-lite.vcxproj | 8 ++++----
Projects/vc15/shibsp/shibsp.vcxproj | 8 ++++----
config_win32.h | 6 +++---
configure.ac | 2 +-
shibsp/Makefile.am | 4 ++--
shibsp/shibsp.rc | 12 ++++++------
shibsp/version.h | 4 ++--
util/resourceCommon.rci | 6 +++---
8 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/Projects/vc15/shibsp/shibsp-lite.vcxproj b/Projects/vc15/shibsp/shibsp-lite.vcxproj
index 5a718883..499fea5b 100644
--- a/Projects/vc15/shibsp/shibsp-lite.vcxproj
+++ b/Projects/vc15/shibsp/shibsp-lite.vcxproj
@@ -92,10 +92,10 @@
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)3_2</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)3_2</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)3_2D</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)3_2D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)3_3</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)3_3</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)3_3D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)3_3D</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
diff --git a/Projects/vc15/shibsp/shibsp.vcxproj b/Projects/vc15/shibsp/shibsp.vcxproj
index 35947ad5..bb1ae5cc 100644
--- a/Projects/vc15/shibsp/shibsp.vcxproj
+++ b/Projects/vc15/shibsp/shibsp.vcxproj
@@ -90,10 +90,10 @@
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)3_2D</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)3_2D</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)3_2</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)3_2</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)3_3D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)3_3D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)3_3</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)3_3</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IntDir>$(SolutionDir)..\..\Build\VC15\$(projectName)\$(Platform)\$(Configuration)\</IntDir>
diff --git a/config_win32.h b/config_win32.h
index 87d6fc2c..fa785a28 100644
--- a/config_win32.h
+++ b/config_win32.h
@@ -121,13 +121,13 @@
#define PACKAGE_NAME "shibboleth"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "shibboleth 3.2.3"
+#define PACKAGE_STRING "shibboleth 3.3.0"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "shibboleth-sp"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "3.2.3"
+#define PACKAGE_VERSION "3.3.0"
/* Define to the necessary symbol if this constant uses a non-standard name on
your system. */
@@ -140,7 +140,7 @@
/* #undef TM_IN_SYS_TIME */
/* Version number of package */
-#define VERSION "3.2.3"
+#define VERSION "3.3.0"
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
diff --git a/configure.ac b/configure.ac
index ab379e91..2b23e2d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.50])
-AC_INIT([shibboleth],[3.2.3],[https://issues.shibboleth.net/],[shibboleth-sp])
+AC_INIT([shibboleth],[3.3.0],[https://shibboleth.atlassian.net/jira],[shibboleth-sp])
AC_CONFIG_SRCDIR(shibsp)
AC_CONFIG_AUX_DIR(build-aux)
AC_CONFIG_MACRO_DIR(m4)
diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
index b8e0d90d..a45210fd 100644
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -244,7 +244,7 @@ libshibsp_la_SOURCES = \
# this is different from the project version
# http://sources.redhat.com/autobook/autobook/autobook_91.html
-libshibsp_la_LDFLAGS = -version-info 10:2:0
+libshibsp_la_LDFLAGS = -version-info 10:3:0
libshibsp_la_CXXFLAGS = \
$(AM_CXXFLAGS) \
$(BOOST_CPPFLAGS) \
@@ -263,7 +263,7 @@ libshibsp_la_LIBADD = \
$(xerces_LIBS) \
$(xmlsec_LIBS) \
$(xmltooling_LIBS)
-libshibsp_lite_la_LDFLAGS = -version-info 10:2:0
+libshibsp_lite_la_LDFLAGS = -version-info 10:3:0
libshibsp_lite_la_CXXFLAGS = -DSHIBSP_LITE \
$(AM_CXXFLAGS) \
$(BOOST_CPPFLAGS) \
diff --git a/shibsp/shibsp.rc b/shibsp/shibsp.rc
index 012d029d..b2c2838e 100644
--- a/shibsp/shibsp.rc
+++ b/shibsp/shibsp.rc
@@ -68,20 +68,20 @@ BEGIN
VALUE "LegalTrademarks", "\0"
#ifdef SHIBSP_LITE
#ifdef _DEBUG
- VALUE "OriginalFilename", "shibsp-lite3_2D.dll\0"
+ VALUE "OriginalFilename", "shibsp-lite3_3D.dll\0"
#else
- VALUE "OriginalFilename", "shibsp-lite3_2.dll\0"
+ VALUE "OriginalFilename", "shibsp-lite3_3.dll\0"
#endif
#else
#ifdef _DEBUG
- VALUE "OriginalFilename", "shibsp3_2D.dll\0"
+ VALUE "OriginalFilename", "shibsp3_3D.dll\0"
#else
- VALUE "OriginalFilename", "shibsp3_2.dll\0"
+ VALUE "OriginalFilename", "shibsp3_3.dll\0"
#endif
#endif
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 3.2.3\0"
- VALUE "ProductVersion", "3, 2, 3, 0\0"
+ VALUE "ProductName", "Shibboleth 3.3.0\0"
+ VALUE "ProductVersion", "3, 3, 0, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/shibsp/version.h b/shibsp/version.h
index f3500032..77675728 100644
--- a/shibsp/version.h
+++ b/shibsp/version.h
@@ -43,8 +43,8 @@
*/
#define SHIBSP_VERSION_MAJOR 3
-#define SHIBSP_VERSION_MINOR 2
-#define SHIBSP_VERSION_REVISION 3
+#define SHIBSP_VERSION_MINOR 3
+#define SHIBSP_VERSION_REVISION 0
/** DO NOT MODIFY BELOW THIS LINE */
diff --git a/util/resourceCommon.rci b/util/resourceCommon.rci
index c374f469..d7d01f83 100644
--- a/util/resourceCommon.rci
+++ b/util/resourceCommon.rci
@@ -1,10 +1,10 @@
VALUE "Comments", "\0"
VALUE "CompanyName", "Shibboleth Consortium\0"
- VALUE "FileVersion", "3,2,3,0\0"
+ VALUE "FileVersion", "3,3,3,0\0"
VALUE "LegalCopyright", "Copyright 2021 Various\0"
VALUE "LegalTrademarks", "\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 3.2.3\0"
- VALUE "ProductVersion", "3, 2, 3, 0\0"
+ VALUE "ProductName", "Shibboleth 3.3.0\0"
+ VALUE "ProductVersion", "3, 3, 0, 0\0"
VALUE "SpecialBuild", "\0"
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list