Skip to content

DRILL-5584: Add branding and versioning information for windows C++ C… #1039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
superbstreak wants to merge 1 commit into from
Closed

DRILL-5584: Add branding and versioning information for windows C++ C… #1039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion contrib/native/client/src/clientlib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -52,7 +59,9 @@ set_property(
if(MSVC)
set(CMAKE_CXX_FLAGS "/EHsc")
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)
7 changes: 6 additions & 1 deletion contrib/native/client/src/clientlib/env.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,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@
Expand All @@ -30,6 +30,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"
Copy link
Contributor Author

@superbstreak superbstreak Nov 16, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewer, please make sure this is correct

#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


68 changes: 68 additions & 0 deletions contrib/native/client/src/clientlib/version.rc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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