projects / shibboleth / cpp-opensaml.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: f43f417)
Bump library version.
authorScott Cantor <cantor.2@osu.edu>
Fri, 11 Jul 2008 17:49:27 +0000 (17:49 +0000)
committerScott Cantor <cantor.2@osu.edu>
Fri, 11 Jul 2008 17:49:27 +0000 (17:49 +0000)
saml/Makefile.am patch | blob | history
saml/saml.vcproj patch | blob | history

diff --git a/saml/Makefile.am b/saml/Makefile.am
index 2ee7847..057ba3d 100644 (file)
--- a/saml/Makefile.am
+++ b/saml/Makefile.am
@@ -144,6 +144,7 @@ libsaml_la_SOURCES = \
        saml2/metadata/impl/MetadataSchemaValidators.cpp \
        saml2/metadata/impl/NullMetadataProvider.cpp \
        saml2/metadata/impl/SignatureMetadataFilter.cpp \
+       saml2/metadata/impl/RequireValidUntilMetadataFilter.cpp \
        saml2/metadata/impl/WhitelistMetadataFilter.cpp \
        saml2/metadata/impl/XMLMetadataProvider.cpp \
        saml2/binding/impl/SAML2Artifact.cpp \
@@ -171,7 +172,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 2:0:0
+libsaml_la_LDFLAGS = -version-info 3:0:0
 
 install-exec-hook:
        for la in $(lib_LTLIBRARIES) ; do rm -f $(DESTDIR)$(libdir)/$$la ; done
diff --git a/saml/saml.vcproj b/saml/saml.vcproj
index 82ece66..54cf986 100644 (file)
--- a/saml/saml.vcproj
+++ b/saml/saml.vcproj
@@ -99,12 +99,11 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        CharacterSet="1"\r
-                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -120,12 +119,17 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(ProjectDir)&quot;;&quot;$(ProjectDir)\zlib&quot;;&quot;..\..\cpp-xmltooling&quot;"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"\r
-                               RuntimeLibrary="2"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BrowseInformation="1"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
@@ -135,21 +139,20 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_UNICODE;UNICODE;_DEBUG"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="..\..\cpp-xmltooling\$(ConfigurationName)\xmltooling1.lib xerces-c_2.lib xsec_1.lib log4shib1.lib"\r
-                               OutputFile="$(OutDir)\$(ProjectName)2_1.dll"\r
-                               LinkIncremental="1"\r
+                               AdditionalDependencies="..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)\xmltooling1D.lib xerces-c_2D.lib xsec_1D.lib log4shib1D.lib"\r
+                               OutputFile="$(OutDir)\$(ProjectName)2_1D.dll"\r
+                               LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               ImportLibrary="$(TargetDir)$(ProjectName)2.lib"\r
-                               TargetMachine="1"\r
+                               ImportLibrary="$(TargetDir)$(ProjectName)2D.lib"\r
+                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -177,11 +180,12 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -197,17 +201,12 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
                                AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(ProjectDir)&quot;;&quot;$(ProjectDir)\zlib&quot;;&quot;..\..\cpp-xmltooling&quot;"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BrowseInformation="1"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"\r
+                               RuntimeLibrary="2"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
@@ -217,20 +216,21 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_UNICODE;UNICODE;_DEBUG"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)\xmltooling1D.lib xerces-c_2D.lib xsec_1D.lib log4shib1D.lib"\r
-                               OutputFile="$(OutDir)\$(ProjectName)2_1D.dll"\r
-                               LinkIncremental="2"\r
+                               AdditionalDependencies="..\..\cpp-xmltooling\$(ConfigurationName)\xmltooling1.lib xerces-c_2.lib xsec_1.lib log4shib1.lib"\r
+                               OutputFile="$(OutDir)\$(ProjectName)2_1.dll"\r
+                               LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
-                               ImportLibrary="$(TargetDir)$(ProjectName)2D.lib"\r
-                               TargetMachine="17"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               ImportLibrary="$(TargetDir)$(ProjectName)2.lib"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -531,6 +531,10 @@
                                                        >\r
                                                </File>\r
                                                <File\r
+                                                       RelativePath=".\saml2\metadata\impl\RequireValidUntilMetadataFilter.cpp"\r
+                                                       >\r
+                                               </File>\r
+                                               <File\r
                                                        RelativePath=".\saml2\metadata\impl\SignatureMetadataFilter.cpp"\r
                                                        >\r
                                                </File>\r
@@ -563,7 +567,7 @@
                                                                />\r
                                                        </FileConfiguration>\r
                                                        <FileConfiguration\r
-                                                               Name="Release|Win32"\r
+                                                               Name="Debug|x64"\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCLCompilerTool"\r
@@ -572,7 +576,7 @@
                                                                />\r
                                                        </FileConfiguration>\r
                                                        <FileConfiguration\r
-                                                               Name="Debug|x64"\r
+                                                               Name="Release|Win32"\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCLCompilerTool"\r
@@ -611,7 +615,7 @@
                                                                />\r
                                                        </FileConfiguration>\r
                                                        <FileConfiguration\r
-                                                               Name="Release|Win32"\r
+                                                               Name="Debug|x64"\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCLCompilerTool"\r
@@ -620,7 +624,7 @@
                                                                />\r
                                                        </FileConfiguration>\r
                                                        <FileConfiguration\r
-                                                               Name="Debug|x64"\r
+                                                               Name="Release|Win32"\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCLCompilerTool"\r
@@ -700,7 +704,7 @@
                                                        />\r
                                                </FileConfiguration>\r
                                                <FileConfiguration\r
-                                                       Name="Release|Win32"\r
+                                                       Name="Debug|x64"\r
                                                        >\r
                                                        <Tool\r
                                                                Name="VCCLCompilerTool"\r
@@ -709,7 +713,7 @@
                                                        />\r
                                                </FileConfiguration>\r
                                                <FileConfiguration\r
-                                                       Name="Debug|x64"\r
+                                                       Name="Release|Win32"\r
                                                        >\r
                                                        <Tool\r
                                                                Name="VCCLCompilerTool"\r
@@ -740,7 +744,7 @@
                                                        />\r
                                                </FileConfiguration>\r
                                                <FileConfiguration\r
-                                                       Name="Release|Win32"\r
+                                                       Name="Debug|x64"\r
                                                        >\r
                                                        <Tool\r
                                                                Name="VCCLCompilerTool"\r
@@ -749,7 +753,7 @@
                                                        />\r
                                                </FileConfiguration>\r
                                                <FileConfiguration\r
-                                                       Name="Debug|x64"\r
+                                                       Name="Release|Win32"\r
                                                        >\r
                                                        <Tool\r
                                                                Name="VCCLCompilerTool"\r
Unnamed repository; edit this file 'description' to name the repository.