Skip to content

Add RE2 library to desktop packaging & Update MSVC dependencies #981

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 6 commits into from
Jun 3, 2022
Merged

Add RE2 library to desktop packaging & Update MSVC dependencies #981

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5d8d435
blastdoor configuration for re2
dconeybe Jun 2, 2022
1675e6e
Fix re2 library embed to only go into Firestore.
jonsimantov Jun 2, 2022
3c3602b
Remove extra namespaces - they are underneath re2::
jonsimantov Jun 2, 2022
78fd02c
Add dbghelp and bcrypt to needed Firestore libs
a-maurice Jun 2, 2022
642d058
Update readme.md
a-maurice Jun 2, 2022
d1f6659
Release note change
jonsimantov Jun 3, 2022
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
3 changes: 2 additions & 1 deletion build_scripts/desktop/package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ readonly deps_hidden_firebase_firestore="
*/firestore-build/*/grpc-build/${subdir}${prefix}*.${ext}
*/firestore-build/*/grpc-build/third_party/cares/*${subdir}${prefix}*.${ext}
*/firestore-build/*/grpc-build/third_party/abseil-cpp/*${subdir}${prefix}*.${ext}
*/firestore-build/*/grpc-build/third_party/re2/*${subdir}${prefix}re2.${ext}
"

# List of C++ namespaces to be renamed, so as to not conflict with the
Expand All @@ -228,7 +229,7 @@ readonly -a rename_namespaces=(flatbuffers flexbuffers reflection ZLib bssl uWS
grpc_ssl_server_credentials grpc_tls_credential_reload_config
grpc_tls_server_authorization_check_config GrpcUdpListener leveldb
leveldb_filterpolicy_create_bloom leveldb_writebatch_iterate strings
TlsCredentials TlsServerCredentials tsi snappy)
TlsCredentials TlsServerCredentials tsi snappy re2)

# String to prepend to all hidden symbols.
readonly rename_string=f_b_
Expand Down
2 changes: 1 addition & 1 deletion firestore/integration_test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ else()
"-framework SystemConfiguration"
)
elseif(MSVC)
set(ADDITIONAL_LIBS advapi32 ws2_32 crypt32)
set(ADDITIONAL_LIBS advapi32 ws2_32 crypt32 dbghelp bcrypt)
else()
set(ADDITIONAL_LIBS pthread)
endif()
Expand Down
3 changes: 2 additions & 1 deletion release_build_files/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ information):
Firebase C++ Library | Windows SDK library dependencies
-------------------- | -----------------------------------------------------
Authentication | `advapi32, ws2_32, crypt32`
Firestore | `advapi32, ws2_32, crypt32, rpcrt4, ole32, shell32`
Firestore | `advapi32, ws2_32, crypt32, rpcrt4, ole32, shell32, dbghelp, bcrypt`
Functions | `advapi32, ws2_32, crypt32, rpcrt4, ole32`
Realtime Database | `advapi32, ws2_32, crypt32, iphlpapi, psapi, userenv, shell32`
Remote Config | `advapi32, ws2_32, crypt32, rpcrt4, ole32`
Expand Down Expand Up @@ -607,6 +607,7 @@ code.
with URLs other than cloudfunctions.net.
- Analytics (iOS): Added InitiateOnDeviceConversionMeasurementWithEmail function to facilitate the
[on-device conversion measurement](https://support.google.com/google-ads/answer/12119136) API.
- Firestore (Windows): dbghelp and bcrypt need to be linked against.

### 9.0.0
- Changes
Expand Down