Bump version and parameterize msbuild path

diff --git a/config_win32.h b/config_win32.h
index 5d4db31..29aa511 100644 (file)
--- a/config_win32.h
+++ b/config_win32.h
@@ -87,13 +87,13 @@
 #define PACKAGE_NAME "opensaml"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "opensaml 2.5.2"
+#define PACKAGE_STRING "opensaml 2.5.3"
 
 /* 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.5.2"
+#define PACKAGE_VERSION "2.5.3"
 
 /* Define to the necessary symbol if this constant uses a non-standard name on
    your system. */
@@ -106,7 +106,7 @@
 /* #undef TM_IN_SYS_TIME */
 
 /* Version number of package */
-#define VERSION "2.5.2"
+#define VERSION "2.5.3"
 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */

diff --git a/configure.ac b/configure.ac
index 38233e3..530b234 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.50])
-AC_INIT([opensaml],[2.5.2],[https://issues.shibboleth.net/],[opensaml])
+AC_INIT([opensaml],[2.5.3],[https://issues.shibboleth.net/],[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 ffb9831..ed59585 100644 (file)
--- a/saml/Makefile.am
+++ b/saml/Makefile.am
@@ -191,7 +191,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 8:2:0
+libsaml_la_LDFLAGS = -version-info 8:3: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 a381b5b..13fe8a1 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,5,2,0\r
- PRODUCTVERSION 2,5,2,0\r
+ FILEVERSION 2,5,3,0\r
+ PRODUCTVERSION 2,5,3,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -47,7 +47,7 @@ BEGIN
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "Shibboleth Consortium\0"\r
             VALUE "FileDescription", "OpenSAML Library\0"\r
-            VALUE "FileVersion", "2, 5, 2, 0\0"\r
+            VALUE "FileVersion", "2, 5, 3, 0\0"\r
 #ifdef _DEBUG\r
             VALUE "InternalName", "saml2_5D\0"\r
 #else\r
@@ -61,8 +61,8 @@ BEGIN
             VALUE "OriginalFilename", "saml2_5.dll\0"\r
 #endif\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "OpenSAML 2.5.2\0"\r
-            VALUE "ProductVersion", "2, 5, 2, 0\0"\r
+            VALUE "ProductName", "OpenSAML 2.5.3\0"\r
+            VALUE "ProductVersion", "2, 5, 3, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r

diff --git a/saml/saml.vcxproj b/saml/saml.vcxproj
index 150f6b8..bde47d4 100644 (file)
--- a/saml/saml.vcxproj
+++ b/saml/saml.vcxproj
@@ -59,8 +59,8 @@
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <Import Project="..\..\BuildPath.props" />\r
-  <Import Project="..\MsBuild\Versions.props" />\r
-  <Import Project="..\MsBuild\Includes.props" />\r
+  <Import Project="$(ParentRoot)\Versions.props" />\r
+  <Import Project="$(ParentRoot)\Includes.props" />\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>\r

diff --git a/saml/version.h b/saml/version.h
index 6102bfe..e4bf2c4 100644 (file)
--- a/saml/version.h
+++ b/saml/version.h
@@ -44,7 +44,7 @@
 
 #define OPENSAML_VERSION_MAJOR 2
 #define OPENSAML_VERSION_MINOR 5
-#define OPENSAML_VERSION_REVISION 2
+#define OPENSAML_VERSION_REVISION 3
 
 /** DO NOT MODIFY BELOW THIS LINE */
 

diff --git a/samlsign/samlsign.rc b/samlsign/samlsign.rc
index c44a4a1..8b73bd3 100644 (file)
--- a/samlsign/samlsign.rc
+++ b/samlsign/samlsign.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,5,2,0
- PRODUCTVERSION 2,5,2,0
+ FILEVERSION 2,5,3,0
+ PRODUCTVERSION 2,5,3,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Shibboleth Consortium\0"
             VALUE "FileDescription", "OpenSAML Signature Utility\0"
-            VALUE "FileVersion", "2, 5, 2, 0\0"
+            VALUE "FileVersion", "2, 5, 3, 0\0"
             VALUE "InternalName", "samlsign\0"
             VALUE "LegalCopyright", "Copyright © 2013 UCAID\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "samlsign.exe\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "OpenSAML 2.5.2\0"
-            VALUE "ProductVersion", "2, 5, 2, 0\0"
+            VALUE "ProductName", "OpenSAML 2.5.3\0"
+            VALUE "ProductVersion", "2, 5, 3, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END

diff --git a/samlsign/samlsign.vcxproj b/samlsign/samlsign.vcxproj
index dc7b998..2bdfd13 100644 (file)
--- a/samlsign/samlsign.vcxproj
+++ b/samlsign/samlsign.vcxproj
@@ -59,8 +59,8 @@
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <Import Project="..\..\BuildPath.props" />\r
-  <Import Project="..\MsBuild\Versions.props" />\r
-  <Import Project="..\MsBuild\Includes.props" />\r
+  <Import Project="$(ParentRoot)\Versions.props" />\r
+  <Import Project="$(ParentRoot)\Includes.props" />\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>\r

diff --git a/samltest/samltest.vcxproj b/samltest/samltest.vcxproj
index 3a207c7..0ada19f 100644 (file)
--- a/samltest/samltest.vcxproj
+++ b/samltest/samltest.vcxproj
@@ -22,7 +22,7 @@
     <ProjectGuid>{8BBB3B12-DBA1-4533-9C36-2CA95F1F1659}</ProjectGuid>\r
     <RootNamespace>samltest</RootNamespace>\r
     <Keyword>Win32Proj</Keyword>\r
-    <CxxTestRoot>..\..\..\cxxtest\</CxxTestRoot>\r
+    <CxxTestRoot>$(BuildRoot)\cxxtest</CxxTestRoot>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
@@ -60,8 +60,8 @@
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <Import Project="..\..\BuildPath.props" />\r
-  <Import Project="..\MsBuild\Versions.props" />\r
-  <Import Project="..\MsBuild\Includes.props" />\r
+  <Import Project="$(ParentRoot)\Versions.props" />\r
+  <Import Project="$(ParentRoot)\Includes.props" />\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>\r