Bump version, fix for CPPOST-65.

diff --git a/config_win32.h b/config_win32.h
index 2820361..fbc744d 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- a/saml/saml.rc
+++ b/saml/saml.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,4,1,0\r
- PRODUCTVERSION 2,4,1,0\r
+ FILEVERSION 2,5,0,0\r
+ PRODUCTVERSION 2,5,0,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -46,23 +46,23 @@ BEGIN
         BEGIN\r
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "Internet2\0"\r
-            VALUE "FileDescription", "OpenSAML 2.4.1 Library\0"\r
-            VALUE "FileVersion", "2, 4, 1, 0\0"\r
+            VALUE "FileDescription", "OpenSAML 2.5 Library\0"\r
+            VALUE "FileVersion", "2, 5, 0, 0\0"\r
 #ifdef _DEBUG\r
-            VALUE "InternalName", "saml2_4D\0"\r
+            VALUE "InternalName", "saml2_5D\0"\r
 #else\r
-            VALUE "InternalName", "saml2_4\0"\r
+            VALUE "InternalName", "saml2_5\0"\r
 #endif\r
-            VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"\r
+            VALUE "LegalCopyright", "Copyright © 2011 UCAID\0"\r
             VALUE "LegalTrademarks", "\0"\r
 #ifdef _DEBUG\r
-            VALUE "OriginalFilename", "saml2_4D.dll\0"\r
+            VALUE "OriginalFilename", "saml2_5D.dll\0"\r
 #else\r
-            VALUE "OriginalFilename", "saml2_4.dll\0"\r
+            VALUE "OriginalFilename", "saml2_5.dll\0"\r
 #endif\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "OpenSAML 2.4.1\0"\r
-            VALUE "ProductVersion", "2, 4, 1, 0\0"\r
+            VALUE "ProductName", "OpenSAML 2.5\0"\r
+            VALUE "ProductVersion", "2, 5, 0, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r

diff --git a/saml/saml.vcxproj b/saml/saml.vcxproj
index c817340..e960c5f 100644 (file)
--- a/saml/saml.vcxproj
+++ b/saml/saml.vcxproj
@@ -84,17 +84,16 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>\r
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />\r
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)2_4D</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)2_4D</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)2_4</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)2_4</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)2_5D</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)2_5D</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)2_5</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)2_5</TargetName>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
       <AdditionalIncludeDirectories>$(SolutionDir);$(ProjectDir);..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <MinimalRebuild>true</MinimalRebuild>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <BrowseInformation>true</BrowseInformation>\r
       <WarningLevel>Level3</WarningLevel>\r
@@ -120,7 +119,6 @@
       <Optimization>Disabled</Optimization>\r
       <AdditionalIncludeDirectories>$(SolutionDir);$(ProjectDir);..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <MinimalRebuild>true</MinimalRebuild>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <BrowseInformation>true</BrowseInformation>\r
       <WarningLevel>Level3</WarningLevel>\r
@@ -275,6 +273,7 @@
     <ClCompile Include="profile\impl\AudienceRestrictionRule.cpp" />\r
     <ClCompile Include="profile\impl\ConditionsRule.cpp" />\r
     <ClCompile Include="profile\impl\IgnoreRule.cpp" />\r
+    <ClCompile Include="version.cpp" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="Assertion.h" />\r

diff --git a/saml/saml.vcxproj.filters b/saml/saml.vcxproj.filters
index 7bef27d..5bf3d4d 100644 (file)
--- a/saml/saml.vcxproj.filters
+++ b/saml/saml.vcxproj.filters
@@ -360,6 +360,9 @@
     <ClCompile Include="saml2\metadata\impl\DiscoverableMetadataProvider.cpp">\r
       <Filter>Source Files\saml2\metadata\impl</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="version.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="Assertion.h">\r

diff --git a/saml/version.cpp b/saml/version.cpp
new file mode 100644 (file)
index 0000000..cccacca
--- /dev/null
+++ b/saml/version.cpp
@@ -0,0 +1,32 @@
+/*\r
+ * Licensed to UCAID under one or more contributor license agreements.\r
+ * See the NOTICE file distributed with this work for additional information\r
+ * regarding copyright ownership. The ASF licenses this file to you under\r
+ * the Apache License, Version 2.0 (the "License"); you may not use this\r
+ * file except in compliance with the License.  You may obtain a copy of the\r
+ * License at\r
+ *\r
+ *       http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
+\r
+/**\r
+ * version.cpp\r
+ * \r
+ * Library version macros and constants.\r
+ */\r
+\r
+#include "internal.h"\r
+#include "version.h"\r
+\r
+SAML_API const char* const    gOpenSAMLVersionStr = OPENSAML_VERSIONSTR;\r
+SAML_API const char* const    gOpenSAMLFullVersionStr = OPENSAML_FULLVERSIONSTR;\r
+SAML_API const char* const    gOpenSAMLDotVersionStr = OPENSAML_FULLVERSIONDOT;\r
+SAML_API const unsigned int   gOpenSAMLMajVersion = OPENSAML_VERSION_MAJOR;\r
+SAML_API const unsigned int   gOpenSAMLMinVersion = OPENSAML_VERSION_MINOR;\r
+SAML_API const unsigned int   gOpenSAMLRevision   = OPENSAML_VERSION_REVISION;\r

diff --git a/saml/version.h b/saml/version.h
index fc3ebec..7aed170 100644 (file)
--- 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 <saml/base.h>
 #include <xercesc/util/XercesVersion.hpp>
 
 // ---------------------------------------------------------------------------
@@ -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 (file)
--- a/samlsign/samlsign.vcxproj
+++ b/samlsign/samlsign.vcxproj
@@ -90,7 +90,6 @@
       <Optimization>Disabled</Optimization>\r
       <AdditionalIncludeDirectories>$(SolutionDir);$(ProjectDir);..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <MinimalRebuild>true</MinimalRebuild>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
@@ -114,7 +113,6 @@
       <Optimization>Disabled</Optimization>\r
       <AdditionalIncludeDirectories>$(SolutionDir);$(ProjectDir);..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <MinimalRebuild>true</MinimalRebuild>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r

diff --git a/samltest/samltest.vcxproj b/samltest/samltest.vcxproj
index 2d0e8df..67b5235 100644 (file)
--- a/samltest/samltest.vcxproj
+++ b/samltest/samltest.vcxproj
@@ -90,7 +90,6 @@
       <Optimization>Disabled</Optimization>\r
       <AdditionalIncludeDirectories>$(SolutionDir);$(ProjectDir);..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <MinimalRebuild>true</MinimalRebuild>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <BrowseInformation>true</BrowseInformation>\r
       <WarningLevel>Level3</WarningLevel>\r
@@ -112,7 +111,6 @@
       <Optimization>Disabled</Optimization>\r
       <AdditionalIncludeDirectories>$(SolutionDir);$(ProjectDir);..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <MinimalRebuild>true</MinimalRebuild>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <BrowseInformation>true</BrowseInformation>\r
       <WarningLevel>Level3</WarningLevel>\r