From fb21f3cca06e9ff367795ed47e6bb93a9cfcfcba Mon Sep 17 00:00:00 2001 From: Photonios Date: Fri, 22 Nov 2013 17:31:07 +0100 Subject: [PATCH 01/94] Added Git ignore file to prevent build files being seen as changed files --- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6b65910 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +Debug +ipch +*.vcxproj.user +*.opensdf +*.sdf +*.suo \ No newline at end of file From d0882077b352991124f398280395a5bc2e6d3faa Mon Sep 17 00:00:00 2001 From: Photonios Date: Fri, 22 Nov 2013 17:32:40 +0100 Subject: [PATCH 02/94] Added configuration options for x64 to vs2010 solution/project file --- gflags-vs2010.sln | 14 ++- .../gflags_unittest-vs2010.vcxproj | 73 ++++++++++++++++ vsprojects/libgflags/libgflags-vs2010.vcxproj | 87 +++++++++++++++++++ 3 files changed, 172 insertions(+), 2 deletions(-) diff --git a/gflags-vs2010.sln b/gflags-vs2010.sln index 5c34be4..f195d66 100644 --- a/gflags-vs2010.sln +++ b/gflags-vs2010.sln @@ -1,23 +1,33 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgflags", "vsprojects\libgflags\libgflags-vs2010.vcxproj", "{FB27FBDB-E6C0-4D00-A7F8-1EEEF1B48ABC}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgflags-vs2010", "vsprojects\libgflags\libgflags-vs2010.vcxproj", "{FB27FBDB-E6C0-4D00-A7F8-1EEEF1B48ABC}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gflags_unittest", "vsprojects\gflags_unittest\gflags_unittest-vs2010.vcxproj", "{4B263748-5F0F-468C-8C5C-ED2682BB6BE3}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gflags_unittest-vs2010", "vsprojects\gflags_unittest\gflags_unittest-vs2010.vcxproj", "{4B263748-5F0F-468C-8C5C-ED2682BB6BE3}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {FB27FBDB-E6C0-4D00-A7F8-1EEEF1B48ABC}.Debug|Win32.ActiveCfg = Debug|Win32 {FB27FBDB-E6C0-4D00-A7F8-1EEEF1B48ABC}.Debug|Win32.Build.0 = Debug|Win32 + {FB27FBDB-E6C0-4D00-A7F8-1EEEF1B48ABC}.Debug|x64.ActiveCfg = Debug|x64 + {FB27FBDB-E6C0-4D00-A7F8-1EEEF1B48ABC}.Debug|x64.Build.0 = Debug|x64 {FB27FBDB-E6C0-4D00-A7F8-1EEEF1B48ABC}.Release|Win32.ActiveCfg = Release|Win32 {FB27FBDB-E6C0-4D00-A7F8-1EEEF1B48ABC}.Release|Win32.Build.0 = Release|Win32 + {FB27FBDB-E6C0-4D00-A7F8-1EEEF1B48ABC}.Release|x64.ActiveCfg = Release|x64 + {FB27FBDB-E6C0-4D00-A7F8-1EEEF1B48ABC}.Release|x64.Build.0 = Release|x64 {4B263748-5F0F-468C-8C5C-ED2682BB6BE3}.Debug|Win32.ActiveCfg = Debug|Win32 {4B263748-5F0F-468C-8C5C-ED2682BB6BE3}.Debug|Win32.Build.0 = Debug|Win32 + {4B263748-5F0F-468C-8C5C-ED2682BB6BE3}.Debug|x64.ActiveCfg = Debug|x64 + {4B263748-5F0F-468C-8C5C-ED2682BB6BE3}.Debug|x64.Build.0 = Debug|x64 {4B263748-5F0F-468C-8C5C-ED2682BB6BE3}.Release|Win32.ActiveCfg = Release|Win32 {4B263748-5F0F-468C-8C5C-ED2682BB6BE3}.Release|Win32.Build.0 = Release|Win32 + {4B263748-5F0F-468C-8C5C-ED2682BB6BE3}.Release|x64.ActiveCfg = Release|x64 + {4B263748-5F0F-468C-8C5C-ED2682BB6BE3}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/vsprojects/gflags_unittest/gflags_unittest-vs2010.vcxproj b/vsprojects/gflags_unittest/gflags_unittest-vs2010.vcxproj index 77bd3f5..6624350 100644 --- a/vsprojects/gflags_unittest/gflags_unittest-vs2010.vcxproj +++ b/vsprojects/gflags_unittest/gflags_unittest-vs2010.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {4B263748-5F0F-468C-8C5C-ED2682BB6BE3} @@ -19,34 +27,60 @@ Application MultiByte + + Application + MultiByte + Application MultiByte + + Application + MultiByte + + + + + + + <_ProjectFileVersion>10.0.30319.1 $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\ + $(Configuration)\ true + true $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\ + $(Configuration)\ false + false AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + @@ -68,6 +102,24 @@ MachineX86 + + + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + Level3 + ProgramDatabase + + + $(OutDir)gflags_unittest.exe + true + $(OutDir)gflags_unittest.pdb + Console + + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -86,12 +138,33 @@ MachineX86 + + + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + + + $(OutDir)gflags_unittest.exe + true + Console + true + true + + ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) + ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL + MultiThreadedDebugDLL ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) + ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) MultiThreadedDLL + MultiThreadedDLL diff --git a/vsprojects/libgflags/libgflags-vs2010.vcxproj b/vsprojects/libgflags/libgflags-vs2010.vcxproj index 7b9d36c..2e9f397 100644 --- a/vsprojects/libgflags/libgflags-vs2010.vcxproj +++ b/vsprojects/libgflags/libgflags-vs2010.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {FB27FBDB-E6C0-4D00-A7F8-1EEEF1B48ABC} @@ -20,34 +28,60 @@ DynamicLibrary MultiByte + + DynamicLibrary + MultiByte + DynamicLibrary MultiByte + + DynamicLibrary + MultiByte + + + + + + + <_ProjectFileVersion>10.0.30319.1 $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\ + $(Configuration)\ true + true $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\ + $(Configuration)\ false + false AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + @@ -70,6 +104,25 @@ MachineX86 + + + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBGFLAGS_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + Level3 + ProgramDatabase + + + $(OutDir)libgflags-debug.dll + true + $(OutDir)libgflags-debug.pdb + Windows + $(OutDir)libgflags-debug.lib + + WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBGFLAGS_EXPORTS;%(PreprocessorDefinitions) @@ -89,30 +142,64 @@ MachineX86 + + + WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBGFLAGS_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + + + $(OutDir)libgflags.dll + true + Windows + true + true + $(OutDir)libgflags.lib + + ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) + ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL + MultiThreadedDebugDLL ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) + ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) MultiThreadedDLL + MultiThreadedDLL ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) + ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL + MultiThreadedDebugDLL ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) + ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) MultiThreadedDLL + MultiThreadedDLL ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) + ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL + MultiThreadedDebugDLL ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) + ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) MultiThreadedDLL + MultiThreadedDLL ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) + ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL + MultiThreadedDebugDLL ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) + ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) MultiThreadedDLL + MultiThreadedDLL From 2bd1aeeeb7829c232d5bb7a0ed94a82767f3b5a6 Mon Sep 17 00:00:00 2001 From: Swen Kooij Date: Wed, 27 Nov 2013 18:04:40 +0100 Subject: [PATCH 03/94] Renamed projects in VS2012 solution file to match the filename --- gflags-vs2012.sln | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gflags-vs2012.sln b/gflags-vs2012.sln index dea7012..eb15d17 100644 --- a/gflags-vs2012.sln +++ b/gflags-vs2012.sln @@ -1,8 +1,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Express 2012 for Windows Desktop -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgflags", "vsprojects\libgflags\libgflags-vs2012.vcxproj", "{FB27FBDB-E6C0-4D00-A7F8-1EEEF1B48ABC}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgflags-vs2012", "vsprojects\libgflags\libgflags-vs2012.vcxproj", "{FB27FBDB-E6C0-4D00-A7F8-1EEEF1B48ABC}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gflags_unittest", "vsprojects\gflags_unittest\gflags_unittest-vs2012.vcxproj", "{4B263748-5F0F-468C-8C5C-ED2682BB6BE3}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gflags_unittest-vs2012", "vsprojects\gflags_unittest\gflags_unittest-vs2012.vcxproj", "{4B263748-5F0F-468C-8C5C-ED2682BB6BE3}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution From 38b662ab07be9a32dd1d0c644b8ac2ae591bb0a4 Mon Sep 17 00:00:00 2001 From: Swen Kooij Date: Wed, 27 Nov 2013 18:05:06 +0100 Subject: [PATCH 04/94] Renamed projects in VS2003 solution file to match the filename --- gflags-vs2003.sln | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gflags-vs2003.sln b/gflags-vs2003.sln index ec25b09..bff7f6d 100644 --- a/gflags-vs2003.sln +++ b/gflags-vs2003.sln @@ -1,9 +1,9 @@ Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgflags", "vsprojects\libgflags\libgflags-vs2003.vcproj", "{FB27FBDB-E6C0-4D00-A7F8-1EEEF1B48ABC}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgflags-vs2003", "vsprojects\libgflags\libgflags-vs2003.vcproj", "{FB27FBDB-E6C0-4D00-A7F8-1EEEF1B48ABC}" ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gflags_unittest", "vsprojects\gflags_unittest\gflags_unittest-vs2003.vcproj", "{4B263748-5F0F-468C-8C5C-ED2682BB6BE3}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gflags_unittest-vs2003", "vsprojects\gflags_unittest\gflags_unittest-vs2003.vcproj", "{4B263748-5F0F-468C-8C5C-ED2682BB6BE3}" ProjectSection(ProjectDependencies) = postProject {FB27FBDB-E6C0-4D00-A7F8-1EEEF1B48ABC} = {FB27FBDB-E6C0-4D00-A7F8-1EEEF1B48ABC} EndProjectSection From 41181669d15b8630e63a449388401d16fc1c2741 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Wed, 19 Mar 2014 16:46:56 +0000 Subject: [PATCH 05/94] Use OS_WINDOWS #define instead of _WIN32 and WINDOWS. The OS_WINDOWS #define has previously been used in gflags.cc before the CMake migration. --- CMakeLists.txt | 10 +++++----- src/config.h.in | 7 +++++-- src/gflags.cc | 2 +- src/mutex.h | 4 ++-- src/util.h | 2 +- src/windows_port.h | 2 +- 6 files changed, 15 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index acb8b44..ae24799 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,9 @@ cmake_minimum_required(VERSION 2.8.4 FATAL_ERROR) if (WIN32 AND NOT CYGWIN) - set (WINDOWS 1) + set (OS_WINDOWS 1) else () - set (WINDOWS 0) + set (OS_WINDOWS 0) endif () # ---------------------------------------------------------------------------- @@ -34,7 +34,7 @@ version_numbers ( # configure options option (BUILD_SHARED_LIBS "Request build of shared libraries." OFF) -if (WINDOWS AND BUILD_SHARED_LIBS) +if (OS_WINDOWS AND BUILD_SHARED_LIBS) set (GFLAGS_IS_A_DLL 1) else () set (GFLAGS_IS_A_DLL 0) @@ -184,7 +184,7 @@ set (GFLAGS_SRCS "gflags_completions.cc" ) -if (WINDOWS) +if (OS_WINDOWS) list (APPEND PRIVATE_HDRS "windows_port.h") list (APPEND GFLAGS_SRCS "windows_port.cc") endif () @@ -226,7 +226,7 @@ endif () # ---------------------------------------------------------------------------- # installation -if (WINDOWS) +if (OS_WINDOWS) set (RUNTIME_INSTALL_DIR Bin) set (LIBRARY_INSTALL_DIR Lib) set (INCLUDE_INSTALL_DIR Include) diff --git a/src/config.h.in b/src/config.h.in index 24b513e..3f94663 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -5,6 +5,9 @@ // --------------------------------------------------------------------------- // System checks +// Define if you build this library for a MS Windows OS. +#cmakedefine OS_WINDOWS + // Define if you have the header file. #cmakedefine HAVE_STDINT_H @@ -73,7 +76,7 @@ // --------------------------------------------------------------------------- // Path separator #ifndef PATH_SEPARATOR -# if _WIN32 +# ifdef OS_WINDOWS # define PATH_SEPARATOR '\\' # else # define PATH_SEPARATOR '/' @@ -101,7 +104,7 @@ # define GFLAGS_DLL_DEFINE_FLAG GFLAGS_DLL_DECL #endif -#ifdef _WIN32 +#ifdef OS_WINDOWS // The unittests import the symbols of the shared gflags library # if GFLAGS_IS_A_DLL && defined(_MSC_VER) # define GFLAGS_DLL_DECL_FOR_UNITTESTS __declspec(dllimport) diff --git a/src/gflags.cc b/src/gflags.cc index bd1b130..b314f08 100644 --- a/src/gflags.cc +++ b/src/gflags.cc @@ -1494,7 +1494,7 @@ const char* ProgramInvocationName() { // like the GNU libc fn } const char* ProgramInvocationShortName() { // like the GNU libc fn const char* slash = strrchr(argv0, '/'); -#ifdef _WINDOWS +#ifdef OS_WINDOWS if (!slash) slash = strrchr(argv0, '\\'); #endif return slash ? slash + 1 : argv0; diff --git a/src/mutex.h b/src/mutex.h index 3e2f28e..0bdd9d5 100644 --- a/src/mutex.h +++ b/src/mutex.h @@ -110,7 +110,7 @@ #if defined(NO_THREADS) typedef int MutexType; // to keep a lock-count -#elif defined(_WIN32) || defined(__CYGWIN32__) || defined(__CYGWIN64__) +#elif defined(OS_WINDOWS) # ifndef WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN // We only need minimal includes # endif @@ -227,7 +227,7 @@ bool Mutex::TryLock() { if (mutex_) return false; Lock(); return true; } void Mutex::ReaderLock() { assert(++mutex_ > 0); } void Mutex::ReaderUnlock() { assert(mutex_-- > 0); } -#elif defined(_WIN32) || defined(__CYGWIN32__) || defined(__CYGWIN64__) +#elif defined(OS_WINDOWS) Mutex::Mutex() : destroy_(true) { InitializeCriticalSection(&mutex_); diff --git a/src/util.h b/src/util.h index 6991c37..de94091 100644 --- a/src/util.h +++ b/src/util.h @@ -65,7 +65,7 @@ extern GFLAGS_DLL_DECL void (*gflags_exitfunc)(int); #elif defined(HAVE_STRTOQ) # define strto64 strtoq # define strtou64 strtouq -#elif defined(_WIN32) && !defined(__MINGW32__) && !defined(__MINGW64__) +#elif defined(OS_WINDOWS) # define strto64 _strtoi64 # define strtou64 _strtoui64 // Neither strtoll nor strtoq are defined. I hope strtol works! diff --git a/src/windows_port.h b/src/windows_port.h index 246f715..c8ff24f 100644 --- a/src/windows_port.h +++ b/src/windows_port.h @@ -112,7 +112,7 @@ inline void setenv(const char* name, const char* value, int) { #define PRId64 "I64d" #define PRIu64 "I64u" -#ifndef __MINGW32__ +#if !defined(__MINGW32__) && !defined(__MINGW64__) #define strtoq _strtoi64 #define strtouq _strtoui64 #define strtoll _strtoi64 From acb460af9e66d83401341d9af04984ce53eed0f0 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Wed, 19 Mar 2014 16:53:19 +0000 Subject: [PATCH 06/94] Use strtoll as defined by windows_port.h for strto64. --- src/util.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/util.h b/src/util.h index de94091..366e1be 100644 --- a/src/util.h +++ b/src/util.h @@ -58,16 +58,13 @@ namespace GFLAGS_NAMESPACE { // This is used for unittests for death-testing. It is defined in gflags.cc. extern GFLAGS_DLL_DECL void (*gflags_exitfunc)(int); -// Work properly if either strtoll or strtoq is on this system -#if defined(HAVE_STRTOLL) +// Work properly if either strtoll or strtoq is on this system. +#if defined(strtoll) || defined(HAVE_STRTOLL) # define strto64 strtoll # define strtou64 strtoull #elif defined(HAVE_STRTOQ) # define strto64 strtoq # define strtou64 strtouq -#elif defined(OS_WINDOWS) -# define strto64 _strtoi64 -# define strtou64 _strtoui64 // Neither strtoll nor strtoq are defined. I hope strtol works! #else # define strto64 strtol From 9242578bc18a220c41ce07e024d620465ec9e434 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Wed, 19 Mar 2014 17:15:36 +0000 Subject: [PATCH 07/94] Look for shlwapi.h also in case of MinGW. --- CMakeLists.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) mode change 100644 => 100755 CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt old mode 100644 new mode 100755 index ae24799..fa456ea --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,11 +82,11 @@ if (MSVC) set (HAVE_INTTYPES_H 0) set (HAVE_UNISTD_H 0) set (HAVE_SYS_STAT_H 1) - check_include_file_cxx ("shlwapi.h" HAVE_SHLWAPI_H) + set (HAVE_SHLWAPI_H 1) else () foreach (fname IN ITEMS unistd stdint inttypes sys/types sys/stat fnmatch) string (TOUPPER "${fname}" FNAME) - string (REGEX REPLACE "/" "_" FNAME "${FNAME}") + string (REPLACE "/" "_" FNAME "${FNAME}") if (NOT HAVE_${FNAME}_H) check_include_file_cxx ("${fname}.h" HAVE_${FNAME}_H) endif () @@ -95,6 +95,9 @@ else () bool_to_int (HAVE_STDINT_H) bool_to_int (HAVE_SYS_TYPES_H) bool_to_int (HAVE_INTTYPES_H) + if (NOT HAVE_FNMATCH_H AND OS_WINDOWS) + check_include_file_cxx ("shlwapi.h" HAVE_SHLWAPI_H) + endif () endif () set (GFLAGS_INTTYPES_FORMAT "" CACHE STRING "Format of integer types: \"C99\" (uint32_t), \"BSD\" (u_int32_t), \"VC7\" (__int32)") From ddc535741996b5ed42bb4d2c1bbcd371573a5bfd Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Wed, 19 Mar 2014 17:32:23 +0000 Subject: [PATCH 08/94] Add link dependency on shlwapi.lib during build configuration instead of #pragma comment statement. Use this library also on MinGW. --- CMakeLists.txt | 8 +++++++- src/gflags.cc | 5 ++--- test/gflags_unittest.cc | 4 ++-- 3 files changed, 11 insertions(+), 6 deletions(-) mode change 100644 => 100755 src/gflags.cc diff --git a/CMakeLists.txt b/CMakeLists.txt index fa456ea..66bbd4c 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,7 +91,7 @@ else () check_include_file_cxx ("${fname}.h" HAVE_${FNAME}_H) endif () endforeach () - # the following are used in #if not #ifdef + # the following are used in #if directives not #ifdef bool_to_int (HAVE_STDINT_H) bool_to_int (HAVE_SYS_TYPES_H) bool_to_int (HAVE_INTTYPES_H) @@ -219,11 +219,17 @@ include_directories ("${PROJECT_BINARY_DIR}/include/${GFLAGS_NAMESPACE}") set (LIB_TARGETS) if (BUILD_gflags_LIB) add_library (gflags ${GFLAGS_SRCS} ${PRIVATE_HDRS} ${PUBLIC_HDRS}) + if (HAVE_SHLWAPI_H) + target_link_libraries (gflags shlwapi.lib) + endif () list (APPEND LIB_TARGETS gflags) endif () if (BUILD_gflags_nothreads_LIB) add_library (gflags_nothreads ${GFLAGS_SRCS} ${PRIVATE_HDRS} ${PUBLIC_HDRS}) set_target_properties (gflags_nothreads PROPERTIES COMPILE_DEFINITIONS NO_THREADS) + if (HAVE_SHLWAPI_H) + target_link_libraries (gflags_nothreads shlwapi.lib) + endif () list (APPEND LIB_TARGETS gflags_nothreads) endif () diff --git a/src/gflags.cc b/src/gflags.cc old mode 100644 new mode 100755 index b314f08..285050f --- a/src/gflags.cc +++ b/src/gflags.cc @@ -95,9 +95,8 @@ #include #if defined(HAVE_FNMATCH_H) # include -#elif defined(_MSC_VER) && defined(HAVE_SHLWAPI_H) +#elif defined(HAVE_SHLWAPI_H) # include -# pragma comment(lib, "shlwapi.lib") #endif #include // For va_list and related operations #include @@ -1310,7 +1309,7 @@ string CommandLineFlagParser::ProcessOptionsFromStringLocked( #if defined(HAVE_FNMATCH_H) || fnmatch(glob.c_str(), ProgramInvocationName(), FNM_PATHNAME) == 0 || fnmatch(glob.c_str(), ProgramInvocationShortName(), FNM_PATHNAME) == 0 -#elif defined(_MSC_VER) && defined(HAVE_SHLWAPI_H) +#elif defined(HAVE_SHLWAPI_H) || PathMatchSpec(glob.c_str(), ProgramInvocationName()) || PathMatchSpec(glob.c_str(), ProgramInvocationShortName()) #endif diff --git a/test/gflags_unittest.cc b/test/gflags_unittest.cc index 7a44f64..80f7398 100644 --- a/test/gflags_unittest.cc +++ b/test/gflags_unittest.cc @@ -408,7 +408,7 @@ TEST(FlagFileTest, FilenamesOurfileFirst) { -1.0); } -#if defined(HAVE_FNMATCH_H) || (defined(_MSC_VER) && defined(HAVE_SHLWAPI_H)) // otherwise glob isn't supported +#if defined(HAVE_FNMATCH_H) || defined(HAVE_SHLWAPI_H) // otherwise glob isn't supported TEST(FlagFileTest, FilenamesOurfileGlob) { FLAGS_test_string = "initial"; FLAGS_test_bool = false; @@ -460,7 +460,7 @@ TEST(FlagFileTest, FilenamesOurfileInBigList) { 1, -1.0); } -#endif // defined(HAVE_FNMATCH_H) || (defined(_MSC_VER) && defined(HAVE_SHLWAPI_H)) +#endif // defined(HAVE_FNMATCH_H) || defined(HAVE_SHLWAPI_H) // Tests that a failed flag-from-string read keeps flags at default values TEST(FlagFileTest, FailReadFlagsFromString) { From ec4ddb403a61e958fc2620878b26453676049b82 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Wed, 19 Mar 2014 17:56:32 +0000 Subject: [PATCH 09/94] Revert "Added Git ignore file to prevent build files being seen as changed files" This reverts commit fb21f3cca06e9ff367795ed47e6bb93a9cfcfcba. --- .gitignore | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 6b65910..0000000 --- a/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -Debug -ipch -*.vcxproj.user -*.opensdf -*.sdf -*.suo \ No newline at end of file From 9ecc4cab3b9a72264ff3ce9be8c3e2661c56e9ab Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 20 Mar 2014 02:11:44 +0000 Subject: [PATCH 10/94] Enable packaging of library using CPack. --- AUTHORS => AUTHORS.txt | 0 CMakeLists.txt | 276 ++++++++++++++++++++++++++----------- COPYING => COPYING.txt | 0 ChangeLog => ChangeLog.txt | 0 INSTALL => INSTALL.txt | 6 +- NEWS => NEWS.txt | 0 README | 5 - README.txt | 8 ++ cmake/README_runtime.txt | 4 + cmake/package.cmake.in | 54 ++++++++ src/config.h.in | 6 +- test/CMakeLists.txt | 20 ++- 12 files changed, 281 insertions(+), 98 deletions(-) rename AUTHORS => AUTHORS.txt (100%) rename COPYING => COPYING.txt (100%) rename ChangeLog => ChangeLog.txt (100%) rename INSTALL => INSTALL.txt (91%) rename NEWS => NEWS.txt (100%) delete mode 100644 README create mode 100644 README.txt create mode 100644 cmake/README_runtime.txt create mode 100644 cmake/package.cmake.in diff --git a/AUTHORS b/AUTHORS.txt similarity index 100% rename from AUTHORS rename to AUTHORS.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 66bbd4c..ff5d476 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,27 +1,19 @@ -cmake_minimum_required(VERSION 2.8.4 FATAL_ERROR) - -if (WIN32 AND NOT CYGWIN) - set (OS_WINDOWS 1) -else () - set (OS_WINDOWS 0) -endif () +cmake_minimum_required (VERSION 2.8.4 FATAL_ERROR) # ---------------------------------------------------------------------------- # includes set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") - include (utils) # ---------------------------------------------------------------------------- # package information -set (PROJECT_NAME "gflags") -set (PACKAGE_NAME "${PROJECT_NAME}") -set (PACKAGE_VERSION "2.1.0") -set (PACKAGE_STRING "${PROJECT_NAME} ${PACKAGE_VERSION}") -set (PACKAGE_TARNAME "${PROJECT_NAME}-${PACKAGE_VERSION}") +set (PACKAGE_NAME "gflags") +set (PACKAGE_VERSION "2.1") +set (PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") +set (PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}") set (PACKAGE_BUGREPORT "https://code.google.com/p/gflags/issues/") -project (${PROJECT_NAME} CXX) +project (${PACKAGE_NAME} CXX) version_numbers ( ${PACKAGE_VERSION} @@ -31,50 +23,53 @@ version_numbers ( ) # ---------------------------------------------------------------------------- -# configure options -option (BUILD_SHARED_LIBS "Request build of shared libraries." OFF) +# options +set (GFLAGS_NAMESPACE "${PACKAGE_NAME}" CACHE STRING "C++ namespace identifier of gflags library.") -if (OS_WINDOWS AND BUILD_SHARED_LIBS) - set (GFLAGS_IS_A_DLL 1) -else () - set (GFLAGS_IS_A_DLL 0) -endif () - -option (BUILD_gflags_LIB "Request build of the multi-threaded gflags library." ON) -option (BUILD_gflags_nothreads_LIB "Request build of the single-threaded gflags library." ON) - -if (NOT BUILD_gflags_LIB AND NOT BUILD_gflags_nothreads_LIB) - message (FATAL_ERROR "At least one of BUILD_gflags_LIB and BUILD_gflags_nothreads_LIB must be ON.") -endif () - -option (BUILD_NEGATIVE_COMPILATION_TESTS "Request addition of negative compilation tests." OFF) -mark_as_advanced (BUILD_NEGATIVE_COMPILATION_TESTS) - -set (GFLAGS_NAMESPACE "gflags" CACHE STRING "C++ namespace identifier of gflags library.") -mark_as_advanced (GFLAGS_NAMESPACE) +option (BUILD_SHARED_LIBS "Request build of shared libraries." OFF) +option (BUILD_STATIC_LIBS "Request build of static libraries (default if BUILD_SHARED_LIBS is OFF)." OFF) +option (BUILD_gflags_LIB "Request build of the multi-threaded gflags library." ON) +option (BUILD_gflags_nothreads_LIB "Request build of the single-threaded gflags library." ON) +option (BUILD_PACKAGING "Enable build of distribution packages using CPack." OFF) +option (BUILD_TESTING "Enable build of the unit tests and their execution using CTest." OFF) +option (BUILD_NC_TESTS "Request addition of negative compilation tests." OFF) +option (INSTALL_HEADERS "Request packaging of headers and other development files." ON) mark_as_advanced (CLEAR CMAKE_INSTALL_PREFIX) -mark_as_advanced (CMAKE_CONFIGURATION_TYPES) -if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CXX_FLAGS AND NOT CMAKE_C_FLAGS) - set ( - CMAKE_BUILD_TYPE "Release" - CACHE STRING "Choose the type of build, options are: None (CMAKE_C_FLAGS and CMAKE_CXX_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." - FORCE - ) -endif () - +mark_as_advanced (CMAKE_CONFIGURATION_TYPES + GFLAGS_NAMESPACE + BUILD_STATIC_LIBS + BUILD_NC_TESTS + INSTALL_HEADERS) if (APPLE) mark_as_advanced(CMAKE_OSX_ARCHITECTURES CMAKE_OSX_DEPLOYMENT_TARGET CMAKE_OSX_SYSROOT) endif () +if (NOT BUILD_SHARED_LIBS AND NOT BUILD_STATIC_LIBS) + set (BUILD_STATIC_LIBS ON) +endif () +if (NOT BUILD_gflags_LIB AND NOT BUILD_gflags_nothreads_LIB) + message (FATAL_ERROR "At least one of BUILD_gflags_LIB and BUILD_gflags_nothreads_LIB must be ON.") +endif () + +if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CXX_FLAGS) + set_property (CACHE CMAKE_BUILD_TYPE PROPERTY VALUE Release) +endif () + # ---------------------------------------------------------------------------- # system checks include (CheckTypeSize) include (CheckIncludeFileCXX) include (CheckCXXSymbolExists) +if (WIN32 AND NOT CYGWIN) + set (OS_WINDOWS 1) +else () + set (OS_WINDOWS 0) +endif () + if (MSVC) set (HAVE_SYS_TYPES_H 1) set (HAVE_STDINT_H 1) @@ -179,6 +174,8 @@ set (PUBLIC_HDRS set (PRIVATE_HDRS "config.h" + "util.h" + "mutex.h" ) set (GFLAGS_SRCS @@ -204,6 +201,10 @@ configure_headers (PUBLIC_HDRS ${PUBLIC_HDRS}) configure_sources (PRIVATE_HDRS ${PRIVATE_HDRS}) configure_sources (GFLAGS_SRCS ${GFLAGS_SRCS}) +include_directories ("${PROJECT_SOURCE_DIR}/src") +include_directories ("${PROJECT_BINARY_DIR}/include") +include_directories ("${PROJECT_BINARY_DIR}/include/${GFLAGS_NAMESPACE}") + # ---------------------------------------------------------------------------- # output directories set (CMAKE_RUNTIME_OUTPUT_DIRECTORY "bin") @@ -211,27 +212,43 @@ set (CMAKE_LIBRARY_OUTPUT_DIRECTORY "lib") set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY "lib") # ---------------------------------------------------------------------------- -# add library target -include_directories ("${PROJECT_SOURCE_DIR}/src") -include_directories ("${PROJECT_BINARY_DIR}/include") -include_directories ("${PROJECT_BINARY_DIR}/include/${GFLAGS_NAMESPACE}") - -set (LIB_TARGETS) -if (BUILD_gflags_LIB) - add_library (gflags ${GFLAGS_SRCS} ${PRIVATE_HDRS} ${PUBLIC_HDRS}) - if (HAVE_SHLWAPI_H) - target_link_libraries (gflags shlwapi.lib) +# add library targets +set (TARGETS) +# static vs. shared +foreach (TYPE IN ITEMS STATIC SHARED) + if (BUILD_${TYPE}_LIBS) + # whether or not targets are a DLL + if (OS_WINDOWS AND "^${TYPE}$" STREQUAL "^SHARED$") + set (GFLAGS_IS_A_DLL 1) + else () + set (GFLAGS_IS_A_DLL 0) + endif () + string (TOLOWER "${TYPE}" type) + # multi-threaded vs. single-threaded + foreach (opts IN ITEMS "" _nothreads) + if (BUILD_gflags${opts}_LIB) + add_library (gflags${opts}-${type} ${TYPE} ${GFLAGS_SRCS} ${PRIVATE_HDRS} ${PUBLIC_HDRS}) + if (opts MATCHES "nothreads") + set (defines "GFLAGS_IS_A_DLL=${GFLAGS_IS_A_DLL};NOTHREADS") + else () + set (defines "GFLAGS_IS_A_DLL=${GFLAGS_IS_A_DLL}") + endif () + set_target_properties ( + gflags${opts}-${type} PROPERTIES COMPILE_DEFINITIONS "${defines}" + OUTPUT_NAME "gflags${opts}" + ) + if (HAVE_SHLWAPI_H) + target_link_libraries (gflags${opts}-${type} shlwapi.lib) + endif () + if (NOT TARGET gflags${opts}) + add_custom_target (gflags${opts}) + endif () + add_dependencies (gflags${opts} gflags${opts}-${type}) + list (APPEND TARGETS gflags${opts}-${type}) + endif () + endforeach () endif () - list (APPEND LIB_TARGETS gflags) -endif () -if (BUILD_gflags_nothreads_LIB) - add_library (gflags_nothreads ${GFLAGS_SRCS} ${PRIVATE_HDRS} ${PUBLIC_HDRS}) - set_target_properties (gflags_nothreads PROPERTIES COMPILE_DEFINITIONS NO_THREADS) - if (HAVE_SHLWAPI_H) - target_link_libraries (gflags_nothreads shlwapi.lib) - endif () - list (APPEND LIB_TARGETS gflags_nothreads) -endif () +endforeach () # ---------------------------------------------------------------------------- # installation @@ -247,41 +264,134 @@ else () set (CONFIG_INSTALL_DIR lib/cmake/${PACKAGE_NAME}) endif () -install (TARGETS ${LIB_TARGETS} DESTINATION ${LIBRARY_INSTALL_DIR} EXPORT gflags-lib) -install (FILES ${PUBLIC_HDRS} DESTINATION ${INCLUDE_INSTALL_DIR}/${GFLAGS_NAMESPACE}) - file (RELATIVE_PATH INSTALL_PREFIX_REL2CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/${CONFIG_INSTALL_DIR}" "${CMAKE_INSTALL_PREFIX}") configure_file (cmake/config.cmake.in "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-config-install.cmake" @ONLY) configure_file (cmake/version.cmake.in "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-config-version.cmake" @ONLY) -install ( - FILES "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-config-install.cmake" - RENAME ${PACKAGE_NAME}-config.cmake - DESTINATION ${CONFIG_INSTALL_DIR} -) - -install ( - FILES "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-config-version.cmake" - DESTINATION ${CONFIG_INSTALL_DIR} -) - -install (EXPORT gflags-lib DESTINATION ${CONFIG_INSTALL_DIR} FILE ${PACKAGE_NAME}-export.cmake) - -if (UNIX) - install (PROGRAMS src/gflags_completions.sh DESTINATION ${RUNTIME_INSTALL_DIR}) +install (TARGETS ${TARGETS} DESTINATION ${LIBRARY_INSTALL_DIR} EXPORT gflags-lib) +if (INSTALL_HEADERS) + install (FILES ${PUBLIC_HDRS} DESTINATION ${INCLUDE_INSTALL_DIR}/${GFLAGS_NAMESPACE}) + install ( + FILES "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-config-install.cmake" + RENAME ${PACKAGE_NAME}-config.cmake + DESTINATION ${CONFIG_INSTALL_DIR} + ) + install ( + FILES "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-config-version.cmake" + DESTINATION ${CONFIG_INSTALL_DIR} + ) + install (EXPORT gflags-lib DESTINATION ${CONFIG_INSTALL_DIR} FILE ${PACKAGE_NAME}-export.cmake) + if (UNIX) + install (PROGRAMS src/gflags_completions.sh DESTINATION ${RUNTIME_INSTALL_DIR}) + endif () endif () # ---------------------------------------------------------------------------- # support direct use of build tree set (INSTALL_PREFIX_REL2CONFIG_DIR .) -export (TARGETS ${LIB_TARGETS} FILE "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-export.cmake") +export (TARGETS ${TARGETS} FILE "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-export.cmake") export (PACKAGE gflags) configure_file (cmake/config.cmake.in "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-config.cmake" @ONLY) # ---------------------------------------------------------------------------- # testing - MUST follow the generation of the build tree config file -include (CTest) if (BUILD_TESTING) + include (CTest) enable_testing () add_subdirectory (test) endif () + +# ---------------------------------------------------------------------------- +# packaging +if (BUILD_PACKAGING) + + if (NOT BUILD_SHARED_LIBS AND NOT INSTALL_HEADERS) + message (WARNING "Package will contain static libraries without headers!" + "\nRecommended options for generation of runtime package:" + "\n BUILD_SHARED_LIBS=ON" + "\n BUILD_STATIC_LIBS=OFF" + "\n INSTALL_HEADERS=OFF" + "\nRecommended options for generation of development package:" + "\n BUILD_SHARED_LIBS=ON" + "\n BUILD_STATIC_LIBS=ON" + "\n INSTALL_HEADERS=ON") + endif () + + # default package generators + if (APPLE) + set (PACKAGE_GENERATOR "PackageMaker") + set (PACKAGE_SOURCE_GENERATOR "TGZ;ZIP") + elseif (UNIX) + set (PACKAGE_GENERATOR "DEB;RPM") + set (PACKAGE_SOURCE_GENERATOR "TGZ;ZIP") + else () + set (PACKAGE_GENERATOR "ZIP") + set (PACKAGE_SOURCE_GENERATOR "ZIP") + endif () + + # used package generators + set (CPACK_GENERATOR "${PACKAGE_GENERATOR}" CACHE STRING "List of binary package generators (CPack).") + set (CPACK_SOURCE_GENERATOR "${PACKAGE_SOURCE_GENERATOR}" CACHE STRING "List of source package generators (CPack).") + mark_as_advanced (CPACK_GENERATOR CPACK_SOURCE_GENERATOR) + + # common package information + set (CPACK_PACKAGE_VENDOR "Open Source by Andreas Schuh") + set (CPACK_PACKAGE_CONTACT "google-gflags@googlegroups.com") + set (CPACK_PACKAGE_NAME "${PACKAGE_NAME}") + set (CPACK_PACKAGE_VERSION "${PACKAGE_VERSION}") + set (CPACK_PACKAGE_VERSION_MAJOR "${PACKAGE_VERSION_MAJOR}") + set (CPACK_PACKAGE_VERSION_MINOR "${PACKAGE_VERSION_MINOR}") + set (CPACK_PACKAGE_VERSION_PATCH "${PACKAGE_VERSION_PATCH}") + set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "A commandline flags library that allows for distributed flags.") + set (CPACK_RESOURCE_FILE_WELCOME "${CMAKE_CURRENT_LIST_DIR}/README.txt") + set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_LIST_DIR}/COPYING.txt") + set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_LIST_DIR}/INSTALL.txt") + set (CPACK_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") + set (CPACK_OUTPUT_FILE_PREFIX packages) + set (CPACK_PACKAGE_RELOCATABLE TRUE) + set (CPACK_MONOLITHIC_INSTALL TRUE) + + if (INSTALL_HEADERS) + set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_LIST_DIR}/doc/gflags.html") + else () + set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_LIST_DIR}/cmake/README_runtime.txt") + endif () + + # system name used for binary package file name + if (WINDOWS) + if (CMAKE_CL_64) + set (CPACK_SYSTEM_NAME "win64") + else () + set (CPACK_SYSTEM_NAME "win32") + endif () + else () + string (TOLOWER "${CMAKE_SYSTEM_NAME}" CPACK_SYSTEM_NAME) + endif () + + # source package settings + set (CPACK_SOURCE_TOPLEVEL_TAG "source") + set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") + set (CPACK_SOURCE_IGNORE_FILES "/\\\\.git/;\\\\.swp$;\\\\.#;/#;\\\\.*~;cscope\\\\.*;/[Bb]uild[.+-_a-zA-Z0-9]*/") + + # default binary package settings + set (CPACK_INCLUDE_TOPLEVEL_DIRECTORY TRUE) + set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_SYSTEM_NAME}") + if (CMAKE_SYSTEM_PROCESSOR) + set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-${CMAKE_SYSTEM_PROCESSOR}") + endif () + + # generator specific configuration file + # + # allow package maintainers to use their own configuration file + # $ cmake -DCPACK_PROJECT_CONFIG_FILE:FILE=/path/to/package/config + if (NOT CPACK_PROJECT_CONFIG_FILE) + configure_file ( + "${CMAKE_CURRENT_LIST_DIR}/cmake/package.cmake.in" + "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-package.cmake" @ONLY + ) + set (CPACK_PROJECT_CONFIG_FILE "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-package.cmake") + endif () + + include (CPack) + +endif () # BUILD_PACKAGING diff --git a/COPYING b/COPYING.txt similarity index 100% rename from COPYING rename to COPYING.txt diff --git a/ChangeLog b/ChangeLog.txt similarity index 100% rename from ChangeLog rename to ChangeLog.txt diff --git a/INSTALL b/INSTALL.txt similarity index 91% rename from INSTALL rename to INSTALL.txt index 78683ac..a96a772 100644 --- a/INSTALL +++ b/INSTALL.txt @@ -3,9 +3,9 @@ INSTALLING A BINARY DISTRIBUTION PACKAGE ======================================== No official binary distribution packages are provided by the gflags developers. -There may, however, be binary packages available for your OS, in particular -for various flavors of Linux. Please consult the package repositories of your -Linux distribution to see if a binary package is available. +There may, however, be binary packages available for your OS at +https://code.google.com/p/gflags/downloads/list. Please consult also the +package repositories of your Linux distribution. For example on Debian/Ubuntu Linux, gflags can be installed using the following command: diff --git a/NEWS b/NEWS.txt similarity index 100% rename from NEWS rename to NEWS.txt diff --git a/README b/README deleted file mode 100644 index 9935d3a..0000000 --- a/README +++ /dev/null @@ -1,5 +0,0 @@ -This repository contains the C++ implementation of the commandline flags module -originally developed at Google. Documentation for this module is in doc/. -The python version of gflags is now a separate project. - -See INSTALL for (generic) installation instructions. diff --git a/README.txt b/README.txt new file mode 100644 index 0000000..bda07ef --- /dev/null +++ b/README.txt @@ -0,0 +1,8 @@ +A commandline flags library that allows for distributed flags. + +This package contains a library that implements commandline flags +processing. As such it's a replacement for getopt(). It has increased +flexibility, including built-in support for C++ types like string, and +the ability to define flags in the source file in which they're used. +The devel package contains static and debug libraries and header files +for developing applications that use the gflags package. diff --git a/cmake/README_runtime.txt b/cmake/README_runtime.txt new file mode 100644 index 0000000..d2556b2 --- /dev/null +++ b/cmake/README_runtime.txt @@ -0,0 +1,4 @@ +This package contains runtime libraries only which are required +by applications that use these libraries for the commandline flags +processing. If you want to develop such application, download +and install the development package instead. diff --git a/cmake/package.cmake.in b/cmake/package.cmake.in new file mode 100644 index 0000000..05f378f --- /dev/null +++ b/cmake/package.cmake.in @@ -0,0 +1,54 @@ +# Per-generator CPack configuration file. See CPACK_PROJECT_CONFIG_FILE documented at +# http://www.cmake.org/cmake/help/v2.8.12/cpack.html#variable:CPACK_PROJECT_CONFIG_FILE +# +# All common CPACK_* variables are set in CMakeLists.txt already. This file only +# overrides some of these to provide package generator specific settings. + +# whether package contains all development files or only runtime files +set (DEVEL @INSTALL_HEADERS@) + +# ------------------------------------------------------------------------------ +# Mac OS X package +if (CPACK_GENERATOR MATCHES "PackageMaker|DragNDrop") + + set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}") + if (DEVEL) + set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-devel") + endif () + set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-${CPACK_PACKAGE_VERSION}") + +# ------------------------------------------------------------------------------ +# Debian package +elseif ("^${CPACK_GENERATOR}$" STREQUAL "DEB") + + set (CPACK_PACKAGE_FILE_NAME "lib${CPACK_PACKAGE_NAME}") + if (DEVEL) + set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-dev") + else () + set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}0") + endif () + set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}_${CPACK_PACKAGE_VERSION}-1_${CMAKE_SYSTEM_PROCESSOR}") + + execute_process ( + COMMAND dpkg --print-architecture + RESULT_VARIABLE RV + OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE + ) + if (NOT RV EQUAL 0) + set (CPACK_DEBIAN_PACKAGE_ARCHITECTURE i386) + endif () + set (CPACK_DEBIAN_PACKAGE_DEPENDS) + set (CPACK_DEBIAN_PACKAGE_SECTION devel) + set (CPACK_DEBIAN_PACKAGE_PRIORITY optional) + +# ------------------------------------------------------------------------------ +# RPM package +elseif ("^${CPACK_GENERATOR}$" STREQUAL "RPM") + + set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}") + if (DEVEL) + set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-devel") + endif () + set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-${CPACK_PACKAGE_VERSION}-1_${CMAKE_SYSTEM_PROCESSOR}") + +endif () diff --git a/src/config.h.in b/src/config.h.in index 3f94663..c033dee 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -86,8 +86,10 @@ // --------------------------------------------------------------------------- // Windows -// Whether gflags library is shared. -#define GFLAGS_IS_A_DLL @GFLAGS_IS_A_DLL@ +// Whether gflags library is a DLL. +#ifndef GFLAGS_IS_A_DLL +# define GFLAGS_IS_A_DLL 0 +#endif // Always export symbols when compiling a shared library as this file is only // included by internal modules when building the gflags library itself. diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 3f7f17e..49c97ea 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -12,7 +12,17 @@ set (GFLAGS_FLAGFILES_DIR "${CMAKE_CURRENT_SOURCE_DIR}") # ---------------------------------------------------------------------------- # common include directories and link libraries include_directories ("${CMAKE_CURRENT_SOURCE_DIR}") -link_libraries (gflags_nothreads) + +if (BUILD_SHARED_LIBS) + set (type shared) +else () + set (type static) +endif () +if (BUILD_gflags_LIB) + link_libraries (gflags-${type}) +else () + link_libraries (gflags_nothreads-${type}) +endif () # ---------------------------------------------------------------------------- # STRIP_FLAG_HELP @@ -35,7 +45,7 @@ add_executable (gflags_unittest gflags_unittest.cc) add_executable (gflags_unittest-main gflags_unittest-main.cc) add_executable (gflags_unittest_main gflags_unittest_main.cc) -if (WIN32 AND NOT CYGWIN) +if (OS_WINDOWS) set (SLASH "\\\\") else () set (SLASH "/") @@ -146,11 +156,11 @@ add_gflags_test(always_fail 1 "ERROR: failed validation of new value 'true' for # ---------------------------------------------------------------------------- # (negative) compilation tests -if (BUILD_NEGATIVE_COMPILATION_TESTS) +if (BUILD_NC_TESTS) find_package (PythonInterp) if (NOT PYTHON_EXECUTABLE) message (FATAL_ERROR "No Python installation found! It is required by the negative compilation tests." - " Either install Python or set NEGATIVE_COMPILATION_TESTS to FALSE and try again.") + " Either install Python or set BUILD_NC_TESTS to FALSE and try again.") endif () set (SRCDIR "${CMAKE_CURRENT_SOURCE_DIR}/nc") configure_file (gflags_nc.py.in "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/nc.py" @ONLY) @@ -165,4 +175,4 @@ if (BUILD_NEGATIVE_COMPILATION_TESTS) add_gflags_nc_test (int_instead_of_bool) add_gflags_nc_test (bool_in_quotes) add_gflags_nc_test (define_string_with_0) -endif () \ No newline at end of file +endif () From cb62c003548ce9ee30840113fa03c031556c7345 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 20 Mar 2014 02:13:13 +0000 Subject: [PATCH 11/94] Change mode of text file. --- CMakeLists.txt | 0 src/gflags.cc | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 CMakeLists.txt mode change 100755 => 100644 src/gflags.cc diff --git a/CMakeLists.txt b/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/src/gflags.cc b/src/gflags.cc old mode 100755 new mode 100644 From bf139ea0a8e31b0b54ad35b7f3ffef90ed6c7ee3 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 20 Mar 2014 03:04:44 +0000 Subject: [PATCH 12/94] Fix build of threaded library on Unix by adding the appropriate link library. --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index ff5d476..acc38f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -232,6 +232,9 @@ foreach (TYPE IN ITEMS STATIC SHARED) set (defines "GFLAGS_IS_A_DLL=${GFLAGS_IS_A_DLL};NOTHREADS") else () set (defines "GFLAGS_IS_A_DLL=${GFLAGS_IS_A_DLL}") + if (CMAKE_USE_PTHREADS_INIT) + target_link_libraries (gflags${opts}-${type} ${CMAKE_THREAD_LIBS_INIT}) + endif () endif () set_target_properties ( gflags${opts}-${type} PROPERTIES COMPILE_DEFINITIONS "${defines}" From 13fe86b8fe9a46bdffa540eda9aa594ecbad33bb Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 20 Mar 2014 03:22:57 +0000 Subject: [PATCH 13/94] Correct CPack package description file. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index acc38f8..46e8b68 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -348,7 +348,7 @@ if (BUILD_PACKAGING) set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "A commandline flags library that allows for distributed flags.") set (CPACK_RESOURCE_FILE_WELCOME "${CMAKE_CURRENT_LIST_DIR}/README.txt") set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_LIST_DIR}/COPYING.txt") - set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_LIST_DIR}/INSTALL.txt") + set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_LIST_DIR}/README.txt") set (CPACK_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") set (CPACK_OUTPUT_FILE_PREFIX packages) set (CPACK_PACKAGE_RELOCATABLE TRUE) From 516e028901c9bead498ff40f53fa6fe405d20689 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 20 Mar 2014 03:23:08 +0000 Subject: [PATCH 14/94] Set RPM generator specific variables. --- CMakeLists.txt | 1 + cmake/package.cmake.in | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 46e8b68..f93c1f7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -349,6 +349,7 @@ if (BUILD_PACKAGING) set (CPACK_RESOURCE_FILE_WELCOME "${CMAKE_CURRENT_LIST_DIR}/README.txt") set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_LIST_DIR}/COPYING.txt") set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_LIST_DIR}/README.txt") + set (CPACK_RESOURCE_FILE_CHANGELOG "${CMAKE_CURRENT_LIST_DIR}/ChangeLog.txt") set (CPACK_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") set (CPACK_OUTPUT_FILE_PREFIX packages) set (CPACK_PACKAGE_RELOCATABLE TRUE) diff --git a/cmake/package.cmake.in b/cmake/package.cmake.in index 05f378f..3414d21 100644 --- a/cmake/package.cmake.in +++ b/cmake/package.cmake.in @@ -51,4 +51,9 @@ elseif ("^${CPACK_GENERATOR}$" STREQUAL "RPM") endif () set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-${CPACK_PACKAGE_VERSION}-1_${CMAKE_SYSTEM_PROCESSOR}") + set (CPACK_RPM_PACKAGE_GROUP "Development/Libraries") + set (CPACK_RPM_PACKAGE_LICENSE "BSD") + set (CPACK_RPM_PACKAGE_URL "http://code.google.com/p/gflags") + set (CPACK_RPM_CHANGELOG_FILE "@CPACK_RESOURCE_FILE_CHANGELOG@") + endif () From 37a9a90d1db73964d54a9ed0d10f21000af5711a Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 20 Mar 2014 03:27:13 +0000 Subject: [PATCH 15/94] Set RPM CPack variables already in CMakeList.txt. --- CMakeLists.txt | 7 ++++++- cmake/package.cmake.in | 5 ----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f93c1f7..8aec4b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -349,12 +349,17 @@ if (BUILD_PACKAGING) set (CPACK_RESOURCE_FILE_WELCOME "${CMAKE_CURRENT_LIST_DIR}/README.txt") set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_LIST_DIR}/COPYING.txt") set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_LIST_DIR}/README.txt") - set (CPACK_RESOURCE_FILE_CHANGELOG "${CMAKE_CURRENT_LIST_DIR}/ChangeLog.txt") set (CPACK_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") set (CPACK_OUTPUT_FILE_PREFIX packages) set (CPACK_PACKAGE_RELOCATABLE TRUE) set (CPACK_MONOLITHIC_INSTALL TRUE) + # RPM specification + set (CPACK_RPM_PACKAGE_GROUP "Development/Libraries") + set (CPACK_RPM_PACKAGE_LICENSE "BSD") + set (CPACK_RPM_PACKAGE_URL "http://code.google.com/p/gflags") + set (CPACK_RPM_CHANGELOG_FILE "${CMAKE_CURRENT_LIST_DIR}/ChangeLog.txt") + if (INSTALL_HEADERS) set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_LIST_DIR}/doc/gflags.html") else () diff --git a/cmake/package.cmake.in b/cmake/package.cmake.in index 3414d21..05f378f 100644 --- a/cmake/package.cmake.in +++ b/cmake/package.cmake.in @@ -51,9 +51,4 @@ elseif ("^${CPACK_GENERATOR}$" STREQUAL "RPM") endif () set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-${CPACK_PACKAGE_VERSION}-1_${CMAKE_SYSTEM_PROCESSOR}") - set (CPACK_RPM_PACKAGE_GROUP "Development/Libraries") - set (CPACK_RPM_PACKAGE_LICENSE "BSD") - set (CPACK_RPM_PACKAGE_URL "http://code.google.com/p/gflags") - set (CPACK_RPM_CHANGELOG_FILE "@CPACK_RESOURCE_FILE_CHANGELOG@") - endif () From 26a35dd2e4802997e90808e963a96cf1652c5c2c Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 20 Mar 2014 03:35:15 +0000 Subject: [PATCH 16/94] Convert ChangeLog to format allowed in RPM spec. --- ChangeLog.txt | 302 +++++++++++++++++++++++++------------------------- 1 file changed, 151 insertions(+), 151 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index f9ef935..84a9b4e 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,193 +1,193 @@ -Wed Jan 25 15:09:14 2012 Google Inc. +* Wed Jan 25 15:09:14 2012 Google Inc. - * gflags: version 2.0 - * Changed the 'official' gflags email in setup.py/etc - * Renamed google-gflags.sln to gflags.sln - * Changed copyright text to reflect Google's relinquished ownership + - gflags: version 2.0 + - Changed the 'official' gflags email in setup.py/etc + - Renamed google-gflags.sln to gflags.sln + - Changed copyright text to reflect Google's relinquished ownership -Tue Dec 20 19:48:57 2011 Google Inc. +* Tue Dec 20 19:48:57 2011 Google Inc. - * google-gflags: version 1.7 - * Add CommandLineFlagInfo::flag_ptr pointing to current storage (musji) - * PORTING: flush after writing to stderr, needed on cygwin - * PORTING: Clean up the GFLAGS_DLL_DECL stuff better - * Fix a bug in StringPrintf() that affected large strings (csilvers) - * Die at configure-time when g++ isn't installed + - google-gflags: version 1.7 + - Add CommandLineFlagInfo::flag_ptr pointing to current storage (musji) + - PORTING: flush after writing to stderr, needed on cygwin + - PORTING: Clean up the GFLAGS_DLL_DECL stuff better + - Fix a bug in StringPrintf() that affected large strings (csilvers) + - Die at configure-time when g++ isn't installed -Fri Jul 29 19:05:21 2011 Google Inc. +* Fri Jul 29 19:05:21 2011 Google Inc. - * google-gflags: version 1.6 - * BUGFIX: Fix a bug where we were leaving out a required $(top_srcdir) - * Fix definition of clstring (jyrki) - * Split up flag declares into its own file (jyrki) - * Add --version support (csilvers) - * Update the README for gflags with static libs - * Update acx_pthread.m4 for nostdlib - * Change ReparseCommandLineFlags to return void (csilvers) - * Some doc typofixes and example augmentation (various) + - google-gflags: version 1.6 + - BUGFIX: Fix a bug where we were leaving out a required $(top_srcdir) + - Fix definition of clstring (jyrki) + - Split up flag declares into its own file (jyrki) + - Add --version support (csilvers) + - Update the README for gflags with static libs + - Update acx_pthread.m4 for nostdlib + - Change ReparseCommandLineFlags to return void (csilvers) + - Some doc typofixes and example augmentation (various) -Mon Jan 24 16:11:35 2011 Google Inc. +* Mon Jan 24 16:11:35 2011 Google Inc. - * google-gflags: version 1.5 - * Better reporting of current vs default value (handler) - * Add API for cleaning up of memory at program-exit (jmarantz) - * Fix macros to work inside namespaces (csilvers) - * Use our own string typedef in case string is redefined (csilvers) - * Updated to autoconf 2.65 + - google-gflags: version 1.5 + - Better reporting of current vs default value (handler) + - Add API for cleaning up of memory at program-exit (jmarantz) + - Fix macros to work inside namespaces (csilvers) + - Use our own string typedef in case string is redefined (csilvers) + - Updated to autoconf 2.65 -Wed Oct 13 17:40:12 2010 Google Inc. +* Wed Oct 13 17:40:12 2010 Google Inc. - * google-gflags: version 1.4 - * Add a check to prevent passing 0 to DEFINE_string (jorg) - * Reduce compile (.o) size (jyrki) - * Some small changes to quiet debug compiles (alexk) - * PORTING: better support static linking on windows (csilvers) - * DOCUMENTATION: change default values, use validators, etc. - * Update the NEWS file to be non-empty - * Add pkg-config (.pc) files for libgflags and libgflags_nothreads + - google-gflags: version 1.4 + - Add a check to prevent passing 0 to DEFINE_string (jorg) + - Reduce compile (.o) size (jyrki) + - Some small changes to quiet debug compiles (alexk) + - PORTING: better support static linking on windows (csilvers) + - DOCUMENTATION: change default values, use validators, etc. + - Update the NEWS file to be non-empty + - Add pkg-config (.pc) files for libgflags and libgflags_nothreads -Mon Jan 4 18:09:30 2010 Google Inc. +* Mon Jan 4 18:09:30 2010 Google Inc. - * google-gflags: version 1.3 - * PORTABILITY: can now build and run tests under MSVC (csilvers) - * Remove the python gflags code, which is now its own package (tansell) - * Clarify that "last flag wins" in the docs (csilvers) - * Comment danger of using GetAllFlags in validators (wojtekm) - * PORTABILITY: Some fixes necessary for c++0x (mboerger) - * Makefile fix: $(srcdir) -> $(top_srcdir) in one place (csilvres) - * INSTALL: autotools to autoconf v2.64 + automake v1.11 (csilvers) + - google-gflags: version 1.3 + - PORTABILITY: can now build and run tests under MSVC (csilvers) + - Remove the python gflags code, which is now its own package (tansell) + - Clarify that "last flag wins" in the docs (csilvers) + - Comment danger of using GetAllFlags in validators (wojtekm) + - PORTABILITY: Some fixes necessary for c++0x (mboerger) + - Makefile fix: $(srcdir) -> $(top_srcdir) in one place (csilvres) + - INSTALL: autotools to autoconf v2.64 + automake v1.11 (csilvers) -Thu Sep 10 12:53:04 2009 Google Inc. +* Thu Sep 10 12:53:04 2009 Google Inc. - * google-gflags: version 1.2 - * PORTABILITY: can now build and run tests under mingw (csilvers) - * Using a string arg for a bool flag is a compile-time error (rbayardo) - * Add --helpxml to gflags.py (salcianu) - * Protect against a hypothetical global d'tor mutex problem (csilvers) - * BUGFIX: can now define a flag after 'using namespace google' (hamaji) + - google-gflags: version 1.2 + - PORTABILITY: can now build and run tests under mingw (csilvers) + - Using a string arg for a bool flag is a compile-time error (rbayardo) + - Add --helpxml to gflags.py (salcianu) + - Protect against a hypothetical global d'tor mutex problem (csilvers) + - BUGFIX: can now define a flag after 'using namespace google' (hamaji) -Tue Apr 14 12:35:25 2009 Google Inc. +* Tue Apr 14 12:35:25 2009 Google Inc. - * google-gflags: version 1.1 - * Add both foo and nofoo for boolean flags, with --undefok (andychu) - * Better document how validators work (wojtekm) - * Improve binary-detection for bash-completion (mtamsky) - * Python: Add a concept of "key flags", used with --help (salcianu) - * Python: Robustify flag_values (salcianu) - * Python: Add a new DEFINE_bool alias (keir, andrewliu) - * Python: Do module introspection based on module name (dsturtevant) - * Fix autoconf a bit better, especially on windows and solaris (ajenjo) - * BUG FIX: gflags_nothreads was linking against the wrong lib (ajenjo) - * BUG FIX: threads-detection failed on FreeBSD; replace it (ajenjo) - * PORTABILITY: Quiet an internal compiler error with SUSE 10 (csilvers) - * PORTABILITY: Update deb.sh for more recenty debuilds (csilvers) - * PORTABILITY: #include more headers to satify new gcc's (csilvers) - * INSTALL: Updated to autoconf 2.61 and libtool 1.5.26 (csilvers) + - google-gflags: version 1.1 + - Add both foo and nofoo for boolean flags, with --undefok (andychu) + - Better document how validators work (wojtekm) + - Improve binary-detection for bash-completion (mtamsky) + - Python: Add a concept of "key flags", used with --help (salcianu) + - Python: Robustify flag_values (salcianu) + - Python: Add a new DEFINE_bool alias (keir, andrewliu) + - Python: Do module introspection based on module name (dsturtevant) + - Fix autoconf a bit better, especially on windows and solaris (ajenjo) + - BUG FIX: gflags_nothreads was linking against the wrong lib (ajenjo) + - BUG FIX: threads-detection failed on FreeBSD; replace it (ajenjo) + - PORTABILITY: Quiet an internal compiler error with SUSE 10 (csilvers) + - PORTABILITY: Update deb.sh for more recenty debuilds (csilvers) + - PORTABILITY: #include more headers to satify new gcc's (csilvers) + - INSTALL: Updated to autoconf 2.61 and libtool 1.5.26 (csilvers) -Fri Oct 3 15:16:46 2008 Google Inc. +* Fri Oct 3 15:16:46 2008 Google Inc. - * google-gflags: version 1.0 - * Add a missing newline to an error string (bcmills) - * (otherwise exactly the same as gflags 1.0rc2) + - google-gflags: version 1.0 + - Add a missing newline to an error string (bcmills) + - (otherwise exactly the same as gflags 1.0rc2) -Thu Sep 18 12:58:05 2008 Google Inc. +* Thu Sep 18 12:58:05 2008 Google Inc. - * google-gflags: version 1.0rc2 - * Report current flag values in --helpxml (hdn) - * Fix compilation troubles with gcc 4.3.3 (simonb) - * BUG FIX: I was missing a std:: in DECLARE_string (csilvers) - * BUG FIX: Clarify in docs how to specify --bool flags (csilvers) - * BUG FIX: Fix --helpshort for source files not in a subdir (csilvers) - * BUG FIX: Fix python unittest for 64-bit builds (bcmills) + - google-gflags: version 1.0rc2 + - Report current flag values in --helpxml (hdn) + - Fix compilation troubles with gcc 4.3.3 (simonb) + - BUG FIX: I was missing a std:: in DECLARE_string (csilvers) + - BUG FIX: Clarify in docs how to specify --bool flags (csilvers) + - BUG FIX: Fix --helpshort for source files not in a subdir (csilvers) + - BUG FIX: Fix python unittest for 64-bit builds (bcmills) -Tue Aug 19 16:15:48 2008 +* Tue Aug 19 16:15:48 2008 - * google-gflags: version 1.0rc1 - * Move #include files from google/ to gflags/ (csilvers) - * Small optimizations to reduce binary (library) size (jyrki) - * BUGFIX: forgot a std:: in one of the .h files (csilvers) - * Speed up locking by making sure calls are inlined (ajenjo) - * 64-BIT COMPATIBILITY: Use %PRId64 instead of %lld (csilvers) - * PORTABILITY: fix Makefile to work with Cygwin (ajenjo) - * PORTABILITY: fix code to compile under Visual Studio (ajenjo) - * PORTABILITY: fix code to compile under Solaris 10 with CC (csilvers) + - google-gflags: version 1.0rc1 + - Move #include files from google/ to gflags/ (csilvers) + - Small optimizations to reduce binary (library) size (jyrki) + - BUGFIX: forgot a std:: in one of the .h files (csilvers) + - Speed up locking by making sure calls are inlined (ajenjo) + - 64-BIT COMPATIBILITY: Use %PRId64 instead of %lld (csilvers) + - PORTABILITY: fix Makefile to work with Cygwin (ajenjo) + - PORTABILITY: fix code to compile under Visual Studio (ajenjo) + - PORTABILITY: fix code to compile under Solaris 10 with CC (csilvers) -Mon Jul 21 23:01:38 2008 Google Inc. +* Mon Jul 21 23:01:38 2008 Google Inc. - * google-gflags: version 0.9 - * Add the ability to validate a command-line flag (csilvers) - * Add completion support for commandline flags in bash (daven) - * Add -W compile flags to Makefile, when using gcc (csilvers) - * Allow helpstring to be NULL (cristianoc) - * Improved documentation of classes in the .cc file (csilvers) - * Fix python bug with AppendFlagValues + shortnames (jjtswan) - * Use bool instead of int for boolean flags in gflags.py (bcmills) - * Simplify the way we declare flags, now more foolproof (csilvers) - * Better error messages when bool flags collide (colohan) - * Only evaluate DEFINE_foo macro args once (csilvers) + - google-gflags: version 0.9 + - Add the ability to validate a command-line flag (csilvers) + - Add completion support for commandline flags in bash (daven) + - Add -W compile flags to Makefile, when using gcc (csilvers) + - Allow helpstring to be NULL (cristianoc) + - Improved documentation of classes in the .cc file (csilvers) + - Fix python bug with AppendFlagValues + shortnames (jjtswan) + - Use bool instead of int for boolean flags in gflags.py (bcmills) + - Simplify the way we declare flags, now more foolproof (csilvers) + - Better error messages when bool flags collide (colohan) + - Only evaluate DEFINE_foo macro args once (csilvers) -Wed Mar 26 15:20:18 2008 Google Inc. +* Wed Mar 26 15:20:18 2008 Google Inc. - * google-gflags: version 0.8 - * Export DescribeOneFlag() in the API - * Add support for automatic line wrapping at 80 cols for gflags.py - * Bugfix: do not treat an isolated "-" the same as an isolated "--" - * Update rpm spec to point to Google Code rather than sourceforge (!) - * Improve documentation (including documenting thread-safety) - * Improve #include hygiene - * Improve testing + - google-gflags: version 0.8 + - Export DescribeOneFlag() in the API + - Add support for automatic line wrapping at 80 cols for gflags.py + - Bugfix: do not treat an isolated "-" the same as an isolated "--" + - Update rpm spec to point to Google Code rather than sourceforge (!) + - Improve documentation (including documenting thread-safety) + - Improve #include hygiene + - Improve testing -Thu Oct 18 11:33:20 2007 Google Inc. +* Thu Oct 18 11:33:20 2007 Google Inc. - * google-gflags: version 0.7 - * Deal even more correctly with libpthread not linked in (csilvers) - * Add STRIP_LOG, an improved DO_NOT_SHOW_COMMANDLINE_HELP (sioffe) - * Be more accurate printing default flag values in --help (dsturtevant) - * Reduce .o file size a bit by using shorter namespace names (jeff) - * Use relative install path, so 'setup.py --home' works (csilvers) - * Notice when a boolean flag has a non-boolean default (bnmouli) - * Broaden --helpshort to match foo-main.cc and foo_main.cc (hendrie) - * Fix "no modules match" message for --helpshort, etc (hendrie) + - google-gflags: version 0.7 + - Deal even more correctly with libpthread not linked in (csilvers) + - Add STRIP_LOG, an improved DO_NOT_SHOW_COMMANDLINE_HELP (sioffe) + - Be more accurate printing default flag values in --help (dsturtevant) + - Reduce .o file size a bit by using shorter namespace names (jeff) + - Use relative install path, so 'setup.py --home' works (csilvers) + - Notice when a boolean flag has a non-boolean default (bnmouli) + - Broaden --helpshort to match foo-main.cc and foo_main.cc (hendrie) + - Fix "no modules match" message for --helpshort, etc (hendrie) -Wed Aug 15 07:35:51 2007 Google Inc. +* Wed Aug 15 07:35:51 2007 Google Inc. - * google-gflags: version 0.6 - * Deal correctly with case that libpthread is not linked in (csilvers) - * Update Makefile/tests so we pass "make distcheck" (csilvers) - * Document and test that last assignment to a flag wins (wan) + - google-gflags: version 0.6 + - Deal correctly with case that libpthread is not linked in (csilvers) + - Update Makefile/tests so we pass "make distcheck" (csilvers) + - Document and test that last assignment to a flag wins (wan) -Tue Jun 12 15:23:42 2007 Google Inc. +* Tue Jun 12 15:23:42 2007 Google Inc. - * google-gflags: version 0.5 - * Include all m4 macros in the distribution (csilvers) - * Python: Fix broken data_files field in setup.py (sidlon) - * Python: better string serliaizing and unparsing (abo, csimmons) - * Fix checks for NaN and inf to work with Mac OS X (csilvers) + - google-gflags: version 0.5 + - Include all m4 macros in the distribution (csilvers) + - Python: Fix broken data_files field in setup.py (sidlon) + - Python: better string serliaizing and unparsing (abo, csimmons) + - Fix checks for NaN and inf to work with Mac OS X (csilvers) -Thu Apr 19 15:15:07 2007 Google Inc. +* Thu Apr 19 15:15:07 2007 Google Inc. - * google-gflags: version 0.4 - * Remove is_default from GetCommandLineFlagInfo (csilvers) - * Portability fixes: includes, strtoll, gcc4.3 errors (csilvers) - * A few doc typo cleanups (csilvers) + - google-gflags: version 0.4 + - Remove is_default from GetCommandLineFlagInfo (csilvers) + - Portability fixes: includes, strtoll, gcc4.3 errors (csilvers) + - A few doc typo cleanups (csilvers) -Wed Mar 28 12:15:56 2007 Google Inc. +* Wed Mar 28 12:15:56 2007 Google Inc. - * google-gflags: version 0.3 - * python portability fix: use popen instead of subprocess (csilvers) - * Add is_default to CommandLineFlagInfo (pchien) - * Make docs a bit prettier (csilvers) - * Actually include the python files in the distribution! :-/ (csilvers) + - google-gflags: version 0.3 + - python portability fix: use popen instead of subprocess (csilvers) + - Add is_default to CommandLineFlagInfo (pchien) + - Make docs a bit prettier (csilvers) + - Actually include the python files in the distribution! :-/ (csilvers) -Mon Jan 22 15:33:06 2007 Google Inc. +* Mon Jan 22 15:33:06 2007 Google Inc. - * google-gflags: version 0.2 - * added support for python commandlineflags, as well as c++ - * gflags2man, a script to turn flags into a man page (dchristian) + - google-gflags: version 0.2 + - added support for python commandlineflags, as well as c++ + - gflags2man, a script to turn flags into a man page (dchristian) -Wed Dec 13 12:37:19 2006 Google Inc. +* Wed Dec 13 12:37:19 2006 Google Inc. - * google-gflags: initial release: + - google-gflags: initial release: The gflags package contains a library that implements commandline flags processing. As such it's a replacement for getopt(). It has increased flexibility, including built-in support for C++ From b6f61ab0ce802ca3f88cf497be5e91bcb64d5658 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 20 Mar 2014 03:38:59 +0000 Subject: [PATCH 17/94] Fix bugs in package configuration file. --- cmake/package.cmake.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/package.cmake.in b/cmake/package.cmake.in index 05f378f..d4419a1 100644 --- a/cmake/package.cmake.in +++ b/cmake/package.cmake.in @@ -19,7 +19,7 @@ if (CPACK_GENERATOR MATCHES "PackageMaker|DragNDrop") # ------------------------------------------------------------------------------ # Debian package -elseif ("^${CPACK_GENERATOR}$" STREQUAL "DEB") +elseif (CPACK_GENERATOR MATCHES "DEB") set (CPACK_PACKAGE_FILE_NAME "lib${CPACK_PACKAGE_NAME}") if (DEVEL) @@ -43,7 +43,7 @@ elseif ("^${CPACK_GENERATOR}$" STREQUAL "DEB") # ------------------------------------------------------------------------------ # RPM package -elseif ("^${CPACK_GENERATOR}$" STREQUAL "RPM") +elseif (CPACK_GENERATOR MATCHES "RPM") set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}") if (DEVEL) From dc9674ee46a16b0b7fb3596e641434908bd8abe9 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 20 Mar 2014 03:42:22 +0000 Subject: [PATCH 18/94] Remove time fields from ChangeLog entries which are not compatible with RPM spec. --- ChangeLog.txt | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 84a9b4e..e05a538 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,11 +1,11 @@ -* Wed Jan 25 15:09:14 2012 Google Inc. +* Wed Jan 25 2012 Google Inc. - gflags: version 2.0 - Changed the 'official' gflags email in setup.py/etc - Renamed google-gflags.sln to gflags.sln - Changed copyright text to reflect Google's relinquished ownership -* Tue Dec 20 19:48:57 2011 Google Inc. +* Tue Dec 20 2011 Google Inc. - google-gflags: version 1.7 - Add CommandLineFlagInfo::flag_ptr pointing to current storage (musji) @@ -14,7 +14,7 @@ - Fix a bug in StringPrintf() that affected large strings (csilvers) - Die at configure-time when g++ isn't installed -* Fri Jul 29 19:05:21 2011 Google Inc. +* Fri Jul 29 2011 Google Inc. - google-gflags: version 1.6 - BUGFIX: Fix a bug where we were leaving out a required $(top_srcdir) @@ -26,7 +26,7 @@ - Change ReparseCommandLineFlags to return void (csilvers) - Some doc typofixes and example augmentation (various) -* Mon Jan 24 16:11:35 2011 Google Inc. +* Mon Jan 24 2011 Google Inc. - google-gflags: version 1.5 - Better reporting of current vs default value (handler) @@ -35,7 +35,7 @@ - Use our own string typedef in case string is redefined (csilvers) - Updated to autoconf 2.65 -* Wed Oct 13 17:40:12 2010 Google Inc. +* Wed Oct 13 2010 Google Inc. - google-gflags: version 1.4 - Add a check to prevent passing 0 to DEFINE_string (jorg) @@ -46,7 +46,7 @@ - Update the NEWS file to be non-empty - Add pkg-config (.pc) files for libgflags and libgflags_nothreads -* Mon Jan 4 18:09:30 2010 Google Inc. +* Mon Jan 4 2010 Google Inc. - google-gflags: version 1.3 - PORTABILITY: can now build and run tests under MSVC (csilvers) @@ -57,7 +57,7 @@ - Makefile fix: $(srcdir) -> $(top_srcdir) in one place (csilvres) - INSTALL: autotools to autoconf v2.64 + automake v1.11 (csilvers) -* Thu Sep 10 12:53:04 2009 Google Inc. +* Thu Sep 10 2009 Google Inc. - google-gflags: version 1.2 - PORTABILITY: can now build and run tests under mingw (csilvers) @@ -66,7 +66,7 @@ - Protect against a hypothetical global d'tor mutex problem (csilvers) - BUGFIX: can now define a flag after 'using namespace google' (hamaji) -* Tue Apr 14 12:35:25 2009 Google Inc. +* Tue Apr 14 2009 Google Inc. - google-gflags: version 1.1 - Add both foo and nofoo for boolean flags, with --undefok (andychu) @@ -84,13 +84,13 @@ - PORTABILITY: #include more headers to satify new gcc's (csilvers) - INSTALL: Updated to autoconf 2.61 and libtool 1.5.26 (csilvers) -* Fri Oct 3 15:16:46 2008 Google Inc. +* Fri Oct 3 2008 Google Inc. - google-gflags: version 1.0 - Add a missing newline to an error string (bcmills) - (otherwise exactly the same as gflags 1.0rc2) -* Thu Sep 18 12:58:05 2008 Google Inc. +* Thu Sep 18 2008 Google Inc. - google-gflags: version 1.0rc2 - Report current flag values in --helpxml (hdn) @@ -100,7 +100,7 @@ - BUG FIX: Fix --helpshort for source files not in a subdir (csilvers) - BUG FIX: Fix python unittest for 64-bit builds (bcmills) -* Tue Aug 19 16:15:48 2008 +* Tue Aug 19 2008 - google-gflags: version 1.0rc1 - Move #include files from google/ to gflags/ (csilvers) @@ -112,7 +112,7 @@ - PORTABILITY: fix code to compile under Visual Studio (ajenjo) - PORTABILITY: fix code to compile under Solaris 10 with CC (csilvers) -* Mon Jul 21 23:01:38 2008 Google Inc. +* Mon Jul 21 2008 Google Inc. - google-gflags: version 0.9 - Add the ability to validate a command-line flag (csilvers) @@ -126,7 +126,7 @@ - Better error messages when bool flags collide (colohan) - Only evaluate DEFINE_foo macro args once (csilvers) -* Wed Mar 26 15:20:18 2008 Google Inc. +* Wed Mar 26 Google Inc. - google-gflags: version 0.8 - Export DescribeOneFlag() in the API @@ -137,7 +137,7 @@ - Improve #include hygiene - Improve testing -* Thu Oct 18 11:33:20 2007 Google Inc. +* Thu Oct 18 2007 Google Inc. - google-gflags: version 0.7 - Deal even more correctly with libpthread not linked in (csilvers) @@ -149,14 +149,14 @@ - Broaden --helpshort to match foo-main.cc and foo_main.cc (hendrie) - Fix "no modules match" message for --helpshort, etc (hendrie) -* Wed Aug 15 07:35:51 2007 Google Inc. +* Wed Aug 15 2007 Google Inc. - google-gflags: version 0.6 - Deal correctly with case that libpthread is not linked in (csilvers) - Update Makefile/tests so we pass "make distcheck" (csilvers) - Document and test that last assignment to a flag wins (wan) -* Tue Jun 12 15:23:42 2007 Google Inc. +* Tue Jun 12 2007 Google Inc. - google-gflags: version 0.5 - Include all m4 macros in the distribution (csilvers) @@ -164,14 +164,14 @@ - Python: better string serliaizing and unparsing (abo, csimmons) - Fix checks for NaN and inf to work with Mac OS X (csilvers) -* Thu Apr 19 15:15:07 2007 Google Inc. +* Thu Apr 19 2007 Google Inc. - google-gflags: version 0.4 - Remove is_default from GetCommandLineFlagInfo (csilvers) - Portability fixes: includes, strtoll, gcc4.3 errors (csilvers) - A few doc typo cleanups (csilvers) -* Wed Mar 28 12:15:56 2007 Google Inc. +* Wed Mar 28 2007 Google Inc. - google-gflags: version 0.3 - python portability fix: use popen instead of subprocess (csilvers) @@ -179,13 +179,13 @@ - Make docs a bit prettier (csilvers) - Actually include the python files in the distribution! :-/ (csilvers) -* Mon Jan 22 15:33:06 2007 Google Inc. +* Mon Jan 22 2007 Google Inc. - google-gflags: version 0.2 - added support for python commandlineflags, as well as c++ - gflags2man, a script to turn flags into a man page (dchristian) -* Wed Dec 13 12:37:19 2006 Google Inc. +* Wed Dec 13 2006 Google Inc. - google-gflags: initial release: The gflags package contains a library that implements commandline From 313e39e323cc0a72bcca10ce93690b6c818d1c45 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 20 Mar 2014 03:49:21 +0000 Subject: [PATCH 19/94] Add missing name to ChangeLog entry and further format changes. --- ChangeLog.txt | 333 ++++++++++++++++++++++++++------------------------ 1 file changed, 174 insertions(+), 159 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index e05a538..cddca1c 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,195 +1,210 @@ -* Wed Jan 25 2012 Google Inc. +------------------------------------------------------------------- +* Wed Jan 25 2012 - Google Inc. - - gflags: version 2.0 - - Changed the 'official' gflags email in setup.py/etc - - Renamed google-gflags.sln to gflags.sln - - Changed copyright text to reflect Google's relinquished ownership +- gflags: version 2.0 +- Changed the 'official' gflags email in setup.py/etc +- Renamed google-gflags.sln to gflags.sln +- Changed copyright text to reflect Google's relinquished ownership -* Tue Dec 20 2011 Google Inc. +------------------------------------------------------------------- +* Tue Dec 20 2011 - Google Inc. - - google-gflags: version 1.7 - - Add CommandLineFlagInfo::flag_ptr pointing to current storage (musji) - - PORTING: flush after writing to stderr, needed on cygwin - - PORTING: Clean up the GFLAGS_DLL_DECL stuff better - - Fix a bug in StringPrintf() that affected large strings (csilvers) - - Die at configure-time when g++ isn't installed +- google-gflags: version 1.7 +- Add CommandLineFlagInfo::flag_ptr pointing to current storage (musji) +- PORTING: flush after writing to stderr, needed on cygwin +- PORTING: Clean up the GFLAGS_DLL_DECL stuff better +- Fix a bug in StringPrintf() that affected large strings (csilvers) +- Die at configure-time when g++ isn't installed -* Fri Jul 29 2011 Google Inc. +------------------------------------------------------------------- +* Fri Jul 29 2011 - Google Inc. - - google-gflags: version 1.6 - - BUGFIX: Fix a bug where we were leaving out a required $(top_srcdir) - - Fix definition of clstring (jyrki) - - Split up flag declares into its own file (jyrki) - - Add --version support (csilvers) - - Update the README for gflags with static libs - - Update acx_pthread.m4 for nostdlib - - Change ReparseCommandLineFlags to return void (csilvers) - - Some doc typofixes and example augmentation (various) +- google-gflags: version 1.6 +- BUGFIX: Fix a bug where we were leaving out a required $(top_srcdir) +- Fix definition of clstring (jyrki) +- Split up flag declares into its own file (jyrki) +- Add --version support (csilvers) +- Update the README for gflags with static libs +- Update acx_pthread.m4 for nostdlib +- Change ReparseCommandLineFlags to return void (csilvers) +- Some doc typofixes and example augmentation (various) -* Mon Jan 24 2011 Google Inc. +------------------------------------------------------------------- +* Mon Jan 24 2011 - Google Inc. - - google-gflags: version 1.5 - - Better reporting of current vs default value (handler) - - Add API for cleaning up of memory at program-exit (jmarantz) - - Fix macros to work inside namespaces (csilvers) - - Use our own string typedef in case string is redefined (csilvers) - - Updated to autoconf 2.65 +- google-gflags: version 1.5 +- Better reporting of current vs default value (handler) +- Add API for cleaning up of memory at program-exit (jmarantz) +- Fix macros to work inside namespaces (csilvers) +- Use our own string typedef in case string is redefined (csilvers) +- Updated to autoconf 2.65 -* Wed Oct 13 2010 Google Inc. +------------------------------------------------------------------- +* Wed Oct 13 2010 - Google Inc. - - google-gflags: version 1.4 - - Add a check to prevent passing 0 to DEFINE_string (jorg) - - Reduce compile (.o) size (jyrki) - - Some small changes to quiet debug compiles (alexk) - - PORTING: better support static linking on windows (csilvers) - - DOCUMENTATION: change default values, use validators, etc. - - Update the NEWS file to be non-empty - - Add pkg-config (.pc) files for libgflags and libgflags_nothreads +- google-gflags: version 1.4 +- Add a check to prevent passing 0 to DEFINE_string (jorg) +- Reduce compile (.o) size (jyrki) +- Some small changes to quiet debug compiles (alexk) +- PORTING: better support static linking on windows (csilvers) +- DOCUMENTATION: change default values, use validators, etc. +- Update the NEWS file to be non-empty +- Add pkg-config (.pc) files for libgflags and libgflags_nothreads -* Mon Jan 4 2010 Google Inc. +------------------------------------------------------------------- +* Mon Jan 4 2010 - Google Inc. - - google-gflags: version 1.3 - - PORTABILITY: can now build and run tests under MSVC (csilvers) - - Remove the python gflags code, which is now its own package (tansell) - - Clarify that "last flag wins" in the docs (csilvers) - - Comment danger of using GetAllFlags in validators (wojtekm) - - PORTABILITY: Some fixes necessary for c++0x (mboerger) - - Makefile fix: $(srcdir) -> $(top_srcdir) in one place (csilvres) - - INSTALL: autotools to autoconf v2.64 + automake v1.11 (csilvers) +- google-gflags: version 1.3 +- PORTABILITY: can now build and run tests under MSVC (csilvers) +- Remove the python gflags code, which is now its own package (tansell) +- Clarify that "last flag wins" in the docs (csilvers) +- Comment danger of using GetAllFlags in validators (wojtekm) +- PORTABILITY: Some fixes necessary for c++0x (mboerger) +- Makefile fix: $(srcdir) -> $(top_srcdir) in one place (csilvres) +- INSTALL: autotools to autoconf v2.64 + automake v1.11 (csilvers) -* Thu Sep 10 2009 Google Inc. +------------------------------------------------------------------- +* Thu Sep 10 2009 - Google Inc. - - google-gflags: version 1.2 - - PORTABILITY: can now build and run tests under mingw (csilvers) - - Using a string arg for a bool flag is a compile-time error (rbayardo) - - Add --helpxml to gflags.py (salcianu) - - Protect against a hypothetical global d'tor mutex problem (csilvers) - - BUGFIX: can now define a flag after 'using namespace google' (hamaji) +- google-gflags: version 1.2 +- PORTABILITY: can now build and run tests under mingw (csilvers) +- Using a string arg for a bool flag is a compile-time error (rbayardo) +- Add --helpxml to gflags.py (salcianu) +- Protect against a hypothetical global d'tor mutex problem (csilvers) +- BUGFIX: can now define a flag after 'using namespace google' (hamaji) -* Tue Apr 14 2009 Google Inc. +------------------------------------------------------------------- +* Tue Apr 14 2009 - Google Inc. - - google-gflags: version 1.1 - - Add both foo and nofoo for boolean flags, with --undefok (andychu) - - Better document how validators work (wojtekm) - - Improve binary-detection for bash-completion (mtamsky) - - Python: Add a concept of "key flags", used with --help (salcianu) - - Python: Robustify flag_values (salcianu) - - Python: Add a new DEFINE_bool alias (keir, andrewliu) - - Python: Do module introspection based on module name (dsturtevant) - - Fix autoconf a bit better, especially on windows and solaris (ajenjo) - - BUG FIX: gflags_nothreads was linking against the wrong lib (ajenjo) - - BUG FIX: threads-detection failed on FreeBSD; replace it (ajenjo) - - PORTABILITY: Quiet an internal compiler error with SUSE 10 (csilvers) - - PORTABILITY: Update deb.sh for more recenty debuilds (csilvers) - - PORTABILITY: #include more headers to satify new gcc's (csilvers) - - INSTALL: Updated to autoconf 2.61 and libtool 1.5.26 (csilvers) +- google-gflags: version 1.1 +- Add both foo and nofoo for boolean flags, with --undefok (andychu) +- Better document how validators work (wojtekm) +- Improve binary-detection for bash-completion (mtamsky) +- Python: Add a concept of "key flags", used with --help (salcianu) +- Python: Robustify flag_values (salcianu) +- Python: Add a new DEFINE_bool alias (keir, andrewliu) +- Python: Do module introspection based on module name (dsturtevant) +- Fix autoconf a bit better, especially on windows and solaris (ajenjo) +- BUG FIX: gflags_nothreads was linking against the wrong lib (ajenjo) +- BUG FIX: threads-detection failed on FreeBSD; replace it (ajenjo) +- PORTABILITY: Quiet an internal compiler error with SUSE 10 (csilvers) +- PORTABILITY: Update deb.sh for more recenty debuilds (csilvers) +- PORTABILITY: #include more headers to satify new gcc's (csilvers) +- INSTALL: Updated to autoconf 2.61 and libtool 1.5.26 (csilvers) -* Fri Oct 3 2008 Google Inc. +------------------------------------------------------------------- +* Fri Oct 3 2008 - Google Inc. - - google-gflags: version 1.0 - - Add a missing newline to an error string (bcmills) - - (otherwise exactly the same as gflags 1.0rc2) +- google-gflags: version 1.0 +- Add a missing newline to an error string (bcmills) +- (otherwise exactly the same as gflags 1.0rc2) -* Thu Sep 18 2008 Google Inc. +------------------------------------------------------------------- +* Thu Sep 18 2008 - Google Inc. - - google-gflags: version 1.0rc2 - - Report current flag values in --helpxml (hdn) - - Fix compilation troubles with gcc 4.3.3 (simonb) - - BUG FIX: I was missing a std:: in DECLARE_string (csilvers) - - BUG FIX: Clarify in docs how to specify --bool flags (csilvers) - - BUG FIX: Fix --helpshort for source files not in a subdir (csilvers) - - BUG FIX: Fix python unittest for 64-bit builds (bcmills) - -* Tue Aug 19 2008 +- google-gflags: version 1.0rc2 +- Report current flag values in --helpxml (hdn) +- Fix compilation troubles with gcc 4.3.3 (simonb) +- BUG FIX: I was missing a std:: in DECLARE_string (csilvers) +- BUG FIX: Clarify in docs how to specify --bool flags (csilvers) +- BUG FIX: Fix --helpshort for source files not in a subdir (csilvers) +- BUG FIX: Fix python unittest for 64-bit builds (bcmills) - - google-gflags: version 1.0rc1 - - Move #include files from google/ to gflags/ (csilvers) - - Small optimizations to reduce binary (library) size (jyrki) - - BUGFIX: forgot a std:: in one of the .h files (csilvers) - - Speed up locking by making sure calls are inlined (ajenjo) - - 64-BIT COMPATIBILITY: Use %PRId64 instead of %lld (csilvers) - - PORTABILITY: fix Makefile to work with Cygwin (ajenjo) - - PORTABILITY: fix code to compile under Visual Studio (ajenjo) - - PORTABILITY: fix code to compile under Solaris 10 with CC (csilvers) +------------------------------------------------------------------- +* Tue Aug 19 2008 - Google Inc. -* Mon Jul 21 2008 Google Inc. +- google-gflags: version 1.0rc1 +- Move #include files from google/ to gflags/ (csilvers) +- Small optimizations to reduce binary (library) size (jyrki) +- BUGFIX: forgot a std:: in one of the .h files (csilvers) +- Speed up locking by making sure calls are inlined (ajenjo) +- 64-BIT COMPATIBILITY: Use %PRId64 instead of %lld (csilvers) +- PORTABILITY: fix Makefile to work with Cygwin (ajenjo) +- PORTABILITY: fix code to compile under Visual Studio (ajenjo) +- PORTABILITY: fix code to compile under Solaris 10 with CC (csilvers) - - google-gflags: version 0.9 - - Add the ability to validate a command-line flag (csilvers) - - Add completion support for commandline flags in bash (daven) - - Add -W compile flags to Makefile, when using gcc (csilvers) - - Allow helpstring to be NULL (cristianoc) - - Improved documentation of classes in the .cc file (csilvers) - - Fix python bug with AppendFlagValues + shortnames (jjtswan) - - Use bool instead of int for boolean flags in gflags.py (bcmills) - - Simplify the way we declare flags, now more foolproof (csilvers) - - Better error messages when bool flags collide (colohan) - - Only evaluate DEFINE_foo macro args once (csilvers) +------------------------------------------------------------------- +* Mon Jul 21 2008 - Google Inc. -* Wed Mar 26 Google Inc. +- google-gflags: version 0.9 +- Add the ability to validate a command-line flag (csilvers) +- Add completion support for commandline flags in bash (daven) +- Add -W compile flags to Makefile, when using gcc (csilvers) +- Allow helpstring to be NULL (cristianoc) +- Improved documentation of classes in the .cc file (csilvers) +- Fix python bug with AppendFlagValues + shortnames (jjtswan) +- Use bool instead of int for boolean flags in gflags.py (bcmills) +- Simplify the way we declare flags, now more foolproof (csilvers) +- Better error messages when bool flags collide (colohan) +- Only evaluate DEFINE_foo macro args once (csilvers) - - google-gflags: version 0.8 - - Export DescribeOneFlag() in the API - - Add support for automatic line wrapping at 80 cols for gflags.py - - Bugfix: do not treat an isolated "-" the same as an isolated "--" - - Update rpm spec to point to Google Code rather than sourceforge (!) - - Improve documentation (including documenting thread-safety) - - Improve #include hygiene - - Improve testing - -* Thu Oct 18 2007 Google Inc. +------------------------------------------------------------------- +* Wed Mar 26 - Google Inc. - - google-gflags: version 0.7 - - Deal even more correctly with libpthread not linked in (csilvers) - - Add STRIP_LOG, an improved DO_NOT_SHOW_COMMANDLINE_HELP (sioffe) - - Be more accurate printing default flag values in --help (dsturtevant) - - Reduce .o file size a bit by using shorter namespace names (jeff) - - Use relative install path, so 'setup.py --home' works (csilvers) - - Notice when a boolean flag has a non-boolean default (bnmouli) - - Broaden --helpshort to match foo-main.cc and foo_main.cc (hendrie) - - Fix "no modules match" message for --helpshort, etc (hendrie) +- google-gflags: version 0.8 +- Export DescribeOneFlag() in the API +- Add support for automatic line wrapping at 80 cols for gflags.py +- Bugfix: do not treat an isolated "-" the same as an isolated "--" +- Update rpm spec to point to Google Code rather than sourceforge (!) +- Improve documentation (including documenting thread-safety) +- Improve #include hygiene +- Improve testing -* Wed Aug 15 2007 Google Inc. +------------------------------------------------------------------- +* Thu Oct 18 2007 - Google Inc. - - google-gflags: version 0.6 - - Deal correctly with case that libpthread is not linked in (csilvers) - - Update Makefile/tests so we pass "make distcheck" (csilvers) - - Document and test that last assignment to a flag wins (wan) +- google-gflags: version 0.7 +- Deal even more correctly with libpthread not linked in (csilvers) +- Add STRIP_LOG, an improved DO_NOT_SHOW_COMMANDLINE_HELP (sioffe) +- Be more accurate printing default flag values in --help (dsturtevant) +- Reduce .o file size a bit by using shorter namespace names (jeff) +- Use relative install path, so 'setup.py --home' works (csilvers) +- Notice when a boolean flag has a non-boolean default (bnmouli) +- Broaden --helpshort to match foo-main.cc and foo_main.cc (hendrie) +- Fix "no modules match" message for --helpshort, etc (hendrie) -* Tue Jun 12 2007 Google Inc. +------------------------------------------------------------------- +* Wed Aug 15 2007 - Google Inc. - - google-gflags: version 0.5 - - Include all m4 macros in the distribution (csilvers) - - Python: Fix broken data_files field in setup.py (sidlon) - - Python: better string serliaizing and unparsing (abo, csimmons) - - Fix checks for NaN and inf to work with Mac OS X (csilvers) - -* Thu Apr 19 2007 Google Inc. +- google-gflags: version 0.6 +- Deal correctly with case that libpthread is not linked in (csilvers) +- Update Makefile/tests so we pass "make distcheck" (csilvers) +- Document and test that last assignment to a flag wins (wan) - - google-gflags: version 0.4 - - Remove is_default from GetCommandLineFlagInfo (csilvers) - - Portability fixes: includes, strtoll, gcc4.3 errors (csilvers) - - A few doc typo cleanups (csilvers) +------------------------------------------------------------------- +* Tue Jun 12 2007 - Google Inc. -* Wed Mar 28 2007 Google Inc. +- google-gflags: version 0.5 +- Include all m4 macros in the distribution (csilvers) +- Python: Fix broken data_files field in setup.py (sidlon) +- Python: better string serliaizing and unparsing (abo, csimmons) +- Fix checks for NaN and inf to work with Mac OS X (csilvers) - - google-gflags: version 0.3 - - python portability fix: use popen instead of subprocess (csilvers) - - Add is_default to CommandLineFlagInfo (pchien) - - Make docs a bit prettier (csilvers) - - Actually include the python files in the distribution! :-/ (csilvers) +------------------------------------------------------------------- +* Thu Apr 19 2007 - Google Inc. -* Mon Jan 22 2007 Google Inc. +- google-gflags: version 0.4 +- Remove is_default from GetCommandLineFlagInfo (csilvers) +- Portability fixes: includes, strtoll, gcc4.3 errors (csilvers) +- A few doc typo cleanups (csilvers) - - google-gflags: version 0.2 - - added support for python commandlineflags, as well as c++ - - gflags2man, a script to turn flags into a man page (dchristian) +------------------------------------------------------------------- +* Wed Mar 28 2007 - Google Inc. -* Wed Dec 13 2006 Google Inc. +- google-gflags: version 0.3 +- python portability fix: use popen instead of subprocess (csilvers) +- Add is_default to CommandLineFlagInfo (pchien) +- Make docs a bit prettier (csilvers) +- Actually include the python files in the distribution! :-/ (csilvers) - - google-gflags: initial release: - The gflags package contains a library that implements commandline - flags processing. As such it's a replacement for getopt(). It - has increased flexibility, including built-in support for C++ - types like string, and the ability to define flags in the source - file in which they're used. +------------------------------------------------------------------- +* Mon Jan 22 2007 - Google Inc. + +- google-gflags: version 0.2 +- added support for python commandlineflags, as well as c++ +- gflags2man, a script to turn flags into a man page (dchristian) + +------------------------------------------------------------------- +* Wed Dec 13 2006 - Google Inc. + +- google-gflags: version 0.1 From 4258af12b715570a3ef29ffd1f75b72a430aa40a Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 20 Mar 2014 03:51:30 +0000 Subject: [PATCH 20/94] Remove separating lines from ChangeLog again. --- ChangeLog.txt | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index cddca1c..da3187d 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,4 +1,3 @@ -------------------------------------------------------------------- * Wed Jan 25 2012 - Google Inc. - gflags: version 2.0 @@ -6,7 +5,6 @@ - Renamed google-gflags.sln to gflags.sln - Changed copyright text to reflect Google's relinquished ownership -------------------------------------------------------------------- * Tue Dec 20 2011 - Google Inc. - google-gflags: version 1.7 @@ -16,7 +14,6 @@ - Fix a bug in StringPrintf() that affected large strings (csilvers) - Die at configure-time when g++ isn't installed -------------------------------------------------------------------- * Fri Jul 29 2011 - Google Inc. - google-gflags: version 1.6 @@ -29,7 +26,6 @@ - Change ReparseCommandLineFlags to return void (csilvers) - Some doc typofixes and example augmentation (various) -------------------------------------------------------------------- * Mon Jan 24 2011 - Google Inc. - google-gflags: version 1.5 @@ -39,7 +35,6 @@ - Use our own string typedef in case string is redefined (csilvers) - Updated to autoconf 2.65 -------------------------------------------------------------------- * Wed Oct 13 2010 - Google Inc. - google-gflags: version 1.4 @@ -51,7 +46,6 @@ - Update the NEWS file to be non-empty - Add pkg-config (.pc) files for libgflags and libgflags_nothreads -------------------------------------------------------------------- * Mon Jan 4 2010 - Google Inc. - google-gflags: version 1.3 @@ -63,7 +57,6 @@ - Makefile fix: $(srcdir) -> $(top_srcdir) in one place (csilvres) - INSTALL: autotools to autoconf v2.64 + automake v1.11 (csilvers) -------------------------------------------------------------------- * Thu Sep 10 2009 - Google Inc. - google-gflags: version 1.2 @@ -73,7 +66,6 @@ - Protect against a hypothetical global d'tor mutex problem (csilvers) - BUGFIX: can now define a flag after 'using namespace google' (hamaji) -------------------------------------------------------------------- * Tue Apr 14 2009 - Google Inc. - google-gflags: version 1.1 @@ -92,14 +84,12 @@ - PORTABILITY: #include more headers to satify new gcc's (csilvers) - INSTALL: Updated to autoconf 2.61 and libtool 1.5.26 (csilvers) -------------------------------------------------------------------- * Fri Oct 3 2008 - Google Inc. - google-gflags: version 1.0 - Add a missing newline to an error string (bcmills) - (otherwise exactly the same as gflags 1.0rc2) -------------------------------------------------------------------- * Thu Sep 18 2008 - Google Inc. - google-gflags: version 1.0rc2 @@ -110,7 +100,6 @@ - BUG FIX: Fix --helpshort for source files not in a subdir (csilvers) - BUG FIX: Fix python unittest for 64-bit builds (bcmills) -------------------------------------------------------------------- * Tue Aug 19 2008 - Google Inc. - google-gflags: version 1.0rc1 @@ -123,7 +112,6 @@ - PORTABILITY: fix code to compile under Visual Studio (ajenjo) - PORTABILITY: fix code to compile under Solaris 10 with CC (csilvers) -------------------------------------------------------------------- * Mon Jul 21 2008 - Google Inc. - google-gflags: version 0.9 @@ -138,7 +126,6 @@ - Better error messages when bool flags collide (colohan) - Only evaluate DEFINE_foo macro args once (csilvers) -------------------------------------------------------------------- * Wed Mar 26 - Google Inc. - google-gflags: version 0.8 @@ -150,7 +137,6 @@ - Improve #include hygiene - Improve testing -------------------------------------------------------------------- * Thu Oct 18 2007 - Google Inc. - google-gflags: version 0.7 @@ -163,7 +149,6 @@ - Broaden --helpshort to match foo-main.cc and foo_main.cc (hendrie) - Fix "no modules match" message for --helpshort, etc (hendrie) -------------------------------------------------------------------- * Wed Aug 15 2007 - Google Inc. - google-gflags: version 0.6 @@ -171,7 +156,6 @@ - Update Makefile/tests so we pass "make distcheck" (csilvers) - Document and test that last assignment to a flag wins (wan) -------------------------------------------------------------------- * Tue Jun 12 2007 - Google Inc. - google-gflags: version 0.5 @@ -180,7 +164,6 @@ - Python: better string serliaizing and unparsing (abo, csimmons) - Fix checks for NaN and inf to work with Mac OS X (csilvers) -------------------------------------------------------------------- * Thu Apr 19 2007 - Google Inc. - google-gflags: version 0.4 @@ -188,7 +171,6 @@ - Portability fixes: includes, strtoll, gcc4.3 errors (csilvers) - A few doc typo cleanups (csilvers) -------------------------------------------------------------------- * Wed Mar 28 2007 - Google Inc. - google-gflags: version 0.3 @@ -197,14 +179,12 @@ - Make docs a bit prettier (csilvers) - Actually include the python files in the distribution! :-/ (csilvers) -------------------------------------------------------------------- * Mon Jan 22 2007 - Google Inc. - google-gflags: version 0.2 - added support for python commandlineflags, as well as c++ - gflags2man, a script to turn flags into a man page (dchristian) -------------------------------------------------------------------- * Wed Dec 13 2006 - Google Inc. - google-gflags: version 0.1 From 4b1ca7d5f147dfdd8a845a5ea2749220ff9e6eb1 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 20 Mar 2014 03:53:50 +0000 Subject: [PATCH 21/94] Add missing year to ChangeLog entry. RPM is now generated successfully. --- ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index da3187d..4476a99 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -126,7 +126,7 @@ - Better error messages when bool flags collide (colohan) - Only evaluate DEFINE_foo macro args once (csilvers) -* Wed Mar 26 - Google Inc. +* Wed Mar 26 2008 - Google Inc. - google-gflags: version 0.8 - Export DescribeOneFlag() in the API From 52bf642cf8c9c0f662fc613fb840178e3074edcd Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 20 Mar 2014 04:06:13 +0000 Subject: [PATCH 22/94] Remove brief description from README to avoid duplicate appearance in RPM and other packages. --- README.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.txt b/README.txt index bda07ef..b5ecbbb 100644 --- a/README.txt +++ b/README.txt @@ -1,5 +1,3 @@ -A commandline flags library that allows for distributed flags. - This package contains a library that implements commandline flags processing. As such it's a replacement for getopt(). It has increased flexibility, including built-in support for C++ types like string, and From fc6e079cfce76fa3a5dfdbbf356d6e7187a56129 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 20 Mar 2014 04:09:02 +0000 Subject: [PATCH 23/94] Change package vendor to just a name. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8aec4b8..4fa4603 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -338,7 +338,7 @@ if (BUILD_PACKAGING) mark_as_advanced (CPACK_GENERATOR CPACK_SOURCE_GENERATOR) # common package information - set (CPACK_PACKAGE_VENDOR "Open Source by Andreas Schuh") + set (CPACK_PACKAGE_VENDOR "Andreas Schuh") set (CPACK_PACKAGE_CONTACT "google-gflags@googlegroups.com") set (CPACK_PACKAGE_NAME "${PACKAGE_NAME}") set (CPACK_PACKAGE_VERSION "${PACKAGE_VERSION}") From e8890f274af67c6e6f6f3a98bb3641baced364e4 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 20 Mar 2014 04:20:15 +0000 Subject: [PATCH 24/94] Set additional DEB CPack variables in package.cmake.in. --- CMakeLists.txt | 2 +- cmake/package.cmake.in | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4fa4603..759fcb2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -354,7 +354,7 @@ if (BUILD_PACKAGING) set (CPACK_PACKAGE_RELOCATABLE TRUE) set (CPACK_MONOLITHIC_INSTALL TRUE) - # RPM specification + # RPM package information -- used in cmake/package.cmake.in also for DEB set (CPACK_RPM_PACKAGE_GROUP "Development/Libraries") set (CPACK_RPM_PACKAGE_LICENSE "BSD") set (CPACK_RPM_PACKAGE_URL "http://code.google.com/p/gflags") diff --git a/cmake/package.cmake.in b/cmake/package.cmake.in index d4419a1..c3ebdc9 100644 --- a/cmake/package.cmake.in +++ b/cmake/package.cmake.in @@ -38,8 +38,10 @@ elseif (CPACK_GENERATOR MATCHES "DEB") set (CPACK_DEBIAN_PACKAGE_ARCHITECTURE i386) endif () set (CPACK_DEBIAN_PACKAGE_DEPENDS) - set (CPACK_DEBIAN_PACKAGE_SECTION devel) - set (CPACK_DEBIAN_PACKAGE_PRIORITY optional) + set (CPACK_DEBIAN_PACKAGE_SECTION "devel") + set (CPACK_DEBIAN_PACKAGE_PRIORITY "optional") + set (CPACK_DEBIAN_PACKAGE_HOMEPAGE "${CPACK_RPM_PACKAGE_URL}") + set (CPACK_DEBIAN_PACKAGE_MAINTAINER "${CPACK_PACKAGE_VENDOR}") # ------------------------------------------------------------------------------ # RPM package From a49a656f1e2664811f8aa2dc1305210f9e74832f Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 20 Mar 2014 04:24:57 +0000 Subject: [PATCH 25/94] Use dpkg --print-architecture also for RPM generator. --- cmake/package.cmake.in | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/cmake/package.cmake.in b/cmake/package.cmake.in index c3ebdc9..f0b9fd0 100644 --- a/cmake/package.cmake.in +++ b/cmake/package.cmake.in @@ -37,6 +37,7 @@ elseif (CPACK_GENERATOR MATCHES "DEB") if (NOT RV EQUAL 0) set (CPACK_DEBIAN_PACKAGE_ARCHITECTURE i386) endif () + set (CPACK_DEBIAN_PACKAGE_DEPENDS) set (CPACK_DEBIAN_PACKAGE_SECTION "devel") set (CPACK_DEBIAN_PACKAGE_PRIORITY "optional") @@ -47,6 +48,15 @@ elseif (CPACK_GENERATOR MATCHES "DEB") # RPM package elseif (CPACK_GENERATOR MATCHES "RPM") + execute_process ( + COMMAND dpkg --print-architecture + RESULT_VARIABLE RV + OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE + ) + if (NOT RV EQUAL 0) + set (CPACK_RPM_PACKAGE_ARCHITECTURE i386) + endif () + set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}") if (DEVEL) set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-devel") From 978c567d02835e197d2f15dd4187160249da5951 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 20 Mar 2014 04:43:01 +0000 Subject: [PATCH 26/94] Ignore packages subdirectory (if it exists). --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 737f962..39cb957 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ CMakeFiles/ /lib/ /test/gflags_unittest_main.cc /test/gflags_unittest-main.cc +/packages/ From 76f2ffadb4f393ed0c850f8cdd83307a680b97f2 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 20 Mar 2014 16:02:15 +0000 Subject: [PATCH 27/94] Add ChangeLog entries for v2.1 release. --- ChangeLog.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index 4476a99..347b701 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,13 @@ +* Thu Mar 20 2014 - Andreas Schuh + +- gflags: version 2.1.0 +- Build system configuration using CMake instead of autotools +- CPack packaging support for Debian/Ubuntu, Red Hat, and Mac OS X +- Fixed issue 54: Fix "invalid suffix on literal" (C++11) +- Fixed issue 57: Use _strdup instead of strdup on Windows +- Fixed issue 62: Change all preprocessor include guards to start with GFLAGS_ +- Fixed issue 64: Add DEFINE_validator macro + * Wed Jan 25 2012 - Google Inc. - gflags: version 2.0 From 0100be50ece23f5708f54246a132051168526f3c Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 20 Mar 2014 16:15:10 +0000 Subject: [PATCH 28/94] Add missing entry to ChangeLog for v2.1 release. --- ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index 347b701..9771549 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -7,6 +7,7 @@ - Fixed issue 57: Use _strdup instead of strdup on Windows - Fixed issue 62: Change all preprocessor include guards to start with GFLAGS_ - Fixed issue 64: Add DEFINE_validator macro +- Fixed issue 73: Warnings in Visual Studio 2010 and unable to compile unit test * Wed Jan 25 2012 - Google Inc. From 3e96a19026c384dae208f2d4db95b938a987772d Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 20 Mar 2014 16:19:00 +0000 Subject: [PATCH 29/94] Change version to 2.1.0, i.e., use common semantic versioning system including patch number for bug fix releases. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 759fcb2..34dc4b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ include (utils) # ---------------------------------------------------------------------------- # package information set (PACKAGE_NAME "gflags") -set (PACKAGE_VERSION "2.1") +set (PACKAGE_VERSION "2.1.0") set (PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set (PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}") set (PACKAGE_BUGREPORT "https://code.google.com/p/gflags/issues/") From 33e2cbe2c63bdc94b5e5add7ccf7d38f3cca35e1 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 20 Mar 2014 16:32:54 +0000 Subject: [PATCH 30/94] Add release notes. --- NEWS.txt | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/NEWS.txt b/NEWS.txt index f049345..4d976d7 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -1,3 +1,37 @@ +=== 20 March 2014 === + +I've just released gflags 2.1.0. + +The major changes are the use of CMake for the build configuration instead +of the autotools and packaging support through CPack. This release compiles +with all major compilers without warnings and passed the unit tests on +Ubuntu 12.04, Windows 7 (Visual Studio 2008 and 2010, Cygwin, MinGW), and +Mac OS X (Xcode 5.1). + +The SVN repository on Google Code is now frozen and replaced by a Git +repository such that it can be used as Git submodule by projects. The main +hosting of this project remains at Google Code. Thanks to the distributed +character of Git, I can push (and pull) changes from both GitHub and Google Code +in order to keep the two public repositories in sync. +When fixing an issue for a pull request through either of these hosting +platforms, please reference the issue number as +[https://code.google.com/p/support/wiki/IssueTracker#Integration_with_version_control described here]. + +Binary and source distribution packages can be downloaded from +[https://github.com/schuhschuh/gflags GitHub] as Google Code no longer +permits the upload of such download packages. + + +=== 14 January 2013 === + +The migration of the build system to CMake is almost complete. +What remains to be done is rewriting the tests in Python such they can be +executed on non-Unix platforms and splitting them up into separate CTest tests. +Though merging these changes into the master branch yet remains to be done, +it is recommended to already start using the +[https://github.com/schuhschuh/gflags/tree/cmake-migration cmake-migration] branch. + + === 20 April 2013 === More than a year has past since I (Andreas) took over the maintenance for From 882db5d018c813cf8f037de4d4d6d9e876dd8804 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 20 Mar 2014 16:35:30 +0000 Subject: [PATCH 31/94] Mention Git branching model in NEWS. --- NEWS.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/NEWS.txt b/NEWS.txt index 4d976d7..b9a68f3 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -16,6 +16,10 @@ in order to keep the two public repositories in sync. When fixing an issue for a pull request through either of these hosting platforms, please reference the issue number as [https://code.google.com/p/support/wiki/IssueTracker#Integration_with_version_control described here]. +For the further development, I am following the +[http://nvie.com/posts/a-successful-git-branching-model/ Git branching model] +with feature branch names prefixed by "feature/" and bugfix branch names +prefixed by "bugfix/", respectively. Binary and source distribution packages can be downloaded from [https://github.com/schuhschuh/gflags GitHub] as Google Code no longer From d699559081ff610f905f512b3a923bd9cabc19f0 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 20 Mar 2014 20:21:30 +0000 Subject: [PATCH 32/94] Fix architecture used for RPM packages and DEB/RPM package file names. --- CMakeLists.txt | 26 +++++++++++++++++++++----- cmake/package.cmake.in | 31 +++++++------------------------ 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 34dc4b4..93d3a73 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -366,15 +366,31 @@ if (BUILD_PACKAGING) set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_LIST_DIR}/cmake/README_runtime.txt") endif () - # system name used for binary package file name + # system/architecture if (WINDOWS) if (CMAKE_CL_64) set (CPACK_SYSTEM_NAME "win64") else () set (CPACK_SYSTEM_NAME "win32") endif () + set (CPACK_PACKAGE_ARCHITECTURE) else () string (TOLOWER "${CMAKE_SYSTEM_NAME}" CPACK_SYSTEM_NAME) + execute_process ( + COMMAND dpkg --print-architecture + RESULT_VARIABLE RV + OUTPUT_VARIABLE CPACK_PACKAGE_ARCHITECTURE + ) + if (RV EQUAL 0) + string (STRIP "${CPACK_PACKAGE_ARCHITECTURE}" CPACK_PACKAGE_ARCHITECTURE) + else () + execute_process (COMMAND uname -m OUTPUT_VARIABLE CPACK_PACKAGE_ARCHITECTURE) + if (CPACK_PACKAGE_ARCHITECTURE MATCHES "x86_64") + set (CPACK_PACKAGE_ARCHITECTURE amd64) + else () + set (CPACK_PACKAGE_ARCHITECTURE i386) + endif () + endif () endif () # source package settings @@ -383,10 +399,10 @@ if (BUILD_PACKAGING) set (CPACK_SOURCE_IGNORE_FILES "/\\\\.git/;\\\\.swp$;\\\\.#;/#;\\\\.*~;cscope\\\\.*;/[Bb]uild[.+-_a-zA-Z0-9]*/") # default binary package settings - set (CPACK_INCLUDE_TOPLEVEL_DIRECTORY TRUE) - set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_SYSTEM_NAME}") - if (CMAKE_SYSTEM_PROCESSOR) - set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-${CMAKE_SYSTEM_PROCESSOR}") + set (CPACK_INCLUDE_TOPLEVEL_DIRECTORY TRUE) + set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_SYSTEM_NAME}") + if (CPACK_PACKAGE_ARCHITECTURE) + set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-${CPACK_PACKAGE_ARCHITECTURE}") endif () # generator specific configuration file diff --git a/cmake/package.cmake.in b/cmake/package.cmake.in index f0b9fd0..aaec792 100644 --- a/cmake/package.cmake.in +++ b/cmake/package.cmake.in @@ -27,40 +27,23 @@ elseif (CPACK_GENERATOR MATCHES "DEB") else () set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}0") endif () - set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}_${CPACK_PACKAGE_VERSION}-1_${CMAKE_SYSTEM_PROCESSOR}") - - execute_process ( - COMMAND dpkg --print-architecture - RESULT_VARIABLE RV - OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE - ) - if (NOT RV EQUAL 0) - set (CPACK_DEBIAN_PACKAGE_ARCHITECTURE i386) - endif () + set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}_${CPACK_PACKAGE_VERSION}-1_${CPACK_PACKAGE_ARCHITECTURE}") set (CPACK_DEBIAN_PACKAGE_DEPENDS) - set (CPACK_DEBIAN_PACKAGE_SECTION "devel") - set (CPACK_DEBIAN_PACKAGE_PRIORITY "optional") - set (CPACK_DEBIAN_PACKAGE_HOMEPAGE "${CPACK_RPM_PACKAGE_URL}") - set (CPACK_DEBIAN_PACKAGE_MAINTAINER "${CPACK_PACKAGE_VENDOR}") + set (CPACK_DEBIAN_PACKAGE_SECTION "devel") + set (CPACK_DEBIAN_PACKAGE_PRIORITY "optional") + set (CPACK_DEBIAN_PACKAGE_HOMEPAGE "${CPACK_RPM_PACKAGE_URL}") + set (CPACK_DEBIAN_PACKAGE_MAINTAINER "${CPACK_PACKAGE_VENDOR}") + set (CPACK_DEBIAN_PACKAGE_ARCHITECTURE "${CPACK_PACKAGE_ARCHITECTURE}") # ------------------------------------------------------------------------------ # RPM package elseif (CPACK_GENERATOR MATCHES "RPM") - execute_process ( - COMMAND dpkg --print-architecture - RESULT_VARIABLE RV - OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE - ) - if (NOT RV EQUAL 0) - set (CPACK_RPM_PACKAGE_ARCHITECTURE i386) - endif () - set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}") if (DEVEL) set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-devel") endif () - set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-${CPACK_PACKAGE_VERSION}-1_${CMAKE_SYSTEM_PROCESSOR}") + set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-${CPACK_PACKAGE_VERSION}-1.${CPACK_PACKAGE_ARCHITECTURE}") endif () From cf40f73c4019a08de47da53f0c7f1d8ae0e9af32 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 20 Mar 2014 20:56:05 +0000 Subject: [PATCH 33/94] Set package architecture to i386 when compiling with -m32. --- CMakeLists.txt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 759fcb2..faefdd2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -375,6 +375,25 @@ if (BUILD_PACKAGING) endif () else () string (TOLOWER "${CMAKE_SYSTEM_NAME}" CPACK_SYSTEM_NAME) + if (CMAKE_CXX_FLAGS MATCHES "-m32") + set (CPACK_PACKAGE_ARCHITECTURE i386) + else () + execute_process ( + COMMAND dpkg --print-architecture + RESULT_VARIABLE RV + OUTPUT_VARIABLE CPACK_PACKAGE_ARCHITECTURE + ) + if (RV EQUAL 0) + string (STRIP "${CPACK_PACKAGE_ARCHITECTURE}" CPACK_PACKAGE_ARCHITECTURE) + else () + execute_process (COMMAND uname -m OUTPUT_VARIABLE CPACK_PACKAGE_ARCHITECTURE) + if (CPACK_PACKAGE_ARCHITECTURE MATCHES "x86_64") + set (CPACK_PACKAGE_ARCHITECTURE amd64) + else () + set (CPACK_PACKAGE_ARCHITECTURE i386) + endif () + endif () + endif () endif () # source package settings From bbe1895559c61ea72faeabf1f083e0cb16bc3a6b Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Sat, 22 Mar 2014 01:00:11 +0000 Subject: [PATCH 34/94] Remove devel package content summary from README --- README.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.txt b/README.txt index b5ecbbb..958c87e 100644 --- a/README.txt +++ b/README.txt @@ -2,5 +2,3 @@ This package contains a library that implements commandline flags processing. As such it's a replacement for getopt(). It has increased flexibility, including built-in support for C++ types like string, and the ability to define flags in the source file in which they're used. -The devel package contains static and debug libraries and header files -for developing applications that use the gflags package. From 09f7800768f8cc02ecaff4fdb020c195ba4d363a Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Tue, 25 Mar 2014 15:29:56 +0000 Subject: [PATCH 35/94] Use GFLAGS_IS_A_DLL=1 in public headers if BUILD_SHARED_LIBS is enabled (Fixes issue #77). --- CMakeLists.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 93d3a73..7ada98c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -197,6 +197,15 @@ else () set (GFLAGS_ATTRIBUTE_UNUSED) endif () +# whenever we build a shared library (DLL on Windows), configure the public +# headers of the API for use of this library rather than the optionally +# also build statically linked library; users can override GFLAGS_DLL_DECL +if (BUILD_SHARED_LIBS) + set (GFLAGS_IS_A_DLL 1) +else () + set (GFLAGS_IS_A_DLL 0) +endif () + configure_headers (PUBLIC_HDRS ${PUBLIC_HDRS}) configure_sources (PRIVATE_HDRS ${PRIVATE_HDRS}) configure_sources (GFLAGS_SRCS ${GFLAGS_SRCS}) From 6040eac5b35763d94af5a0cf6aff75d84f0129b6 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Tue, 25 Mar 2014 15:29:56 +0000 Subject: [PATCH 36/94] Use GFLAGS_IS_A_DLL=1 in public headers if BUILD_SHARED_LIBS is enabled (Fixes issue #77). --- CMakeLists.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ed3161..4702485 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -197,6 +197,15 @@ else () set (GFLAGS_ATTRIBUTE_UNUSED) endif () +# whenever we build a shared library (DLL on Windows), configure the public +# headers of the API for use of this library rather than the optionally +# also build statically linked library; users can override GFLAGS_DLL_DECL +if (BUILD_SHARED_LIBS) + set (GFLAGS_IS_A_DLL 1) +else () + set (GFLAGS_IS_A_DLL 0) +endif () + configure_headers (PUBLIC_HDRS ${PUBLIC_HDRS}) configure_sources (PRIVATE_HDRS ${PRIVATE_HDRS}) configure_sources (GFLAGS_SRCS ${GFLAGS_SRCS}) From 38213112a57f48e0d86206477313bf389e13d8fa Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Wed, 26 Mar 2014 19:37:01 +0000 Subject: [PATCH 37/94] Replace GFLAGS_NAMESPACE by @GFLAGS_NAMESPACE@ in gflags_declare.h (Fixes issue #79). --- src/gflags_declare.h.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gflags_declare.h.in b/src/gflags_declare.h.in index b0548fa..b9ab9c7 100644 --- a/src/gflags_declare.h.in +++ b/src/gflags_declare.h.in @@ -113,13 +113,13 @@ typedef std::string clstring; DECLARE_VARIABLE(bool, B, name) #define DECLARE_int32(name) \ - DECLARE_VARIABLE(GFLAGS_NAMESPACE::int32, I, name) + DECLARE_VARIABLE(::@GFLAGS_NAMESPACE@::int32, I, name) #define DECLARE_int64(name) \ - DECLARE_VARIABLE(GFLAGS_NAMESPACE::int64, I64, name) + DECLARE_VARIABLE(::@GFLAGS_NAMESPACE@::int64, I64, name) #define DECLARE_uint64(name) \ - DECLARE_VARIABLE(GFLAGS_NAMESPACE::uint64, U64, name) + DECLARE_VARIABLE(::@GFLAGS_NAMESPACE@::uint64, U64, name) #define DECLARE_double(name) \ DECLARE_VARIABLE(double, D, name) From aff8ef820a165d373ff47614304b337d2082f9dd Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 27 Mar 2014 01:09:20 +0000 Subject: [PATCH 38/94] Add GFLAGS_INCLUDE_DIR CMake variable (Fixes issue #80). Both GFLAGS_NAMESPACE and GFLAGS_INCLUDE_DIR can be used to customize the installation of the gflags library. One specifies the C++ namespace name of the gflags symbols, the other the include subdirectory path of the public header files. By default, both are set to "gflags", but other Google libraries still expect "google" as C++ namespace name, but not necessarily also include path. --- CMakeLists.txt | 15 ++++++++++++--- cmake/utils.cmake | 12 ++++++------ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4702485..8afdddf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,15 @@ version_numbers ( # ---------------------------------------------------------------------------- # options -set (GFLAGS_NAMESPACE "${PACKAGE_NAME}" CACHE STRING "C++ namespace identifier of gflags library.") +set (GFLAGS_NAMESPACE "${PACKAGE_NAME}" CACHE STRING "C++ namespace identifier of gflags library.") +set (GFLAGS_INCLUDE_DIR "${PACKAGE_NAME}" CACHE STRING "Include subdirectory of gflags header files.") + +if (IS_ABSOLUTE GFLAGS_INCLUDE_DIR) + message (FATAL_ERROR "GFLAGS_INCLUDE_DIR must be a path relative to CMAKE_INSTALL_PREFIX/include") +endif () +if (GFLAGS_INCLUDE_DIR MATCHES "^\\.\\.[/\\]") + message (FATAL_ERROR "GFLAGS_INCLUDE_DIR must not start with parent directory reference (../)") +endif () option (BUILD_SHARED_LIBS "Request build of shared libraries." OFF) option (BUILD_STATIC_LIBS "Request build of static libraries (default if BUILD_SHARED_LIBS is OFF)." OFF) @@ -38,6 +46,7 @@ option (INSTALL_HEADERS "Request packaging of headers and other devel mark_as_advanced (CLEAR CMAKE_INSTALL_PREFIX) mark_as_advanced (CMAKE_CONFIGURATION_TYPES GFLAGS_NAMESPACE + GFLAGS_INCLUDE_DIR BUILD_STATIC_LIBS BUILD_NC_TESTS INSTALL_HEADERS) @@ -212,7 +221,7 @@ configure_sources (GFLAGS_SRCS ${GFLAGS_SRCS}) include_directories ("${PROJECT_SOURCE_DIR}/src") include_directories ("${PROJECT_BINARY_DIR}/include") -include_directories ("${PROJECT_BINARY_DIR}/include/${GFLAGS_NAMESPACE}") +include_directories ("${PROJECT_BINARY_DIR}/include/${GFLAGS_INCLUDE_DIR}") # ---------------------------------------------------------------------------- # output directories @@ -282,7 +291,7 @@ configure_file (cmake/version.cmake.in "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-co install (TARGETS ${TARGETS} DESTINATION ${LIBRARY_INSTALL_DIR} EXPORT gflags-lib) if (INSTALL_HEADERS) - install (FILES ${PUBLIC_HDRS} DESTINATION ${INCLUDE_INSTALL_DIR}/${GFLAGS_NAMESPACE}) + install (FILES ${PUBLIC_HDRS} DESTINATION ${INCLUDE_INSTALL_DIR}/${GFLAGS_INCLUDE_DIR}) install ( FILES "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-config-install.cmake" RENAME ${PACKAGE_NAME}-config.cmake diff --git a/cmake/utils.cmake b/cmake/utils.cmake index ead2638..97c9a66 100644 --- a/cmake/utils.cmake +++ b/cmake/utils.cmake @@ -47,11 +47,11 @@ function (configure_headers out) set (tmp) foreach (src IN LISTS ARGN) if (EXISTS "${PROJECT_SOURCE_DIR}/src/${src}.in") - configure_file ("${PROJECT_SOURCE_DIR}/src/${src}.in" "${PROJECT_BINARY_DIR}/include/${GFLAGS_NAMESPACE}/${src}" @ONLY) - list (APPEND tmp "${PROJECT_BINARY_DIR}/include/${GFLAGS_NAMESPACE}/${src}") + configure_file ("${PROJECT_SOURCE_DIR}/src/${src}.in" "${PROJECT_BINARY_DIR}/include/${GFLAGS_INCLUDE_DIR}/${src}" @ONLY) + list (APPEND tmp "${PROJECT_BINARY_DIR}/include/${GFLAGS_INCLUDE_DIR}/${src}") else () - configure_file ("${PROJECT_SOURCE_DIR}/src/${src}" "${PROJECT_BINARY_DIR}/include/${GFLAGS_NAMESPACE}/${src}" COPYONLY) - list (APPEND tmp "${PROJECT_BINARY_DIR}/include/${GFLAGS_NAMESPACE}/${src}") + configure_file ("${PROJECT_SOURCE_DIR}/src/${src}" "${PROJECT_BINARY_DIR}/include/${GFLAGS_INCLUDE_DIR}/${src}" COPYONLY) + list (APPEND tmp "${PROJECT_BINARY_DIR}/include/${GFLAGS_INCLUDE_DIR}/${src}") endif () endforeach () set (${out} "${tmp}" PARENT_SCOPE) @@ -63,8 +63,8 @@ function (configure_sources out) set (tmp) foreach (src IN LISTS ARGN) if (src MATCHES ".h$" AND EXISTS "${PROJECT_SOURCE_DIR}/src/${src}.in") - configure_file ("${PROJECT_SOURCE_DIR}/src/${src}.in" "${PROJECT_BINARY_DIR}/include/${GFLAGS_NAMESPACE}/${src}" @ONLY) - list (APPEND tmp "${PROJECT_BINARY_DIR}/include/${GFLAGS_NAMESPACE}/${src}") + configure_file ("${PROJECT_SOURCE_DIR}/src/${src}.in" "${PROJECT_BINARY_DIR}/include/${GFLAGS_INCLUDE_DIR}/${src}" @ONLY) + list (APPEND tmp "${PROJECT_BINARY_DIR}/include/${GFLAGS_INCLUDE_DIR}/${src}") else () list (APPEND tmp "${PROJECT_SOURCE_DIR}/src/${src}") endif () From 7c80cfd87c1eb195135c91f3493b35a53fb74c88 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Sat, 22 Mar 2014 01:00:11 +0000 Subject: [PATCH 39/94] Remove devel package content summary from README --- README.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.txt b/README.txt index b5ecbbb..958c87e 100644 --- a/README.txt +++ b/README.txt @@ -2,5 +2,3 @@ This package contains a library that implements commandline flags processing. As such it's a replacement for getopt(). It has increased flexibility, including built-in support for C++ types like string, and the ability to define flags in the source file in which they're used. -The devel package contains static and debug libraries and header files -for developing applications that use the gflags package. From 38c4402f58ada036f4609ade095b9fb0ae3276e2 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Tue, 25 Mar 2014 15:29:56 +0000 Subject: [PATCH 40/94] Use GFLAGS_IS_A_DLL=1 in public headers if BUILD_SHARED_LIBS is enabled (Fixes issue #77). --- CMakeLists.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 93d3a73..7ada98c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -197,6 +197,15 @@ else () set (GFLAGS_ATTRIBUTE_UNUSED) endif () +# whenever we build a shared library (DLL on Windows), configure the public +# headers of the API for use of this library rather than the optionally +# also build statically linked library; users can override GFLAGS_DLL_DECL +if (BUILD_SHARED_LIBS) + set (GFLAGS_IS_A_DLL 1) +else () + set (GFLAGS_IS_A_DLL 0) +endif () + configure_headers (PUBLIC_HDRS ${PUBLIC_HDRS}) configure_sources (PRIVATE_HDRS ${PRIVATE_HDRS}) configure_sources (GFLAGS_SRCS ${GFLAGS_SRCS}) From 0c6e5fdb3f94da4e26ab5212a0e6b01739ecc999 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 27 Mar 2014 01:09:20 +0000 Subject: [PATCH 41/94] Add GFLAGS_INCLUDE_DIR CMake variable (Fixes issue #80). Both GFLAGS_NAMESPACE and GFLAGS_INCLUDE_DIR can be used to customize the installation of the gflags library. One specifies the C++ namespace name of the gflags symbols, the other the include subdirectory path of the public header files. By default, both are set to "gflags", but other Google libraries still expect "google" as C++ namespace name, but not necessarily also include path. --- CMakeLists.txt | 15 ++++++++++++--- cmake/utils.cmake | 12 ++++++------ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ada98c..bb9f5e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,15 @@ version_numbers ( # ---------------------------------------------------------------------------- # options -set (GFLAGS_NAMESPACE "${PACKAGE_NAME}" CACHE STRING "C++ namespace identifier of gflags library.") +set (GFLAGS_NAMESPACE "${PACKAGE_NAME}" CACHE STRING "C++ namespace identifier of gflags library.") +set (GFLAGS_INCLUDE_DIR "${PACKAGE_NAME}" CACHE STRING "Include subdirectory of gflags header files.") + +if (IS_ABSOLUTE GFLAGS_INCLUDE_DIR) + message (FATAL_ERROR "GFLAGS_INCLUDE_DIR must be a path relative to CMAKE_INSTALL_PREFIX/include") +endif () +if (GFLAGS_INCLUDE_DIR MATCHES "^\\.\\.[/\\]") + message (FATAL_ERROR "GFLAGS_INCLUDE_DIR must not start with parent directory reference (../)") +endif () option (BUILD_SHARED_LIBS "Request build of shared libraries." OFF) option (BUILD_STATIC_LIBS "Request build of static libraries (default if BUILD_SHARED_LIBS is OFF)." OFF) @@ -38,6 +46,7 @@ option (INSTALL_HEADERS "Request packaging of headers and other devel mark_as_advanced (CLEAR CMAKE_INSTALL_PREFIX) mark_as_advanced (CMAKE_CONFIGURATION_TYPES GFLAGS_NAMESPACE + GFLAGS_INCLUDE_DIR BUILD_STATIC_LIBS BUILD_NC_TESTS INSTALL_HEADERS) @@ -212,7 +221,7 @@ configure_sources (GFLAGS_SRCS ${GFLAGS_SRCS}) include_directories ("${PROJECT_SOURCE_DIR}/src") include_directories ("${PROJECT_BINARY_DIR}/include") -include_directories ("${PROJECT_BINARY_DIR}/include/${GFLAGS_NAMESPACE}") +include_directories ("${PROJECT_BINARY_DIR}/include/${GFLAGS_INCLUDE_DIR}") # ---------------------------------------------------------------------------- # output directories @@ -282,7 +291,7 @@ configure_file (cmake/version.cmake.in "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-co install (TARGETS ${TARGETS} DESTINATION ${LIBRARY_INSTALL_DIR} EXPORT gflags-lib) if (INSTALL_HEADERS) - install (FILES ${PUBLIC_HDRS} DESTINATION ${INCLUDE_INSTALL_DIR}/${GFLAGS_NAMESPACE}) + install (FILES ${PUBLIC_HDRS} DESTINATION ${INCLUDE_INSTALL_DIR}/${GFLAGS_INCLUDE_DIR}) install ( FILES "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-config-install.cmake" RENAME ${PACKAGE_NAME}-config.cmake diff --git a/cmake/utils.cmake b/cmake/utils.cmake index ead2638..97c9a66 100644 --- a/cmake/utils.cmake +++ b/cmake/utils.cmake @@ -47,11 +47,11 @@ function (configure_headers out) set (tmp) foreach (src IN LISTS ARGN) if (EXISTS "${PROJECT_SOURCE_DIR}/src/${src}.in") - configure_file ("${PROJECT_SOURCE_DIR}/src/${src}.in" "${PROJECT_BINARY_DIR}/include/${GFLAGS_NAMESPACE}/${src}" @ONLY) - list (APPEND tmp "${PROJECT_BINARY_DIR}/include/${GFLAGS_NAMESPACE}/${src}") + configure_file ("${PROJECT_SOURCE_DIR}/src/${src}.in" "${PROJECT_BINARY_DIR}/include/${GFLAGS_INCLUDE_DIR}/${src}" @ONLY) + list (APPEND tmp "${PROJECT_BINARY_DIR}/include/${GFLAGS_INCLUDE_DIR}/${src}") else () - configure_file ("${PROJECT_SOURCE_DIR}/src/${src}" "${PROJECT_BINARY_DIR}/include/${GFLAGS_NAMESPACE}/${src}" COPYONLY) - list (APPEND tmp "${PROJECT_BINARY_DIR}/include/${GFLAGS_NAMESPACE}/${src}") + configure_file ("${PROJECT_SOURCE_DIR}/src/${src}" "${PROJECT_BINARY_DIR}/include/${GFLAGS_INCLUDE_DIR}/${src}" COPYONLY) + list (APPEND tmp "${PROJECT_BINARY_DIR}/include/${GFLAGS_INCLUDE_DIR}/${src}") endif () endforeach () set (${out} "${tmp}" PARENT_SCOPE) @@ -63,8 +63,8 @@ function (configure_sources out) set (tmp) foreach (src IN LISTS ARGN) if (src MATCHES ".h$" AND EXISTS "${PROJECT_SOURCE_DIR}/src/${src}.in") - configure_file ("${PROJECT_SOURCE_DIR}/src/${src}.in" "${PROJECT_BINARY_DIR}/include/${GFLAGS_NAMESPACE}/${src}" @ONLY) - list (APPEND tmp "${PROJECT_BINARY_DIR}/include/${GFLAGS_NAMESPACE}/${src}") + configure_file ("${PROJECT_SOURCE_DIR}/src/${src}.in" "${PROJECT_BINARY_DIR}/include/${GFLAGS_INCLUDE_DIR}/${src}" @ONLY) + list (APPEND tmp "${PROJECT_BINARY_DIR}/include/${GFLAGS_INCLUDE_DIR}/${src}") else () list (APPEND tmp "${PROJECT_SOURCE_DIR}/src/${src}") endif () From 94c23575c7183b73912f4b60a66f49d3f3d59b70 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 27 Mar 2014 01:45:47 +0000 Subject: [PATCH 42/94] Update NEWS. --- NEWS.txt | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/NEWS.txt b/NEWS.txt index b9a68f3..ba8d91c 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -1,12 +1,15 @@ === 20 March 2014 === -I've just released gflags 2.1.0. +I've just released gflags 2.1. The major changes are the use of CMake for the build configuration instead -of the autotools and packaging support through CPack. This release compiles -with all major compilers without warnings and passed the unit tests on -Ubuntu 12.04, Windows 7 (Visual Studio 2008 and 2010, Cygwin, MinGW), and -Mac OS X (Xcode 5.1). +of the autotools and packaging support through CPack. The default namespace +of all C++ symbols is now "gflags" instead of "google". This can be +configured via the GFLAGS_NAMESPACE variable. + +This release compiles with all major compilers without warnings and passed +the unit tests on Ubuntu 12.04, Windows 7 (Visual Studio 2008 and 2010, +Cygwin, MinGW), and Mac OS X (Xcode 5.1). The SVN repository on Google Code is now frozen and replaced by a Git repository such that it can be used as Git submodule by projects. The main @@ -21,9 +24,7 @@ For the further development, I am following the with feature branch names prefixed by "feature/" and bugfix branch names prefixed by "bugfix/", respectively. -Binary and source distribution packages can be downloaded from -[https://github.com/schuhschuh/gflags GitHub] as Google Code no longer -permits the upload of such download packages. +Binary and source [https://github.com/schuhschuh/gflags/releases packages] are available on GitHub. === 14 January 2013 === From dc8543a4738548dda6f210cca035693e19c7042d Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Sun, 30 Mar 2014 15:16:00 +0100 Subject: [PATCH 43/94] Add test which uses gflags_declare.h. Update issue 79 Added a test which uses gflags_declare.h as any other project would use it to avoid such avoidable build configuration mistakes. --- test/CMakeLists.txt | 7 +++++++ test/gflags_declare_flags.cc | 9 +++++++++ test/gflags_declare_test.cc | 12 ++++++++++++ 3 files changed, 28 insertions(+) create mode 100644 test/gflags_declare_flags.cc create mode 100644 test/gflags_declare_test.cc diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 49c97ea..ff07474 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -154,6 +154,13 @@ add_gflags_test(always_fail 1 "ERROR: failed validation of new value 'true' for # debugger abort() intervention in case of Debug configuration. #add_gflags_test(deadlock_if_cant_lock 0 "PASS" "" gflags_unittest --deadlock_if_cant_lock) +# ---------------------------------------------------------------------------- +# use gflags_declare.h +add_executable (gflags_declare_test gflags_declare_test.cc gflags_declare_flags.cc) + +add_test(NAME gflags_declare COMMAND gflags_declare_test --message "Hello gflags!") +set_tests_properties(gflags_declare PROPERTIES PASS_REGULAR_EXPRESSION "Hello gflags!") + # ---------------------------------------------------------------------------- # (negative) compilation tests if (BUILD_NC_TESTS) diff --git a/test/gflags_declare_flags.cc b/test/gflags_declare_flags.cc new file mode 100644 index 0000000..dc53de5 --- /dev/null +++ b/test/gflags_declare_flags.cc @@ -0,0 +1,9 @@ +#include +#include + +DECLARE_string(message); // in gflags_delcare_test.cc + +void print_message() +{ + std::cout << FLAGS_message << std::endl; +} diff --git a/test/gflags_declare_test.cc b/test/gflags_declare_test.cc new file mode 100644 index 0000000..707bcc0 --- /dev/null +++ b/test/gflags_declare_test.cc @@ -0,0 +1,12 @@ +#include + +DEFINE_string(message, "", "The message to print"); +void print_message(); // in gflags_declare_flags.cc + +int main(int argc, char **argv) +{ + gflags::SetUsageMessage("Test compilation and use of gflags_declare.h"); + gflags::ParseCommandLineFlags(&argc, &argv, true); + print_message(); + return 0; +} From eb5e1f7fe44992058db423594cba5c94da85462c Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Sun, 30 Mar 2014 15:17:49 +0100 Subject: [PATCH 44/94] Bump version to 2.1.1. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8afdddf..b11c697 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ include (utils) # ---------------------------------------------------------------------------- # package information set (PACKAGE_NAME "gflags") -set (PACKAGE_VERSION "2.1.0") +set (PACKAGE_VERSION "2.1.1") set (PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set (PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}") set (PACKAGE_BUGREPORT "https://code.google.com/p/gflags/issues/") From 0890b699e97d7f8ffc898f3c5de6e2645be74e0c Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Sun, 30 Mar 2014 15:18:26 +0100 Subject: [PATCH 45/94] Add NEWS of release version 2.1.1. --- NEWS.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/NEWS.txt b/NEWS.txt index ba8d91c..7418607 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -1,3 +1,14 @@ +=== 30 March 2014 === + +I've just released gflags 2.1.1. + +This release fixes a few bugs in the configuration of gflags_declare.h +and adds a separate GFLAGS_INCLUDE_DIR CMake variable to the build configuration. +Setting GFLAGS_NAMESPACE to "google" no longer changes also the include +path of the public header files. This allows the use of the library with +other Google projects such as glog which still use the deprecated "google" +namespace for the gflags library, but include it as "gflags/gflags.h". + === 20 March 2014 === I've just released gflags 2.1. From ef5c5474b29318a418c1628038865ee252e98b0e Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Sun, 30 Mar 2014 15:34:13 +0100 Subject: [PATCH 46/94] Set CPACK_PACKAGE_ARCHITECTURE to darwin on Mac OS. --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index b11c697..17d38b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -392,6 +392,8 @@ if (BUILD_PACKAGING) set (CPACK_SYSTEM_NAME "win32") endif () set (CPACK_PACKAGE_ARCHITECTURE) + elseif (APPLE) + set (CPACK_PACKAGE_ARCHITECTURE darwin) else () string (TOLOWER "${CMAKE_SYSTEM_NAME}" CPACK_SYSTEM_NAME) if (CMAKE_CXX_FLAGS MATCHES "-m32") From 40031034993c32ebfb4ef19730b58535ed76340b Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Sun, 30 Mar 2014 15:41:02 +0100 Subject: [PATCH 47/94] Add ChangeLog entries for release 2.1.1. --- ChangeLog.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index 9771549..e14d88e 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,10 @@ +* Sun Mar 20 2014 - Andreas Schuh + +- gflags: version 2.1.1 +- Fixed issue 77: GFLAGS_IS_A_DLL expands to empty string in gflags_declare.h +- Fixed issue 79: GFLAGS_NAMESPACE not expanded to actual namespace in gflags_declare.h +- Fixed issue 80: Allow include path to differ from GFLAGS_NAMESPACE + * Thu Mar 20 2014 - Andreas Schuh - gflags: version 2.1.0 From cac974eb07ba7528b01bb6db4836a18c2a88f247 Mon Sep 17 00:00:00 2001 From: shawke Date: Mon, 7 Apr 2014 18:03:26 +0200 Subject: [PATCH 48/94] Fix compatibility with older versions of CMake The "SONAME_FLAG" was introduced in CMake 2.8.9, while the current CMake scripts require 2.8.4 (first line of CMakeLists.txt). Increasing the required CMake version will block building in less recent OSes (e.g., for Ubuntu 12.04 LTS, the latest version from the official repositories is currently 2.8.7). The more compatible solution will be to use the old variable name, i.e. the one which was used before CMake was patched. NB: this issue is triggered upon specifying -DBUILD_SHARED_LIBS=ON. Related bug report: http://public.kitware.com/Bug/view.php?id=13884 Commit which implemented this new variable: http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e1409ac5 --- cmake/CMakeCXXInformation.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/CMakeCXXInformation.cmake b/cmake/CMakeCXXInformation.cmake index 4d0a14a..9ddae4a 100644 --- a/cmake/CMakeCXXInformation.cmake +++ b/cmake/CMakeCXXInformation.cmake @@ -256,7 +256,7 @@ include(CMakeCommonLanguageInclude) # create a shared C++ library if(NOT CMAKE_CXX_CREATE_SHARED_LIBRARY) set(CMAKE_CXX_CREATE_SHARED_LIBRARY - " -o ") + " -o ") endif() # create a c++ shared module copy the shared library rule by default From 55490439d00273a7ae09e0d45095ef453a987fd7 Mon Sep 17 00:00:00 2001 From: John Khvatov Date: Thu, 1 May 2014 00:57:04 +0400 Subject: [PATCH 49/94] cmake: append LIB_SUFFIX to LIBRARY_INSTALL_DIR --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 17d38b4..10c9cca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -280,9 +280,9 @@ if (OS_WINDOWS) set (CONFIG_INSTALL_DIR CMake) else () set (RUNTIME_INSTALL_DIR bin) - set (LIBRARY_INSTALL_DIR lib) + set (LIBRARY_INSTALL_DIR lib${LIB_SUFFIX}) set (INCLUDE_INSTALL_DIR include) - set (CONFIG_INSTALL_DIR lib/cmake/${PACKAGE_NAME}) + set (CONFIG_INSTALL_DIR lib${LIB_SUFFIX}/cmake/${PACKAGE_NAME}) endif () file (RELATIVE_PATH INSTALL_PREFIX_REL2CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/${CONFIG_INSTALL_DIR}" "${CMAKE_INSTALL_PREFIX}") From d9d06b99a4cbe03c6e40039b6d10c24686c82755 Mon Sep 17 00:00:00 2001 From: John Khvatov Date: Thu, 1 May 2014 03:10:54 +0400 Subject: [PATCH 50/94] doc: rename namespace from google (deprecated) to gflags (default) --- doc/gflags.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/gflags.html b/doc/gflags.html index 1a887b4..3a66713 100644 --- a/doc/gflags.html +++ b/doc/gflags.html @@ -269,7 +269,7 @@ the getopt library, but has much less overhead to use. In fact, it's just a single function call:

-   google::ParseCommandLineFlags(&argc, &argv, true);
+   gflags::ParseCommandLineFlags(&argc, &argv, true);

Usually, this code is at the beginning of main(). @@ -529,8 +529,8 @@ access parts of argv outside main, including the program name (argv[0]).

For more information about these routines, and other useful helper -methods such as google::SetUsageMessage() and -google::SetVersionString, see gflags.h.

+methods such as gflags::SetUsageMessage() and +gflags::SetVersionString, see gflags.h.

Miscellaneous Notes

From e9144aa1597c63a73ab05ea980a349367501a3e6 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 1 May 2014 19:49:24 +0100 Subject: [PATCH 51/94] Make LIBRARY_INSTALL_DIR configurable by the user. --- CMakeLists.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 10c9cca..ee81c1b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -280,9 +280,15 @@ if (OS_WINDOWS) set (CONFIG_INSTALL_DIR CMake) else () set (RUNTIME_INSTALL_DIR bin) - set (LIBRARY_INSTALL_DIR lib${LIB_SUFFIX}) + # The LIB_SUFFIX variable is used by the Fedora package maintainers. + # Also package maintainers of other distribution packages need to be able + # to specify the name of the library directory. + set (LIBRARY_INSTALL_DIR lib${LIB_SUFFIX} + CACHE STRING "Directory name for installed libraries, e.g., \"lib64\"" + ) + mark_as_advanced (LIBRARY_INSTALL_DIR) set (INCLUDE_INSTALL_DIR include) - set (CONFIG_INSTALL_DIR lib${LIB_SUFFIX}/cmake/${PACKAGE_NAME}) + set (CONFIG_INSTALL_DIR ${LIBRARY_INSTALL_DIR}/cmake/${PACKAGE_NAME}) endif () file (RELATIVE_PATH INSTALL_PREFIX_REL2CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/${CONFIG_INSTALL_DIR}" "${CMAKE_INSTALL_PREFIX}") From 31f0e290d632d755034d6d2d2c29d3ec7be6b3f0 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 1 May 2014 19:58:25 +0100 Subject: [PATCH 52/94] Use LIB_INSTALL_DIR to initialize LIBRARY_INSTALL_DIR. In particular the Fedora package maintainers pass LIB_INSTALL_DIR instead of LIBRARY_INSTALL_DIR. --- CMakeLists.txt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ee81c1b..a4d0f07 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -280,11 +280,14 @@ if (OS_WINDOWS) set (CONFIG_INSTALL_DIR CMake) else () set (RUNTIME_INSTALL_DIR bin) - # The LIB_SUFFIX variable is used by the Fedora package maintainers. - # Also package maintainers of other distribution packages need to be able - # to specify the name of the library directory. - set (LIBRARY_INSTALL_DIR lib${LIB_SUFFIX} - CACHE STRING "Directory name for installed libraries, e.g., \"lib64\"" + # The LIB_INSTALL_DIR and LIB_SUFFIX variables are used by the Fedora + # package maintainers. Also package maintainers of other distribution + # packages need to be able to specify the name of the library directory. + if (NOT LIB_INSTALL_DIR) + set (LIB_INSTALL_DIR "lib${LIB_SUFFIX}") + endif () + set (LIBRARY_INSTALL_DIR "${LIB_INSTALL_DIR}" + CACHE PATH "Directory of installed libraries, e.g., \"lib64\"" ) mark_as_advanced (LIBRARY_INSTALL_DIR) set (INCLUDE_INSTALL_DIR include) From bf889786c2a3a2dab89610d0722634d2eedfc694 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 1 May 2014 20:16:16 +0100 Subject: [PATCH 53/94] Set VERSION property of library targets to .. --- CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index a4d0f07..7f65563 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,6 +22,8 @@ version_numbers ( PACKAGE_VERSION_PATCH ) +set (PACKAGE_SOVERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}") + # ---------------------------------------------------------------------------- # options set (GFLAGS_NAMESPACE "${PACKAGE_NAME}" CACHE STRING "C++ namespace identifier of gflags library.") @@ -257,6 +259,9 @@ foreach (TYPE IN ITEMS STATIC SHARED) set_target_properties ( gflags${opts}-${type} PROPERTIES COMPILE_DEFINITIONS "${defines}" OUTPUT_NAME "gflags${opts}" + # Set VERSION instead of SOVERSION such + # that it is also used on Windows + VERSION "${PACKAGE_SOVERSION}" ) if (HAVE_SHLWAPI_H) target_link_libraries (gflags${opts}-${type} shlwapi.lib) From cd7aece14e2aac0669292c95ab42de6e267a5034 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Fri, 2 May 2014 11:12:05 +0100 Subject: [PATCH 54/94] Use major version number only as SOVERSION. --- CMakeLists.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f65563..ca2c1df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,7 @@ version_numbers ( PACKAGE_VERSION_PATCH ) -set (PACKAGE_SOVERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}") +set (PACKAGE_SOVERSION "${PACKAGE_VERSION_MAJOR}") # ---------------------------------------------------------------------------- # options @@ -258,10 +258,9 @@ foreach (TYPE IN ITEMS STATIC SHARED) endif () set_target_properties ( gflags${opts}-${type} PROPERTIES COMPILE_DEFINITIONS "${defines}" - OUTPUT_NAME "gflags${opts}" - # Set VERSION instead of SOVERSION such - # that it is also used on Windows - VERSION "${PACKAGE_SOVERSION}" + OUTPUT_NAME "gflags${opts}" + VERSION "${PACKAGE_VERSION}" + SOVERSION "${PACKAGE_SOVERSION}" ) if (HAVE_SHLWAPI_H) target_link_libraries (gflags${opts}-${type} shlwapi.lib) From a93de007a65eea5f0eea1eb830788dbdb7c17112 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Fri, 2 May 2014 12:00:35 +0100 Subject: [PATCH 55/94] Define GFLAGS_NAMESPACE in public headers. This avoids any mistakes where once @GFLAGS_NAMESPACE@ was used in public .h.in files, or the #define GFLAGS_NAMESPACE in internal source files. --- src/config.h.in | 3 --- src/gflags.h.in | 20 ++++++++++---------- src/gflags_declare.h.in | 15 ++++++++++----- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/config.h.in b/src/config.h.in index c033dee..a8708da 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -70,9 +70,6 @@ // Define to the address where bug reports for this package should be sent. #define PACKAGE_BUGREPORT @PACKAGE_BUGREPORT@ -// Namespace of gflags library symbols. -#define GFLAGS_NAMESPACE @GFLAGS_NAMESPACE@ - // --------------------------------------------------------------------------- // Path separator #ifndef PATH_SEPARATOR diff --git a/src/gflags.h.in b/src/gflags.h.in index 852de48..9ee7738 100644 --- a/src/gflags.h.in +++ b/src/gflags.h.in @@ -94,7 +94,7 @@ #endif -namespace @GFLAGS_NAMESPACE@ { +namespace GFLAGS_NAMESPACE { // -------------------------------------------------------------------- @@ -136,7 +136,7 @@ extern GFLAGS_DLL_DECL bool RegisterFlagValidator(const std::string* flag, bool // Convenience macro for the registration of a flag validator #define DEFINE_validator(name, validator) \ static const bool name##_validator_registered = \ - @GFLAGS_NAMESPACE@::RegisterFlagValidator(&FLAGS_##name, validator) + GFLAGS_NAMESPACE::RegisterFlagValidator(&FLAGS_##name, validator) // -------------------------------------------------------------------- @@ -442,7 +442,7 @@ class GFLAGS_DLL_DECL FlagRegisterer { extern GFLAGS_DLL_DECL const char kStrippedFlagHelp[]; -} // namespace @GFLAGS_NAMESPACE@ +} // namespace GFLAGS_NAMESPACE #ifndef SWIG // In swig, ignore the main flag declarations @@ -450,7 +450,7 @@ extern GFLAGS_DLL_DECL const char kStrippedFlagHelp[]; #if defined(STRIP_FLAG_HELP) && STRIP_FLAG_HELP > 0 // Need this construct to avoid the 'defined but not used' warning. #define MAYBE_STRIPPED_HELP(txt) \ - (false ? (txt) : @GFLAGS_NAMESPACE@::kStrippedFlagHelp) + (false ? (txt) : GFLAGS_NAMESPACE::kStrippedFlagHelp) #else #define MAYBE_STRIPPED_HELP(txt) txt #endif @@ -472,7 +472,7 @@ extern GFLAGS_DLL_DECL const char kStrippedFlagHelp[]; /* We always want to export defined variables, dll or no */ \ GFLAGS_DLL_DEFINE_FLAG type FLAGS_##name = FLAGS_nono##name; \ type FLAGS_no##name = FLAGS_nono##name; \ - static @GFLAGS_NAMESPACE@::FlagRegisterer o_##name( \ + static GFLAGS_NAMESPACE::FlagRegisterer o_##name( \ #name, #type, MAYBE_STRIPPED_HELP(help), __FILE__, \ &FLAGS_##name, &FLAGS_no##name); \ } \ @@ -500,20 +500,20 @@ GFLAGS_DLL_DECL bool IsBoolFlag(bool from); #define DEFINE_bool(name, val, txt) \ namespace fLB { \ typedef ::fLB::CompileAssert FLAG_##name##_value_is_not_a_bool[ \ - (sizeof(::fLB::IsBoolFlag(val)) != sizeof(double)) ? 1 : -1]; \ + (sizeof(::fLB::IsBoolFlag(val)) != sizeof(double))? 1: -1]; \ } \ DEFINE_VARIABLE(bool, B, name, val, txt) #define DEFINE_int32(name, val, txt) \ - DEFINE_VARIABLE(@GFLAGS_NAMESPACE@::int32, I, \ + DEFINE_VARIABLE(GFLAGS_NAMESPACE::int32, I, \ name, val, txt) #define DEFINE_int64(name, val, txt) \ - DEFINE_VARIABLE(@GFLAGS_NAMESPACE@::int64, I64, \ + DEFINE_VARIABLE(GFLAGS_NAMESPACE::int64, I64, \ name, val, txt) #define DEFINE_uint64(name,val, txt) \ - DEFINE_VARIABLE(@GFLAGS_NAMESPACE@::uint64, U64, \ + DEFINE_VARIABLE(GFLAGS_NAMESPACE::uint64, U64, \ name, val, txt) #define DEFINE_double(name, val, txt) \ @@ -554,7 +554,7 @@ inline clstring* dont_pass0toDEFINE_string(char *stringspot, clstring* const FLAGS_no##name = ::fLS:: \ dont_pass0toDEFINE_string(s_##name[0].s, \ val); \ - static @GFLAGS_NAMESPACE@::FlagRegisterer o_##name( \ + static GFLAGS_NAMESPACE::FlagRegisterer o_##name( \ #name, "string", MAYBE_STRIPPED_HELP(txt), __FILE__, \ s_##name[0].s, new (s_##name[1].s) clstring(*FLAGS_no##name)); \ extern GFLAGS_DLL_DEFINE_FLAG clstring& FLAGS_##name; \ diff --git a/src/gflags_declare.h.in b/src/gflags_declare.h.in index b9ab9c7..279db24 100644 --- a/src/gflags_declare.h.in +++ b/src/gflags_declare.h.in @@ -37,6 +37,11 @@ #ifndef GFLAGS_DECLARE_H_ #define GFLAGS_DECLARE_H_ + +// --------------------------------------------------------------------------- +// Namespace of gflags library symbols. +#define GFLAGS_NAMESPACE @GFLAGS_NAMESPACE@ + // --------------------------------------------------------------------------- // Windows DLL import/export. @@ -69,7 +74,7 @@ # include // a third place for uint32_t or u_int32_t #endif -namespace @GFLAGS_NAMESPACE@ { +namespace GFLAGS_NAMESPACE { #if @GFLAGS_INTTYPES_FORMAT_C99@ // C99 typedef int32_t int32; @@ -90,7 +95,7 @@ typedef unsigned __int64 uint64; # error Do not know how to define a 32-bit integer quantity on your system #endif -} // namespace @GFLAGS_NAMESPACE@ +} // namespace GFLAGS_NAMESPACE namespace fLS { @@ -113,13 +118,13 @@ typedef std::string clstring; DECLARE_VARIABLE(bool, B, name) #define DECLARE_int32(name) \ - DECLARE_VARIABLE(::@GFLAGS_NAMESPACE@::int32, I, name) + DECLARE_VARIABLE(::GFLAGS_NAMESPACE::int32, I, name) #define DECLARE_int64(name) \ - DECLARE_VARIABLE(::@GFLAGS_NAMESPACE@::int64, I64, name) + DECLARE_VARIABLE(::GFLAGS_NAMESPACE::int64, I64, name) #define DECLARE_uint64(name) \ - DECLARE_VARIABLE(::@GFLAGS_NAMESPACE@::uint64, U64, name) + DECLARE_VARIABLE(::GFLAGS_NAMESPACE::uint64, U64, name) #define DECLARE_double(name) \ DECLARE_VARIABLE(double, D, name) From 659b440f9e403c9080eb304efc53b938c63cbe47 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Fri, 2 May 2014 14:56:58 +0100 Subject: [PATCH 56/94] Support alternative namespaces in GFLAGS_NAMESPACE CMake variable. The first element in the GFLAGS_NAMESPACE list is used as primary/default namespace. The symbols are then imported from this primary namespace into each of the other alternative namespaces with the using keyword. This is in particular used to maintain backwards compatibility with previous gflags library versions that used the "google" namespace instead of the new default "gflags" namespace. --- CMakeLists.txt | 45 ++++++++++++++++---- cmake/utils.cmake | 4 +- src/gflags.h.in | 4 ++ src/gflags_ns.h.in | 101 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 144 insertions(+), 10 deletions(-) create mode 100644 src/gflags_ns.h.in diff --git a/CMakeLists.txt b/CMakeLists.txt index ca2c1df..1e55bb0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,15 +26,19 @@ set (PACKAGE_SOVERSION "${PACKAGE_VERSION_MAJOR}") # ---------------------------------------------------------------------------- # options -set (GFLAGS_NAMESPACE "${PACKAGE_NAME}" CACHE STRING "C++ namespace identifier of gflags library.") -set (GFLAGS_INCLUDE_DIR "${PACKAGE_NAME}" CACHE STRING "Include subdirectory of gflags header files.") - -if (IS_ABSOLUTE GFLAGS_INCLUDE_DIR) - message (FATAL_ERROR "GFLAGS_INCLUDE_DIR must be a path relative to CMAKE_INSTALL_PREFIX/include") -endif () -if (GFLAGS_INCLUDE_DIR MATCHES "^\\.\\.[/\\]") - message (FATAL_ERROR "GFLAGS_INCLUDE_DIR must not start with parent directory reference (../)") +set (GFLAGS_NAMESPACE "${PACKAGE_NAME};google" CACHE STRING "C++ namespace identifier(s) of gflags library.") +set (GFLAGS_NAMESPACE_SECONDARY "${GFLAGS_NAMESPACE}") +list (REMOVE_DUPLICATES GFLAGS_NAMESPACE_SECONDARY) +if (NOT GFLAGS_NAMESPACE_SECONDARY) + message (FATAL_ERROR "GFLAGS_NAMESPACE must be set to one (or more) valid C++ namespace identifier(s separated by semicolon \";\").") endif () +foreach (ns IN LISTS GFLAGS_NAMESPACE_SECONDARY) + if (NOT ns MATCHES "^[a-zA-Z][a-zA-Z0-9_]*$") + message (FATAL_ERROR "GFLAGS_NAMESPACE contains invalid namespace identifier: ${ns}") + endif () +endforeach () +list (GET GFLAGS_NAMESPACE_SECONDARY 0 GFLAGS_NAMESPACE) +list (REMOVE_AT GFLAGS_NAMESPACE_SECONDARY 0) option (BUILD_SHARED_LIBS "Request build of shared libraries." OFF) option (BUILD_STATIC_LIBS "Request build of static libraries (default if BUILD_SHARED_LIBS is OFF)." OFF) @@ -48,7 +52,6 @@ option (INSTALL_HEADERS "Request packaging of headers and other devel mark_as_advanced (CLEAR CMAKE_INSTALL_PREFIX) mark_as_advanced (CMAKE_CONFIGURATION_TYPES GFLAGS_NAMESPACE - GFLAGS_INCLUDE_DIR BUILD_STATIC_LIBS BUILD_NC_TESTS INSTALL_HEADERS) @@ -69,6 +72,17 @@ if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CXX_FLAGS) set_property (CACHE CMAKE_BUILD_TYPE PROPERTY VALUE Release) endif () +if (NOT GFLAGS_INCLUDE_DIR) + set (GFLAGS_INCLUDE_DIR "${GFLAGS_NAMESPACE}") +else () + if (IS_ABSOLUTE GFLAGS_INCLUDE_DIR) + message (FATAL_ERROR "GFLAGS_INCLUDE_DIR must be a path relative to CMAKE_INSTALL_PREFIX/include") + endif () + if (GFLAGS_INCLUDE_DIR MATCHES "^\\.\\.[/\\]") + message (FATAL_ERROR "GFLAGS_INCLUDE_DIR must not start with parent directory reference (../)") + endif () +endif () + # ---------------------------------------------------------------------------- # system checks include (CheckTypeSize) @@ -183,6 +197,19 @@ set (PUBLIC_HDRS "gflags_completions.h" ) +if (GFLAGS_NAMESPACE_SECONDARY) + set (INCLUDE_GFLAGS_NS_H "// Import gflags library symbols into alternative/deprecated namespace(s)") + foreach (ns IN LISTS GFLAGS_NAMESPACE_SECONDARY) + string (TOUPPER "${ns}" NS) + set (gflags_ns_h "${PROJECT_BINARY_DIR}/include/${GFLAGS_INCLUDE_DIR}/gflags_${ns}.h") + configure_file ("${PROJECT_SOURCE_DIR}/src/gflags_ns.h.in" "${gflags_ns_h}" @ONLY) + list (APPEND PUBLIC_HDRS "${gflags_ns_h}") + set (INCLUDE_GFLAGS_NS_H "${INCLUDE_GFLAGS_NS_H}\n#include \"gflags_${ns}.h\"") + endforeach () +else () + set (INCLUDE_GFLAGS_NS_H) +endif () + set (PRIVATE_HDRS "config.h" "util.h" diff --git a/cmake/utils.cmake b/cmake/utils.cmake index 97c9a66..9cef463 100644 --- a/cmake/utils.cmake +++ b/cmake/utils.cmake @@ -46,7 +46,9 @@ endfunction () function (configure_headers out) set (tmp) foreach (src IN LISTS ARGN) - if (EXISTS "${PROJECT_SOURCE_DIR}/src/${src}.in") + if (IS_ABSOLUTE "${src}") + list (APPEND tmp "${src}") + elseif (EXISTS "${PROJECT_SOURCE_DIR}/src/${src}.in") configure_file ("${PROJECT_SOURCE_DIR}/src/${src}.in" "${PROJECT_BINARY_DIR}/include/${GFLAGS_INCLUDE_DIR}/${src}" @ONLY) list (APPEND tmp "${PROJECT_BINARY_DIR}/include/${GFLAGS_INCLUDE_DIR}/${src}") else () diff --git a/src/gflags.h.in b/src/gflags.h.in index 9ee7738..0324d39 100644 --- a/src/gflags.h.in +++ b/src/gflags.h.in @@ -565,4 +565,8 @@ inline clstring* dont_pass0toDEFINE_string(char *stringspot, #endif // SWIG + +@INCLUDE_GFLAGS_NS_H@ + + #endif // GFLAGS_GFLAGS_H_ diff --git a/src/gflags_ns.h.in b/src/gflags_ns.h.in new file mode 100644 index 0000000..1bb2038 --- /dev/null +++ b/src/gflags_ns.h.in @@ -0,0 +1,101 @@ +// Copyright (c) 2014, Andreas Schuh +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +// ----------------------------------------------------------------------------- +// Imports the gflags library symbols into an alternative/deprecated namespace. + +#ifndef GFLAGS_GFLAGS_H_ +# error The internal header gflags_@ns@.h may only be included by gflags.h +#endif + +#ifndef GFLAGS_@NS@_H_ +#define GFLAGS_@NS@_H_ + + +namespace @ns@ { + + +using GFLAGS_NAMESPACE::int32; +using GFLAGS_NAMESPACE::uint32; +using GFLAGS_NAMESPACE::int64; +using GFLAGS_NAMESPACE::uint64; + +using GFLAGS_NAMESPACE::RegisterFlagValidator; +using GFLAGS_NAMESPACE::CommandLineFlagInfo; +using GFLAGS_NAMESPACE::GetAllFlags; +using GFLAGS_NAMESPACE::ShowUsageWithFlags; +using GFLAGS_NAMESPACE::ShowUsageWithFlagsRestrict; +using GFLAGS_NAMESPACE::DescribeOneFlag; +using GFLAGS_NAMESPACE::SetArgv; +using GFLAGS_NAMESPACE::GetArgvs; +using GFLAGS_NAMESPACE::GetArgv; +using GFLAGS_NAMESPACE::GetArgv0; +using GFLAGS_NAMESPACE::GetArgvSum; +using GFLAGS_NAMESPACE::ProgramInvocationName; +using GFLAGS_NAMESPACE::ProgramInvocationShortName; +using GFLAGS_NAMESPACE::ProgramUsage; +using GFLAGS_NAMESPACE::VersionString; +using GFLAGS_NAMESPACE::GetCommandLineOption; +using GFLAGS_NAMESPACE::GetCommandLineFlagInfo; +using GFLAGS_NAMESPACE::GetCommandLineFlagInfoOrDie; +using GFLAGS_NAMESPACE::FlagSettingMode; +using GFLAGS_NAMESPACE::SET_FLAGS_VALUE; +using GFLAGS_NAMESPACE::SET_FLAG_IF_DEFAULT; +using GFLAGS_NAMESPACE::SET_FLAGS_DEFAULT; +using GFLAGS_NAMESPACE::SetCommandLineOption; +using GFLAGS_NAMESPACE::SetCommandLineOptionWithMode; +using GFLAGS_NAMESPACE::FlagSaver; +using GFLAGS_NAMESPACE::CommandlineFlagsIntoString; +using GFLAGS_NAMESPACE::ReadFlagsFromString; +using GFLAGS_NAMESPACE::AppendFlagsIntoFile; +using GFLAGS_NAMESPACE::ReadFromFlagsFile; +using GFLAGS_NAMESPACE::BoolFromEnv; +using GFLAGS_NAMESPACE::Int32FromEnv; +using GFLAGS_NAMESPACE::Int64FromEnv; +using GFLAGS_NAMESPACE::Uint64FromEnv; +using GFLAGS_NAMESPACE::DoubleFromEnv; +using GFLAGS_NAMESPACE::StringFromEnv; +using GFLAGS_NAMESPACE::SetUsageMessage; +using GFLAGS_NAMESPACE::SetVersionString; +using GFLAGS_NAMESPACE::ParseCommandLineNonHelpFlags; +using GFLAGS_NAMESPACE::HandleCommandLineHelpFlags; +using GFLAGS_NAMESPACE::AllowCommandLineReparsing; +using GFLAGS_NAMESPACE::ReparseCommandLineNonHelpFlags; +using GFLAGS_NAMESPACE::ShutDownCommandLineFlags; +using GFLAGS_NAMESPACE::FlagRegisterer; + +#ifndef SWIG +using GFLAGS_NAMESPACE::ParseCommandLineFlags; +#endif + + +} // namespace @ns@ + + +#endif // GFLAGS_@NS@_H_ From 2b81a76bed7bba6c30cb8fc5a9507841bb047fcb Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 17 Jul 2014 02:14:41 +0100 Subject: [PATCH 57/94] fix: Include guard of alternative "gflags" namespace header. --- src/gflags_ns.h.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gflags_ns.h.in b/src/gflags_ns.h.in index 1bb2038..f692666 100644 --- a/src/gflags_ns.h.in +++ b/src/gflags_ns.h.in @@ -34,8 +34,8 @@ # error The internal header gflags_@ns@.h may only be included by gflags.h #endif -#ifndef GFLAGS_@NS@_H_ -#define GFLAGS_@NS@_H_ +#ifndef GFLAGS_NS_@NS@_H_ +#define GFLAGS_NS_@NS@_H_ namespace @ns@ { @@ -98,4 +98,4 @@ using GFLAGS_NAMESPACE::ParseCommandLineFlags; } // namespace @ns@ -#endif // GFLAGS_@NS@_H_ +#endif // GFLAGS_NS_@NS@_H_ From 76cbe0d003bb5d099683d4399e87b191795c4bcb Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 17 Jul 2014 02:45:50 +0100 Subject: [PATCH 58/94] Change default GFLAGS_NAMESPACE to "google;gflags" and add GFLAGS_INCLUDE_DIR with default "gflags" to cache. This ensures binary compatibility with previous 2.x release versions while allowing users to refer to the gflags library symbols using the preferred "gflags" namespace identifier. --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e55bb0..c63b2de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,7 +26,7 @@ set (PACKAGE_SOVERSION "${PACKAGE_VERSION_MAJOR}") # ---------------------------------------------------------------------------- # options -set (GFLAGS_NAMESPACE "${PACKAGE_NAME};google" CACHE STRING "C++ namespace identifier(s) of gflags library.") +set (GFLAGS_NAMESPACE "google;${PACKAGE_NAME}" CACHE STRING "C++ namespace identifier(s) of gflags library.") set (GFLAGS_NAMESPACE_SECONDARY "${GFLAGS_NAMESPACE}") list (REMOVE_DUPLICATES GFLAGS_NAMESPACE_SECONDARY) if (NOT GFLAGS_NAMESPACE_SECONDARY) @@ -72,8 +72,9 @@ if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CXX_FLAGS) set_property (CACHE CMAKE_BUILD_TYPE PROPERTY VALUE Release) endif () +set (GFLAGS_INCLUDE_DIR "" CACHE STRING "Installation directory of header files relative to CMAKE_INSTALL_PREFIX.") if (NOT GFLAGS_INCLUDE_DIR) - set (GFLAGS_INCLUDE_DIR "${GFLAGS_NAMESPACE}") + set_property (CACHE GFLAGS_INCLUDE_DIR PROPERTY VALUE "${PACKAGE_NAME}") else () if (IS_ABSOLUTE GFLAGS_INCLUDE_DIR) message (FATAL_ERROR "GFLAGS_INCLUDE_DIR must be a path relative to CMAKE_INSTALL_PREFIX/include") From 376ef823be65bc9902810370108bbac85f114304 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 17 Jul 2014 11:21:36 +0100 Subject: [PATCH 59/94] cmake: Do not cache GFLAGS_NAMESPACE and GFLAGS_INCLUDE_DIR. These CMake variables are now set to a default which both maintains binary backwards compatibility with previous versions of the library, but at the same time allows already the use of the new "gflags" namespace instead of "google". Users may still override the default using the -D option of cmake, for example, when they use the library directly as submodule in their own project and prefer a different namespace/installation directory. --- CMakeLists.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c63b2de..9cd9025 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,7 +26,11 @@ set (PACKAGE_SOVERSION "${PACKAGE_VERSION_MAJOR}") # ---------------------------------------------------------------------------- # options -set (GFLAGS_NAMESPACE "google;${PACKAGE_NAME}" CACHE STRING "C++ namespace identifier(s) of gflags library.") +if (NOT GFLAGS_NAMESPACE) + # maintain binary backwards compatibility with gflags library version <= 2.0, + # but at the same time enable the use of the preferred new "gflags" namespace + set (GFLAGS_NAMESPACE "google;${PACKAGE_NAME}") +endif () set (GFLAGS_NAMESPACE_SECONDARY "${GFLAGS_NAMESPACE}") list (REMOVE_DUPLICATES GFLAGS_NAMESPACE_SECONDARY) if (NOT GFLAGS_NAMESPACE_SECONDARY) @@ -51,7 +55,6 @@ option (INSTALL_HEADERS "Request packaging of headers and other devel mark_as_advanced (CLEAR CMAKE_INSTALL_PREFIX) mark_as_advanced (CMAKE_CONFIGURATION_TYPES - GFLAGS_NAMESPACE BUILD_STATIC_LIBS BUILD_NC_TESTS INSTALL_HEADERS) @@ -72,9 +75,8 @@ if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CXX_FLAGS) set_property (CACHE CMAKE_BUILD_TYPE PROPERTY VALUE Release) endif () -set (GFLAGS_INCLUDE_DIR "" CACHE STRING "Installation directory of header files relative to CMAKE_INSTALL_PREFIX.") if (NOT GFLAGS_INCLUDE_DIR) - set_property (CACHE GFLAGS_INCLUDE_DIR PROPERTY VALUE "${PACKAGE_NAME}") + set (GFLAGS_INCLUDE_DIR "${PACKAGE_NAME}") else () if (IS_ABSOLUTE GFLAGS_INCLUDE_DIR) message (FATAL_ERROR "GFLAGS_INCLUDE_DIR must be a path relative to CMAKE_INSTALL_PREFIX/include") From 2a40e1913740d348878b58de878e02002f448127 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Tue, 24 Mar 2015 12:33:52 +0000 Subject: [PATCH 60/94] cmake: Add advanced cache entries for GFLAGS_NAMESPACE and GFLAGS_INCLUDE_DIR --- CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9cd9025..ca11b1d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,8 @@ set (PACKAGE_SOVERSION "${PACKAGE_VERSION_MAJOR}") if (NOT GFLAGS_NAMESPACE) # maintain binary backwards compatibility with gflags library version <= 2.0, # but at the same time enable the use of the preferred new "gflags" namespace - set (GFLAGS_NAMESPACE "google;${PACKAGE_NAME}") + set (GFLAGS_NAMESPACE "google;${PACKAGE_NAME}" CACHE STRING "Name(s) of library namespace (separate multiple options by semicolon)") + mark_as_advanced (GFLAGS_NAMESPACE) endif () set (GFLAGS_NAMESPACE_SECONDARY "${GFLAGS_NAMESPACE}") list (REMOVE_DUPLICATES GFLAGS_NAMESPACE_SECONDARY) @@ -76,7 +77,8 @@ if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CXX_FLAGS) endif () if (NOT GFLAGS_INCLUDE_DIR) - set (GFLAGS_INCLUDE_DIR "${PACKAGE_NAME}") + set (GFLAGS_INCLUDE_DIR "${PACKAGE_NAME}" CACHE STRING "Name of include directory of installed header files") + mark_as_advanced (GFLAGS_INCLUDE_DIR) else () if (IS_ABSOLUTE GFLAGS_INCLUDE_DIR) message (FATAL_ERROR "GFLAGS_INCLUDE_DIR must be a path relative to CMAKE_INSTALL_PREFIX/include") From eb89101a1a065c6829ca7bc27ee2cf26dd850fa4 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Tue, 24 Mar 2015 12:34:22 +0000 Subject: [PATCH 61/94] doc: Replace README by previous NEWS in Markdown format --- NEWS.txt => README.md | 118 ++++++++++++++++++++++++------------------ README.txt | 4 -- 2 files changed, 67 insertions(+), 55 deletions(-) rename NEWS.txt => README.md (76%) delete mode 100644 README.txt diff --git a/NEWS.txt b/README.md similarity index 76% rename from NEWS.txt rename to README.md index 7418607..1d6790d 100644 --- a/NEWS.txt +++ b/README.md @@ -1,22 +1,34 @@ -=== 30 March 2014 === +24 March 2015 +------------- + +Finalized move of gflags project from Google Code to GitHub. +Email addresses of original issue reporters got lost in the process. +Given the age of most issue reports, this should be neglibable. + +Please report any further issues using the GitHub issue tracker. + + +30 March 2014 +------------- I've just released gflags 2.1.1. -This release fixes a few bugs in the configuration of gflags_declare.h -and adds a separate GFLAGS_INCLUDE_DIR CMake variable to the build configuration. -Setting GFLAGS_NAMESPACE to "google" no longer changes also the include +This release fixes a few bugs in the configuration of gflags\_declare.h +and adds a separate GFLAGS\_INCLUDE\_DIR CMake variable to the build configuration. +Setting GFLAGS\_NAMESPACE to "google" no longer changes also the include path of the public header files. This allows the use of the library with other Google projects such as glog which still use the deprecated "google" namespace for the gflags library, but include it as "gflags/gflags.h". -=== 20 March 2014 === +20 March 2014 +------------- I've just released gflags 2.1. The major changes are the use of CMake for the build configuration instead of the autotools and packaging support through CPack. The default namespace of all C++ symbols is now "gflags" instead of "google". This can be -configured via the GFLAGS_NAMESPACE variable. +configured via the GFLAGS\_NAMESPACE variable. This release compiles with all major compilers without warnings and passed the unit tests on Ubuntu 12.04, Windows 7 (Visual Studio 2008 and 2010, @@ -28,34 +40,36 @@ hosting of this project remains at Google Code. Thanks to the distributed character of Git, I can push (and pull) changes from both GitHub and Google Code in order to keep the two public repositories in sync. When fixing an issue for a pull request through either of these hosting -platforms, please reference the issue number as -[https://code.google.com/p/support/wiki/IssueTracker#Integration_with_version_control described here]. +platforms, please reference the issue number as +[described here](https://code.google.com/p/support/wiki/IssueTracker#Integration_with_version_control). For the further development, I am following the -[http://nvie.com/posts/a-successful-git-branching-model/ Git branching model] +[Git branching model](http://nvie.com/posts/a-successful-git-branching-model/) with feature branch names prefixed by "feature/" and bugfix branch names prefixed by "bugfix/", respectively. -Binary and source [https://github.com/schuhschuh/gflags/releases packages] are available on GitHub. +Binary and source [packages](https://github.com/schuhschuh/gflags/releases) are available on GitHub. -=== 14 January 2013 === +14 January 2013 +--------------- The migration of the build system to CMake is almost complete. What remains to be done is rewriting the tests in Python such they can be executed on non-Unix platforms and splitting them up into separate CTest tests. Though merging these changes into the master branch yet remains to be done, it is recommended to already start using the -[https://github.com/schuhschuh/gflags/tree/cmake-migration cmake-migration] branch. +[cmake-migration](https://github.com/schuhschuh/gflags/tree/cmake-migration) branch. -=== 20 April 2013 === +20 April 2013 +------------- More than a year has past since I (Andreas) took over the maintenance for `gflags`. Only few minor changes have been made since then, much to my regret. To get more involved and stimulate participation in the further development of the library, I moved the project source code today to -[https://github.com/schuhschuh/gflags GitHub]. -I believe that the strengths of [http://git-scm.com/ Git] will allow for better community collaboration +[GitHub](https://github.com/schuhschuh/gflags). +I believe that the strengths of [Git](http://git-scm.com/) will allow for better community collaboration as well as ease the integration of changes made by others. I encourage everyone who would like to contribute to send me pull requests. Git's lightweight feature branches will also provide the right tool for more @@ -74,13 +88,14 @@ Please continue to report any issues with gflags on Google Code. The GitHub proj only be used to host the Git repository. One major change of the project structure I have in mind for the next weeks -is the migration from autotools to [http://www.cmake.org/ CMake]. +is the migration from autotools to [CMake](http://www.cmake.org/). Check out the (unstable!) -[https://github.com/schuhschuh/gflags/tree/cmake-migration cmake-migration] +[cmake-migration](https://github.com/schuhschuh/gflags/tree/cmake-migration) branch on GitHub for details. -=== 25 January 2012 === +25 January 2012 +--------------- I've just released gflags 2.0. @@ -91,8 +106,7 @@ around gflags and the ideas you have for the project going forward, and look forward to having you on the team. I bumped the major version number up to 2 to reflect the new community -ownership of the project. All the -[http://gflags.googlecode.com/svn/tags/gflags-2.0/ChangeLog changes] +ownership of the project. All the [changes](ChangeLog.txt) are related to the renaming. There are no functional changes from gflags 1.7. In particular, I've kept the code in the namespace `google`, though in a future version it should be renamed to `gflags`. @@ -101,7 +115,8 @@ synonym of `/usr/local/include/gflags/`, though the former name has been obsolete for some time now. -=== 18 January 2011 === +18 January 2011 +--------------- The `google-gflags` Google Code page has been renamed to `gflags`, in preparation for the project being renamed to @@ -111,15 +126,16 @@ relinquishing ownership of the project; it will now be entirely community run. The name change reflects that shift. -=== 20 December 2011 === +20 December 2011 +---------------- I've just released gflags 1.7. This is a minor release; the major change is that `CommandLineFlagInfo` now exports the address in memory where the flag is located. There has also been a bugfix involving -very long --help strings, and some other minor -[http://code.google.com/p/google-gflags/source/browse/tags/gflags-1.7/ChangeLog changes]. +very long --help strings, and some other minor [changes](ChangeLog.txt). -=== 29 July 2011 === +29 July 2011 +------------ I've just released gflags 1.6. The major new feature in this release is support for setting version info, so that --version does something @@ -138,11 +154,10 @@ frequent updates with better change descriptions. They will also result in future `ChangeLog` entries being much more verbose (for better or for worse). -See the -[http://code.google.com/p/google-gflags/source/browse/tags/gflags-1.6/ChangeLog ChangeLog] -for a full list of changes for this release. +See the [ChangeLog](ChangeLog.txt) for a full list of changes for this release. -=== 24 January 2011 === +24 January 2011 +--------------- I've just released gflags 1.5. This release has only minor changes from 1.4, including some slightly better reporting in --help, and @@ -152,28 +167,30 @@ libraries under valgrind. The major change is to fix up the macros If you have not had a problem with these macros, and don't need any of the other changes described, there is no need to upgrade. See the -[http://code.google.com/p/google-gflags/source/browse/tags/gflags-1.5/ChangeLog ChangeLog] -for a full list of changes for this release. +[ChangeLog](ChangeLog.txt) for a full list of changes for this release. -=== 11 October 2010 === +11 October 2010 +--------------- I've just released gflags 1.4. This release has only minor changes from 1.3, including some documentation tweaks and some work to make the library smaller. If 1.3 is working well for you, there's no particular reason to upgrade. -=== 4 January 2010 === +4 January 2010 +-------------- I've just released gflags 1.3. gflags now compiles under MSVC, and -all tests pass. I *really* never thought non-unix-y Windows folks +all tests pass. I **really** never thought non-unix-y Windows folks would want gflags, but at least some of them do. The major news, though, is that I've separated out the python package -into its own library, [http://code.google.com/p/python-gflags python-gflags]. +into its own library, [python-gflags](http://code.google.com/p/python-gflags). If you're interested in the Python version of gflags, that's the place to get it now. -=== 10 September 2009 == +10 September 2009 +----------------- I've just released gflags 1.2. The major change from gflags 1.1 is it now compiles under MinGW (as well as cygwin), and all tests pass. I @@ -184,14 +201,13 @@ wrong! The other changes are minor, such as support for --htmlxml in the python version of gflags. -=== 15 April 2009 === +15 April 2009 +------------- I've just released gflags 1.1. It has only minor changes fdrom gflags -1.0 (see the -[http://code.google.com/p/google-gflags/source/browse/tags/gflags-1.1/ChangeLog ChangeLog] -for details). The major change is that I moved to a new -system for creating .deb and .rpm files. This allows me to create -x86_64 deb and rpm files. +1.0 (see the [ChangeLog](ChangeLog.txt) for details). +The major change is that I moved to a new system for creating .deb and .rpm files. +This allows me to create x86\_64 deb and rpm files. In the process of moving to this new system, I noticed an inconsistency: the tar.gz and .rpm files created libraries named @@ -199,7 +215,7 @@ libgflags.so, but the deb file created libgoogle-gflags.so. I have fixed the deb file to create libraries like the others. I'm no expert in debian packaging, but I believe this has caused the package name to change as well. Please let me know (at -[mailto:google-gflags@googlegroups.com +[[mailto:google-gflags@googlegroups.com](mailto:google-gflags@googlegroups.com) google-gflags@googlegroups.com]) if this causes problems for you -- especially if you know of a fix! I would be happy to change the deb packages to add symlinks from the old library name to the new @@ -210,20 +226,21 @@ If you've tried to install a .rpm or .deb and it doesn't work for you, let me know. I'm excited to finally have 64-bit package files, but there may still be some wrinkles in the new system to iron out. -=== 1 October 2008 === +1 October 2008 +-------------- gflags 1.0rc2 was out for a few weeks without any issues, so gflags 1.0 is now released. This is much like gflags 0.9. The major change is that the .h files have been moved from `/usr/include/google` to `/usr/include/gflags`. While I have backwards-compatibility forwarding headeds in place, please rewrite existing code to say -{{{ +``` #include -}}} +``` instead of -{{{ +``` #include -}}} +``` I've kept the default namespace to google. You can still change with with the appropriate flag to the configure script (`./configure @@ -233,8 +250,7 @@ non-backwards-compatible change, send mail to `google-gflags@googlegroups.com`! Version 1.0 also has some neat new features, like support for bash -commandline-completion of help flags. See the -[http://code.google.com/p/google-gflags/source/browse/tags/gflags-1.0rc2/ChangeLog -ChangeLog] for more details. +commandline-completion of help flags. See the [ChangeLog](ChangeLog.txt) +for more details. If I don't hear any bad news for a few weeks, I'll release 1.0-final. diff --git a/README.txt b/README.txt deleted file mode 100644 index 958c87e..0000000 --- a/README.txt +++ /dev/null @@ -1,4 +0,0 @@ -This package contains a library that implements commandline flags -processing. As such it's a replacement for getopt(). It has increased -flexibility, including built-in support for C++ types like string, and -the ability to define flags in the source file in which they're used. From 2614f123fd77603196ed4ac3ae6ff27be55c2f32 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Tue, 24 Mar 2015 12:41:43 +0000 Subject: [PATCH 62/94] doc: Convert INSTALL instructions to Markdown --- INSTALL.md | 54 +++++++++++++++++++++++++++++++++++++++++ INSTALL.txt | 70 ----------------------------------------------------- 2 files changed, 54 insertions(+), 70 deletions(-) create mode 100644 INSTALL.md delete mode 100644 INSTALL.txt diff --git a/INSTALL.md b/INSTALL.md new file mode 100644 index 0000000..d054193 --- /dev/null +++ b/INSTALL.md @@ -0,0 +1,54 @@ +Installing a binary distribution package +======================================== + +No official binary distribution packages are provided by the gflags developers. +There may, however, be binary packages available for your OS. Please consult +also the package repositories of your Linux distribution. + +For example on Debian/Ubuntu Linux, gflags can be installed using the +following command: + + sudo apt-get install gflags + + +Compiling the source code +========================= + +The build system of gflags is since version 2.1 based on [CMake](http://cmake.org). +The common steps to build, test, and install software are therefore: + +1. Extract source files. +2. Create build directory and change to it. +3. Run CMake to configure the build tree. +4. Build the software using selected build tool. +5. Test the built software. +6. Install the built files. + +On Unix-like systems with GNU Make as build tool, these build steps can be +summarized by the following sequence of commands executed in a shell, +where ```$package``` and ```$version``` are shell variables which represent +the name of this package and the obtained version of the software. + + $ tar xzf gflags-$version-source.tar.gz + $ cd gflags-$version + $ mkdir build && cd build + $ ccmake .. + + - Press 'c' to configure the build system and 'e' to ignore warnings. + - Set CMAKE_INSTALL_PREFIX and other CMake variables and options. + - Continue pressing 'c' until the option 'g' is available. + - Then press 'g' to generate the configuration files for GNU Make. + + $ make + $ make test (optional) + $ make install (optional) + +In the following, only gflags-specific CMake settings available to +configure the build and installation are documented. + + +CMake Option | Description +---------------------- | ------------------------------------------------------- +CMAKE_INSTALL_PREFIX | Installation directory, e.g., "/usr/local" on Unix and "C:\Program Files\gflags" on Windows. +GFLAGS_NAMESPACE | Name of the C++ namespace to be used by the gflags library. Note that the public source header files are installed in a subdirectory named after this namespace. To maintain backwards compatibility with the Google Commandline Flags, set this variable to "google". The default is "gflags". +GFLAGS_INCLUDE_DIR | Name of include subdirectory where headers are installed into. diff --git a/INSTALL.txt b/INSTALL.txt deleted file mode 100644 index a96a772..0000000 --- a/INSTALL.txt +++ /dev/null @@ -1,70 +0,0 @@ - -INSTALLING A BINARY DISTRIBUTION PACKAGE -======================================== - -No official binary distribution packages are provided by the gflags developers. -There may, however, be binary packages available for your OS at -https://code.google.com/p/gflags/downloads/list. Please consult also the -package repositories of your Linux distribution. - -For example on Debian/Ubuntu Linux, gflags can be installed using the -following command: - -$ sudo apt-get install gflags - - - -BUILDING THE SOFTWARE FROM SOURCES -================================== - -Build Steps ------------ - -The build system of gflags is since version 2.1 based on CMake (cmake.org). -The common steps to build, test, and install software based on CMake are: - -1. Extract source files. -2. Create build directory and change to it. -3. Run CMake to configure the build tree. -4. Build the software using selected build tool. -5. Test the built software. -6. Install the built files. - -On Unix-like systems with GNU Make as build tool, these build steps can be -summarized by the following sequence of commands executed in a shell, -where $package and $version are shell variables which represent the name -of this package and the obtained version of the software. - -$ tar xzf gflags-$version-source.tar.gz -$ cd gflags-$version -$ mkdir build && cd build -$ ccmake .. - - - Press 'c' to configure the build system and 'e' to ignore warnings. - - Set CMAKE_INSTALL_PREFIX and other CMake variables and options. - - Continue pressing 'c' until the option 'g' is available. - - Then press 'g' to generate the configuration files for GNU Make. - -$ make -$ make test (optional) -$ make install (optional) - -In the following, only gflags-specific CMake settings available to -configure the build and installation are documented. - - -CMake Options -------------- - -- CMAKE_INSTALL_PREFIX Installation directory, e.g., "/usr/local" on Unix - and "C:\Program Files\gflags" on Windows. - - -Advanced CMake Options ----------------------- - -- GFLAGS_NAMESPACE Name of the C++ namespace to be used by the gflags library. - Note that the public source header files are installed in - a subdirectory named after this namespace. To maintain - backwards compatibility with the Google Commandline Flags, - set this variable to "google". The default is "gflags". From 3a49eafd20121a192f8240e100787527cddc3bad Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Tue, 24 Mar 2015 12:51:30 +0000 Subject: [PATCH 63/94] add: Files from doc/ directory of master branch --- designstyle.css | 115 ++++++++++ gflags.html | 558 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 673 insertions(+) create mode 100644 designstyle.css create mode 100644 gflags.html diff --git a/designstyle.css b/designstyle.css new file mode 100644 index 0000000..f5d1ec2 --- /dev/null +++ b/designstyle.css @@ -0,0 +1,115 @@ +body { + background-color: #ffffff; + color: black; + margin-right: 1in; + margin-left: 1in; +} + + +h1, h2, h3, h4, h5, h6 { + color: #3366ff; + font-family: sans-serif; +} +@media print { + /* Darker version for printing */ + h1, h2, h3, h4, h5, h6 { + color: #000080; + font-family: helvetica, sans-serif; + } +} + +h1 { + text-align: center; + font-size: 18pt; +} +h2 { + margin-left: -0.5in; +} +h3 { + margin-left: -0.25in; +} +h4 { + margin-left: -0.125in; +} +hr { + margin-left: -1in; +} + +/* Definition lists: definition term bold */ +dt { + font-weight: bold; +} + +address { + text-align: right; +} +/* Use the tag for bits of code and for variables and objects. */ +code,pre,samp,var { + color: #006000; +} +/* Use the tag for file and directory paths and names. */ +file { + color: #905050; + font-family: monospace; +} +/* Use the tag for stuff the user should type. */ +kbd { + color: #600000; +} +div.note p { + float: right; + width: 3in; + margin-right: 0%; + padding: 1px; + border: 2px solid #6060a0; + background-color: #fffff0; +} + +UL.nobullets { + list-style-type: none; + list-style-image: none; + margin-left: -1em; +} + +/* +body:after { + content: "Google Confidential"; +} +*/ + +/* pretty printing styles. See prettify.js */ +.str { color: #080; } +.kwd { color: #008; } +.com { color: #800; } +.typ { color: #606; } +.lit { color: #066; } +.pun { color: #660; } +.pln { color: #000; } +.tag { color: #008; } +.atn { color: #606; } +.atv { color: #080; } +pre.prettyprint { padding: 2px; border: 1px solid #888; } + +.embsrc { background: #eee; } + +@media print { + .str { color: #060; } + .kwd { color: #006; font-weight: bold; } + .com { color: #600; font-style: italic; } + .typ { color: #404; font-weight: bold; } + .lit { color: #044; } + .pun { color: #440; } + .pln { color: #000; } + .tag { color: #006; font-weight: bold; } + .atn { color: #404; } + .atv { color: #060; } +} + +/* Table Column Headers */ +.hdr { + color: #006; + font-weight: bold; + background-color: #dddddd; } +.hdr2 { + color: #006; + background-color: #eeeeee; } \ No newline at end of file diff --git a/gflags.html b/gflags.html new file mode 100644 index 0000000..3a66713 --- /dev/null +++ b/gflags.html @@ -0,0 +1,558 @@ + + + + +How To Use Gflags (formerly Google Commandline Flags) + + + + + + + + +

How To Use gflags (formerly Google Commandline Flags)

+(as of +) + +
+ + + +

Introduction, and Comparison to Other Commandline + Flags Libraries

+ +

Commandline flags are flags that users specify on the +command line when they run an executable. In the command

+
+   fgrep -l -f /var/tmp/foo johannes brahms
+
+

-l and -f /var/tmp/foo are the two +commandline flags. (johannes and brahms, +which don't start with a dash, are commandline arguments.)

+ +

Typically, an application lists what flags the user is allowed to +pass in, and what arguments they take -- in this example, +-l takes no argument, and -f takes a +string (in particular, a filename) as an argument. Users can use a +library to help parse the commandline and store the flags in some data +structure.

+ +

Gflags, the commandline flags library used within Google, +differs from other libraries, +such as getopt(), in that flag definitions can be +scattered around the source code, and not just listed in one place +such as main(). In practice, this means that a single +source-code file will define and use flags that are meaningful to that +file. Any application that links in that file will get the flags, and +the gflags library will automatically handle that +flag appropriately.

+ +

There's significant gain in flexibility, and ease of code reuse, +due to this technique. However, there is a danger that two files will +define the same flag, and then give an error when they're linked +together.

+ +

The rest of this document describes how to use the commandlineflag +library. It's a C++ library, so examples are in C++. However, there +is a Python port with the same functionality, and this discussion +translates directly to Python.

+ +

Finding and Linking to gflags using CMake

+ +

Using gflags within a project which uses CMake for its build system is easy. Therefore, simply add the following CMake code to your CMakeLists.txt file. + +

+   find_package (gflags REQUIRED)
+   include_directories (${gflags_INCLUDE_DIR})
+   
+   add_executable (foo main.cc)
+   target_link_libraries (foo gflags)
+
+ +

DEFINE: Defining Flags In Program

+ +

Defining a flag is easy: just use the appropriate macro for the +type you want the flag to be, as defined at the bottom of +gflags/gflags.h. Here's an example file, +foo.cc:

+ +
+   #include <gflags/gflags.h>
+
+   DEFINE_bool(big_menu, true, "Include 'advanced' options in the menu listing");
+   DEFINE_string(languages, "english,french,german",
+                 "comma-separated list of languages to offer in the 'lang' menu");
+
+ +

DEFINE_bool defines a boolean flag. Here are the +types supported:

+
    +
  • DEFINE_bool: boolean +
  • DEFINE_int32: 32-bit integer +
  • DEFINE_int64: 64-bit integer +
  • DEFINE_uint64: unsigned 64-bit integer +
  • DEFINE_double: double +
  • DEFINE_string: C++ string +
+ +

Note that there are no 'complex' types like lists: the "languages" +flag in our example is a list of strings, but is defined of type +"string", not "list_of_string" or similar. This is by design. We'd +rather use only simple types for the flags, and allow for complex, +arbitrary parsing routines to parse them, than to try to put the logic +inside the flags library proper.

+ +

All DEFINE macros take the same three arguments: the name of the +flag, its default value, and a 'help' string that describes its use. +The 'help' string is displayed when the user runs the application with +the --help flag.

+ +

You can define a flag in any source-code file in your executable. +Only define a flag once! If you want to access a flag in more than +one source file, DEFINE it in one file, and DECLARE it in the others. Even better, DEFINE it +in foo.cc and DECLARE it in foo.h; then +everyone who #includes foo.h can use the flag.

+ +

+Defining flags in libraries rather than in main() is powerful, but +does have some costs. One is that a library might not have a good +default value for its flags, for example if the flag holds a +filename that might not exist in some environments. To mitigate such problems, +you can use flag validators to ensure prompt +notification (in the form of a crash) of an invalid flag value. +

+ +

Note that while most functions in this library are defined in the +google namespace, DEFINE_foo (and +DECLARE_foo, below), should always +be in the global namespace.

+ + +

Accessing the Flag

+ +

All defined flags are available to the program as just a normal +variable, with the prefix FLAGS_ prepended. In the above +example, the macros define two variables, FLAGS_big_menu +(a bool), and FLAGS_languages (a C++ string).

+ +

You can read and write to the flag just like any other +variable:

+
+   if (FLAGS_consider_made_up_languages)
+     FLAGS_languages += ",klingon";   // implied by --consider_made_up_languages
+   if (FLAGS_languages.find("finnish") != string::npos)
+     HandleFinnish();
+
+ +

You can also get and set flag values via special functions in +gflags.h. That's a rarer use case, though.

+ + +

DECLARE: Using the Flag in a Different File

+ +

Accessing a flag in the manner of the previous section only works +if the flag was DEFINE-ed at the top of the file. If it +wasn't, you'll get an 'unknown variable' error.

+ +

The DECLARE_type macro is available when you want to +use a flag that's defined in another file. For instance, if I were +writing bar.cc but wanted to access the big_menu, flag, I +would put this near the top of bar.cc:

+
+   DECLARE_bool(big_menu);
+
+ +

This is functionally equivalent to saying extern +FLAGS_big_menu.

+ +

Note that such an extern declaration introduces a dependency +between your file and the file that defines the big_menu +flag: foo.cc, in this case. Such implicit dependencies +can be difficult to manage in large projects. For that reason we +recommend the following guideline:

+ +
+If you DEFINE a flag in foo.cc, either don't DECLARE it +at all, only DECLARE it in tightly related tests, or only DECLARE +it in foo.h. +
+ +

You should go the do-not-DECLARE route when the flag is only needed +by foo.cc, and not in any other file. If you want to +modify the value of the flag in the related test file to see if it is +functioning as expected, DECLARE it in the foo_test.cc +file. + +

If the flag does span multiple files, DECLARE it in the associated +.h file, and make others #include that +.h file if they want to access the flag. The +#include will make explicit the dependency between the +two files. This causes the flag to be a global variable.

+ + +

RegisterFlagValidator: Sanity-checking Flag Values

+ +

After DEFINE-ing a flag, you may optionally register a validator +function with the flag. If you do this, after the flag is parsed from +the commandline, and whenever its value is changed via a call to +SetCommandLineOption(), the validator function is called +with the new value as an argument. The validator function should +return 'true' if the flag value is valid, and false otherwise. +If the function returns false for the new setting of the +flag, the flag will retain its current value. If it returns false for the +default value, ParseCommandLineFlags will die. + +

Here is an example use of this functionality:

+
+static bool ValidatePort(const char* flagname, int32 value) {
+   if (value > 0 && value < 32768)   // value is ok
+     return true;
+   printf("Invalid value for --%s: %d\n", flagname, (int)value);
+   return false;
+}
+DEFINE_int32(port, 0, "What port to listen on");
+static const bool port_dummy = RegisterFlagValidator(&FLAGS_port, &ValidatePort);
+
+ +

By doing the registration at global initialization time (right +after the DEFINE), we ensure that the registration happens before +the commandline is parsed at the beginning of main().

+ +

RegisterFlagValidator() returns true if the +registration is successful. It return false if the registration fails +because a) the first argument does not refer to a commandline flag, or +b) a different validator has already been registered for this flag.

+ + +

Putting It Together: How to Set Up Flags

+ +

The final piece is the one that tells the executable to process the +commandline flags, and set the FLAGS_* variables to the +appropriate, non-default value based on what is seen on the +commandline. This is equivalent to the getopt() call in +the getopt library, but has much less overhead to use. In fact, it's +just a single function call:

+ +
+   gflags::ParseCommandLineFlags(&argc, &argv, true);
+
+ +

Usually, this code is at the beginning of main(). +argc and argv are exactly as passed in to +main(). This routine might modify them, which is why +pointers to them are passed in.

+ +

The last argument is called "remove_flags". If true, then +ParseCommandLineFlags removes the flags and their +arguments from argv, and modifies argc +appropriately. In this case, after the function call, +argv will hold only commandline arguments, and not +commandline flags.

+ +

If, on the other hand, remove_flags is false, then +ParseCommandLineFlags will leave argc unchanged, but will +rearrange the arguments in argv so that the flags are all at the +beginning. For example, if the input is "/bin/foo" "arg1" "-q" +"arg2" (which is legal but weird), the function will rearrange +argv so it reads "/bin/foo", "-q", "arg1", +"arg2". In this case, ParseCommandLineFlags +returns the index into argv that holds the first commandline argument: +that is, the index past the last flag. (In this example, it would +return 2, since argv[2] points to arg1.)

+ +

In either case, the FLAGS_* variables are modified +based on what was passed in on the +commandline.

+ + +

Setting Flags on the Command Line

+ +

The reason you make something a flag instead of a compile-time +constant, is so users can specify a non-default value on the +commandline. Here's how they might do it for an application that +links in foo.cc:

+
+   app_containing_foo --nobig_menu -languages="chinese,japanese,korean" ...
+
+ +

This sets FLAGS_big_menu = false; and +FLAGS_languages = "chinese,japanese,korean", when +ParseCommandLineFlags is run.

+ +

Note the atypical syntax for setting a boolean flag to false: +putting "no" in front of its name. There's a fair bit of flexibility +to how flags may be specified. Here's an example of all the ways to +specify the "languages" flag:

+
    +
  • app_containing_foo --languages="chinese,japanese,korean" +
  • app_containing_foo -languages="chinese,japanese,korean" +
  • app_containing_foo --languages "chinese,japanese,korean" +
  • app_containing_foo -languages "chinese,japanese,korean" +
+ +

For boolean flags, the possibilities are slightly different:

+
    +
  • app_containing_foo --big_menu +
  • app_containing_foo --nobig_menu +
  • app_containing_foo --big_menu=true +
  • app_containing_foo --big_menu=false +
+

(as well as the single-dash variant on all of these).

+ +

Despite this flexibility, we recommend using only a single form: +--variable=value for non-boolean flags, and +--variable/--novariable for boolean flags. This +consistency will make your code more readable, and is also the format +required for certain special-use cases like flagfiles.

+ +

It is a fatal error to specify a flag on the commandline that has +not been DEFINED somewhere in the executable. If you need that +functionality for some reason -- say you want to use the same set of +flags for several executables, but not all of them DEFINE every flag +in your list -- you can specify --undefok to suppress the error.

+ +

As in getopt(), -- by itself will terminate flags +processing. So in foo -f1 1 -- -f2 2, f1 is +considered a flag, but -f2 is not.

+ +

If a flag is specified more than once, only the last specification +is used; the others are ignored.

+ +

Note that flags do not have single-letter synonyms, like they do in +the getopt library, nor do we allow "combining" flags behind a +single dash, as in ls -la.

+ + + +

Changing the Default Flag Value

+ +

Sometimes a flag is defined in a library, and you want to change +its default value in one application but not others. It's simple to +do this: just assign a new value to the flag in main(), +before calling ParseCommandLineFlags():

+
+   DECLARE_bool(lib_verbose);   // mylib has a lib_verbose flag, default is false
+   int main(int argc, char** argv) {
+     FLAGS_lib_verbose = true;  // in my app, I want a verbose lib by default
+     ParseCommandLineFlags(...);
+   }
+
+ +

For this application, users can still set the flag value on the +commandline, but if they do not, the flag's value will default to +true.

+ + +

Special Flags

+ +

There are a few flags defined by the commandlineflags module +itself, and are available to all applications that use +commandlineflags. These fall into +three categories. First are the 'reporting' flags that, when found, cause +the application to print some information about itself and exit.

+ + + + + + + + + + + + + + + + + + + + + + + + + +
--helpshows all flags from all files, sorted by file and then by name; + shows the flagname, its default value, and its help string
--helpfullsame as -help, but unambiguously asks for all flags + (in case -help changes in the future)
--helpshortshows only flags for the file with the same name as the executable + (usually the one containing main())
--helpxmllike --help, but output is in xml for easier parsing
--helpon=FILE  shows only flags defined in FILE.*
--helpmatch=Sshows only flags defined in *S*.*
--helppackageshows flags defined in files in same directory as main()
--versionprints version info for the executable
+ +

Second are the flags that affect how other flags are parsed.

+ + + +
--undefok=flagname,flagname,...for those names listed as the argument to --undefok, + suppress the normal error-exit that occurs when + --name is seen on the commandline, but + name has not been DEFINED anywhere in the + application +
+ +

Third are the 'recursive' flags, that cause other flag values to be +set: --fromenv, --tryfromenv, +--flagfile. These are described below in more +detail.

+ +

--fromenv

+ +

--fromenv=foo,bar says to read the values for the +foo and bar flags from the environment. +In concert with this flag, you must actually set the values in the +environment, via a line like one of the two below:

+
+   export FLAGS_foo=xxx; export FLAGS_bar=yyy   # sh
+   setenv FLAGS_foo xxx; setenv FLAGS_bar yyy   # tcsh
+
+

This is equivalent to specifying --foo=xxx, +--bar=yyy on the commandline.

+ +

Note it is a fatal error to say --fromenv=foo if +foo is not DEFINED somewhere in the application. (Though +you can suppress this error via --undefok=foo, just like +for any other flag.)

+ +

It is also a fatal error to say --fromenv=foo if +FLAGS_foo is not actually defined in the environment.

+ +

--tryfromenv

+ +

--tryfromenv is exactly like --fromenv, +except it is not a fatal error to say +--tryfromenv=foo if FLAGS_foo is not +actually defined in the environment. Instead, in such cases, +FLAGS_foo just keeps its default value as specified in +the application.

+ +

Note it is still an error to say --tryfromenv=foo if +foo is not DEFINED somewhere in the application.

+ +

--flagfile

+ +

--flagfile=f tells the commandlineflags module to read +the file f, and to run all the flag-assignments found in +that file as if these flags had been specified on the commandline.

+ +

In its simplest form, f should just be a list of flag +assignments, one per line. Unlike on the commandline, the equals sign +separating a flagname from its argument is required for +flagfiles. An example flagfile, /tmp/myflags:

+
+--nobig_menus
+--languages=english,french
+
+ +

With this flagfile, the following two lines are equivalent:

+

+   ./myapp --foo --nobig_menus --languages=english,french --bar
+   ./myapp --foo --flagfile=/tmp/myflags --bar
+
+ +

Note that many errors are silently suppressed in flagfiles. In +particular, unrecognized flagnames are silently ignored, as are flags +that are missing a required value (e.g., a flagfile that just says +--languages).

+ +

The general format of a flagfile is a bit more complicated than the +simple, common case above. It is: a sequence of filenames, one per +line, followed by a sequence of flags, one per line, repeated as many +times as desired. Filenames in a flagfile can use wildcards +(* and ?), and the sequence of flags located +after a sequence of filenames is processed only if the current +executable's name matches one of the filenames. It is possible to +start the flagfile with a sequence of flags instead of a sequence of +filenames; if such a sequence of flags is present, these flags are +applied to the current executable no matter what it is.

+ +

Lines that start with a # are ignored as comments. +Leading whitespace is also ignored in flagfiles, as are blank +lines.

+ +

It is possible for a flagfile to use the --flagfile +flag to include another flagfile.

+ +

Flags are always processed in the expected order. That is, +processing begins by examining the flags specified directly on the +command line. If a flagfile is specified, its contents are processed, +and then processing continues with remaining flags from the command +line.

+ + +

The API

+ +

In addition to accessing FLAGS_foo directly, it is +possible to access the flags programmatically, through an API. It is +also possible to access information about a flag, such as its default +value and help-string. A FlagSaver makes it easy to +modify flags and then automatically undo the modifications later. +Finally, there are somewhat unrelated, but useful, routines to easily +access parts of argv outside main, including the program +name (argv[0]).

+ +

For more information about these routines, and other useful helper +methods such as gflags::SetUsageMessage() and +gflags::SetVersionString, see gflags.h.

+ + +

Miscellaneous Notes

+ +

If your application has code like this:

+
+   #define STRIP_FLAG_HELP 1    // this must go before the #include!
+   #include <gflags/gflags.h>
+
+

we will remove the help messages from the compiled source. This can +reduce the size of the resulting binary somewhat, and may also be +useful for security reasons.

+ + +
+
+Craig Silverstein, Andreas Schuh
+ +
+ + + From 63b9776eee1471d13d22eb0f36b955649cbb34cc Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Tue, 24 Mar 2015 12:55:31 +0000 Subject: [PATCH 64/94] fix: Rename documentation HTML file to index.html --- gflags.html => index.html | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename gflags.html => index.html (100%) diff --git a/gflags.html b/index.html similarity index 100% rename from gflags.html rename to index.html From 957f0d291c80acbf894eb5dad918798546db9c07 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Tue, 24 Mar 2015 12:55:52 +0000 Subject: [PATCH 65/94] add: .nojekyll file --- .nojekyll | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .nojekyll diff --git a/.nojekyll b/.nojekyll new file mode 100644 index 0000000..e69de29 From d8d218ac6f79b57a841ef21e918b61212d0487ea Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Tue, 24 Mar 2015 12:58:23 +0000 Subject: [PATCH 66/94] doc: Add gh-pages branch as submodule in doc directory --- .gitmodules | 4 + doc | 1 + doc/designstyle.css | 115 --------- doc/gflags.html | 558 -------------------------------------------- 4 files changed, 5 insertions(+), 673 deletions(-) create mode 100644 .gitmodules create mode 160000 doc delete mode 100644 doc/designstyle.css delete mode 100644 doc/gflags.html diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..cc7a78b --- /dev/null +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "doc"] + path = doc + url = git@github.com:schuhschuh/gflags.git + branch = gh-pages diff --git a/doc b/doc new file mode 160000 index 0000000..957f0d2 --- /dev/null +++ b/doc @@ -0,0 +1 @@ +Subproject commit 957f0d291c80acbf894eb5dad918798546db9c07 diff --git a/doc/designstyle.css b/doc/designstyle.css deleted file mode 100644 index f5d1ec2..0000000 --- a/doc/designstyle.css +++ /dev/null @@ -1,115 +0,0 @@ -body { - background-color: #ffffff; - color: black; - margin-right: 1in; - margin-left: 1in; -} - - -h1, h2, h3, h4, h5, h6 { - color: #3366ff; - font-family: sans-serif; -} -@media print { - /* Darker version for printing */ - h1, h2, h3, h4, h5, h6 { - color: #000080; - font-family: helvetica, sans-serif; - } -} - -h1 { - text-align: center; - font-size: 18pt; -} -h2 { - margin-left: -0.5in; -} -h3 { - margin-left: -0.25in; -} -h4 { - margin-left: -0.125in; -} -hr { - margin-left: -1in; -} - -/* Definition lists: definition term bold */ -dt { - font-weight: bold; -} - -address { - text-align: right; -} -/* Use the tag for bits of code and for variables and objects. */ -code,pre,samp,var { - color: #006000; -} -/* Use the tag for file and directory paths and names. */ -file { - color: #905050; - font-family: monospace; -} -/* Use the tag for stuff the user should type. */ -kbd { - color: #600000; -} -div.note p { - float: right; - width: 3in; - margin-right: 0%; - padding: 1px; - border: 2px solid #6060a0; - background-color: #fffff0; -} - -UL.nobullets { - list-style-type: none; - list-style-image: none; - margin-left: -1em; -} - -/* -body:after { - content: "Google Confidential"; -} -*/ - -/* pretty printing styles. See prettify.js */ -.str { color: #080; } -.kwd { color: #008; } -.com { color: #800; } -.typ { color: #606; } -.lit { color: #066; } -.pun { color: #660; } -.pln { color: #000; } -.tag { color: #008; } -.atn { color: #606; } -.atv { color: #080; } -pre.prettyprint { padding: 2px; border: 1px solid #888; } - -.embsrc { background: #eee; } - -@media print { - .str { color: #060; } - .kwd { color: #006; font-weight: bold; } - .com { color: #600; font-style: italic; } - .typ { color: #404; font-weight: bold; } - .lit { color: #044; } - .pun { color: #440; } - .pln { color: #000; } - .tag { color: #006; font-weight: bold; } - .atn { color: #404; } - .atv { color: #060; } -} - -/* Table Column Headers */ -.hdr { - color: #006; - font-weight: bold; - background-color: #dddddd; } -.hdr2 { - color: #006; - background-color: #eeeeee; } \ No newline at end of file diff --git a/doc/gflags.html b/doc/gflags.html deleted file mode 100644 index 3a66713..0000000 --- a/doc/gflags.html +++ /dev/null @@ -1,558 +0,0 @@ - - - - -How To Use Gflags (formerly Google Commandline Flags) - - - - - - - - -

How To Use gflags (formerly Google Commandline Flags)

-(as of -) - -
- - - -

Introduction, and Comparison to Other Commandline - Flags Libraries

- -

Commandline flags are flags that users specify on the -command line when they run an executable. In the command

-
-   fgrep -l -f /var/tmp/foo johannes brahms
-
-

-l and -f /var/tmp/foo are the two -commandline flags. (johannes and brahms, -which don't start with a dash, are commandline arguments.)

- -

Typically, an application lists what flags the user is allowed to -pass in, and what arguments they take -- in this example, --l takes no argument, and -f takes a -string (in particular, a filename) as an argument. Users can use a -library to help parse the commandline and store the flags in some data -structure.

- -

Gflags, the commandline flags library used within Google, -differs from other libraries, -such as getopt(), in that flag definitions can be -scattered around the source code, and not just listed in one place -such as main(). In practice, this means that a single -source-code file will define and use flags that are meaningful to that -file. Any application that links in that file will get the flags, and -the gflags library will automatically handle that -flag appropriately.

- -

There's significant gain in flexibility, and ease of code reuse, -due to this technique. However, there is a danger that two files will -define the same flag, and then give an error when they're linked -together.

- -

The rest of this document describes how to use the commandlineflag -library. It's a C++ library, so examples are in C++. However, there -is a Python port with the same functionality, and this discussion -translates directly to Python.

- -

Finding and Linking to gflags using CMake

- -

Using gflags within a project which uses CMake for its build system is easy. Therefore, simply add the following CMake code to your CMakeLists.txt file. - -

-   find_package (gflags REQUIRED)
-   include_directories (${gflags_INCLUDE_DIR})
-   
-   add_executable (foo main.cc)
-   target_link_libraries (foo gflags)
-
- -

DEFINE: Defining Flags In Program

- -

Defining a flag is easy: just use the appropriate macro for the -type you want the flag to be, as defined at the bottom of -gflags/gflags.h. Here's an example file, -foo.cc:

- -
-   #include <gflags/gflags.h>
-
-   DEFINE_bool(big_menu, true, "Include 'advanced' options in the menu listing");
-   DEFINE_string(languages, "english,french,german",
-                 "comma-separated list of languages to offer in the 'lang' menu");
-
- -

DEFINE_bool defines a boolean flag. Here are the -types supported:

-
    -
  • DEFINE_bool: boolean -
  • DEFINE_int32: 32-bit integer -
  • DEFINE_int64: 64-bit integer -
  • DEFINE_uint64: unsigned 64-bit integer -
  • DEFINE_double: double -
  • DEFINE_string: C++ string -
- -

Note that there are no 'complex' types like lists: the "languages" -flag in our example is a list of strings, but is defined of type -"string", not "list_of_string" or similar. This is by design. We'd -rather use only simple types for the flags, and allow for complex, -arbitrary parsing routines to parse them, than to try to put the logic -inside the flags library proper.

- -

All DEFINE macros take the same three arguments: the name of the -flag, its default value, and a 'help' string that describes its use. -The 'help' string is displayed when the user runs the application with -the --help flag.

- -

You can define a flag in any source-code file in your executable. -Only define a flag once! If you want to access a flag in more than -one source file, DEFINE it in one file, and DECLARE it in the others. Even better, DEFINE it -in foo.cc and DECLARE it in foo.h; then -everyone who #includes foo.h can use the flag.

- -

-Defining flags in libraries rather than in main() is powerful, but -does have some costs. One is that a library might not have a good -default value for its flags, for example if the flag holds a -filename that might not exist in some environments. To mitigate such problems, -you can use flag validators to ensure prompt -notification (in the form of a crash) of an invalid flag value. -

- -

Note that while most functions in this library are defined in the -google namespace, DEFINE_foo (and -DECLARE_foo, below), should always -be in the global namespace.

- - -

Accessing the Flag

- -

All defined flags are available to the program as just a normal -variable, with the prefix FLAGS_ prepended. In the above -example, the macros define two variables, FLAGS_big_menu -(a bool), and FLAGS_languages (a C++ string).

- -

You can read and write to the flag just like any other -variable:

-
-   if (FLAGS_consider_made_up_languages)
-     FLAGS_languages += ",klingon";   // implied by --consider_made_up_languages
-   if (FLAGS_languages.find("finnish") != string::npos)
-     HandleFinnish();
-
- -

You can also get and set flag values via special functions in -gflags.h. That's a rarer use case, though.

- - -

DECLARE: Using the Flag in a Different File

- -

Accessing a flag in the manner of the previous section only works -if the flag was DEFINE-ed at the top of the file. If it -wasn't, you'll get an 'unknown variable' error.

- -

The DECLARE_type macro is available when you want to -use a flag that's defined in another file. For instance, if I were -writing bar.cc but wanted to access the big_menu, flag, I -would put this near the top of bar.cc:

-
-   DECLARE_bool(big_menu);
-
- -

This is functionally equivalent to saying extern -FLAGS_big_menu.

- -

Note that such an extern declaration introduces a dependency -between your file and the file that defines the big_menu -flag: foo.cc, in this case. Such implicit dependencies -can be difficult to manage in large projects. For that reason we -recommend the following guideline:

- -
-If you DEFINE a flag in foo.cc, either don't DECLARE it -at all, only DECLARE it in tightly related tests, or only DECLARE -it in foo.h. -
- -

You should go the do-not-DECLARE route when the flag is only needed -by foo.cc, and not in any other file. If you want to -modify the value of the flag in the related test file to see if it is -functioning as expected, DECLARE it in the foo_test.cc -file. - -

If the flag does span multiple files, DECLARE it in the associated -.h file, and make others #include that -.h file if they want to access the flag. The -#include will make explicit the dependency between the -two files. This causes the flag to be a global variable.

- - -

RegisterFlagValidator: Sanity-checking Flag Values

- -

After DEFINE-ing a flag, you may optionally register a validator -function with the flag. If you do this, after the flag is parsed from -the commandline, and whenever its value is changed via a call to -SetCommandLineOption(), the validator function is called -with the new value as an argument. The validator function should -return 'true' if the flag value is valid, and false otherwise. -If the function returns false for the new setting of the -flag, the flag will retain its current value. If it returns false for the -default value, ParseCommandLineFlags will die. - -

Here is an example use of this functionality:

-
-static bool ValidatePort(const char* flagname, int32 value) {
-   if (value > 0 && value < 32768)   // value is ok
-     return true;
-   printf("Invalid value for --%s: %d\n", flagname, (int)value);
-   return false;
-}
-DEFINE_int32(port, 0, "What port to listen on");
-static const bool port_dummy = RegisterFlagValidator(&FLAGS_port, &ValidatePort);
-
- -

By doing the registration at global initialization time (right -after the DEFINE), we ensure that the registration happens before -the commandline is parsed at the beginning of main().

- -

RegisterFlagValidator() returns true if the -registration is successful. It return false if the registration fails -because a) the first argument does not refer to a commandline flag, or -b) a different validator has already been registered for this flag.

- - -

Putting It Together: How to Set Up Flags

- -

The final piece is the one that tells the executable to process the -commandline flags, and set the FLAGS_* variables to the -appropriate, non-default value based on what is seen on the -commandline. This is equivalent to the getopt() call in -the getopt library, but has much less overhead to use. In fact, it's -just a single function call:

- -
-   gflags::ParseCommandLineFlags(&argc, &argv, true);
-
- -

Usually, this code is at the beginning of main(). -argc and argv are exactly as passed in to -main(). This routine might modify them, which is why -pointers to them are passed in.

- -

The last argument is called "remove_flags". If true, then -ParseCommandLineFlags removes the flags and their -arguments from argv, and modifies argc -appropriately. In this case, after the function call, -argv will hold only commandline arguments, and not -commandline flags.

- -

If, on the other hand, remove_flags is false, then -ParseCommandLineFlags will leave argc unchanged, but will -rearrange the arguments in argv so that the flags are all at the -beginning. For example, if the input is "/bin/foo" "arg1" "-q" -"arg2" (which is legal but weird), the function will rearrange -argv so it reads "/bin/foo", "-q", "arg1", -"arg2". In this case, ParseCommandLineFlags -returns the index into argv that holds the first commandline argument: -that is, the index past the last flag. (In this example, it would -return 2, since argv[2] points to arg1.)

- -

In either case, the FLAGS_* variables are modified -based on what was passed in on the -commandline.

- - -

Setting Flags on the Command Line

- -

The reason you make something a flag instead of a compile-time -constant, is so users can specify a non-default value on the -commandline. Here's how they might do it for an application that -links in foo.cc:

-
-   app_containing_foo --nobig_menu -languages="chinese,japanese,korean" ...
-
- -

This sets FLAGS_big_menu = false; and -FLAGS_languages = "chinese,japanese,korean", when -ParseCommandLineFlags is run.

- -

Note the atypical syntax for setting a boolean flag to false: -putting "no" in front of its name. There's a fair bit of flexibility -to how flags may be specified. Here's an example of all the ways to -specify the "languages" flag:

-
    -
  • app_containing_foo --languages="chinese,japanese,korean" -
  • app_containing_foo -languages="chinese,japanese,korean" -
  • app_containing_foo --languages "chinese,japanese,korean" -
  • app_containing_foo -languages "chinese,japanese,korean" -
- -

For boolean flags, the possibilities are slightly different:

-
    -
  • app_containing_foo --big_menu -
  • app_containing_foo --nobig_menu -
  • app_containing_foo --big_menu=true -
  • app_containing_foo --big_menu=false -
-

(as well as the single-dash variant on all of these).

- -

Despite this flexibility, we recommend using only a single form: ---variable=value for non-boolean flags, and ---variable/--novariable for boolean flags. This -consistency will make your code more readable, and is also the format -required for certain special-use cases like flagfiles.

- -

It is a fatal error to specify a flag on the commandline that has -not been DEFINED somewhere in the executable. If you need that -functionality for some reason -- say you want to use the same set of -flags for several executables, but not all of them DEFINE every flag -in your list -- you can specify --undefok to suppress the error.

- -

As in getopt(), -- by itself will terminate flags -processing. So in foo -f1 1 -- -f2 2, f1 is -considered a flag, but -f2 is not.

- -

If a flag is specified more than once, only the last specification -is used; the others are ignored.

- -

Note that flags do not have single-letter synonyms, like they do in -the getopt library, nor do we allow "combining" flags behind a -single dash, as in ls -la.

- - - -

Changing the Default Flag Value

- -

Sometimes a flag is defined in a library, and you want to change -its default value in one application but not others. It's simple to -do this: just assign a new value to the flag in main(), -before calling ParseCommandLineFlags():

-
-   DECLARE_bool(lib_verbose);   // mylib has a lib_verbose flag, default is false
-   int main(int argc, char** argv) {
-     FLAGS_lib_verbose = true;  // in my app, I want a verbose lib by default
-     ParseCommandLineFlags(...);
-   }
-
- -

For this application, users can still set the flag value on the -commandline, but if they do not, the flag's value will default to -true.

- - -

Special Flags

- -

There are a few flags defined by the commandlineflags module -itself, and are available to all applications that use -commandlineflags. These fall into -three categories. First are the 'reporting' flags that, when found, cause -the application to print some information about itself and exit.

- - - - - - - - - - - - - - - - - - - - - - - - - -
--helpshows all flags from all files, sorted by file and then by name; - shows the flagname, its default value, and its help string
--helpfullsame as -help, but unambiguously asks for all flags - (in case -help changes in the future)
--helpshortshows only flags for the file with the same name as the executable - (usually the one containing main())
--helpxmllike --help, but output is in xml for easier parsing
--helpon=FILE  shows only flags defined in FILE.*
--helpmatch=Sshows only flags defined in *S*.*
--helppackageshows flags defined in files in same directory as main()
--versionprints version info for the executable
- -

Second are the flags that affect how other flags are parsed.

- - - -
--undefok=flagname,flagname,...for those names listed as the argument to --undefok, - suppress the normal error-exit that occurs when - --name is seen on the commandline, but - name has not been DEFINED anywhere in the - application -
- -

Third are the 'recursive' flags, that cause other flag values to be -set: --fromenv, --tryfromenv, ---flagfile. These are described below in more -detail.

- -

--fromenv

- -

--fromenv=foo,bar says to read the values for the -foo and bar flags from the environment. -In concert with this flag, you must actually set the values in the -environment, via a line like one of the two below:

-
-   export FLAGS_foo=xxx; export FLAGS_bar=yyy   # sh
-   setenv FLAGS_foo xxx; setenv FLAGS_bar yyy   # tcsh
-
-

This is equivalent to specifying --foo=xxx, ---bar=yyy on the commandline.

- -

Note it is a fatal error to say --fromenv=foo if -foo is not DEFINED somewhere in the application. (Though -you can suppress this error via --undefok=foo, just like -for any other flag.)

- -

It is also a fatal error to say --fromenv=foo if -FLAGS_foo is not actually defined in the environment.

- -

--tryfromenv

- -

--tryfromenv is exactly like --fromenv, -except it is not a fatal error to say ---tryfromenv=foo if FLAGS_foo is not -actually defined in the environment. Instead, in such cases, -FLAGS_foo just keeps its default value as specified in -the application.

- -

Note it is still an error to say --tryfromenv=foo if -foo is not DEFINED somewhere in the application.

- -

--flagfile

- -

--flagfile=f tells the commandlineflags module to read -the file f, and to run all the flag-assignments found in -that file as if these flags had been specified on the commandline.

- -

In its simplest form, f should just be a list of flag -assignments, one per line. Unlike on the commandline, the equals sign -separating a flagname from its argument is required for -flagfiles. An example flagfile, /tmp/myflags:

-
---nobig_menus
---languages=english,french
-
- -

With this flagfile, the following two lines are equivalent:

-

-   ./myapp --foo --nobig_menus --languages=english,french --bar
-   ./myapp --foo --flagfile=/tmp/myflags --bar
-
- -

Note that many errors are silently suppressed in flagfiles. In -particular, unrecognized flagnames are silently ignored, as are flags -that are missing a required value (e.g., a flagfile that just says ---languages).

- -

The general format of a flagfile is a bit more complicated than the -simple, common case above. It is: a sequence of filenames, one per -line, followed by a sequence of flags, one per line, repeated as many -times as desired. Filenames in a flagfile can use wildcards -(* and ?), and the sequence of flags located -after a sequence of filenames is processed only if the current -executable's name matches one of the filenames. It is possible to -start the flagfile with a sequence of flags instead of a sequence of -filenames; if such a sequence of flags is present, these flags are -applied to the current executable no matter what it is.

- -

Lines that start with a # are ignored as comments. -Leading whitespace is also ignored in flagfiles, as are blank -lines.

- -

It is possible for a flagfile to use the --flagfile -flag to include another flagfile.

- -

Flags are always processed in the expected order. That is, -processing begins by examining the flags specified directly on the -command line. If a flagfile is specified, its contents are processed, -and then processing continues with remaining flags from the command -line.

- - -

The API

- -

In addition to accessing FLAGS_foo directly, it is -possible to access the flags programmatically, through an API. It is -also possible to access information about a flag, such as its default -value and help-string. A FlagSaver makes it easy to -modify flags and then automatically undo the modifications later. -Finally, there are somewhat unrelated, but useful, routines to easily -access parts of argv outside main, including the program -name (argv[0]).

- -

For more information about these routines, and other useful helper -methods such as gflags::SetUsageMessage() and -gflags::SetVersionString, see gflags.h.

- - -

Miscellaneous Notes

- -

If your application has code like this:

-
-   #define STRIP_FLAG_HELP 1    // this must go before the #include!
-   #include <gflags/gflags.h>
-
-

we will remove the help messages from the compiled source. This can -reduce the size of the resulting binary somewhat, and may also be -useful for security reasons.

- - -
-
-Craig Silverstein, Andreas Schuh
- -
- - - From 0133710d47adf544ae0010ba3bef52002d255721 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Tue, 24 Mar 2015 12:59:56 +0000 Subject: [PATCH 67/94] add: Common build directory names to ignore list --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 39cb957..4281522 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +/xcode/ +/build/ +/build-*/ .DS_Store CMakeCache.txt DartConfiguration.tcl From 02e8c78f9dbe475cf8ff4bf476686f524d48845d Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Tue, 24 Mar 2015 13:21:35 +0000 Subject: [PATCH 68/94] doc: Spelling correction --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1d6790d..dee5d87 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Finalized move of gflags project from Google Code to GitHub. Email addresses of original issue reporters got lost in the process. -Given the age of most issue reports, this should be neglibable. +Given the age of most issue reports, this should be negligable. Please report any further issues using the GitHub issue tracker. From 04c73f86c3abd4ef9ae89aa5924a5364e108906f Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Tue, 24 Mar 2015 14:39:43 +0000 Subject: [PATCH 69/94] doc: Remove no longer needed include_directories command from example --- index.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/index.html b/index.html index 3a66713..8c42a9d 100644 --- a/index.html +++ b/index.html @@ -97,8 +97,6 @@ translates directly to Python.

    find_package (gflags REQUIRED)
-   include_directories (${gflags_INCLUDE_DIR})
-   
    add_executable (foo main.cc)
    target_link_libraries (foo gflags)
From 7b5b080a066e4415199e6a0a693af2a52a40cb69 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Tue, 24 Mar 2015 14:41:10 +0000 Subject: [PATCH 70/94] #103 Silence CMake warning regarding CMP0042 (MACOS_RPATH) --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index ca11b1d..ce01214 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,9 @@ cmake_minimum_required (VERSION 2.8.4 FATAL_ERROR) +if (POLICY CMP0042) + cmake_policy (SET CMP0042 NEW) +endif () + # ---------------------------------------------------------------------------- # includes set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") From 2b8deaa5e0b37b7894c2a40efd3f610cef017037 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Tue, 24 Mar 2015 14:41:52 +0000 Subject: [PATCH 71/94] fix: File paths and package URLs --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ce01214..2cb5816 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ set (PACKAGE_NAME "gflags") set (PACKAGE_VERSION "2.1.1") set (PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set (PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}") -set (PACKAGE_BUGREPORT "https://code.google.com/p/gflags/issues/") +set (PACKAGE_BUGREPORT "https://github.com/schuhschuh/gflags/issues") project (${PACKAGE_NAME} CXX) @@ -413,9 +413,9 @@ if (BUILD_PACKAGING) set (CPACK_PACKAGE_VERSION_MINOR "${PACKAGE_VERSION_MINOR}") set (CPACK_PACKAGE_VERSION_PATCH "${PACKAGE_VERSION_PATCH}") set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "A commandline flags library that allows for distributed flags.") - set (CPACK_RESOURCE_FILE_WELCOME "${CMAKE_CURRENT_LIST_DIR}/README.txt") + set (CPACK_RESOURCE_FILE_WELCOME "${CMAKE_CURRENT_LIST_DIR}/README.md") set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_LIST_DIR}/COPYING.txt") - set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_LIST_DIR}/README.txt") + set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_LIST_DIR}/README.md") set (CPACK_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") set (CPACK_OUTPUT_FILE_PREFIX packages) set (CPACK_PACKAGE_RELOCATABLE TRUE) @@ -424,11 +424,11 @@ if (BUILD_PACKAGING) # RPM package information -- used in cmake/package.cmake.in also for DEB set (CPACK_RPM_PACKAGE_GROUP "Development/Libraries") set (CPACK_RPM_PACKAGE_LICENSE "BSD") - set (CPACK_RPM_PACKAGE_URL "http://code.google.com/p/gflags") + set (CPACK_RPM_PACKAGE_URL "http://schuhschuh.github.com/gflags") set (CPACK_RPM_CHANGELOG_FILE "${CMAKE_CURRENT_LIST_DIR}/ChangeLog.txt") if (INSTALL_HEADERS) - set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_LIST_DIR}/doc/gflags.html") + set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_LIST_DIR}/doc/index.html") else () set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_LIST_DIR}/cmake/README_runtime.txt") endif () From 76c53b710ed3d1a6b9ed736de23accb4006e0a34 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Tue, 24 Mar 2015 14:44:12 +0000 Subject: [PATCH 72/94] #104 Set INTERFACE_INCLUDE_DIRECTORIES of (imported) targets --- CMakeLists.txt | 66 +++++++++++++++++++++++++++---------------- cmake/config.cmake.in | 4 +++ doc | 2 +- 3 files changed, 46 insertions(+), 26 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2cb5816..017d995 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -257,9 +257,12 @@ configure_headers (PUBLIC_HDRS ${PUBLIC_HDRS}) configure_sources (PRIVATE_HDRS ${PRIVATE_HDRS}) configure_sources (GFLAGS_SRCS ${GFLAGS_SRCS}) -include_directories ("${PROJECT_SOURCE_DIR}/src") -include_directories ("${PROJECT_BINARY_DIR}/include") -include_directories ("${PROJECT_BINARY_DIR}/include/${GFLAGS_INCLUDE_DIR}") +# deprecated declaration of include directories for older CMake versions +if (NOT COMMAND target_include_directories) + include_directories ("${PROJECT_SOURCE_DIR}/src") + include_directories ("${PROJECT_BINARY_DIR}/include") + include_directories ("${PROJECT_BINARY_DIR}/include/${GFLAGS_INCLUDE_DIR}") +endif () # ---------------------------------------------------------------------------- # output directories @@ -267,6 +270,29 @@ set (CMAKE_RUNTIME_OUTPUT_DIRECTORY "bin") set (CMAKE_LIBRARY_OUTPUT_DIRECTORY "lib") set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY "lib") +# ---------------------------------------------------------------------------- +# installation directories +if (OS_WINDOWS) + set (RUNTIME_INSTALL_DIR Bin) + set (LIBRARY_INSTALL_DIR Lib) + set (INCLUDE_INSTALL_DIR Include) + set (CONFIG_INSTALL_DIR CMake) +else () + set (RUNTIME_INSTALL_DIR bin) + # The LIB_INSTALL_DIR and LIB_SUFFIX variables are used by the Fedora + # package maintainers. Also package maintainers of other distribution + # packages need to be able to specify the name of the library directory. + if (NOT LIB_INSTALL_DIR) + set (LIB_INSTALL_DIR "lib${LIB_SUFFIX}") + endif () + set (LIBRARY_INSTALL_DIR "${LIB_INSTALL_DIR}" + CACHE PATH "Directory of installed libraries, e.g., \"lib64\"" + ) + mark_as_advanced (LIBRARY_INSTALL_DIR) + set (INCLUDE_INSTALL_DIR include) + set (CONFIG_INSTALL_DIR ${LIBRARY_INSTALL_DIR}/cmake/${PACKAGE_NAME}) +endif () + # ---------------------------------------------------------------------------- # add library targets set (TARGETS) @@ -284,6 +310,17 @@ foreach (TYPE IN ITEMS STATIC SHARED) foreach (opts IN ITEMS "" _nothreads) if (BUILD_gflags${opts}_LIB) add_library (gflags${opts}-${type} ${TYPE} ${GFLAGS_SRCS} ${PRIVATE_HDRS} ${PUBLIC_HDRS}) + if (COMMAND target_include_directories) + target_include_directories (gflags${opts}-${type} + PUBLIC "$" + PRIVATE "${PROJECT_SOURCE_DIR}/src;${PROJECT_BINARY_DIR}/include/${GFLAGS_INCLUDE_DIR}" + ) + if (INSTALL_HEADERS) + target_include_directories (gflags${opts}-${type} + PUBLIC "$" + ) + endif () + endif () if (opts MATCHES "nothreads") set (defines "GFLAGS_IS_A_DLL=${GFLAGS_IS_A_DLL};NOTHREADS") else () @@ -312,28 +349,7 @@ foreach (TYPE IN ITEMS STATIC SHARED) endforeach () # ---------------------------------------------------------------------------- -# installation -if (OS_WINDOWS) - set (RUNTIME_INSTALL_DIR Bin) - set (LIBRARY_INSTALL_DIR Lib) - set (INCLUDE_INSTALL_DIR Include) - set (CONFIG_INSTALL_DIR CMake) -else () - set (RUNTIME_INSTALL_DIR bin) - # The LIB_INSTALL_DIR and LIB_SUFFIX variables are used by the Fedora - # package maintainers. Also package maintainers of other distribution - # packages need to be able to specify the name of the library directory. - if (NOT LIB_INSTALL_DIR) - set (LIB_INSTALL_DIR "lib${LIB_SUFFIX}") - endif () - set (LIBRARY_INSTALL_DIR "${LIB_INSTALL_DIR}" - CACHE PATH "Directory of installed libraries, e.g., \"lib64\"" - ) - mark_as_advanced (LIBRARY_INSTALL_DIR) - set (INCLUDE_INSTALL_DIR include) - set (CONFIG_INSTALL_DIR ${LIBRARY_INSTALL_DIR}/cmake/${PACKAGE_NAME}) -endif () - +# installation rules file (RELATIVE_PATH INSTALL_PREFIX_REL2CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/${CONFIG_INSTALL_DIR}" "${CMAKE_INSTALL_PREFIX}") configure_file (cmake/config.cmake.in "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-config-install.cmake" @ONLY) configure_file (cmake/version.cmake.in "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-config-version.cmake" @ONLY) diff --git a/cmake/config.cmake.in b/cmake/config.cmake.in index 77a8a67..ee8a916 100644 --- a/cmake/config.cmake.in +++ b/cmake/config.cmake.in @@ -14,6 +14,10 @@ get_filename_component (CMAKE_CURRENT_LIST_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH get_filename_component (_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_DIR}/@INSTALL_PREFIX_REL2CONFIG_DIR@" ABSOLUTE) # include directory +# +# Newer versions of CMake set the INTERFACE_INCLUDE_DIRECTORIES property +# of the imported targets. It is hence not necessary to add this path +# manually to the include search path for targets which link to gflags. set (@PACKAGE_NAME@_INCLUDE_DIR "${_INSTALL_PREFIX}/@INCLUDE_INSTALL_DIR@") # gflags library diff --git a/doc b/doc index 957f0d2..64cf9f3 160000 --- a/doc +++ b/doc @@ -1 +1 @@ -Subproject commit 957f0d291c80acbf894eb5dad918798546db9c07 +Subproject commit 64cf9f3249edb88fae268b43d13dd2ca211e1da0 From 4b771465b1f8c942c9a1e77fbb9131d41649bb2d Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Tue, 24 Mar 2015 14:44:57 +0000 Subject: [PATCH 73/94] cmake: Set version of master branch to next release version --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 017d995..1272770 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ include (utils) # ---------------------------------------------------------------------------- # package information set (PACKAGE_NAME "gflags") -set (PACKAGE_VERSION "2.1.1") +set (PACKAGE_VERSION "2.2.0") set (PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set (PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}") set (PACKAGE_BUGREPORT "https://github.com/schuhschuh/gflags/issues") From afbf3f22ff2c84ebe0d4ad55c8ffb37a80209a75 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Tue, 24 Mar 2015 14:48:59 +0000 Subject: [PATCH 74/94] fix: Remove accidentally added gh-pages files --- .nojekyll | 0 designstyle.css | 115 ---------- doc | 1 - index.html | 556 ------------------------------------------------ 4 files changed, 672 deletions(-) delete mode 100644 .nojekyll delete mode 100644 designstyle.css delete mode 160000 doc delete mode 100644 index.html diff --git a/.nojekyll b/.nojekyll deleted file mode 100644 index e69de29..0000000 diff --git a/designstyle.css b/designstyle.css deleted file mode 100644 index f5d1ec2..0000000 --- a/designstyle.css +++ /dev/null @@ -1,115 +0,0 @@ -body { - background-color: #ffffff; - color: black; - margin-right: 1in; - margin-left: 1in; -} - - -h1, h2, h3, h4, h5, h6 { - color: #3366ff; - font-family: sans-serif; -} -@media print { - /* Darker version for printing */ - h1, h2, h3, h4, h5, h6 { - color: #000080; - font-family: helvetica, sans-serif; - } -} - -h1 { - text-align: center; - font-size: 18pt; -} -h2 { - margin-left: -0.5in; -} -h3 { - margin-left: -0.25in; -} -h4 { - margin-left: -0.125in; -} -hr { - margin-left: -1in; -} - -/* Definition lists: definition term bold */ -dt { - font-weight: bold; -} - -address { - text-align: right; -} -/* Use the tag for bits of code and for variables and objects. */ -code,pre,samp,var { - color: #006000; -} -/* Use the tag for file and directory paths and names. */ -file { - color: #905050; - font-family: monospace; -} -/* Use the tag for stuff the user should type. */ -kbd { - color: #600000; -} -div.note p { - float: right; - width: 3in; - margin-right: 0%; - padding: 1px; - border: 2px solid #6060a0; - background-color: #fffff0; -} - -UL.nobullets { - list-style-type: none; - list-style-image: none; - margin-left: -1em; -} - -/* -body:after { - content: "Google Confidential"; -} -*/ - -/* pretty printing styles. See prettify.js */ -.str { color: #080; } -.kwd { color: #008; } -.com { color: #800; } -.typ { color: #606; } -.lit { color: #066; } -.pun { color: #660; } -.pln { color: #000; } -.tag { color: #008; } -.atn { color: #606; } -.atv { color: #080; } -pre.prettyprint { padding: 2px; border: 1px solid #888; } - -.embsrc { background: #eee; } - -@media print { - .str { color: #060; } - .kwd { color: #006; font-weight: bold; } - .com { color: #600; font-style: italic; } - .typ { color: #404; font-weight: bold; } - .lit { color: #044; } - .pun { color: #440; } - .pln { color: #000; } - .tag { color: #006; font-weight: bold; } - .atn { color: #404; } - .atv { color: #060; } -} - -/* Table Column Headers */ -.hdr { - color: #006; - font-weight: bold; - background-color: #dddddd; } -.hdr2 { - color: #006; - background-color: #eeeeee; } \ No newline at end of file diff --git a/doc b/doc deleted file mode 160000 index 64cf9f3..0000000 --- a/doc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 64cf9f3249edb88fae268b43d13dd2ca211e1da0 diff --git a/index.html b/index.html deleted file mode 100644 index 8c42a9d..0000000 --- a/index.html +++ /dev/null @@ -1,556 +0,0 @@ - - - - -How To Use Gflags (formerly Google Commandline Flags) - - - - - - - - -

How To Use gflags (formerly Google Commandline Flags)

-(as of -) - -
- - - -

Introduction, and Comparison to Other Commandline - Flags Libraries

- -

Commandline flags are flags that users specify on the -command line when they run an executable. In the command

-
-   fgrep -l -f /var/tmp/foo johannes brahms
-
-

-l and -f /var/tmp/foo are the two -commandline flags. (johannes and brahms, -which don't start with a dash, are commandline arguments.)

- -

Typically, an application lists what flags the user is allowed to -pass in, and what arguments they take -- in this example, --l takes no argument, and -f takes a -string (in particular, a filename) as an argument. Users can use a -library to help parse the commandline and store the flags in some data -structure.

- -

Gflags, the commandline flags library used within Google, -differs from other libraries, -such as getopt(), in that flag definitions can be -scattered around the source code, and not just listed in one place -such as main(). In practice, this means that a single -source-code file will define and use flags that are meaningful to that -file. Any application that links in that file will get the flags, and -the gflags library will automatically handle that -flag appropriately.

- -

There's significant gain in flexibility, and ease of code reuse, -due to this technique. However, there is a danger that two files will -define the same flag, and then give an error when they're linked -together.

- -

The rest of this document describes how to use the commandlineflag -library. It's a C++ library, so examples are in C++. However, there -is a Python port with the same functionality, and this discussion -translates directly to Python.

- -

Finding and Linking to gflags using CMake

- -

Using gflags within a project which uses CMake for its build system is easy. Therefore, simply add the following CMake code to your CMakeLists.txt file. - -

-   find_package (gflags REQUIRED)
-   add_executable (foo main.cc)
-   target_link_libraries (foo gflags)
-
- -

DEFINE: Defining Flags In Program

- -

Defining a flag is easy: just use the appropriate macro for the -type you want the flag to be, as defined at the bottom of -gflags/gflags.h. Here's an example file, -foo.cc:

- -
-   #include <gflags/gflags.h>
-
-   DEFINE_bool(big_menu, true, "Include 'advanced' options in the menu listing");
-   DEFINE_string(languages, "english,french,german",
-                 "comma-separated list of languages to offer in the 'lang' menu");
-
- -

DEFINE_bool defines a boolean flag. Here are the -types supported:

-
    -
  • DEFINE_bool: boolean -
  • DEFINE_int32: 32-bit integer -
  • DEFINE_int64: 64-bit integer -
  • DEFINE_uint64: unsigned 64-bit integer -
  • DEFINE_double: double -
  • DEFINE_string: C++ string -
- -

Note that there are no 'complex' types like lists: the "languages" -flag in our example is a list of strings, but is defined of type -"string", not "list_of_string" or similar. This is by design. We'd -rather use only simple types for the flags, and allow for complex, -arbitrary parsing routines to parse them, than to try to put the logic -inside the flags library proper.

- -

All DEFINE macros take the same three arguments: the name of the -flag, its default value, and a 'help' string that describes its use. -The 'help' string is displayed when the user runs the application with -the --help flag.

- -

You can define a flag in any source-code file in your executable. -Only define a flag once! If you want to access a flag in more than -one source file, DEFINE it in one file, and DECLARE it in the others. Even better, DEFINE it -in foo.cc and DECLARE it in foo.h; then -everyone who #includes foo.h can use the flag.

- -

-Defining flags in libraries rather than in main() is powerful, but -does have some costs. One is that a library might not have a good -default value for its flags, for example if the flag holds a -filename that might not exist in some environments. To mitigate such problems, -you can use flag validators to ensure prompt -notification (in the form of a crash) of an invalid flag value. -

- -

Note that while most functions in this library are defined in the -google namespace, DEFINE_foo (and -DECLARE_foo, below), should always -be in the global namespace.

- - -

Accessing the Flag

- -

All defined flags are available to the program as just a normal -variable, with the prefix FLAGS_ prepended. In the above -example, the macros define two variables, FLAGS_big_menu -(a bool), and FLAGS_languages (a C++ string).

- -

You can read and write to the flag just like any other -variable:

-
-   if (FLAGS_consider_made_up_languages)
-     FLAGS_languages += ",klingon";   // implied by --consider_made_up_languages
-   if (FLAGS_languages.find("finnish") != string::npos)
-     HandleFinnish();
-
- -

You can also get and set flag values via special functions in -gflags.h. That's a rarer use case, though.

- - -

DECLARE: Using the Flag in a Different File

- -

Accessing a flag in the manner of the previous section only works -if the flag was DEFINE-ed at the top of the file. If it -wasn't, you'll get an 'unknown variable' error.

- -

The DECLARE_type macro is available when you want to -use a flag that's defined in another file. For instance, if I were -writing bar.cc but wanted to access the big_menu, flag, I -would put this near the top of bar.cc:

-
-   DECLARE_bool(big_menu);
-
- -

This is functionally equivalent to saying extern -FLAGS_big_menu.

- -

Note that such an extern declaration introduces a dependency -between your file and the file that defines the big_menu -flag: foo.cc, in this case. Such implicit dependencies -can be difficult to manage in large projects. For that reason we -recommend the following guideline:

- -
-If you DEFINE a flag in foo.cc, either don't DECLARE it -at all, only DECLARE it in tightly related tests, or only DECLARE -it in foo.h. -
- -

You should go the do-not-DECLARE route when the flag is only needed -by foo.cc, and not in any other file. If you want to -modify the value of the flag in the related test file to see if it is -functioning as expected, DECLARE it in the foo_test.cc -file. - -

If the flag does span multiple files, DECLARE it in the associated -.h file, and make others #include that -.h file if they want to access the flag. The -#include will make explicit the dependency between the -two files. This causes the flag to be a global variable.

- - -

RegisterFlagValidator: Sanity-checking Flag Values

- -

After DEFINE-ing a flag, you may optionally register a validator -function with the flag. If you do this, after the flag is parsed from -the commandline, and whenever its value is changed via a call to -SetCommandLineOption(), the validator function is called -with the new value as an argument. The validator function should -return 'true' if the flag value is valid, and false otherwise. -If the function returns false for the new setting of the -flag, the flag will retain its current value. If it returns false for the -default value, ParseCommandLineFlags will die. - -

Here is an example use of this functionality:

-
-static bool ValidatePort(const char* flagname, int32 value) {
-   if (value > 0 && value < 32768)   // value is ok
-     return true;
-   printf("Invalid value for --%s: %d\n", flagname, (int)value);
-   return false;
-}
-DEFINE_int32(port, 0, "What port to listen on");
-static const bool port_dummy = RegisterFlagValidator(&FLAGS_port, &ValidatePort);
-
- -

By doing the registration at global initialization time (right -after the DEFINE), we ensure that the registration happens before -the commandline is parsed at the beginning of main().

- -

RegisterFlagValidator() returns true if the -registration is successful. It return false if the registration fails -because a) the first argument does not refer to a commandline flag, or -b) a different validator has already been registered for this flag.

- - -

Putting It Together: How to Set Up Flags

- -

The final piece is the one that tells the executable to process the -commandline flags, and set the FLAGS_* variables to the -appropriate, non-default value based on what is seen on the -commandline. This is equivalent to the getopt() call in -the getopt library, but has much less overhead to use. In fact, it's -just a single function call:

- -
-   gflags::ParseCommandLineFlags(&argc, &argv, true);
-
- -

Usually, this code is at the beginning of main(). -argc and argv are exactly as passed in to -main(). This routine might modify them, which is why -pointers to them are passed in.

- -

The last argument is called "remove_flags". If true, then -ParseCommandLineFlags removes the flags and their -arguments from argv, and modifies argc -appropriately. In this case, after the function call, -argv will hold only commandline arguments, and not -commandline flags.

- -

If, on the other hand, remove_flags is false, then -ParseCommandLineFlags will leave argc unchanged, but will -rearrange the arguments in argv so that the flags are all at the -beginning. For example, if the input is "/bin/foo" "arg1" "-q" -"arg2" (which is legal but weird), the function will rearrange -argv so it reads "/bin/foo", "-q", "arg1", -"arg2". In this case, ParseCommandLineFlags -returns the index into argv that holds the first commandline argument: -that is, the index past the last flag. (In this example, it would -return 2, since argv[2] points to arg1.)

- -

In either case, the FLAGS_* variables are modified -based on what was passed in on the -commandline.

- - -

Setting Flags on the Command Line

- -

The reason you make something a flag instead of a compile-time -constant, is so users can specify a non-default value on the -commandline. Here's how they might do it for an application that -links in foo.cc:

-
-   app_containing_foo --nobig_menu -languages="chinese,japanese,korean" ...
-
- -

This sets FLAGS_big_menu = false; and -FLAGS_languages = "chinese,japanese,korean", when -ParseCommandLineFlags is run.

- -

Note the atypical syntax for setting a boolean flag to false: -putting "no" in front of its name. There's a fair bit of flexibility -to how flags may be specified. Here's an example of all the ways to -specify the "languages" flag:

-
    -
  • app_containing_foo --languages="chinese,japanese,korean" -
  • app_containing_foo -languages="chinese,japanese,korean" -
  • app_containing_foo --languages "chinese,japanese,korean" -
  • app_containing_foo -languages "chinese,japanese,korean" -
- -

For boolean flags, the possibilities are slightly different:

-
    -
  • app_containing_foo --big_menu -
  • app_containing_foo --nobig_menu -
  • app_containing_foo --big_menu=true -
  • app_containing_foo --big_menu=false -
-

(as well as the single-dash variant on all of these).

- -

Despite this flexibility, we recommend using only a single form: ---variable=value for non-boolean flags, and ---variable/--novariable for boolean flags. This -consistency will make your code more readable, and is also the format -required for certain special-use cases like flagfiles.

- -

It is a fatal error to specify a flag on the commandline that has -not been DEFINED somewhere in the executable. If you need that -functionality for some reason -- say you want to use the same set of -flags for several executables, but not all of them DEFINE every flag -in your list -- you can specify --undefok to suppress the error.

- -

As in getopt(), -- by itself will terminate flags -processing. So in foo -f1 1 -- -f2 2, f1 is -considered a flag, but -f2 is not.

- -

If a flag is specified more than once, only the last specification -is used; the others are ignored.

- -

Note that flags do not have single-letter synonyms, like they do in -the getopt library, nor do we allow "combining" flags behind a -single dash, as in ls -la.

- - - -

Changing the Default Flag Value

- -

Sometimes a flag is defined in a library, and you want to change -its default value in one application but not others. It's simple to -do this: just assign a new value to the flag in main(), -before calling ParseCommandLineFlags():

-
-   DECLARE_bool(lib_verbose);   // mylib has a lib_verbose flag, default is false
-   int main(int argc, char** argv) {
-     FLAGS_lib_verbose = true;  // in my app, I want a verbose lib by default
-     ParseCommandLineFlags(...);
-   }
-
- -

For this application, users can still set the flag value on the -commandline, but if they do not, the flag's value will default to -true.

- - -

Special Flags

- -

There are a few flags defined by the commandlineflags module -itself, and are available to all applications that use -commandlineflags. These fall into -three categories. First are the 'reporting' flags that, when found, cause -the application to print some information about itself and exit.

- - - - - - - - - - - - - - - - - - - - - - - - - -
--helpshows all flags from all files, sorted by file and then by name; - shows the flagname, its default value, and its help string
--helpfullsame as -help, but unambiguously asks for all flags - (in case -help changes in the future)
--helpshortshows only flags for the file with the same name as the executable - (usually the one containing main())
--helpxmllike --help, but output is in xml for easier parsing
--helpon=FILE  shows only flags defined in FILE.*
--helpmatch=Sshows only flags defined in *S*.*
--helppackageshows flags defined in files in same directory as main()
--versionprints version info for the executable
- -

Second are the flags that affect how other flags are parsed.

- - - -
--undefok=flagname,flagname,...for those names listed as the argument to --undefok, - suppress the normal error-exit that occurs when - --name is seen on the commandline, but - name has not been DEFINED anywhere in the - application -
- -

Third are the 'recursive' flags, that cause other flag values to be -set: --fromenv, --tryfromenv, ---flagfile. These are described below in more -detail.

- -

--fromenv

- -

--fromenv=foo,bar says to read the values for the -foo and bar flags from the environment. -In concert with this flag, you must actually set the values in the -environment, via a line like one of the two below:

-
-   export FLAGS_foo=xxx; export FLAGS_bar=yyy   # sh
-   setenv FLAGS_foo xxx; setenv FLAGS_bar yyy   # tcsh
-
-

This is equivalent to specifying --foo=xxx, ---bar=yyy on the commandline.

- -

Note it is a fatal error to say --fromenv=foo if -foo is not DEFINED somewhere in the application. (Though -you can suppress this error via --undefok=foo, just like -for any other flag.)

- -

It is also a fatal error to say --fromenv=foo if -FLAGS_foo is not actually defined in the environment.

- -

--tryfromenv

- -

--tryfromenv is exactly like --fromenv, -except it is not a fatal error to say ---tryfromenv=foo if FLAGS_foo is not -actually defined in the environment. Instead, in such cases, -FLAGS_foo just keeps its default value as specified in -the application.

- -

Note it is still an error to say --tryfromenv=foo if -foo is not DEFINED somewhere in the application.

- -

--flagfile

- -

--flagfile=f tells the commandlineflags module to read -the file f, and to run all the flag-assignments found in -that file as if these flags had been specified on the commandline.

- -

In its simplest form, f should just be a list of flag -assignments, one per line. Unlike on the commandline, the equals sign -separating a flagname from its argument is required for -flagfiles. An example flagfile, /tmp/myflags:

-
---nobig_menus
---languages=english,french
-
- -

With this flagfile, the following two lines are equivalent:

-

-   ./myapp --foo --nobig_menus --languages=english,french --bar
-   ./myapp --foo --flagfile=/tmp/myflags --bar
-
- -

Note that many errors are silently suppressed in flagfiles. In -particular, unrecognized flagnames are silently ignored, as are flags -that are missing a required value (e.g., a flagfile that just says ---languages).

- -

The general format of a flagfile is a bit more complicated than the -simple, common case above. It is: a sequence of filenames, one per -line, followed by a sequence of flags, one per line, repeated as many -times as desired. Filenames in a flagfile can use wildcards -(* and ?), and the sequence of flags located -after a sequence of filenames is processed only if the current -executable's name matches one of the filenames. It is possible to -start the flagfile with a sequence of flags instead of a sequence of -filenames; if such a sequence of flags is present, these flags are -applied to the current executable no matter what it is.

- -

Lines that start with a # are ignored as comments. -Leading whitespace is also ignored in flagfiles, as are blank -lines.

- -

It is possible for a flagfile to use the --flagfile -flag to include another flagfile.

- -

Flags are always processed in the expected order. That is, -processing begins by examining the flags specified directly on the -command line. If a flagfile is specified, its contents are processed, -and then processing continues with remaining flags from the command -line.

- - -

The API

- -

In addition to accessing FLAGS_foo directly, it is -possible to access the flags programmatically, through an API. It is -also possible to access information about a flag, such as its default -value and help-string. A FlagSaver makes it easy to -modify flags and then automatically undo the modifications later. -Finally, there are somewhat unrelated, but useful, routines to easily -access parts of argv outside main, including the program -name (argv[0]).

- -

For more information about these routines, and other useful helper -methods such as gflags::SetUsageMessage() and -gflags::SetVersionString, see gflags.h.

- - -

Miscellaneous Notes

- -

If your application has code like this:

-
-   #define STRIP_FLAG_HELP 1    // this must go before the #include!
-   #include <gflags/gflags.h>
-
-

we will remove the help messages from the compiled source. This can -reduce the size of the resulting binary somewhat, and may also be -useful for security reasons.

- - -
-
-Craig Silverstein, Andreas Schuh
- -
- - - From 13cf9e1b39b580cc6b886d1bf33bfbe87d25c3db Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Tue, 24 Mar 2015 14:59:51 +0000 Subject: [PATCH 75/94] doc: Readding doc submodule --- doc | 1 + 1 file changed, 1 insertion(+) create mode 160000 doc diff --git a/doc b/doc new file mode 160000 index 0000000..957aa3a --- /dev/null +++ b/doc @@ -0,0 +1 @@ +Subproject commit 957aa3aa622d48839c99a51eb8f8b1f55d16b06b From 35fcdb3b2fd13da4178f793e61eaa461af7502fc Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Tue, 24 Mar 2015 15:05:08 +0000 Subject: [PATCH 76/94] mod: Update gh-pages --- doc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc b/doc index 957aa3a..3398e7b 160000 --- a/doc +++ b/doc @@ -1 +1 @@ -Subproject commit 957aa3aa622d48839c99a51eb8f8b1f55d16b06b +Subproject commit 3398e7b0c920e84a137b1860f838b7d353d23e75 From 51f1db74312c4a9718dad77d2787d0ca22cce032 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Tue, 24 Mar 2015 15:36:26 +0000 Subject: [PATCH 77/94] #101 Enable C language again as long as FindThreads requires it This avoids having patched CMake modules in the source tree of the gflags library. Usually a C compiler is installed along a C++ compiler (or it is used for C as well). The only slight downside is the extra configuration time needed by CMake to check the C compiler. --- CMakeLists.txt | 10 +- cmake/CMakeCXXInformation.cmake | 300 ------------------------------ cmake/CheckCXXLibraryExists.cmake | 80 -------- cmake/CheckForPthreads.cxx | 38 ---- cmake/CheckTypeSize.c.in | 37 ---- cmake/CheckTypeSize.cmake | 268 -------------------------- cmake/CheckTypeSizeMap.cmake.in | 1 - cmake/FindThreadsCXX.cmake | 181 ------------------ 8 files changed, 9 insertions(+), 906 deletions(-) delete mode 100644 cmake/CMakeCXXInformation.cmake delete mode 100644 cmake/CheckCXXLibraryExists.cmake delete mode 100644 cmake/CheckForPthreads.cxx delete mode 100644 cmake/CheckTypeSize.c.in delete mode 100644 cmake/CheckTypeSize.cmake delete mode 100644 cmake/CheckTypeSizeMap.cmake.in delete mode 100644 cmake/FindThreadsCXX.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 1272770..275426d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,6 +18,14 @@ set (PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}") set (PACKAGE_BUGREPORT "https://github.com/schuhschuh/gflags/issues") project (${PACKAGE_NAME} CXX) +if (CMAKE_VERSION VERSION_LESS 100) + # C language still needed because the following required CMake modules + # (or their dependencies, respectively) are not correctly handling + # the case where only CXX is enabled. + # - CheckTypeSize.cmake (fixed in CMake 3.1, cf. http://www.cmake.org/Bug/view.php?id=14056) + # - FindThreads.cmake (--> CheckIncludeFiles.cmake <--) + enable_language (C) +endif () version_numbers ( ${PACKAGE_VERSION} @@ -179,7 +187,7 @@ else () endif () set (CMAKE_THREAD_PREFER_PTHREAD TRUE) -find_package (ThreadsCXX) +find_package (Threads) if (Threads_FOUND AND CMAKE_USE_PTHREADS_INIT) set (HAVE_PTHREAD 1) check_type_size (pthread_rwlock_t RWLOCK LANGUAGE CXX) diff --git a/cmake/CMakeCXXInformation.cmake b/cmake/CMakeCXXInformation.cmake deleted file mode 100644 index 9ddae4a..0000000 --- a/cmake/CMakeCXXInformation.cmake +++ /dev/null @@ -1,300 +0,0 @@ -# Copied from master branch of CMake (commit SHA 34a49dea) before release of -# this newer version which seems to fix a bug of the one coming with CMake 2.8-12. - -#============================================================================= -# Copyright 2004-2011 Kitware, Inc. -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= -# (To distribute this file outside of CMake, substitute the full -# License text for the above reference.) - -# This file sets the basic flags for the C++ language in CMake. -# It also loads the available platform file for the system-compiler -# if it exists. -# It also loads a system - compiler - processor (or target hardware) -# specific file, which is mainly useful for crosscompiling and embedded systems. - -# some compilers use different extensions (e.g. sdcc uses .rel) -# so set the extension here first so it can be overridden by the compiler specific file -if(UNIX) - set(CMAKE_CXX_OUTPUT_EXTENSION .o) -else() - set(CMAKE_CXX_OUTPUT_EXTENSION .obj) -endif() - -set(_INCLUDED_FILE 0) - -# Load compiler-specific information. -if(CMAKE_CXX_COMPILER_ID) - include(Compiler/${CMAKE_CXX_COMPILER_ID}-CXX OPTIONAL) -endif() - -set(CMAKE_BASE_NAME) -get_filename_component(CMAKE_BASE_NAME "${CMAKE_CXX_COMPILER}" NAME_WE) -# since the gnu compiler has several names force g++ -if(CMAKE_COMPILER_IS_GNUCXX) - set(CMAKE_BASE_NAME g++) -endif() - - -# load a hardware specific file, mostly useful for embedded compilers -if(CMAKE_SYSTEM_PROCESSOR) - if(CMAKE_CXX_COMPILER_ID) - include(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_CXX_COMPILER_ID}-CXX-${CMAKE_SYSTEM_PROCESSOR} OPTIONAL RESULT_VARIABLE _INCLUDED_FILE) - endif() - if (NOT _INCLUDED_FILE) - include(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}-${CMAKE_SYSTEM_PROCESSOR} OPTIONAL) - endif () -endif() - -# load the system- and compiler specific files -if(CMAKE_CXX_COMPILER_ID) - include(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_CXX_COMPILER_ID}-CXX OPTIONAL RESULT_VARIABLE _INCLUDED_FILE) -endif() -if (NOT _INCLUDED_FILE) - include(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL - RESULT_VARIABLE _INCLUDED_FILE) -endif () -# We specify the compiler information in the system file for some -# platforms, but this language may not have been enabled when the file -# was first included. Include it again to get the language info. -# Remove this when all compiler info is removed from system files. -if (NOT _INCLUDED_FILE) - include(Platform/${CMAKE_SYSTEM_NAME} OPTIONAL) -endif () - -if(CMAKE_CXX_SIZEOF_DATA_PTR) - foreach(f ${CMAKE_CXX_ABI_FILES}) - include(${f}) - endforeach() - unset(CMAKE_CXX_ABI_FILES) -endif() - -# This should be included before the _INIT variables are -# used to initialize the cache. Since the rule variables -# have if blocks on them, users can still define them here. -# But, it should still be after the platform file so changes can -# be made to those values. - -if(CMAKE_USER_MAKE_RULES_OVERRIDE) - # Save the full path of the file so try_compile can use it. - include(${CMAKE_USER_MAKE_RULES_OVERRIDE} RESULT_VARIABLE _override) - set(CMAKE_USER_MAKE_RULES_OVERRIDE "${_override}") -endif() - -if(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX) - # Save the full path of the file so try_compile can use it. - include(${CMAKE_USER_MAKE_RULES_OVERRIDE_CXX} RESULT_VARIABLE _override) - set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX "${_override}") -endif() - - -# Create a set of shared library variable specific to C++ -# For 90% of the systems, these are the same flags as the C versions -# so if these are not set just copy the flags from the c version -if(NOT CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS) - set(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS}) -endif() - -if(NOT CMAKE_CXX_COMPILE_OPTIONS_PIC) - set(CMAKE_CXX_COMPILE_OPTIONS_PIC ${CMAKE_C_COMPILE_OPTIONS_PIC}) -endif() - -if(NOT CMAKE_CXX_COMPILE_OPTIONS_PIE) - set(CMAKE_CXX_COMPILE_OPTIONS_PIE ${CMAKE_C_COMPILE_OPTIONS_PIE}) -endif() - -if(NOT CMAKE_CXX_COMPILE_OPTIONS_DLL) - set(CMAKE_CXX_COMPILE_OPTIONS_DLL ${CMAKE_C_COMPILE_OPTIONS_DLL}) -endif() - -if(NOT CMAKE_SHARED_LIBRARY_CXX_FLAGS) - set(CMAKE_SHARED_LIBRARY_CXX_FLAGS ${CMAKE_SHARED_LIBRARY_C_FLAGS}) -endif() - -if(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS) - set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS ${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS}) -endif() - -if(NOT CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG) - set(CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG}) -endif() - -if(NOT CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG_SEP) - set(CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP}) -endif() - -if(NOT CMAKE_SHARED_LIBRARY_RPATH_LINK_CXX_FLAG) - set(CMAKE_SHARED_LIBRARY_RPATH_LINK_CXX_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG}) -endif() - -if(NOT DEFINED CMAKE_EXE_EXPORTS_CXX_FLAG) - set(CMAKE_EXE_EXPORTS_CXX_FLAG ${CMAKE_EXE_EXPORTS_C_FLAG}) -endif() - -if(NOT DEFINED CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG) - set(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG ${CMAKE_SHARED_LIBRARY_SONAME_C_FLAG}) -endif() - -if(NOT CMAKE_EXECUTABLE_RUNTIME_CXX_FLAG) - set(CMAKE_EXECUTABLE_RUNTIME_CXX_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG}) -endif() - -if(NOT CMAKE_EXECUTABLE_RUNTIME_CXX_FLAG_SEP) - set(CMAKE_EXECUTABLE_RUNTIME_CXX_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG_SEP}) -endif() - -if(NOT CMAKE_EXECUTABLE_RPATH_LINK_CXX_FLAG) - set(CMAKE_EXECUTABLE_RPATH_LINK_CXX_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_CXX_FLAG}) -endif() - -if(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_CXX_WITH_RUNTIME_PATH) - set(CMAKE_SHARED_LIBRARY_LINK_CXX_WITH_RUNTIME_PATH ${CMAKE_SHARED_LIBRARY_LINK_C_WITH_RUNTIME_PATH}) -endif() - -if(NOT CMAKE_INCLUDE_FLAG_CXX) - set(CMAKE_INCLUDE_FLAG_CXX ${CMAKE_INCLUDE_FLAG_C}) -endif() - -if(NOT CMAKE_INCLUDE_FLAG_SEP_CXX) - set(CMAKE_INCLUDE_FLAG_SEP_CXX ${CMAKE_INCLUDE_FLAG_SEP_C}) -endif() - -# for most systems a module is the same as a shared library -# so unless the variable CMAKE_MODULE_EXISTS is set just -# copy the values from the LIBRARY variables -if(NOT CMAKE_MODULE_EXISTS) - set(CMAKE_SHARED_MODULE_CXX_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}) - set(CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS}) -endif() - -# repeat for modules -if(NOT CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS) - set(CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS ${CMAKE_SHARED_MODULE_CREATE_C_FLAGS}) -endif() - -if(NOT CMAKE_SHARED_MODULE_CXX_FLAGS) - set(CMAKE_SHARED_MODULE_CXX_FLAGS ${CMAKE_SHARED_MODULE_C_FLAGS}) -endif() - -# Initialize CXX link type selection flags from C versions. -foreach(type SHARED_LIBRARY SHARED_MODULE EXE) - if(NOT CMAKE_${type}_LINK_STATIC_CXX_FLAGS) - set(CMAKE_${type}_LINK_STATIC_CXX_FLAGS - ${CMAKE_${type}_LINK_STATIC_C_FLAGS}) - endif() - if(NOT CMAKE_${type}_LINK_DYNAMIC_CXX_FLAGS) - set(CMAKE_${type}_LINK_DYNAMIC_CXX_FLAGS - ${CMAKE_${type}_LINK_DYNAMIC_C_FLAGS}) - endif() -endforeach() - -# add the flags to the cache based -# on the initial values computed in the platform/*.cmake files -# use _INIT variables so that this only happens the first time -# and you can set these flags in the cmake cache -set(CMAKE_CXX_FLAGS_INIT "$ENV{CXXFLAGS} ${CMAKE_CXX_FLAGS_INIT}") -# avoid just having a space as the initial value for the cache -if(CMAKE_CXX_FLAGS_INIT STREQUAL " ") - set(CMAKE_CXX_FLAGS_INIT) -endif() -set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_INIT}" CACHE STRING - "Flags used by the compiler during all build types.") - -if(NOT CMAKE_NOT_USING_CONFIG_FLAGS) - set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG_INIT}" CACHE STRING - "Flags used by the compiler during debug builds.") - set (CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL_INIT}" CACHE STRING - "Flags used by the compiler during release builds for minimum size.") - set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE_INIT}" CACHE STRING - "Flags used by the compiler during release builds.") - set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT}" CACHE STRING - "Flags used by the compiler during release builds with debug info.") - -endif() - -if(CMAKE_CXX_STANDARD_LIBRARIES_INIT) - set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES_INIT}" - CACHE STRING "Libraries linked by default with all C++ applications.") - mark_as_advanced(CMAKE_CXX_STANDARD_LIBRARIES) -endif() - -include(CMakeCommonLanguageInclude) - -# now define the following rules: -# CMAKE_CXX_CREATE_SHARED_LIBRARY -# CMAKE_CXX_CREATE_SHARED_MODULE -# CMAKE_CXX_COMPILE_OBJECT -# CMAKE_CXX_LINK_EXECUTABLE - -# variables supplied by the generator at use time -# -# the target without the suffix -# -# -# -# -# - -# CXX compiler information -# -# -# -# - -# Static library tools -# -# - - -# create a shared C++ library -if(NOT CMAKE_CXX_CREATE_SHARED_LIBRARY) - set(CMAKE_CXX_CREATE_SHARED_LIBRARY - " -o ") -endif() - -# create a c++ shared module copy the shared library rule by default -if(NOT CMAKE_CXX_CREATE_SHARED_MODULE) - set(CMAKE_CXX_CREATE_SHARED_MODULE ${CMAKE_CXX_CREATE_SHARED_LIBRARY}) -endif() - - -# Create a static archive incrementally for large object file counts. -# If CMAKE_CXX_CREATE_STATIC_LIBRARY is set it will override these. -if(NOT DEFINED CMAKE_CXX_ARCHIVE_CREATE) - set(CMAKE_CXX_ARCHIVE_CREATE " cr ") -endif() -if(NOT DEFINED CMAKE_CXX_ARCHIVE_APPEND) - set(CMAKE_CXX_ARCHIVE_APPEND " r ") -endif() -if(NOT DEFINED CMAKE_CXX_ARCHIVE_FINISH) - set(CMAKE_CXX_ARCHIVE_FINISH " ") -endif() - -# compile a C++ file into an object file -if(NOT CMAKE_CXX_COMPILE_OBJECT) - set(CMAKE_CXX_COMPILE_OBJECT - " -o -c ") -endif() - -if(NOT CMAKE_CXX_LINK_EXECUTABLE) - set(CMAKE_CXX_LINK_EXECUTABLE - " -o ") -endif() - -mark_as_advanced( -CMAKE_VERBOSE_MAKEFILE -CMAKE_CXX_FLAGS -CMAKE_CXX_FLAGS_RELEASE -CMAKE_CXX_FLAGS_RELWITHDEBINFO -CMAKE_CXX_FLAGS_MINSIZEREL -CMAKE_CXX_FLAGS_DEBUG) - -set(CMAKE_CXX_INFORMATION_LOADED 1) - diff --git a/cmake/CheckCXXLibraryExists.cmake b/cmake/CheckCXXLibraryExists.cmake deleted file mode 100644 index 0d1747d..0000000 --- a/cmake/CheckCXXLibraryExists.cmake +++ /dev/null @@ -1,80 +0,0 @@ -#.rst: -# CheckLibraryExists -# ------------------ -# -# Check if the function exists. -# -# CHECK_LIBRARY_EXISTS (LIBRARY FUNCTION LOCATION VARIABLE) -# -# :: -# -# LIBRARY - the name of the library you are looking for -# FUNCTION - the name of the function -# LOCATION - location where the library should be found -# VARIABLE - variable to store the result -# -# -# -# The following variables may be set before calling this macro to modify -# the way the check is run: -# -# :: -# -# CMAKE_REQUIRED_FLAGS = string of compile command line flags -# CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar) -# CMAKE_REQUIRED_LIBRARIES = list of libraries to link - -#============================================================================= -# Copyright 2002-2009 Kitware, Inc. -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= -# (To distribute this file outside of CMake, substitute the full -# License text for the above reference.) - - - -macro(CHECK_CXX_LIBRARY_EXISTS LIBRARY FUNCTION LOCATION VARIABLE) - if("${VARIABLE}" MATCHES "^${VARIABLE}$") - set(MACRO_CHECK_LIBRARY_EXISTS_DEFINITION - "-DCHECK_FUNCTION_EXISTS=${FUNCTION} ${CMAKE_REQUIRED_FLAGS}") - message(STATUS "Looking for ${FUNCTION} in ${LIBRARY}") - set(CHECK_LIBRARY_EXISTS_LIBRARIES ${LIBRARY}) - if(CMAKE_REQUIRED_LIBRARIES) - set(CHECK_LIBRARY_EXISTS_LIBRARIES - ${CHECK_LIBRARY_EXISTS_LIBRARIES} ${CMAKE_REQUIRED_LIBRARIES}) - endif() - configure_file(${CMAKE_ROOT}/Modules/CheckFunctionExists.c - ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CheckFunctionExists.cxx COPYONLY) - try_compile(${VARIABLE} - ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CheckFunctionExists.cxx - COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} - LINK_LIBRARIES ${CHECK_LIBRARY_EXISTS_LIBRARIES} - CMAKE_FLAGS - -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_LIBRARY_EXISTS_DEFINITION} - -DLINK_DIRECTORIES:STRING=${LOCATION} - OUTPUT_VARIABLE OUTPUT) - - if(${VARIABLE}) - message(STATUS "Looking for ${FUNCTION} in ${LIBRARY} - found") - set(${VARIABLE} 1 CACHE INTERNAL "Have library ${LIBRARY}") - file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log - "Determining if the function ${FUNCTION} exists in the ${LIBRARY} " - "passed with the following output:\n" - "${OUTPUT}\n\n") - else() - message(STATUS "Looking for ${FUNCTION} in ${LIBRARY} - not found") - set(${VARIABLE} "" CACHE INTERNAL "Have library ${LIBRARY}") - file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log - "Determining if the function ${FUNCTION} exists in the ${LIBRARY} " - "failed with the following output:\n" - "${OUTPUT}\n\n") - endif() - endif() -endmacro() diff --git a/cmake/CheckForPthreads.cxx b/cmake/CheckForPthreads.cxx deleted file mode 100644 index 2732957..0000000 --- a/cmake/CheckForPthreads.cxx +++ /dev/null @@ -1,38 +0,0 @@ -#include -#include -#include - -void* runner(void*); - -int res = 0; -#ifdef __CLASSIC_C__ -int main(){ - int ac; - char*av[]; -#else -int main(int ac, char*av[]){ -#endif - pthread_t tid[2]; - pthread_create(&tid[0], 0, runner, (void*)1); - pthread_create(&tid[1], 0, runner, (void*)2); - -#if defined(__BEOS__) && !defined(__ZETA__) // (no usleep on BeOS 5.) - usleep(1); // for strange behavior on single-processor sun -#endif - - pthread_join(tid[0], 0); - pthread_join(tid[1], 0); - if(ac > 1000){return *av[0];} - return res; -} - -void* runner(void* args) -{ - int cc; - for ( cc = 0; cc < 10; cc ++ ) - { - printf("%p CC: %d\n", args, cc); - } - res ++; - return 0; -} diff --git a/cmake/CheckTypeSize.c.in b/cmake/CheckTypeSize.c.in deleted file mode 100644 index b6c3688..0000000 --- a/cmake/CheckTypeSize.c.in +++ /dev/null @@ -1,37 +0,0 @@ -@headers@ - -#undef KEY -#if defined(__i386) -# define KEY '_','_','i','3','8','6' -#elif defined(__x86_64) -# define KEY '_','_','x','8','6','_','6','4' -#elif defined(__ppc__) -# define KEY '_','_','p','p','c','_','_' -#elif defined(__ppc64__) -# define KEY '_','_','p','p','c','6','4','_','_' -#endif - -#define SIZE (sizeof(@type@)) -char info_size[] = {'I', 'N', 'F', 'O', ':', 's','i','z','e','[', - ('0' + ((SIZE / 10000)%10)), - ('0' + ((SIZE / 1000)%10)), - ('0' + ((SIZE / 100)%10)), - ('0' + ((SIZE / 10)%10)), - ('0' + (SIZE % 10)), - ']', -#ifdef KEY - ' ','k','e','y','[', KEY, ']', -#endif - '\0'}; - -#ifdef __CLASSIC_C__ -int main(argc, argv) int argc; char *argv[]; -#else -int main(int argc, char *argv[]) -#endif -{ - int require = 0; - require += info_size[argc]; - (void)argv; - return require; -} diff --git a/cmake/CheckTypeSize.cmake b/cmake/CheckTypeSize.cmake deleted file mode 100644 index a437670..0000000 --- a/cmake/CheckTypeSize.cmake +++ /dev/null @@ -1,268 +0,0 @@ -# Copied from master branch of CMake (commit SHA 34a49dea) and -# modified to use CheckIncludeFileCXX instead of CheckIncludeFile -# when the LANGUAGE is CXX. Modified the try_compile call to -# not pass any LINK_LIBRARIES as this option is only supported by -# CMake since version 2.8.11 -# -andreas - -#.rst: -# CheckTypeSize -# ------------- -# -# Check sizeof a type -# -# :: -# -# CHECK_TYPE_SIZE(TYPE VARIABLE [BUILTIN_TYPES_ONLY] -# [LANGUAGE ]) -# -# Check if the type exists and determine its size. On return, -# "HAVE_${VARIABLE}" holds the existence of the type, and "${VARIABLE}" -# holds one of the following: -# -# :: -# -# = type has non-zero size -# "0" = type has arch-dependent size (see below) -# "" = type does not exist -# -# Furthermore, the variable "${VARIABLE}_CODE" holds C preprocessor code -# to define the macro "${VARIABLE}" to the size of the type, or leave -# the macro undefined if the type does not exist. -# -# The variable "${VARIABLE}" may be "0" when CMAKE_OSX_ARCHITECTURES has -# multiple architectures for building OS X universal binaries. This -# indicates that the type size varies across architectures. In this -# case "${VARIABLE}_CODE" contains C preprocessor tests mapping from -# each architecture macro to the corresponding type size. The list of -# architecture macros is stored in "${VARIABLE}_KEYS", and the value for -# each key is stored in "${VARIABLE}-${KEY}". -# -# If the BUILTIN_TYPES_ONLY option is not given, the macro checks for -# headers , , and , and saves results -# in HAVE_SYS_TYPES_H, HAVE_STDINT_H, and HAVE_STDDEF_H. The type size -# check automatically includes the available headers, thus supporting -# checks of types defined in the headers. -# -# If LANGUAGE is set, the specified compiler will be used to perform the -# check. Acceptable values are C and CXX -# -# Despite the name of the macro you may use it to check the size of more -# complex expressions, too. To check e.g. for the size of a struct -# member you can do something like this: -# -# :: -# -# check_type_size("((struct something*)0)->member" SIZEOF_MEMBER) -# -# -# -# The following variables may be set before calling this macro to modify -# the way the check is run: -# -# :: -# -# CMAKE_REQUIRED_FLAGS = string of compile command line flags -# CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar) -# CMAKE_REQUIRED_INCLUDES = list of include directories -# CMAKE_EXTRA_INCLUDE_FILES = list of extra headers to include - -#============================================================================= -# Copyright 2002-2009 Kitware, Inc. -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= -# (To distribute this file outside of CMake, substitute the full -# License text for the above reference.) - -include(CheckIncludeFile) -include(CheckIncludeFileCXX) - -cmake_policy(PUSH) -cmake_minimum_required(VERSION 2.6 FATAL_ERROR) - -get_filename_component(__check_type_size_dir "${CMAKE_CURRENT_LIST_FILE}" PATH) - -#----------------------------------------------------------------------------- -# Helper function. DO NOT CALL DIRECTLY. -function(__check_type_size_impl type var map builtin language) - message(STATUS "Check size of ${type}") - - # Include header files. - set(headers) - if(builtin) - if(HAVE_SYS_TYPES_H) - set(headers "${headers}#include \n") - endif() - if(HAVE_STDINT_H) - set(headers "${headers}#include \n") - endif() - if(HAVE_STDDEF_H) - set(headers "${headers}#include \n") - endif() - endif() - foreach(h ${CMAKE_EXTRA_INCLUDE_FILES}) - set(headers "${headers}#include \"${h}\"\n") - endforeach() - - # Perform the check. - - if("${language}" STREQUAL "C") - set(src ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CheckTypeSize/${var}.c) - elseif("${language}" STREQUAL "CXX") - set(src ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CheckTypeSize/${var}.cpp) - else() - message(FATAL_ERROR "Unknown language:\n ${language}\nSupported languages: C, CXX.\n") - endif() - set(bin ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CheckTypeSize/${var}.bin) - configure_file(${__check_type_size_dir}/CheckTypeSize.c.in ${src} @ONLY) - try_compile(HAVE_${var} ${CMAKE_BINARY_DIR} ${src} - COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} - CMAKE_FLAGS - "-DCOMPILE_DEFINITIONS:STRING=${CMAKE_REQUIRED_FLAGS}" - "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}" - OUTPUT_VARIABLE output - COPY_FILE ${bin} - ) - - if(HAVE_${var}) - # The check compiled. Load information from the binary. - file(STRINGS ${bin} strings LIMIT_COUNT 10 REGEX "INFO:size") - - # Parse the information strings. - set(regex_size ".*INFO:size\\[0*([^]]*)\\].*") - set(regex_key " key\\[([^]]*)\\]") - set(keys) - set(code) - set(mismatch) - set(first 1) - foreach(info ${strings}) - if("${info}" MATCHES "${regex_size}") - # Get the type size. - string(REGEX REPLACE "${regex_size}" "\\1" size "${info}") - if(first) - set(${var} ${size}) - elseif(NOT "${size}" STREQUAL "${${var}}") - set(mismatch 1) - endif() - set(first 0) - - # Get the architecture map key. - string(REGEX MATCH "${regex_key}" key "${info}") - string(REGEX REPLACE "${regex_key}" "\\1" key "${key}") - if(key) - set(code "${code}\nset(${var}-${key} \"${size}\")") - list(APPEND keys ${key}) - endif() - endif() - endforeach() - - # Update the architecture-to-size map. - if(mismatch AND keys) - configure_file(${__check_type_size_dir}/CheckTypeSizeMap.cmake.in ${map} @ONLY) - set(${var} 0) - else() - file(REMOVE ${map}) - endif() - - if(mismatch AND NOT keys) - message(SEND_ERROR "CHECK_TYPE_SIZE found different results, consider setting CMAKE_OSX_ARCHITECTURES or CMAKE_TRY_COMPILE_OSX_ARCHITECTURES to one or no architecture !") - endif() - - message(STATUS "Check size of ${type} - done") - file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log - "Determining size of ${type} passed with the following output:\n${output}\n\n") - set(${var} "${${var}}" CACHE INTERNAL "CHECK_TYPE_SIZE: sizeof(${type})") - else() - # The check failed to compile. - message(STATUS "Check size of ${type} - failed") - file(READ ${src} content) - file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log - "Determining size of ${type} failed with the following output:\n${output}\n${src}:\n${content}\n\n") - set(${var} "" CACHE INTERNAL "CHECK_TYPE_SIZE: ${type} unknown") - file(REMOVE ${map}) - endif() -endfunction() - -#----------------------------------------------------------------------------- -macro(CHECK_TYPE_SIZE TYPE VARIABLE) - # parse arguments - unset(doing) - foreach(arg ${ARGN}) - if("x${arg}" STREQUAL "xBUILTIN_TYPES_ONLY") - set(_CHECK_TYPE_SIZE_${arg} 1) - unset(doing) - elseif("x${arg}" STREQUAL "xLANGUAGE") # change to MATCHES for more keys - set(doing "${arg}") - set(_CHECK_TYPE_SIZE_${doing} "") - elseif("x${doing}" STREQUAL "xLANGUAGE") - set(_CHECK_TYPE_SIZE_${doing} "${arg}") - unset(doing) - else() - message(FATAL_ERROR "Unknown argument:\n ${arg}\n") - endif() - endforeach() - if("x${doing}" MATCHES "^x(LANGUAGE)$") - message(FATAL_ERROR "Missing argument:\n ${doing} arguments requires a value\n") - endif() - if(DEFINED _CHECK_TYPE_SIZE_LANGUAGE) - if(NOT "x${_CHECK_TYPE_SIZE_LANGUAGE}" MATCHES "^x(C|CXX)$") - message(FATAL_ERROR "Unknown language:\n ${_CHECK_TYPE_SIZE_LANGUAGE}.\nSupported languages: C, CXX.\n") - endif() - set(_language ${_CHECK_TYPE_SIZE_LANGUAGE}) - else() - set(_language C) - endif() - - # Optionally check for standard headers. - if(_CHECK_TYPE_SIZE_BUILTIN_TYPES_ONLY) - set(_builtin 0) - else() - set(_builtin 1) - if ("x${_CHECK_TYPE_SIZE_LANGUAGE}" STREQUAL "xCXX") - check_include_file_cxx(sys/types.h HAVE_SYS_TYPES_H) - check_include_file_cxx(stdint.h HAVE_STDINT_H) - check_include_file_cxx(stddef.h HAVE_STDDEF_H) - else () - check_include_file(sys/types.h HAVE_SYS_TYPES_H) - check_include_file(stdint.h HAVE_STDINT_H) - check_include_file(stddef.h HAVE_STDDEF_H) - endif () - endif() - unset(_CHECK_TYPE_SIZE_BUILTIN_TYPES_ONLY) - unset(_CHECK_TYPE_SIZE_LANGUAGE) - - # Compute or load the size or size map. - set(${VARIABLE}_KEYS) - set(_map_file ${CMAKE_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/CheckTypeSize/${VARIABLE}.cmake) - if(NOT DEFINED HAVE_${VARIABLE}) - __check_type_size_impl(${TYPE} ${VARIABLE} ${_map_file} ${_builtin} ${_language}) - endif() - include(${_map_file} OPTIONAL) - set(_map_file) - set(_builtin) - - # Create preprocessor code. - if(${VARIABLE}_KEYS) - set(${VARIABLE}_CODE) - set(_if if) - foreach(key ${${VARIABLE}_KEYS}) - set(${VARIABLE}_CODE "${${VARIABLE}_CODE}#${_if} defined(${key})\n# define ${VARIABLE} ${${VARIABLE}-${key}}\n") - set(_if elif) - endforeach() - set(${VARIABLE}_CODE "${${VARIABLE}_CODE}#else\n# error ${VARIABLE} unknown\n#endif") - set(_if) - elseif(${VARIABLE}) - set(${VARIABLE}_CODE "#define ${VARIABLE} ${${VARIABLE}}") - else() - set(${VARIABLE}_CODE "/* #undef ${VARIABLE} */") - endif() -endmacro() - -#----------------------------------------------------------------------------- -cmake_policy(POP) diff --git a/cmake/CheckTypeSizeMap.cmake.in b/cmake/CheckTypeSizeMap.cmake.in deleted file mode 100644 index 1e73cff..0000000 --- a/cmake/CheckTypeSizeMap.cmake.in +++ /dev/null @@ -1 +0,0 @@ -set(@var@_KEYS "@keys@")@code@ diff --git a/cmake/FindThreadsCXX.cmake b/cmake/FindThreadsCXX.cmake deleted file mode 100644 index 91c795c..0000000 --- a/cmake/FindThreadsCXX.cmake +++ /dev/null @@ -1,181 +0,0 @@ -#.rst: -# FindThreads -# ----------- -# -# This module determines the thread library of the system. -# -# The following variables are set -# -# :: -# -# CMAKE_THREAD_LIBS_INIT - the thread library -# CMAKE_USE_SPROC_INIT - are we using sproc? -# CMAKE_USE_WIN32_THREADS_INIT - using WIN32 threads? -# CMAKE_USE_PTHREADS_INIT - are we using pthreads -# CMAKE_HP_PTHREADS_INIT - are we using hp pthreads -# -# For systems with multiple thread libraries, caller can set -# -# :: -# -# CMAKE_THREAD_PREFER_PTHREAD - -#============================================================================= -# Copyright 2002-2009 Kitware, Inc. -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= -# (To distribute this file outside of CMake, substitute the full -# License text for the above reference.) - -include (CheckIncludeFileCXX) -include (CheckCXXLibraryExists) -include (CheckCXXSymbolExists) -set(Threads_FOUND FALSE) - - -# Do we have sproc? -if(CMAKE_SYSTEM MATCHES IRIX AND NOT CMAKE_THREAD_PREFER_PTHREAD) - CHECK_INCLUDE_FILES_CXX("sys/types.h;sys/prctl.h" CMAKE_HAVE_SPROC_H) -endif() - -if(CMAKE_HAVE_SPROC_H AND NOT CMAKE_THREAD_PREFER_PTHREAD) - # We have sproc - set(CMAKE_USE_SPROC_INIT 1) -else() - # Do we have pthreads? - CHECK_INCLUDE_FILE_CXX("pthread.h" CMAKE_HAVE_PTHREAD_H) - if(CMAKE_HAVE_PTHREAD_H) - - # - # We have pthread.h - # Let's check for the library now. - # - set(CMAKE_HAVE_THREADS_LIBRARY) - if(NOT THREADS_HAVE_PTHREAD_ARG) - # Check if pthread functions are in normal C library - CHECK_CXX_SYMBOL_EXISTS(pthread_create pthread.h CMAKE_HAVE_LIBC_CREATE) - if(CMAKE_HAVE_LIBC_CREATE) - set(CMAKE_THREAD_LIBS_INIT "") - set(CMAKE_HAVE_THREADS_LIBRARY 1) - set(Threads_FOUND TRUE) - endif() - - if(NOT CMAKE_HAVE_THREADS_LIBRARY) - # Do we have -lpthreads - CHECK_CXX_LIBRARY_EXISTS(pthreads pthread_create "" CMAKE_HAVE_PTHREADS_CREATE) - if(CMAKE_HAVE_PTHREADS_CREATE) - set(CMAKE_THREAD_LIBS_INIT "-lpthreads") - set(CMAKE_HAVE_THREADS_LIBRARY 1) - set(Threads_FOUND TRUE) - endif() - - # Ok, how about -lpthread - CHECK_CXX_LIBRARY_EXISTS(pthread pthread_create "" CMAKE_HAVE_PTHREAD_CREATE) - if(CMAKE_HAVE_PTHREAD_CREATE) - set(CMAKE_THREAD_LIBS_INIT "-lpthread") - set(CMAKE_HAVE_THREADS_LIBRARY 1) - set(Threads_FOUND TRUE) - endif() - - if(CMAKE_SYSTEM MATCHES "SunOS.*") - # On sun also check for -lthread - CHECK_CXX_LIBRARY_EXISTS(thread thr_create "" CMAKE_HAVE_THR_CREATE) - if(CMAKE_HAVE_THR_CREATE) - set(CMAKE_THREAD_LIBS_INIT "-lthread") - set(CMAKE_HAVE_THREADS_LIBRARY 1) - set(Threads_FOUND TRUE) - endif() - endif() - endif() - endif() - - if(NOT CMAKE_HAVE_THREADS_LIBRARY) - # If we did not found -lpthread, -lpthreads, or -lthread, look for -pthread - if("THREADS_HAVE_PTHREAD_ARG" MATCHES "^THREADS_HAVE_PTHREAD_ARG") - message(STATUS "Check if compiler accepts -pthread") - configure_file ("${CMAKE_CURRENT_LIST_DIR}/CheckForPthreads.cxx" - "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CheckForPthreads.cxx" COPYONLY) - try_run(THREADS_PTHREAD_ARG THREADS_HAVE_PTHREAD_ARG - ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CheckForPthreads.cxx - CMAKE_FLAGS "-DLINK_LIBRARIES:STRING=-pthread;-DCMAKE_CXX_FLAGS:STRING=-fpermissive" - COMPILE_OUTPUT_VARIABLE OUTPUT) - - if(THREADS_HAVE_PTHREAD_ARG) - if(THREADS_PTHREAD_ARG STREQUAL "2") - set(Threads_FOUND TRUE) - message(STATUS "Check if compiler accepts -pthread - yes") - else() - message(STATUS "Check if compiler accepts -pthread - no") - file(APPEND - ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log - "Determining if compiler accepts -pthread returned ${THREADS_PTHREAD_ARG} instead of 2. The compiler had the following output:\n${OUTPUT}\n\n") - endif() - else() - message(STATUS "Check if compiler accepts -pthread - no") - file(APPEND - ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log - "Determining if compiler accepts -pthread failed with the following output:\n${OUTPUT}\n\n") - endif() - - endif() - - if(THREADS_HAVE_PTHREAD_ARG) - set(Threads_FOUND TRUE) - set(CMAKE_THREAD_LIBS_INIT "-pthread") - endif() - - endif() - endif() -endif() - -if(CMAKE_THREAD_LIBS_INIT OR CMAKE_HAVE_LIBC_CREATE) - set(CMAKE_USE_PTHREADS_INIT 1) - set(Threads_FOUND TRUE) -endif() - -if(CMAKE_SYSTEM MATCHES "Windows") - set(CMAKE_USE_WIN32_THREADS_INIT 1) - set(Threads_FOUND TRUE) -endif() - -if(CMAKE_USE_PTHREADS_INIT) - if(CMAKE_SYSTEM MATCHES "HP-UX-*") - # Use libcma if it exists and can be used. It provides more - # symbols than the plain pthread library. CMA threads - # have actually been deprecated: - # http://docs.hp.com/en/B3920-90091/ch12s03.html#d0e11395 - # http://docs.hp.com/en/947/d8.html - # but we need to maintain compatibility here. - # The CMAKE_HP_PTHREADS setting actually indicates whether CMA threads - # are available. - CHECK_CXX_LIBRARY_EXISTS(cma pthread_attr_create "" CMAKE_HAVE_HP_CMA) - if(CMAKE_HAVE_HP_CMA) - set(CMAKE_THREAD_LIBS_INIT "-lcma") - set(CMAKE_HP_PTHREADS_INIT 1) - set(Threads_FOUND TRUE) - endif() - set(CMAKE_USE_PTHREADS_INIT 1) - endif() - - if(CMAKE_SYSTEM MATCHES "OSF1-V*") - set(CMAKE_USE_PTHREADS_INIT 0) - set(CMAKE_THREAD_LIBS_INIT ) - endif() - - if(CMAKE_SYSTEM MATCHES "CYGWIN_NT*") - set(CMAKE_USE_PTHREADS_INIT 1) - set(Threads_FOUND TRUE) - set(CMAKE_THREAD_LIBS_INIT ) - set(CMAKE_USE_WIN32_THREADS_INIT 0) - endif() -endif() - -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Threads DEFAULT_MSG Threads_FOUND) From 64ac2e30b6c3d6a158bd1635b4537886e261c593 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Tue, 24 Mar 2015 16:21:44 +0000 Subject: [PATCH 78/94] fix: Extension of README file for PackageMaker --- CMakeLists.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 275426d..a94cf1a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -428,6 +428,9 @@ if (BUILD_PACKAGING) set (CPACK_SOURCE_GENERATOR "${PACKAGE_SOURCE_GENERATOR}" CACHE STRING "List of source package generators (CPack).") mark_as_advanced (CPACK_GENERATOR CPACK_SOURCE_GENERATOR) + # some package generators (e.g., PackageMaker) do not allow .md extension + configure_file ("${CMAKE_CURRENT_LIST_DIR}/README.md" "${CMAKE_CURRENT_BINARY_DIR}/README.txt" COPYONLY) + # common package information set (CPACK_PACKAGE_VENDOR "Andreas Schuh") set (CPACK_PACKAGE_CONTACT "google-gflags@googlegroups.com") @@ -437,9 +440,9 @@ if (BUILD_PACKAGING) set (CPACK_PACKAGE_VERSION_MINOR "${PACKAGE_VERSION_MINOR}") set (CPACK_PACKAGE_VERSION_PATCH "${PACKAGE_VERSION_PATCH}") set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "A commandline flags library that allows for distributed flags.") - set (CPACK_RESOURCE_FILE_WELCOME "${CMAKE_CURRENT_LIST_DIR}/README.md") + set (CPACK_RESOURCE_FILE_WELCOME "${CMAKE_CURRENT_BINARY_DIR}/README.md") set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_LIST_DIR}/COPYING.txt") - set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_LIST_DIR}/README.md") + set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_BINARY_DIR}/README.md") set (CPACK_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") set (CPACK_OUTPUT_FILE_PREFIX packages) set (CPACK_PACKAGE_RELOCATABLE TRUE) From a819f0f019f48ead47d30a0e6e267e5e261d57e6 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Tue, 24 Mar 2015 16:29:31 +0000 Subject: [PATCH 79/94] fixup: Package configuration --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a94cf1a..4d00044 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -440,9 +440,9 @@ if (BUILD_PACKAGING) set (CPACK_PACKAGE_VERSION_MINOR "${PACKAGE_VERSION_MINOR}") set (CPACK_PACKAGE_VERSION_PATCH "${PACKAGE_VERSION_PATCH}") set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "A commandline flags library that allows for distributed flags.") - set (CPACK_RESOURCE_FILE_WELCOME "${CMAKE_CURRENT_BINARY_DIR}/README.md") + set (CPACK_RESOURCE_FILE_WELCOME "${CMAKE_CURRENT_BINARY_DIR}/README.txt") set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_LIST_DIR}/COPYING.txt") - set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_BINARY_DIR}/README.md") + set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_BINARY_DIR}/README.txt") set (CPACK_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") set (CPACK_OUTPUT_FILE_PREFIX packages) set (CPACK_PACKAGE_RELOCATABLE TRUE) From 06ccc16dec79ccae9f8cb706406147daaf16b36e Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Tue, 24 Mar 2015 16:35:19 +0000 Subject: [PATCH 80/94] doc: Update README --- README.md | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index dee5d87..962ac29 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,23 @@ 24 March 2015 ------------- -Finalized move of gflags project from Google Code to GitHub. -Email addresses of original issue reporters got lost in the process. -Given the age of most issue reports, this should be negligable. +I've just released gflags 2.1.2. + +This release completes the namespace change fixes. In particular, +it restores binary ABI compatibility with release version 2.0. +The deprecated "google" namespace is by default still kept as +primary namespace while symbols are imported into the new "gflags" namespace. +This can be overridden using the CMake variable GFLAGS_NAMESPACE. + +Other fixes of the build configuration are related to the (patched) +CMake modules FindThreads.cmake and CheckTypeSize.cmake. These have +been removed and instead the C language is enabled again even though +gflags is written in C++ only. + +This release also marks the complete move of the gflags project +from Google Code to GitHub. Email addresses of original issue +reporters got lost in the process. Given the age of most issue reports, +this should be neglibable. Please report any further issues using the GitHub issue tracker. From 2861b1c26954576fca4ba93b31f00671b2e5e1e6 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Tue, 24 Mar 2015 16:36:13 +0000 Subject: [PATCH 81/94] doc: Add ChangeLog entries for release 2.1.2 --- ChangeLog.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index e14d88e..eea9f83 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,13 @@ +* Tue Mar 24 2014 - Andreas Schuh + +- gflags: version 2.1.2 +- Moved project to GitHub +- Added GFLAGS_NAMESPACE definition to gflags_declare.h +- Fixed issue 94: Keep "google" as primary namespace and import symbols into "gflags" namespace +- Fixed issue 96: Fix binary ABI compatibility with gflags 2.0 using "google" as primary namespace +- Fixed issue 97/101: Removed (patched) CMake modules and enabled C language instead +- Fixed issue 103: Set CMake policy CMP0042 to silence warning regarding MACOS_RPATH setting + * Sun Mar 20 2014 - Andreas Schuh - gflags: version 2.1.1 From 14e1138441bbbb584160cb1c0a0426ec1bac35f1 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Tue, 24 Mar 2015 17:04:08 +0000 Subject: [PATCH 82/94] mod: Change URL of gh-pages submodule to use GitHub gflags community repo --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index cc7a78b..ae8f50c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "doc"] path = doc - url = git@github.com:schuhschuh/gflags.git + url = git@github.com:gflags/gflags.git branch = gh-pages From a4bae965eb0805d781a13ded6b1dd7809534bb3d Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Tue, 24 Mar 2015 17:07:00 +0000 Subject: [PATCH 83/94] doc: Spelling correction --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 962ac29..80f5274 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ gflags is written in C++ only. This release also marks the complete move of the gflags project from Google Code to GitHub. Email addresses of original issue reporters got lost in the process. Given the age of most issue reports, -this should be neglibable. +this should be negligable. Please report any further issues using the GitHub issue tracker. From f9e1ffaa3906696c056fdd2a398d3dbf1e8060d7 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Tue, 24 Mar 2015 17:48:29 +0000 Subject: [PATCH 84/94] doc: Correct year in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 80f5274..79bd202 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ prefixed by "bugfix/", respectively. Binary and source [packages](https://github.com/schuhschuh/gflags/releases) are available on GitHub. -14 January 2013 +14 January 2014 --------------- The migration of the build system to CMake is almost complete. From a9b983a827e530cab88639b3ce105f8d2cb2fdde Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Tue, 24 Mar 2015 18:54:30 +0000 Subject: [PATCH 85/94] #104 Fix library include directories settings --- CMakeLists.txt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d00044..4d5d843 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -319,15 +319,14 @@ foreach (TYPE IN ITEMS STATIC SHARED) if (BUILD_gflags${opts}_LIB) add_library (gflags${opts}-${type} ${TYPE} ${GFLAGS_SRCS} ${PRIVATE_HDRS} ${PUBLIC_HDRS}) if (COMMAND target_include_directories) + set (include_dirs "$") + if (INSTALL_HEADERS) + list (APPEND include_dirs "$") + endif () target_include_directories (gflags${opts}-${type} - PUBLIC "$" + PUBLIC "${include_dirs}" PRIVATE "${PROJECT_SOURCE_DIR}/src;${PROJECT_BINARY_DIR}/include/${GFLAGS_INCLUDE_DIR}" ) - if (INSTALL_HEADERS) - target_include_directories (gflags${opts}-${type} - PUBLIC "$" - ) - endif () endif () if (opts MATCHES "nothreads") set (defines "GFLAGS_IS_A_DLL=${GFLAGS_IS_A_DLL};NOTHREADS") From 9e937e80fb1760b0fa893a6e0ec401f9a5bc7946 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Tue, 24 Mar 2015 18:55:17 +0000 Subject: [PATCH 86/94] #105 Add gflags_SHARED and gflags_NOTHREADED gflags-config.cmake options --- cmake/config.cmake.in | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/cmake/config.cmake.in b/cmake/config.cmake.in index ee8a916..d75be46 100644 --- a/cmake/config.cmake.in +++ b/cmake/config.cmake.in @@ -20,8 +20,40 @@ get_filename_component (_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_DIR}/@INSTALL_PREF # manually to the include search path for targets which link to gflags. set (@PACKAGE_NAME@_INCLUDE_DIR "${_INSTALL_PREFIX}/@INCLUDE_INSTALL_DIR@") -# gflags library -set (@PACKAGE_NAME@_LIBRARIES gflags) +# default settings +if (NOT DEFINED @PACKAGE_NAME@_SHARED) + if (TARGET @PACKAGE_NAME@-static OR TARGET @PACKAGE_NAME@_nothreads-static) + set (@PACKAGE_NAME@_SHARED FALSE) + else () + set (@PACKAGE_NAME@_SHARED TRUE) + endif () +endif () +if (NOT DEFINED @PACKAGE_NAME@_NOTHREADS) + if (TARGET @PACKAGE_NAME@-static OR TARGET @PACKAGE_NAME@-shared) + set (@PACKAGE_NAME@_NOTHREADS FALSE) + else () + set (@PACKAGE_NAME@_NOTHREADS TRUE) + endif () +endif () + +# choose imported library target +if (@PACKAGE_NAME@_SHARED) + if (@PACKAGE_NAME@_NOTHREADS) + set (@PACKAGE_NAME@_LIBRARIES @PACKAGE_NAME@_nothreads-shared) + else () + set (@PACKAGE_NAME@_LIBRARIES @PACKAGE_NAME@-shared) + endif () +else () + if (@PACKAGE_NAME@_NOTHREADS) + set (@PACKAGE_NAME@_LIBRARIES @PACKAGE_NAME@_nothreads-static) + else () + set (@PACKAGE_NAME@_LIBRARIES @PACKAGE_NAME@-static) + endif () +endif () +if (NOT TARGET ${@PACKAGE_NAME@_LIBRARIES}) + message (FATAL_ERROR "Your @PACKAGE_NAME@ installation does not contain a ${@PACKAGE_NAME@_LIBRARIES} library!" + " Try a different combination of @PACKAGE_NAME@_SHARED and @PACKAGE_NAME@_NOTHREADS.") +endif () # unset private variables unset (_INSTALL_PREFIX) From 5f29c4b940b445caf5deebb16150ade506b68f27 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Tue, 24 Mar 2015 19:13:46 +0000 Subject: [PATCH 87/94] mod: Update gh-pages with documentation of config options --- doc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc b/doc index 3398e7b..d7a69ed 160000 --- a/doc +++ b/doc @@ -1 +1 @@ -Subproject commit 3398e7b0c920e84a137b1860f838b7d353d23e75 +Subproject commit d7a69edf6697dd6a2b062ccf5a963883f1457e98 From c3fd5432c3cad91b4f9d7279887aa118a259d9fb Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Tue, 24 Mar 2015 23:31:34 +0000 Subject: [PATCH 88/94] mod: Update gh-pages with correct GitHub organization URLs and CMake example --- doc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc b/doc index d7a69ed..745082d 160000 --- a/doc +++ b/doc @@ -1 +1 @@ -Subproject commit d7a69edf6697dd6a2b062ccf5a963883f1457e98 +Subproject commit 745082dbd385905c800295d50df38c9a6de22475 From 33fc9997bd1ccdccb9b9557a8cd53a98cf7996fd Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Tue, 24 Mar 2015 23:43:53 +0000 Subject: [PATCH 89/94] #104 Fix compilation of tests --- test/CMakeLists.txt | 3 +++ test/nc/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index ff07474..af5ca3c 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -12,6 +12,9 @@ set (GFLAGS_FLAGFILES_DIR "${CMAKE_CURRENT_SOURCE_DIR}") # ---------------------------------------------------------------------------- # common include directories and link libraries include_directories ("${CMAKE_CURRENT_SOURCE_DIR}") +include_directories ("${gflags_SOURCE_DIR}/src") +include_directories ("${gflags_BINARY_DIR}/include") +include_directories ("${gflags_BINARY_DIR}/include/gflags") if (BUILD_SHARED_LIBS) set (type shared) diff --git a/test/nc/CMakeLists.txt b/test/nc/CMakeLists.txt index 823fc67..9f906ae 100644 --- a/test/nc/CMakeLists.txt +++ b/test/nc/CMakeLists.txt @@ -10,7 +10,7 @@ string (TOUPPER ${TEST_NAME} TEST_NAME_UPPER) project (gflags_nc_${TEST_NAME}) find_package (gflags REQUIRED) -include_directories (${gflags_INCLUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/..") link_libraries (gflags_nothreads) +include_directories ("${CMAKE_CURRENT_SOURCE_DIR}/..") add_definitions (-DTEST_${TEST_NAME_UPPER}) add_executable (gflags_nc_${TEST_NAME} gflags_nc.cc) From ccff5658e05176cdcf07ef7ffdf2d115687c1a55 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Tue, 24 Mar 2015 23:44:34 +0000 Subject: [PATCH 90/94] #108 Fix temporary directory configuration of negative compilation tests --- test/CMakeLists.txt | 1 + test/gflags_nc.py.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index af5ca3c..891224d 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -173,6 +173,7 @@ if (BUILD_NC_TESTS) " Either install Python or set BUILD_NC_TESTS to FALSE and try again.") endif () set (SRCDIR "${CMAKE_CURRENT_SOURCE_DIR}/nc") + set (TMPDIR "${gflags_BINARY_DIR}/Testing/Temporary") configure_file (gflags_nc.py.in "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/nc.py" @ONLY) macro (add_gflags_nc_test name) add_test ( diff --git a/test/gflags_nc.py.in b/test/gflags_nc.py.in index 7636782..9c6054c 100644 --- a/test/gflags_nc.py.in +++ b/test/gflags_nc.py.in @@ -6,7 +6,7 @@ import subprocess import shutil CMAKE = '@CMAKE_COMMAND@' -TMPDIR = '@TEMPDIR@' +TMPDIR = '@TMPDIR@' SRCDIR = '@SRCDIR@' GFLAGS_DIR = '@gflags_BINARY_DIR@' From 7eb3d365e32625368201c33ac56ed3bbf515713c Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Tue, 24 Mar 2015 23:45:21 +0000 Subject: [PATCH 91/94] #105 Modify negative compilation tests to link against gflags_LIBRARIES --- test/nc/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/nc/CMakeLists.txt b/test/nc/CMakeLists.txt index 9f906ae..663c210 100644 --- a/test/nc/CMakeLists.txt +++ b/test/nc/CMakeLists.txt @@ -10,7 +10,7 @@ string (TOUPPER ${TEST_NAME} TEST_NAME_UPPER) project (gflags_nc_${TEST_NAME}) find_package (gflags REQUIRED) -link_libraries (gflags_nothreads) include_directories ("${CMAKE_CURRENT_SOURCE_DIR}/..") add_definitions (-DTEST_${TEST_NAME_UPPER}) add_executable (gflags_nc_${TEST_NAME} gflags_nc.cc) +target_link_libraries(gflags_nc_${TEST_NAME} ${gflags_LIBRARIES}) From 2e5b884fcea59a716ed61cc4ffcefb5414887f94 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Wed, 25 Mar 2015 00:00:50 +0000 Subject: [PATCH 92/94] #107 Document remaining CMake cache entries --- INSTALL.md | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index d054193..f08ff64 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -44,11 +44,23 @@ the name of this package and the obtained version of the software. $ make install (optional) In the following, only gflags-specific CMake settings available to -configure the build and installation are documented. +configure the build and installation are documented. Note that most of these +variables are for advanced users and binary package maintainers only. +They usually do not have to be modified. -CMake Option | Description ----------------------- | ------------------------------------------------------- -CMAKE_INSTALL_PREFIX | Installation directory, e.g., "/usr/local" on Unix and "C:\Program Files\gflags" on Windows. -GFLAGS_NAMESPACE | Name of the C++ namespace to be used by the gflags library. Note that the public source header files are installed in a subdirectory named after this namespace. To maintain backwards compatibility with the Google Commandline Flags, set this variable to "google". The default is "gflags". -GFLAGS_INCLUDE_DIR | Name of include subdirectory where headers are installed into. +CMake Option | Description +--------------------------- | ------------------------------------------------------- +CMAKE_INSTALL_PREFIX | Installation directory, e.g., "/usr/local" on Unix and "C:\Program Files\gflags" on Windows. +BUILD_SHARED_LIBS | Request build of dynamic link libraries. +BUILD_STATIC_LIBS | Request build of static link libraries. Implied if BUILD_SHARED_LIBS is OFF. +BUILD_PACKAGING | Enable binary package generation using CPack. +BUILD_TESTING | Build tests for execution by CTest. +BUILD_NC_TESTS | Request inclusion of negative compilation tests (requires Python). +BUILD_gflags_LIBS | Request build of multi-threaded gflags libraries (if threading library found). +BUILD_gflags_nothreads_LIBS | Request build of single-threaded gflags libraries. +GFLAGS_NAMESPACE | Name of the C++ namespace to be used by the gflags library. Note that the public source header files are installed in a subdirectory named after this namespace. To maintain backwards compatibility with the Google Commandline Flags, set this variable to "google". The default is "gflags". +GFLAGS_INTTYPES_FORMAT | String identifying format of built-in integer types. +GFLAGS_INCLUDE_DIR | Name of include where headers are installed into relative to CMAKE_INSTALL_PREFIX. +LIBRARY_INSTALL_DIR | Name of library installation directory relative to CMAKE_INSTALL_PREFIX. +INSTALL_HEADERS | Request installation of public header files. From 73b67041d81677ef57e69f0b265974702209b997 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Wed, 25 Mar 2015 00:02:22 +0000 Subject: [PATCH 93/94] #107 Correct description of GFLAGS_INCLUDE_DIR --- INSTALL.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL.md b/INSTALL.md index f08ff64..3d36903 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -61,6 +61,6 @@ BUILD_gflags_LIBS | Request build of multi-threaded gflags libraries ( BUILD_gflags_nothreads_LIBS | Request build of single-threaded gflags libraries. GFLAGS_NAMESPACE | Name of the C++ namespace to be used by the gflags library. Note that the public source header files are installed in a subdirectory named after this namespace. To maintain backwards compatibility with the Google Commandline Flags, set this variable to "google". The default is "gflags". GFLAGS_INTTYPES_FORMAT | String identifying format of built-in integer types. -GFLAGS_INCLUDE_DIR | Name of include where headers are installed into relative to CMAKE_INSTALL_PREFIX. +GFLAGS_INCLUDE_DIR | Name of headers installation directory relative to CMAKE_INSTALL_PREFIX. LIBRARY_INSTALL_DIR | Name of library installation directory relative to CMAKE_INSTALL_PREFIX. INSTALL_HEADERS | Request installation of public header files. From 71c656e0e99363de8ef4847b1c6881ee7a842db0 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Wed, 25 Mar 2015 00:14:46 +0000 Subject: [PATCH 94/94] #108 Use PROJECT_BINARY_DIR in place of gflags_BINARY_DIR --- test/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 891224d..bb189af 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -173,7 +173,7 @@ if (BUILD_NC_TESTS) " Either install Python or set BUILD_NC_TESTS to FALSE and try again.") endif () set (SRCDIR "${CMAKE_CURRENT_SOURCE_DIR}/nc") - set (TMPDIR "${gflags_BINARY_DIR}/Testing/Temporary") + set (TMPDIR "${PROJECT_BINARY_DIR}/Testing/Temporary") configure_file (gflags_nc.py.in "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/nc.py" @ONLY) macro (add_gflags_nc_test name) add_test (
-
Table of contents
-
Introduction
-
Finding and Linking to gflags using CMake
-
DEFINE: Defining Flags In Program
-
Accessing the Flag
-
DECLARE: Using the Flag in a Different File
-
RegisterFlagValidator: Sanity-checking Flag Values
-
Putting It Together: How to Set Up Flags
-
Setting Flags on the Command Line
-
Setting Flags at Runtime
-
Changing the Default Flag Value
-
Special Flags
-
The API
-

-
-
Table of contents
-
Introduction
-
Finding and Linking to gflags using CMake
-
DEFINE: Defining Flags In Program
-
Accessing the Flag
-
DECLARE: Using the Flag in a Different File
-
RegisterFlagValidator: Sanity-checking Flag Values
-
Putting It Together: How to Set Up Flags
-
Setting Flags on the Command Line
-
Setting Flags at Runtime
-
Changing the Default Flag Value
-
Special Flags
-
The API
-

-
+
Table of contents
+
Introduction
+
Finding and Linking to gflags using CMake
+
DEFINE: Defining Flags In Program
+
Accessing the Flag
+
DECLARE: Using the Flag in a Different File
+
RegisterFlagValidator: Sanity-checking Flag Values
+
Putting It Together: How to Set Up Flags
+
Setting Flags on the Command Line
+
Setting Flags at Runtime
+
Changing the Default Flag Value
+
Special Flags
+
The API
+

+