Skip to content

CDRIVER-3091 fix copyrights and OriginalFilename #1457

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

Merged
merged 7 commits into from
Oct 27, 2023
Merged

CDRIVER-3091 fix copyrights and OriginalFilename #1457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f01948c
use `*OUTPUT_BASENAME ` to define `OriginalFilename`
kevinAlbs Oct 26, 2023
cb992e4
use project inception date as copyright year
kevinAlbs Oct 26, 2023
7ba863f
quote macros in .rc file, not CMake
kevinAlbs Oct 26, 2023
67636bc
use `configure_file` to simplify
kevinAlbs Oct 27, 2023
de66151
use `API_VERSION` macros in place of `1.0` literals
kevinAlbs Oct 27, 2023
1e24cc2
guard config of `.rc` files in `if(WIN32)`
kevinAlbs Oct 27, 2023
427b75f
set `InternalName` to `OriginalFilename` without extension
kevinAlbs Oct 27, 2023
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
7 changes: 6 additions & 1 deletion src/libbson/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,12 @@ if(ENABLE_STATIC)
endif()

if(ENABLE_SHARED)
add_library(bson_shared SHARED $<$<PLATFORM_ID:Windows>:libbson.rc>)
add_library(bson_shared SHARED)
if(WIN32)
# Add resource-definition script for Windows shared library (.dll).
configure_file(libbson.rc.in libbson.rc)
target_sources(bson_shared PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/libbson.rc)
endif()
target_link_libraries(bson_shared PRIVATE $<BUILD_INTERFACE:bson_obj_pic>)
list(APPEND bson_libs bson_shared)
endif()
Expand Down
9 changes: 6 additions & 3 deletions src/libbson/libbson.rc → src/libbson/libbson.rc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
#include <bson/bson-version.h> // Defines BSON_MAJOR_VERSION and other version macros.
#undef BSON_COMPILATION

#define BSON_OUTPUT_BASENAME "@BSON_OUTPUT_BASENAME@"
#define BSON_API_VERSION "@BSON_API_VERSION@"

VS_VERSION_INFO VERSIONINFO
FILEVERSION BSON_MAJOR_VERSION,BSON_MINOR_VERSION,BSON_MICRO_VERSION,0
PRODUCTVERSION BSON_MAJOR_VERSION,BSON_MINOR_VERSION,BSON_MICRO_VERSION,0
Expand All @@ -28,11 +31,11 @@ BEGIN
VALUE "CompanyName", "MongoDB, Inc"
VALUE "FileDescription", "A BSON Library for C"
VALUE "FileVersion", BSON_VERSION_S
VALUE "InternalName", "bson-1.0"
VALUE "OriginalFilename", "bson-1.0.dll"
VALUE "InternalName", BSON_OUTPUT_BASENAME "-" BSON_API_VERSION
VALUE "OriginalFilename", BSON_OUTPUT_BASENAME "-" BSON_API_VERSION ".dll"
VALUE "ProductName", "MongoDB C Driver"
VALUE "ProductVersion", BSON_VERSION_S
VALUE "LegalCopyright", "Copyright (C) 2023-present MongoDB, Inc."
VALUE "LegalCopyright", "Copyright (C) 2013-present MongoDB, Inc."
END
END
BLOCK "VarFileInfo"
Expand Down
7 changes: 6 additions & 1 deletion src/libmongoc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -812,7 +812,12 @@ if (MONGOC_ENABLE_STATIC_BUILD)
set_target_properties (mcd_rpc PROPERTIES OUTPUT_NAME "mcd-rpc")
endif ()

add_library (mongoc_shared SHARED ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING} $<$<PLATFORM_ID:Windows>:libmongoc.rc>)
add_library (mongoc_shared SHARED ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING})
if(WIN32)
# Add resource-definition script for Windows shared library (.dll).
configure_file(libmongoc.rc.in libmongoc.rc)
target_sources(mongoc_shared PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/libmongoc.rc)
endif()
set_target_properties (mongoc_shared PROPERTIES CMAKE_CXX_VISIBILITY_PRESET hidden)
target_link_libraries (mongoc_shared PRIVATE ${LIBRARIES} PUBLIC ${BSON_LIBRARIES} mongo::detail::c_dependencies)
target_include_directories (mongoc_shared PRIVATE ${ZLIB_INCLUDE_DIRS})
Expand Down
9 changes: 6 additions & 3 deletions src/libmongoc/libmongoc.rc → src/libmongoc/libmongoc.rc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
#include <winver.h> // Defines VS_VERSION_INFO
#include <mongoc/mongoc-version.h> // Defines MONGOC_MAJOR_VERSION and other version macros.

#define MONGOC_OUTPUT_BASENAME "@MONGOC_OUTPUT_BASENAME@"
#define MONGOC_API_VERSION "@MONGOC_API_VERSION@"

VS_VERSION_INFO VERSIONINFO
FILEVERSION MONGOC_MAJOR_VERSION,MONGOC_MINOR_VERSION,MONGOC_MICRO_VERSION,0
PRODUCTVERSION MONGOC_MAJOR_VERSION,MONGOC_MINOR_VERSION,MONGOC_MICRO_VERSION,0
Expand All @@ -26,11 +29,11 @@ BEGIN
VALUE "CompanyName", "MongoDB, Inc"
VALUE "FileDescription", "MongoDB Client Library for C"
VALUE "FileVersion", MONGOC_VERSION_S
VALUE "InternalName", "mongoc-1.0"
VALUE "OriginalFilename", "mongoc-1.0.dll"
VALUE "InternalName", MONGOC_OUTPUT_BASENAME "-" MONGOC_API_VERSION
VALUE "OriginalFilename", MONGOC_OUTPUT_BASENAME "-" MONGOC_API_VERSION ".dll"
VALUE "ProductName", "MongoDB C Driver"
VALUE "ProductVersion", MONGOC_VERSION_S
VALUE "LegalCopyright", "Copyright (C) 2023-present MongoDB, Inc."
VALUE "LegalCopyright", "Copyright (C) 2013-present MongoDB, Inc."
END
END
BLOCK "VarFileInfo"
Expand Down