[xmltooling] 01/24: Update library version and filenames.
Etienne Dysli Metref
edm-guest at moszumanska.debian.org
Fri Jan 12 15:53:56 UTC 2018
This is an automated email from the git hooks/post-receive script.
edm-guest pushed a commit to branch master
in repository xmltooling.
commit 716e8fc1db66e05e1a5b6615a72fd76e4a6d1271
Author: Scott Cantor <cantor.2 at osu.edu>
Date: Tue Nov 21 13:50:01 2017 -0500
Update library version and filenames.
---
Projects/vc15/xmltooling/xmltooling-lite.vcxproj | 17 +++++++-------
Projects/vc15/xmltooling/xmltooling.vcxproj | 17 +++++++-------
.../vc15/xmltoolingtest/xmltoolingtest.vcxproj | 11 +++++----
config_win32.h | 6 ++---
configure.ac | 2 +-
xmltooling/Makefile.am | 4 ++--
xmltooling/version.h | 4 ++--
xmltooling/xmltooling.rc | 26 +++++++++++-----------
8 files changed, 42 insertions(+), 45 deletions(-)
diff --git a/Projects/vc15/xmltooling/xmltooling-lite.vcxproj b/Projects/vc15/xmltooling/xmltooling-lite.vcxproj
index 8d1221a..f1ca9c0 100644
--- a/Projects/vc15/xmltooling/xmltooling-lite.vcxproj
+++ b/Projects/vc15/xmltooling/xmltooling-lite.vcxproj
@@ -22,7 +22,6 @@
<ProjectGuid>{06B55A46-D3B3-41AE-B5A5-B57830BA010E}</ProjectGuid>
<RootNamespace>xmltooling-lite</RootNamespace>
<Keyword>Win32Proj</Keyword>
- <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -90,10 +89,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)2_7</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)2_7</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)2_7D</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)2_7D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)8_0</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)8_0</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)8_0D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)8_0D</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -119,7 +118,7 @@
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <ImportLibrary>$(TargetDir)$(ProjectName)1D.lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)8D.lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
@@ -149,7 +148,7 @@
<SubSystem>Windows</SubSystem>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <ImportLibrary>$(TargetDir)$(ProjectName)1D.lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)8D.lib</ImportLibrary>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -175,7 +174,7 @@
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <ImportLibrary>$(TargetDir)$(ProjectName)1.lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)8.lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
@@ -204,7 +203,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <ImportLibrary>$(TargetDir)$(ProjectName)1.lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)8.lib</ImportLibrary>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
diff --git a/Projects/vc15/xmltooling/xmltooling.vcxproj b/Projects/vc15/xmltooling/xmltooling.vcxproj
index ef5a93b..e63e3d6 100644
--- a/Projects/vc15/xmltooling/xmltooling.vcxproj
+++ b/Projects/vc15/xmltooling/xmltooling.vcxproj
@@ -22,7 +22,6 @@
<ProjectGuid>{06B55A46-D3B3-41AE-B5A5-B57830BA010D}</ProjectGuid>
<RootNamespace>xmltooling</RootNamespace>
<Keyword>Win32Proj</Keyword>
- <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -88,10 +87,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)2_7D</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)2_7D</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)2_7</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)2_7</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)8_0D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)8_0D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)8_0</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)8_0</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IntDir>$(SolutionDir)..\..\Build\VC15\$(projectName)\$(Platform)\$(Configuration)\</IntDir>
@@ -122,7 +121,7 @@
<SubSystem>Windows</SubSystem>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <ImportLibrary>$(TargetDir)$(ProjectName)1D.lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)8D.lib</ImportLibrary>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -151,7 +150,7 @@
<SubSystem>Windows</SubSystem>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <ImportLibrary>$(TargetDir)$(ProjectName)1D.lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)8D.lib</ImportLibrary>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -172,7 +171,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <ImportLibrary>$(TargetDir)$(ProjectName)1.lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)8.lib</ImportLibrary>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -196,7 +195,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <ImportLibrary>$(TargetDir)$(ProjectName)1.lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)8.lib</ImportLibrary>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
diff --git a/Projects/vc15/xmltoolingtest/xmltoolingtest.vcxproj b/Projects/vc15/xmltoolingtest/xmltoolingtest.vcxproj
index 53df758..9d1bd29 100644
--- a/Projects/vc15/xmltoolingtest/xmltoolingtest.vcxproj
+++ b/Projects/vc15/xmltoolingtest/xmltoolingtest.vcxproj
@@ -23,7 +23,6 @@
<RootNamespace>xmltoolingtest</RootNamespace>
<CxxTestRoot>$(BuildRoot)\cxxtest\</CxxTestRoot>
<Keyword>Win32Proj</Keyword>
- <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -109,7 +108,7 @@
<DisableSpecificWarnings>4275</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>xerces-c_3D.lib;xsec_1D.lib;$(SSLLib);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>xerces-c_3D.lib;xsec_2D.lib;$(SSLLib);%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -134,7 +133,7 @@
<DisableSpecificWarnings>4275</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>xerces-c_3D.lib;xsec_1D.lib;$(SSLLibD);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>xerces-c_3D.lib;xsec_2D.lib;$(SSLLibD);%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<DataExecutionPrevention>
@@ -151,7 +150,7 @@
<DisableSpecificWarnings>4275</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>xerces-c_3.lib;xsec_1.lib;$(SSLLib);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>xerces-c_3.lib;xsec_2.lib;$(SSLLib);%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -175,7 +174,7 @@
<DisableSpecificWarnings>4275</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>xerces-c_3.lib;xsec_1.lib;$(SSLLib);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>xerces-c_3.lib;xsec_2.lib;$(SSLLib);%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -482,4 +481,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/config_win32.h b/config_win32.h
index 506ebc3..40a58a8 100644
--- a/config_win32.h
+++ b/config_win32.h
@@ -114,13 +114,13 @@
#define PACKAGE_NAME "xmltooling"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xmltooling 1.6.0"
+#define PACKAGE_STRING "xmltooling 3.0.0"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "xmltooling"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.6.0"
+#define PACKAGE_VERSION "3.0.0"
/* Define to the necessary symbol if this constant uses a non-standard name on
your system. */
@@ -133,7 +133,7 @@
/* #undef TM_IN_SYS_TIME */
/* Version number of package */
-#define VERSION "1.6.0"
+#define VERSION "3.0.0"
/* Define if you wish to disable XML-Security-dependent features. */
/* #undef XMLTOOLING_NO_XMLSEC */
diff --git a/configure.ac b/configure.ac
index bd66d14..fe5ae0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
# Process this file with autoreconf
AC_PREREQ([2.50])
-AC_INIT([xmltooling],[1.6.0],[https://issues.shibboleth.net/],[xmltooling])
+AC_INIT([xmltooling],[3.0.0],[https://issues.shibboleth.net/],[xmltooling])
AC_CONFIG_SRCDIR(xmltooling)
AC_CONFIG_AUX_DIR(build-aux)
AC_CONFIG_MACRO_DIR(m4)
diff --git a/xmltooling/Makefile.am b/xmltooling/Makefile.am
index 6c8f8f2..8a5f92f 100644
--- a/xmltooling/Makefile.am
+++ b/xmltooling/Makefile.am
@@ -210,13 +210,13 @@ common_sources = \
libxmltooling_lite_la_SOURCES = \
${common_sources}
libxmltooling_lite_la_CPPFLAGS = -DXMLTOOLING_LITE
-libxmltooling_lite_la_LDFLAGS = -version-info 7:0:0
+libxmltooling_lite_la_LDFLAGS = -version-info 8:0:0
if BUILD_XMLSEC
libxmltooling_la_SOURCES = \
${common_sources} \
${xmlsec_sources}
-libxmltooling_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 7:0:0
+libxmltooling_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 8:0:0
endif
install-exec-hook:
diff --git a/xmltooling/version.h b/xmltooling/version.h
index 60288a7..8050fa3 100644
--- a/xmltooling/version.h
+++ b/xmltooling/version.h
@@ -42,8 +42,8 @@
* AND DO NOT MODIFY ANYTHING ELSE IN THIS VERSION HEADER FILE
*/
-#define XMLTOOLING_VERSION_MAJOR 1
-#define XMLTOOLING_VERSION_MINOR 6
+#define XMLTOOLING_VERSION_MAJOR 3
+#define XMLTOOLING_VERSION_MINOR 0
#define XMLTOOLING_VERSION_REVISION 0
/** DO NOT MODIFY BELOW THIS LINE */
diff --git a/xmltooling/xmltooling.rc b/xmltooling/xmltooling.rc
index 42fa549..07f82d2 100644
--- a/xmltooling/xmltooling.rc
+++ b/xmltooling/xmltooling.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,7,0,0
- PRODUCTVERSION 2,7,0,0
+ FILEVERSION 3,0,0,0
+ PRODUCTVERSION 3,0,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -51,38 +51,38 @@ BEGIN
#else
VALUE "FileDescription", "OpenSAML XMLTooling Library\0"
#endif
- VALUE "FileVersion", "2, 7, 0, 0\0"
+ VALUE "FileVersion", "3, 0, 0, 0\0"
#ifdef XMLTOOLING_LITE
#ifdef _DEBUG
- VALUE "InternalName", "xmltooling-lite2_7D\0"
+ VALUE "InternalName", "xmltooling-lite8_0D\0"
#else
- VALUE "InternalName", "xmltooling-lite2_7\0"
+ VALUE "InternalName", "xmltooling-lite8_0\0"
#endif
#else
#ifdef _DEBUG
- VALUE "InternalName", "xmltooling2_7D\0"
+ VALUE "InternalName", "xmltooling8_0D\0"
#else
- VALUE "InternalName", "xmltooling2_7\0"
+ VALUE "InternalName", "xmltooling8_0\0"
#endif
#endif
VALUE "LegalCopyright", "Copyright � 2017 UCAID\0"
VALUE "LegalTrademarks", "\0"
#ifdef XMLTOOLING_LITE
#ifdef _DEBUG
- VALUE "OriginalFilename", "xmltooling-lite2_7D.dll\0"
+ VALUE "OriginalFilename", "xmltooling-lite8_0D.dll\0"
#else
- VALUE "OriginalFilename", "xmltooling-lite2_7.dll\0"
+ VALUE "OriginalFilename", "xmltooling-lite8_0.dll\0"
#endif
#else
#ifdef _DEBUG
- VALUE "OriginalFilename", "xmltooling2_7.dll\0"
+ VALUE "OriginalFilename", "xmltooling8_0.dll\0"
#else
- VALUE "OriginalFilename", "xmltooling2_7.dll\0"
+ VALUE "OriginalFilename", "xmltooling8_0.dll\0"
#endif
#endif
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "OpenSAML 2.7.0\0"
- VALUE "ProductVersion", "2, 7, 0, 0\0"
+ VALUE "ProductName", "OpenSAML 3.0.0\0"
+ VALUE "ProductVersion", "3, 0, 0, 0\0"
VALUE "SpecialBuild", "\0"
END
END
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/xmltooling.git
More information about the Pkg-shibboleth-devel
mailing list