This is an automated email from the ASF dual-hosted git repository. parthc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/drill.git
commit 9908ea035a6a9512ddf005fc402b07a7101243db Author: Rob Wu <[email protected]> AuthorDate: Wed Nov 15 18:21:48 2017 -0800 DRILL-5584: Add branding and versioning information for windows C++ Client. This closes #5584 --- contrib/native/client/src/clientlib/CMakeLists.txt | 11 +++- contrib/native/client/src/clientlib/env.h.in | 7 ++- contrib/native/client/src/clientlib/version.rc.in | 68 ++++++++++++++++++++++ 3 files changed, 84 insertions(+), 2 deletions(-) diff --git a/contrib/native/client/src/clientlib/CMakeLists.txt b/contrib/native/client/src/clientlib/CMakeLists.txt index e793e66..90cfe8b 100644 --- a/contrib/native/client/src/clientlib/CMakeLists.txt +++ b/contrib/native/client/src/clientlib/CMakeLists.txt @@ -16,6 +16,13 @@ # limitations under the License. # +if(MSVC) + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/version.rc.in + ${CMAKE_CURRENT_BINARY_DIR}/version.rc + @ONLY) +endif() + # Drill Client library set (CLIENTLIB_SRC_FILES @@ -51,7 +58,9 @@ set_property( if(MSVC) add_definitions(-DDRILL_CLIENT_EXPORTS -D_SCL_SECURE_NO_WARNINGS) + add_library(drillClient SHARED ${CLIENTLIB_SRC_FILES} ${CMAKE_CURRENT_BINARY_DIR}/version.rc) +else() + add_library(drillClient SHARED ${CLIENTLIB_SRC_FILES}) endif() -add_library(drillClient SHARED ${CLIENTLIB_SRC_FILES} ) target_link_libraries(drillClient ${Boost_LIBRARIES} ${PROTOBUF_LIBRARY} ${Zookeeper_LIBRARIES} ${SASL_LIBRARIES} ${OPENSSL_LIBRARIES} protomsgs y2038) diff --git a/contrib/native/client/src/clientlib/env.h.in b/contrib/native/client/src/clientlib/env.h.in index 380746a..794b628 100644 --- a/contrib/native/client/src/clientlib/env.h.in +++ b/contrib/native/client/src/clientlib/env.h.in @@ -19,7 +19,7 @@ #define ENV_H #define DRILL_NAME "Apache Drill" -#define DRILL_CONNECTOR_NAME "Apache Drill C++ client" +#define DRILL_CONNECTOR_NAME "Apache Drill C++ Client" #define DRILL_VERSION_STRING "@PROJECT_VERSION@" #define DRILL_VERSION_MAJOR @PROJECT_VERSION_MAJOR@ @@ -29,6 +29,11 @@ #define GIT_SHA_PROP @GIT_SHA_PROP@ #define GIT_COMMIT_PROP @GIT_COMMIT_PROP@ +#define DRILL_LEGALCOPYRIGHT_STR "Copyright (c) 2013-2017 The Apache Software Foundation\0" +#define DRILL_PRODUCTNAME_STR DRILL_CONNECTOR_NAME "\0" +#define DRILL_PRODUCTVERSION_STR DRILL_VERSION_STRING ".0\0" +#define DRILL_INTERNALNAME_STR "drillClient.dll\0" + #endif diff --git a/contrib/native/client/src/clientlib/version.rc.in b/contrib/native/client/src/clientlib/version.rc.in new file mode 100644 index 0000000..c013261 --- /dev/null +++ b/contrib/native/client/src/clientlib/version.rc.in @@ -0,0 +1,68 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + #include "env.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (US) resources. +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) + +VS_VERSION_INFO VERSIONINFO + FILEVERSION @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,@PROJECT_VERSION_PATCH@,0 + PRODUCTVERSION @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,@PROJECT_VERSION_PATCH@,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x0L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "\0" + VALUE "FileDescription", DRILL_PRODUCTNAME_STR + VALUE "FileVersion", DRILL_PRODUCTVERSION_STR + VALUE "LegalCopyright", DRILL_LEGALCOPYRIGHT_STR + VALUE "ProductName", DRILL_PRODUCTNAME_STR + VALUE "ProductVersion", DRILL_PRODUCTVERSION_STR + VALUE "InternalName", DRILL_INTERNALNAME_STR + VALUE "OriginalFilename", DRILL_INTERNALNAME_STR + VALUE "LegalTrademarks", "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END \ No newline at end of file -- To stop receiving notification emails like this one, please contact [email protected].
