From 66c4f1aba330282b7e8d6bd9deee07eac60740d8 Mon Sep 17 00:00:00 2001 From: kanjoe24 <165808281+kanjoe24@users.noreply.github.com> Date: Wed, 11 Jun 2025 15:04:38 +0100 Subject: [PATCH 1/4] Add gh #210 : Adding changes to copy openssl and curl libraries to build/bin --- Makefile | 3 +++ build.sh | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ca9ce90..844b6dc 100755 --- a/Makefile +++ b/Makefile @@ -132,6 +132,9 @@ framework: checkvariantchange createdirs download_and_build @${ECHOE} ${GREEN}Framework downloaded and built${NC} @make test VARIANT=${VARIANT} @cp -r $(UT_CONTROL)/build/$(TARGET)/lib/libut_control.* $(LIB_DIR) $(BIN_DIR) + @cp -r $(UT_CONTROL)/build/$(TARGET)/curl/lib/libcurl.so* $(LIB_DIR) $(BIN_DIR) + @cp -r $(UT_CONTROL)/build/$(TARGET)/openssl/lib/libssl.so* $(LIB_DIR) $(BIN_DIR) + @cp -r $(UT_CONTROL)/build/$(TARGET)/openssl/lib/libcrypto.so* $(LIB_DIR) $(BIN_DIR) @${ECHOE} ${GREEN}ut-control LIB Copied to [${BIN_DIR}]${NC} @if [ -d "$(TOP_DIR)/../include" ] && [ -d "$(BUILD_DIR)/src" ]; then \ ${UT_CORE_DIR}/compare-functions-in-headers-testsuite.sh $(TOP_DIR)/../include $(BIN_DIR)/${TARGET_EXEC} ${TARGET}; \ diff --git a/build.sh b/build.sh index 64ee1bf..5f90e21 100755 --- a/build.sh +++ b/build.sh @@ -117,7 +117,8 @@ else check_ut_control_revision # Check out the version required based on control_revision pushd ${UT_CONTROL_LIB_DIR} > /dev/null - git checkout ${UT_CONTROL_PROJECT_VERSION} # MARKER: Version=${UT_CONTROL_PROJECT_VERSION} + #git checkout ${UT_CONTROL_PROJECT_VERSION} # MARKER: Version=${UT_CONTROL_PROJECT_VERSION} + git checkout feature/gh79-ut-control-reduce-size # MARKER: Version=${UT_CONTROL_PROJECT_VERSION} # Note: The above line can be modified by release test scripts to checkout a specific version or branch popd > /dev/null configure_ut_control From 2ac8b340199f63de8c9242078a3489e051298b8f Mon Sep 17 00:00:00 2001 From: kanjoe24 <165808281+kanjoe24@users.noreply.github.com> Date: Wed, 11 Jun 2025 15:04:38 +0100 Subject: [PATCH 2/4] Add gh #210 : Adding changes to copy openssl and curl libraries to build/bin --- Makefile | 2 ++ build.sh | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ca9ce90..eb4d1bb 100755 --- a/Makefile +++ b/Makefile @@ -132,6 +132,8 @@ framework: checkvariantchange createdirs download_and_build @${ECHOE} ${GREEN}Framework downloaded and built${NC} @make test VARIANT=${VARIANT} @cp -r $(UT_CONTROL)/build/$(TARGET)/lib/libut_control.* $(LIB_DIR) $(BIN_DIR) + @cp -r $(UT_CONTROL)/build/$(TARGET)/curl/lib/libcurl.so* $(LIB_DIR) $(BIN_DIR) + @cp -r $(UT_CONTROL)/build/$(TARGET)/openssl/lib/lib*.so* $(LIB_DIR) $(BIN_DIR) @${ECHOE} ${GREEN}ut-control LIB Copied to [${BIN_DIR}]${NC} @if [ -d "$(TOP_DIR)/../include" ] && [ -d "$(BUILD_DIR)/src" ]; then \ ${UT_CORE_DIR}/compare-functions-in-headers-testsuite.sh $(TOP_DIR)/../include $(BIN_DIR)/${TARGET_EXEC} ${TARGET}; \ diff --git a/build.sh b/build.sh index 64ee1bf..5f90e21 100755 --- a/build.sh +++ b/build.sh @@ -117,7 +117,8 @@ else check_ut_control_revision # Check out the version required based on control_revision pushd ${UT_CONTROL_LIB_DIR} > /dev/null - git checkout ${UT_CONTROL_PROJECT_VERSION} # MARKER: Version=${UT_CONTROL_PROJECT_VERSION} + #git checkout ${UT_CONTROL_PROJECT_VERSION} # MARKER: Version=${UT_CONTROL_PROJECT_VERSION} + git checkout feature/gh79-ut-control-reduce-size # MARKER: Version=${UT_CONTROL_PROJECT_VERSION} # Note: The above line can be modified by release test scripts to checkout a specific version or branch popd > /dev/null configure_ut_control From 58433aff735c3c73abc5ef3df0435e810125e256 Mon Sep 17 00:00:00 2001 From: kanjoe24 <165808281+kanjoe24@users.noreply.github.com> Date: Thu, 12 Jun 2025 11:45:59 +0100 Subject: [PATCH 3/4] Add gh #210 : Adding few checks to ensure copy happens only when dirs are valid --- Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index eb4d1bb..9d5bd88 100755 --- a/Makefile +++ b/Makefile @@ -132,9 +132,13 @@ framework: checkvariantchange createdirs download_and_build @${ECHOE} ${GREEN}Framework downloaded and built${NC} @make test VARIANT=${VARIANT} @cp -r $(UT_CONTROL)/build/$(TARGET)/lib/libut_control.* $(LIB_DIR) $(BIN_DIR) - @cp -r $(UT_CONTROL)/build/$(TARGET)/curl/lib/libcurl.so* $(LIB_DIR) $(BIN_DIR) - @cp -r $(UT_CONTROL)/build/$(TARGET)/openssl/lib/lib*.so* $(LIB_DIR) $(BIN_DIR) - @${ECHOE} ${GREEN}ut-control LIB Copied to [${BIN_DIR}]${NC} + @if [ -d "$(UT_CONTROL)/build/$(TARGET)/curl" ]; then \ + @cp -r $(UT_CONTROL)/build/$(TARGET)/curl/lib/libcurl.so* $(LIB_DIR) $(BIN_DIR); \ + fi + @if [ -d "$(UT_CONTROL)/build/$(TARGET)/openssl" ]; then \ + @cp -r $(UT_CONTROL)/build/$(TARGET)/openssl/lib/lib*.so* $(LIB_DIR) $(BIN_DIR); \ + fi + @${ECHOE} ${GREEN}ut-control and related LIBs Copied to [${BIN_DIR}]${NC} @if [ -d "$(TOP_DIR)/../include" ] && [ -d "$(BUILD_DIR)/src" ]; then \ ${UT_CORE_DIR}/compare-functions-in-headers-testsuite.sh $(TOP_DIR)/../include $(BIN_DIR)/${TARGET_EXEC} ${TARGET}; \ fi From 31da6ecb9dc181a76930892ad63e053502e51dbf Mon Sep 17 00:00:00 2001 From: kanjoe24 <165808281+kanjoe24@users.noreply.github.com> Date: Thu, 12 Jun 2025 11:45:59 +0100 Subject: [PATCH 4/4] Add gh #210 : Adding few checks to ensure copy happens only when dirs are valid --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9d5bd88..3c60f38 100755 --- a/Makefile +++ b/Makefile @@ -133,10 +133,10 @@ framework: checkvariantchange createdirs download_and_build @make test VARIANT=${VARIANT} @cp -r $(UT_CONTROL)/build/$(TARGET)/lib/libut_control.* $(LIB_DIR) $(BIN_DIR) @if [ -d "$(UT_CONTROL)/build/$(TARGET)/curl" ]; then \ - @cp -r $(UT_CONTROL)/build/$(TARGET)/curl/lib/libcurl.so* $(LIB_DIR) $(BIN_DIR); \ + cp -r $(UT_CONTROL)/build/$(TARGET)/curl/lib/libcurl.so* $(LIB_DIR) $(BIN_DIR); \ fi @if [ -d "$(UT_CONTROL)/build/$(TARGET)/openssl" ]; then \ - @cp -r $(UT_CONTROL)/build/$(TARGET)/openssl/lib/lib*.so* $(LIB_DIR) $(BIN_DIR); \ + cp -r $(UT_CONTROL)/build/$(TARGET)/openssl/lib/lib*.so* $(LIB_DIR) $(BIN_DIR); \ fi @${ECHOE} ${GREEN}ut-control and related LIBs Copied to [${BIN_DIR}]${NC} @if [ -d "$(TOP_DIR)/../include" ] && [ -d "$(BUILD_DIR)/src" ]; then \