From: Scott Cantor Date: Thu, 19 May 2011 21:39:53 +0000 (+0000) Subject: Bump version, adjust VC build for parallel make, fixes for CPPXT-76. X-Git-Tag: 1.5.0~115 X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-xmltooling.git;a=commitdiff_plain;h=f6946bf428ac3d48ebc1f351daf976f4d5e96767 Bump version, adjust VC build for parallel make, fixes for CPPXT-76. --- diff --git a/config_win32.h b/config_win32.h index 231181d..48fdfb9 100644 --- a/config_win32.h +++ b/config_win32.h @@ -94,13 +94,13 @@ #define PACKAGE_NAME "xmltooling" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "xmltooling 1.4.2" +#define PACKAGE_STRING "xmltooling 1.5" /* 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.4.2" +#define PACKAGE_VERSION "1.5" /* Define to the necessary symbol if this constant uses a non-standard name on your system. */ @@ -113,7 +113,7 @@ /* #undef TM_IN_SYS_TIME */ /* Version number of package */ -#define VERSION "1.4.2" +#define VERSION "1.5" /* Define if you wish to disable XML-Security-dependent features. */ /* #undef XMLTOOLING_NO_XMLSEC */ diff --git a/configure.ac b/configure.ac index 8ef2c9a..8e8e0ae 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # Process this file with autoreconf AC_PREREQ([2.50]) -AC_INIT([xmltooling],[1.4.2],[https://bugs.internet2.edu/],[xmltooling]) +AC_INIT([xmltooling],[1.5],[https://bugs.internet2.edu/],[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 12598e1..035e2af 100644 --- a/xmltooling/Makefile.am +++ b/xmltooling/Makefile.am @@ -172,6 +172,7 @@ common_sources = \ Namespace.cpp \ QName.cpp \ unicode.cpp \ + version.cpp \ XMLObjectBuilder.cpp \ XMLToolingConfig.cpp \ impl/AnyElement.cpp \ @@ -198,10 +199,10 @@ common_sources = \ libxmltooling_lite_la_SOURCES = \ ${common_sources} libxmltooling_lite_la_CPPFLAGS = -DXMLTOOLING_LITE -libxmltooling_lite_la_LDFLAGS = -version-info 5:2:0 +libxmltooling_lite_la_LDFLAGS = -version-info 6:0:0 if BUILD_XMLSEC -libxmltooling_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 5:2:0 +libxmltooling_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 6:0:0 libxmltooling_la_SOURCES = \ ${common_sources} \ ${xmlsec_sources} diff --git a/xmltooling/XMLToolingConfig.cpp b/xmltooling/XMLToolingConfig.cpp index c68bead..377a030 100644 --- a/xmltooling/XMLToolingConfig.cpp +++ b/xmltooling/XMLToolingConfig.cpp @@ -1,11 +1,12 @@ /* - * Copyright 2001-2010 Internet2 + * 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 * - * 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 - * - * 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, @@ -359,7 +360,16 @@ bool XMLToolingInternalConfig::init() log.fatal("failed to initialize libcurl, OpenSSL, or Winsock"); return false; } - log.debug("libcurl %s initialization complete", LIBCURL_VERSION); + curl_version_info_data* curlver = curl_version_info(CURLVERSION_NOW); + if (curlver) { + log.debug("libcurl %s initialization complete", curlver->version); + if (!(curlver->features & CURL_VERSION_SSL)) { + log.warn("libcurl lacks TLS/SSL support, this will greatly limit functionality"); + } + } + else { + log.debug("libcurl %s initialization complete", LIBCURL_VERSION); + } #endif XMLPlatformUtils::Initialize(); diff --git a/xmltooling/soap/impl/CURLSOAPTransport.cpp b/xmltooling/soap/impl/CURLSOAPTransport.cpp index 0cf2d0f..4f8a3c4 100644 --- a/xmltooling/soap/impl/CURLSOAPTransport.cpp +++ b/xmltooling/soap/impl/CURLSOAPTransport.cpp @@ -1,11 +1,12 @@ /* - * Copyright 2001-2010 Internet2 + * 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 * - * 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 - * - * 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, @@ -537,7 +538,12 @@ void CURLSOAPTransport::send(istream* in) m_useragent = XMLToolingConfig::getConfig().user_agent; if (!m_useragent.empty()) { - m_useragent = m_useragent + " libcurl/" + LIBCURL_VERSION + ' ' + OPENSSL_VERSION_TEXT; + curl_version_info_data* curlver = curl_version_info(CURLVERSION_NOW); + m_useragent += " libcurl/"; + if (curlver) + m_useragent = m_useragent + curlver->version + ' ' + curlver->ssl_version; + else + m_useragent = m_useragent + LIBCURL_VERSION + ' ' + OPENSSL_VERSION_TEXT; curl_easy_setopt(m_handle, CURLOPT_USERAGENT, m_useragent.c_str()); } diff --git a/xmltooling/version.cpp b/xmltooling/version.cpp new file mode 100644 index 0000000..f200f85 --- /dev/null +++ b/xmltooling/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" + +XMLTOOL_API const char* const gXMLToolingVersionStr = XMLTOOLING_VERSIONSTR; +XMLTOOL_API const char* const gXMLToolingFullVersionStr = XMLTOOLING_FULLVERSIONSTR; +XMLTOOL_API const char* const gXMLToolingDotVersionStr = XMLTOOLING_FULLVERSIONDOT; +XMLTOOL_API const unsigned int gXMLToolingMajVersion = XMLTOOLING_VERSION_MAJOR; +XMLTOOL_API const unsigned int gXMLToolingMinVersion = XMLTOOLING_VERSION_MINOR; +XMLTOOL_API const unsigned int gXMLToolingRevision = XMLTOOLING_VERSION_REVISION; diff --git a/xmltooling/version.h b/xmltooling/version.h index 5656015..d7d00e3 100644 --- a/xmltooling/version.h +++ b/xmltooling/version.h @@ -1,11 +1,12 @@ /* - * Copyright 2001-2011 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 @@ /** * xmltooling/version.h * - * Library version macros and constants + * Library version macros and constants. */ #if !defined(__xmltooling_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 XMLTOOLING_VERSION_MAJOR 1 -#define XMLTOOLING_VERSION_MINOR 4 -#define XMLTOOLING_VERSION_REVISION 2 +#define XMLTOOLING_VERSION_MINOR 5 +#define XMLTOOLING_VERSION_REVISION 0 /** DO NOT MODIFY BELOW THIS LINE */ @@ -60,11 +62,12 @@ #define XMLTOOLING_FULLVERSIONNUM INVK_CAT3_SEP_NIL(XMLTOOLING_VERSION_MAJOR,XMLTOOLING_VERSION_MINOR,XMLTOOLING_VERSION_REVISION) #define XMLTOOLING_VERSIONSTR INVK_CAT2_SEP_UNDERSCORE(XMLTOOLING_VERSION_MAJOR,XMLTOOLING_VERSION_MINOR) -const char* const gXMLToolingVersionStr = XMLTOOLING_VERSIONSTR; -const char* const gXMLToolingFullVersionStr = XMLTOOLING_FULLVERSIONSTR; -const unsigned int gXMLToolingMajVersion = XMLTOOLING_VERSION_MAJOR; -const unsigned int gXMLToolingMinVersion = XMLTOOLING_VERSION_MINOR; -const unsigned int gXMLToolingRevision = XMLTOOLING_VERSION_REVISION; +extern XMLTOOL_API const char* const gXMLToolingVersionStr; +extern XMLTOOL_API const char* const gXMLToolingFullVersionStr; +extern XMLTOOL_API const char* const gXMLToolingDotVersionStr; +extern XMLTOOL_API const unsigned int gXMLToolingMajVersion; +extern XMLTOOL_API const unsigned int gXMLToolingMinVersion; +extern XMLTOOL_API const unsigned int gXMLToolingRevision; // XMLTooling version numeric constants that can be used for conditional // compilation purposes. diff --git a/xmltooling/xmltooling-lite.vcxproj b/xmltooling/xmltooling-lite.vcxproj index 6c3b6d5..e77ac17 100644 --- a/xmltooling/xmltooling-lite.vcxproj +++ b/xmltooling/xmltooling-lite.vcxproj @@ -80,17 +80,16 @@ AllRules.ruleset - $(ProjectName)1_4 - $(ProjectName)1_4 - $(ProjectName)1_4D - $(ProjectName)1_4D + $(ProjectName)1_5 + $(ProjectName)1_5 + $(ProjectName)1_5D + $(ProjectName)1_5D Disabled $(SolutionDir);$(ProjectDir);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;XMLTOOLING_LITE;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebugDLL @@ -121,7 +120,6 @@ Disabled $(SolutionDir);$(ProjectDir);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;XMLTOOLING_LITE;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebugDLL @@ -206,6 +204,7 @@ + diff --git a/xmltooling/xmltooling-lite.vcxproj.filters b/xmltooling/xmltooling-lite.vcxproj.filters index 977c9c9..9650fff 100644 --- a/xmltooling/xmltooling-lite.vcxproj.filters +++ b/xmltooling/xmltooling-lite.vcxproj.filters @@ -144,6 +144,9 @@ Source Files\soap\impl + + Source Files + diff --git a/xmltooling/xmltooling.rc b/xmltooling/xmltooling.rc index 0de8e09..7829a11 100644 --- a/xmltooling/xmltooling.rc +++ b/xmltooling/xmltooling.rc @@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,4,2,0 - PRODUCTVERSION 2,4,1,0 + FILEVERSION 1,5,0,0 + PRODUCTVERSION 2,5,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -51,38 +51,38 @@ BEGIN #else VALUE "FileDescription", "OpenSAML XMLTooling Library\0" #endif - VALUE "FileVersion", "1, 4, 2, 0\0" + VALUE "FileVersion", "1, 5, 0, 0\0" #ifdef XMLTOOLING_LITE #ifdef _DEBUG - VALUE "InternalName", "xmltooling-lite1_4D\0" + VALUE "InternalName", "xmltooling-lite1_5D\0" #else - VALUE "InternalName", "xmltooling-lite1_4\0" + VALUE "InternalName", "xmltooling-lite1_5\0" #endif #else #ifdef _DEBUG - VALUE "InternalName", "xmltooling1_4D\0" + VALUE "InternalName", "xmltooling1_5D\0" #else - VALUE "InternalName", "xmltooling1_4\0" + VALUE "InternalName", "xmltooling1_5\0" #endif #endif - VALUE "LegalCopyright", "Copyright © 2011 Internet2\0" + VALUE "LegalCopyright", "Copyright © 2011 UCAID\0" VALUE "LegalTrademarks", "\0" #ifdef XMLTOOLING_LITE #ifdef _DEBUG - VALUE "OriginalFilename", "xmltooling-lite1_4D.dll\0" + VALUE "OriginalFilename", "xmltooling-lite1_5D.dll\0" #else - VALUE "OriginalFilename", "xmltooling-lite1_4.dll\0" + VALUE "OriginalFilename", "xmltooling-lite1_5.dll\0" #endif #else #ifdef _DEBUG - VALUE "OriginalFilename", "xmltooling1_4D.dll\0" + VALUE "OriginalFilename", "xmltooling1_5D.dll\0" #else - VALUE "OriginalFilename", "xmltooling1_4.dll\0" + VALUE "OriginalFilename", "xmltooling1_5.dll\0" #endif #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/xmltooling/xmltooling.vcxproj b/xmltooling/xmltooling.vcxproj index 70cec10..9f352f9 100644 --- a/xmltooling/xmltooling.vcxproj +++ b/xmltooling/xmltooling.vcxproj @@ -79,17 +79,16 @@ AllRules.ruleset - $(ProjectName)1_4D - $(ProjectName)1_4D - $(ProjectName)1_4 - $(ProjectName)1_4 + $(ProjectName)1_5D + $(ProjectName)1_5D + $(ProjectName)1_5 + $(ProjectName)1_5 Disabled $(SolutionDir);$(ProjectDir);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true EnableFastChecks @@ -118,7 +117,6 @@ Disabled $(SolutionDir);$(ProjectDir);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true EnableFastChecks @@ -193,6 +191,7 @@ + diff --git a/xmltooling/xmltooling.vcxproj.filters b/xmltooling/xmltooling.vcxproj.filters index 78ee214..987c007 100644 --- a/xmltooling/xmltooling.vcxproj.filters +++ b/xmltooling/xmltooling.vcxproj.filters @@ -258,6 +258,9 @@ Source Files\soap\impl + + Source Files + diff --git a/xmltoolingtest/xmltoolingtest.vcxproj b/xmltoolingtest/xmltoolingtest.vcxproj index d5f950a..bc455d3 100644 --- a/xmltoolingtest/xmltoolingtest.vcxproj +++ b/xmltoolingtest/xmltoolingtest.vcxproj @@ -84,7 +84,6 @@ Disabled $(SolutionDir);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebugDLL true @@ -109,7 +108,6 @@ Disabled $(SolutionDir);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebugDLL true diff --git a/xmltoolingtest/xmltoolingtest.vcxproj.filters b/xmltoolingtest/xmltoolingtest.vcxproj.filters index e4a91fd..4b0094b 100644 --- a/xmltoolingtest/xmltoolingtest.vcxproj.filters +++ b/xmltoolingtest/xmltoolingtest.vcxproj.filters @@ -56,6 +56,9 @@ Generated Code + + Generated Code + @@ -111,5 +114,8 @@ Unit Tests + + Unit Tests + \ No newline at end of file