From d6c484465db0191ac19e9dcf02104a022b63334e Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Thu, 19 May 2011 21:59:05 +0000 Subject: [PATCH] Bump version, fix for CPPOST-65. --- config_win32.h | 6 +++--- configure.ac | 2 +- saml/Makefile.am | 3 ++- saml/saml.rc | 22 +++++++++++----------- saml/saml.vcxproj | 11 +++++------ saml/saml.vcxproj.filters | 3 +++ saml/version.cpp | 32 ++++++++++++++++++++++++++++++++ saml/version.h | 31 +++++++++++++++++-------------- samlsign/samlsign.vcxproj | 2 -- samltest/samltest.vcxproj | 2 -- 10 files changed, 74 insertions(+), 40 deletions(-) create mode 100644 saml/version.cpp diff --git a/config_win32.h b/config_win32.h index 2820361..fbc744d 100644 --- a/config_win32.h +++ b/config_win32.h @@ -67,13 +67,13 @@ #define PACKAGE_NAME "opensaml" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "opensaml 2.4.1" +#define PACKAGE_STRING "opensaml 2.5" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "opensaml" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.4.1" +#define PACKAGE_VERSION "2.5" /* Define to the necessary symbol if this constant uses a non-standard name on your system. */ @@ -86,7 +86,7 @@ /* #undef TM_IN_SYS_TIME */ /* Version number of package */ -#define VERSION "2.4.1" +#define VERSION "2.5" /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ diff --git a/configure.ac b/configure.ac index f223309..eb828e1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.50]) -AC_INIT([opensaml],[2.4.1],[https://bugs.internet2.edu/],[opensaml]) +AC_INIT([opensaml],[2.5],[https://bugs.internet2.edu/],[opensaml]) AC_CONFIG_SRCDIR(saml) AC_CONFIG_AUX_DIR(build-aux) AC_CONFIG_MACRO_DIR(m4) diff --git a/saml/Makefile.am b/saml/Makefile.am index 3741a34..9a690bd 100644 --- a/saml/Makefile.am +++ b/saml/Makefile.am @@ -104,6 +104,7 @@ noinst_HEADERS = \ libsaml_la_SOURCES = \ SAMLConfig.cpp \ + version.cpp \ binding/impl/ArtifactMap.cpp \ binding/impl/ClientCertAuthRule.cpp \ binding/impl/MessageDecoder.cpp \ @@ -185,7 +186,7 @@ libsaml_la_SOURCES = \ # this is different from the project version # http://sources.redhat.com/autobook/autobook/autobook_91.html -libsaml_la_LDFLAGS = -version-info 7:1:0 +libsaml_la_LDFLAGS = -version-info 8:0:0 install-exec-hook: for la in $(lib_LTLIBRARIES) ; do rm -f $(DESTDIR)$(libdir)/$$la ; done diff --git a/saml/saml.rc b/saml/saml.rc index a543a1c..b923f4b 100644 --- a/saml/saml.rc +++ b/saml/saml.rc @@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,4,1,0 - PRODUCTVERSION 2,4,1,0 + FILEVERSION 2,5,0,0 + PRODUCTVERSION 2,5,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -46,23 +46,23 @@ BEGIN BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "Internet2\0" - VALUE "FileDescription", "OpenSAML 2.4.1 Library\0" - VALUE "FileVersion", "2, 4, 1, 0\0" + VALUE "FileDescription", "OpenSAML 2.5 Library\0" + VALUE "FileVersion", "2, 5, 0, 0\0" #ifdef _DEBUG - VALUE "InternalName", "saml2_4D\0" + VALUE "InternalName", "saml2_5D\0" #else - VALUE "InternalName", "saml2_4\0" + VALUE "InternalName", "saml2_5\0" #endif - VALUE "LegalCopyright", "Copyright © 2011 Internet2\0" + VALUE "LegalCopyright", "Copyright © 2011 UCAID\0" VALUE "LegalTrademarks", "\0" #ifdef _DEBUG - VALUE "OriginalFilename", "saml2_4D.dll\0" + VALUE "OriginalFilename", "saml2_5D.dll\0" #else - VALUE "OriginalFilename", "saml2_4.dll\0" + VALUE "OriginalFilename", "saml2_5.dll\0" #endif VALUE "PrivateBuild", "\0" - VALUE "ProductName", "OpenSAML 2.4.1\0" - VALUE "ProductVersion", "2, 4, 1, 0\0" + VALUE "ProductName", "OpenSAML 2.5\0" + VALUE "ProductVersion", "2, 5, 0, 0\0" VALUE "SpecialBuild", "\0" END END diff --git a/saml/saml.vcxproj b/saml/saml.vcxproj index c817340..e960c5f 100644 --- a/saml/saml.vcxproj +++ b/saml/saml.vcxproj @@ -84,17 +84,16 @@ AllRules.ruleset - $(ProjectName)2_4D - $(ProjectName)2_4D - $(ProjectName)2_4 - $(ProjectName)2_4 + $(ProjectName)2_5D + $(ProjectName)2_5D + $(ProjectName)2_5 + $(ProjectName)2_5 Disabled $(SolutionDir);$(ProjectDir);..\..\cpp-xmltooling;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true MultiThreadedDebugDLL true Level3 @@ -120,7 +119,6 @@ Disabled $(SolutionDir);$(ProjectDir);..\..\cpp-xmltooling;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true MultiThreadedDebugDLL true Level3 @@ -275,6 +273,7 @@ + diff --git a/saml/saml.vcxproj.filters b/saml/saml.vcxproj.filters index 7bef27d..5bf3d4d 100644 --- a/saml/saml.vcxproj.filters +++ b/saml/saml.vcxproj.filters @@ -360,6 +360,9 @@ Source Files\saml2\metadata\impl + + Source Files + diff --git a/saml/version.cpp b/saml/version.cpp new file mode 100644 index 0000000..cccacca --- /dev/null +++ b/saml/version.cpp @@ -0,0 +1,32 @@ +/* + * Licensed to UCAID under one or more contributor license agreements. + * See the NOTICE file distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may not use this + * file except in compliance with the License. You may obtain a copy of the + * License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * version.cpp + * + * Library version macros and constants. + */ + +#include "internal.h" +#include "version.h" + +SAML_API const char* const gOpenSAMLVersionStr = OPENSAML_VERSIONSTR; +SAML_API const char* const gOpenSAMLFullVersionStr = OPENSAML_FULLVERSIONSTR; +SAML_API const char* const gOpenSAMLDotVersionStr = OPENSAML_FULLVERSIONDOT; +SAML_API const unsigned int gOpenSAMLMajVersion = OPENSAML_VERSION_MAJOR; +SAML_API const unsigned int gOpenSAMLMinVersion = OPENSAML_VERSION_MINOR; +SAML_API const unsigned int gOpenSAMLRevision = OPENSAML_VERSION_REVISION; diff --git a/saml/version.h b/saml/version.h index fc3ebec..7aed170 100644 --- a/saml/version.h +++ b/saml/version.h @@ -1,11 +1,12 @@ /* - * Copyright 2001-2009 Internet2 - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to UCAID under one or more contributor license agreements. + * See the NOTICE file distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may not use this + * file except in compliance with the License. You may obtain a copy of the + * License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -17,7 +18,7 @@ /** * saml/version.h * - * Library version macros and constants + * Library version macros and constants. */ #ifndef __saml_version_h__ @@ -27,6 +28,7 @@ // support this kind of stuff in the future. If they ever yank some // of this stuff, it can be copied into here. +#include #include // --------------------------------------------------------------------------- @@ -38,8 +40,8 @@ */ #define OPENSAML_VERSION_MAJOR 2 -#define OPENSAML_VERSION_MINOR 4 -#define OPENSAML_VERSION_REVISION 1 +#define OPENSAML_VERSION_MINOR 5 +#define OPENSAML_VERSION_REVISION 0 /** DO NOT MODIFY BELOW THIS LINE */ @@ -60,11 +62,12 @@ #define OPENSAML_FULLVERSIONNUM INVK_CAT3_SEP_NIL(OPENSAML_VERSION_MAJOR,OPENSAML_VERSION_MINOR,OPENSAML_VERSION_REVISION) #define OPENSAML_VERSIONSTR INVK_CAT2_SEP_UNDERSCORE(OPENSAML_VERSION_MAJOR,OPENSAML_VERSION_MINOR) -const char* const gOpenSAMLVersionStr = OPENSAML_VERSIONSTR; -const char* const gOpenSAMLFullVersionStr = OPENSAML_FULLVERSIONSTR; -const unsigned int gOpenSAMLMajVersion = OPENSAML_VERSION_MAJOR; -const unsigned int gOpenSAMLMinVersion = OPENSAML_VERSION_MINOR; -const unsigned int gOpenSAMLRevision = OPENSAML_VERSION_REVISION; +extern SAML_API const char* const gOpenSAMLVersionStr; +extern SAML_API const char* const gOpenSAMLFullVersionStr; +extern SAML_API const char* const gOpenSAMLDotVersionStr; +extern SAML_API const unsigned int gOpenSAMLMajVersion; +extern SAML_API const unsigned int gOpenSAMLMinVersion; +extern SAML_API const unsigned int gOpenSAMLRevision; // OpenSAML version numeric constants that can be used for conditional // compilation purposes. diff --git a/samlsign/samlsign.vcxproj b/samlsign/samlsign.vcxproj index c833563..edcf283 100644 --- a/samlsign/samlsign.vcxproj +++ b/samlsign/samlsign.vcxproj @@ -90,7 +90,6 @@ Disabled $(SolutionDir);$(ProjectDir);..\..\cpp-xmltooling;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true MultiThreadedDebugDLL @@ -114,7 +113,6 @@ Disabled $(SolutionDir);$(ProjectDir);..\..\cpp-xmltooling;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true MultiThreadedDebugDLL diff --git a/samltest/samltest.vcxproj b/samltest/samltest.vcxproj index 2d0e8df..67b5235 100644 --- a/samltest/samltest.vcxproj +++ b/samltest/samltest.vcxproj @@ -90,7 +90,6 @@ Disabled $(SolutionDir);$(ProjectDir);..\..\cpp-xmltooling;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions) - true MultiThreadedDebugDLL true Level3 @@ -112,7 +111,6 @@ Disabled $(SolutionDir);$(ProjectDir);..\..\cpp-xmltooling;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions) - true MultiThreadedDebugDLL true Level3 -- 2.1.4