Joshua s brown automate gcs setup #946
Conversation
…and remove .git from Docker build
…d into JoshuaSBrown-libcurl-openssl
Joshua s brown libcurl openssl
There was a problem hiding this comment.
Overall, I only noticed a few small spelling mistakes, unused code, and potentially unnecessary debug information, as most the PR was just cleaning up files, using environment variables better instead of hard coding paths, and the actual code committed was simple and readable.
| if(BUILD_SHARED_LIBS) | ||
| add_library( common SHARED ${Sources}) | ||
| target_link_libraries( common PUBLIC ${DATAFED_BOOST_DATE_TIME_LIBRARY_PATH} protobuf::libprotobuf libzmq datafed-protobuf) | ||
| else() | ||
| add_library( common STATIC ${Sources}) | ||
| target_link_libraries( common PUBLIC ${DATAFED_BOOST_DATE_TIME_LIBRARY_PATH} protobuf::libprotobuf libzmq-static datafed-protobuf) | ||
| endif() | ||
|
|
There was a problem hiding this comment.
I'm surprised this is so simple to be able to swap between shared and static libraries.
There was a problem hiding this comment.
Actually, it's not, for instance protobuf and some of the other libraries when built will output a cmake file that defaults to shared. Really, it's in building the dependencies and the fact that the CMake files they create are often poorly written. Many times building the dependency if it includes both a shared and static option CMake will only link with the shared library if it is found anywhere.
There was a problem hiding this comment.
Really if you look at the find_package command that's where all the problems are.
| if (m_log_level >= LogLevel::TRACE) { | ||
| if (static_cast<unsigned int>(m_log_level) >= | ||
| static_cast<unsigned int>(LogLevel::TRACE)) { |
There was a problem hiding this comment.
I assume this is to not rely on C++ loose typing which is probably a good idea.
There was a problem hiding this comment.
I could probably leave this out, because I explicitly make the enum an unsigned int when it is constructed. Though I'm as you might have noticed a fan of being explicit sometimes at the detriment of clarity. If you think it makes sense to remove it we can.
| #cmake -S . -B build \ | ||
| # -DBUILD_SHARED_LIBS=ON \ | ||
| # -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ | ||
| # -DCMAKE_INSTALL_PREFIX="${DATAFED_DEPENDENCIES_INSTALL_PATH}" | ||
| #cmake --build build -j 8 | ||
| #if [ -w "${DATAFED_DEPENDENCIES_INSTALL_PATH}" ]; then | ||
| # cmake --build build --target install | ||
| #else | ||
| # "$SUDO_CMD" cmake --build build --target install | ||
| #fi |
scripts/globus/setup_globus.sh
Outdated
| @@ -54,14 +78,22 @@ cat << EOF > mapping.json | |||
| EOF | |||
|
|
|||
| #DOMAINS="--domain ornl.gov --domain clients.auth.globus.org --domain gmail.com" | |||
|
@par-hermes format |
|
@par-hermes format |
…aFed into JoshuaSBrown-automate-gcs-setup
|
@par-hermes format |
JoshuaSBrown
merged commit a858afd
into
JoshuaSBrown-upgrade-protobuf
Description
This pr helps to streamline the creation of the dev environment using two docker compose instances the first for the core services:
The second for the datafed repo services.
Tasks