(celix) branch hotfix/header-includes deleted (was a62656d8d)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch hotfix/header-includes in repository https://gitbox.apache.org/repos/asf/celix.git was a62656d8d Fix header includes. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(celix) 01/01: Merge pull request #761 from apache/hotfix/header-includes
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/celix.git commit 81d3b6b31a9709205f899792093cd4f28d055166 Merge: c533db4f1 a62656d8d Author: PengZheng AuthorDate: Wed Jul 17 20:05:01 2024 +0800 Merge pull request #761 from apache/hotfix/header-includes Hotfix/Fix header includes. .../remote_service_admin_shm_v2/rsa_shm/src/rsa_shm_client.c| 1 + .../remote_service_admin_shm_v2/rsa_shm/src/rsa_shm_server.c| 1 + libs/framework/src/celix_bundle_cache.c | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-)
(celix) branch master updated (c533db4f1 -> 81d3b6b31)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/celix.git from c533db4f1 Merge pull request #760 from apache/hotfix/update-ubuntu-CI add a62656d8d Fix header includes. new 81d3b6b31 Merge pull request #761 from apache/hotfix/header-includes The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../remote_service_admin_shm_v2/rsa_shm/src/rsa_shm_client.c| 1 + .../remote_service_admin_shm_v2/rsa_shm/src/rsa_shm_server.c| 1 + libs/framework/src/celix_bundle_cache.c | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-)
(celix) 01/01: Fix header includes.
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch hotfix/header-includes in repository https://gitbox.apache.org/repos/asf/celix.git commit a62656d8d181faed36963dc3279bb7a2faa82f37 Author: PengZheng AuthorDate: Wed Jul 17 19:39:12 2024 +0800 Fix header includes. --- .../remote_service_admin_shm_v2/rsa_shm/src/rsa_shm_client.c| 1 + .../remote_service_admin_shm_v2/rsa_shm/src/rsa_shm_server.c| 1 + libs/framework/src/celix_bundle_cache.c | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/src/rsa_shm_client.c b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/src/rsa_shm_client.c index 70ffba0b7..2b304dcc7 100644 --- a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/src/rsa_shm_client.c +++ b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/src/rsa_shm_client.c @@ -36,6 +36,7 @@ #include #include #include +#include #include diff --git a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/src/rsa_shm_server.c b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/src/rsa_shm_server.c index aaebbb368..6e40962b7 100644 --- a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/src/rsa_shm_server.c +++ b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/src/rsa_shm_server.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #define MAX_RSA_SHM_SERVER_HANDLE_MSG_THREADS_NUM 5 diff --git a/libs/framework/src/celix_bundle_cache.c b/libs/framework/src/celix_bundle_cache.c index cb0260c64..d401ac432 100644 --- a/libs/framework/src/celix_bundle_cache.c +++ b/libs/framework/src/celix_bundle_cache.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include "celix_constants.h" #include "celix_log.h"
(celix) branch hotfix/header-includes created (now a62656d8d)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch hotfix/header-includes in repository https://gitbox.apache.org/repos/asf/celix.git at a62656d8d Fix header includes. This branch includes the following new commits: new a62656d8d Fix header includes. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(celix) branch hotfix/update-ubuntu-CI deleted (was bfccf0e44)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch hotfix/update-ubuntu-CI in repository https://gitbox.apache.org/repos/asf/celix.git was bfccf0e44 Update linux-build-apt to use ninja. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(celix) branch master updated (758aa7916 -> c533db4f1)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/celix.git from 758aa7916 Merge pull request #757 from apache/hotfix/test-package-failure add bfccf0e44 Update linux-build-apt to use ninja. new c533db4f1 Merge pull request #760 from apache/hotfix/update-ubuntu-CI The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/ubuntu.yml | 4 +++- CMakeLists.txt | 5 - 2 files changed, 3 insertions(+), 6 deletions(-)
(celix) 01/01: Merge pull request #760 from apache/hotfix/update-ubuntu-CI
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/celix.git commit c533db4f109c712b52c0791c197f7eb3ee78c46a Merge: 758aa7916 bfccf0e44 Author: PengZheng AuthorDate: Thu Jul 11 10:49:10 2024 +0800 Merge pull request #760 from apache/hotfix/update-ubuntu-CI Update linux-build-apt to use ninja. .github/workflows/ubuntu.yml | 4 +++- CMakeLists.txt | 5 - 2 files changed, 3 insertions(+), 6 deletions(-)
(celix) 01/01: Update linux-build-apt to use ninja.
This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a commit to branch hotfix/update-ubuntu-CI
in repository https://gitbox.apache.org/repos/asf/celix.git
commit bfccf0e44b7f328afbf9a2ce9484d55688da2486
Author: PengZheng
AuthorDate: Thu Jul 11 10:14:08 2024 +0800
Update linux-build-apt to use ninja.
---
.github/workflows/ubuntu.yml | 4 +++-
CMakeLists.txt | 5 -
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index d5b87a93f..6a1079536 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -110,6 +110,7 @@ jobs:
sudo apt-get update
sudo apt-get install -yq --no-install-recommends \
build-essential \
+ ninja-build \
curl \
uuid-dev \
libzip-dev \
@@ -145,11 +146,12 @@ jobs:
-DENABLE_TESTING_ON_CI=ON
-DCMAKE_BUILD_TYPE=${{ matrix.type }}
-DENABLE_CCACHE=ON
+ -G Ninja
run: |
mkdir build install
cd build
cmake ${BUILD_OPTIONS} -DCMAKE_INSTALL_PREFIX=../install ..
-make -j $(nproc) && make install
+ninja && ninja install
- name: Test
run: |
cd $GITHUB_WORKSPACE/build
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0aa5aa5c..d72ce4d76 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,11 +31,6 @@ list(APPEND CMAKE_MODULE_PATH
"${CMAKE_CURRENT_SOURCE_DIR}/cmake")
set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED)
-# see https://public.kitware.com/Bug/view.php?id=15696
-IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} EQUAL 3.3 AND
${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
-message( FATAL_ERROR "Building Celix using CMake 3.3 and makefiles is not
supported due to a bug in the Makefile Generator (see Bug 15696). Please change
the used CMake version - both, CMake 3.2 and CMake 3.4 are working fine. Or use
a different generator (e.g. Ninja)." )
-ENDIF()
-
# Options
option(ENABLE_TESTING "Enables unit/bundle testing" FALSE)
if (ENABLE_TESTING)
(celix) branch hotfix/update-ubuntu-CI created (now bfccf0e44)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch hotfix/update-ubuntu-CI in repository https://gitbox.apache.org/repos/asf/celix.git at bfccf0e44 Update linux-build-apt to use ninja. This branch includes the following new commits: new bfccf0e44 Update linux-build-apt to use ninja. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(celix) branch feature/devcontainer updated (00dc17aac -> 220673324)
This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a change to branch feature/devcontainer
in repository https://gitbox.apache.org/repos/asf/celix.git
from 00dc17aac Fix test_package error.
add 5712dabe2 Fix test_package error.
add 1606b4993 Update to macOS-12.
add f82223d6e Add test for failure to schedule the celix_shutdown_check
event.
add 758aa7916 Merge pull request #757 from
apache/hotfix/test-package-failure
add 220673324 Merge branch 'master' into feature/devcontainer
No new revisions were added by this update.
Summary of changes:
libs/framework/gtest/CMakeLists.txt | 6 +-
libs/framework/gtest/src/CelixLauncherTestSuite.cc | 13 +
.../src/{activator_with_celix_err.c => activator_stop.c}| 12
libs/framework/src/celix_launcher.c | 3 +--
4 files changed, 23 insertions(+), 11 deletions(-)
copy libs/framework/gtest/src/{activator_with_celix_err.c => activator_stop.c}
(73%)
(celix) branch hotfix/test-package-failure deleted (was f82223d6e)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch hotfix/test-package-failure in repository https://gitbox.apache.org/repos/asf/celix.git was f82223d6e Add test for failure to schedule the celix_shutdown_check event. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(celix) 01/01: Merge pull request #757 from apache/hotfix/test-package-failure
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/celix.git commit 758aa79167847f2fac58f8bf70aecee7f9b2615d Merge: 39e2282f8 f82223d6e Author: PengZheng AuthorDate: Mon Jun 24 19:31:05 2024 +0800 Merge pull request #757 from apache/hotfix/test-package-failure Hotfix/Fix test_package error. .github/workflows/conan_create.yml | 2 +- .github/workflows/macos.yml| 2 +- libs/framework/gtest/CMakeLists.txt| 6 +++- libs/framework/gtest/src/CelixLauncherTestSuite.cc | 8 +++-- libs/framework/gtest/src/activator_stop.c | 36 ++ libs/framework/src/celix_launcher.c| 8 +++-- 6 files changed, 54 insertions(+), 8 deletions(-)
(celix) branch master updated (39e2282f8 -> 758aa7916)
This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/celix.git
from 39e2282f8 Merge pull request #756 from apache/hotfix/shutdown-hang
add 5712dabe2 Fix test_package error.
add 1606b4993 Update to macOS-12.
add f82223d6e Add test for failure to schedule the celix_shutdown_check
event.
new 758aa7916 Merge pull request #757 from
apache/hotfix/test-package-failure
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/conan_create.yml | 2 +-
.github/workflows/macos.yml | 2 +-
libs/framework/gtest/CMakeLists.txt | 6 +-
libs/framework/gtest/src/CelixLauncherTestSuite.cc | 8 ++--
.../src/{activator_with_celix_err.c => activator_stop.c} | 12
libs/framework/src/celix_launcher.c | 8 +---
6 files changed, 22 insertions(+), 16 deletions(-)
copy libs/framework/gtest/src/{activator_with_celix_err.c => activator_stop.c}
(73%)
(celix) branch hotfix/test-package-failure updated (1606b4993 -> f82223d6e)
This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a change to branch hotfix/test-package-failure
in repository https://gitbox.apache.org/repos/asf/celix.git
from 1606b4993 Update to macOS-12.
add f82223d6e Add test for failure to schedule the celix_shutdown_check
event.
No new revisions were added by this update.
Summary of changes:
libs/framework/gtest/CMakeLists.txt | 6 +-
libs/framework/gtest/src/CelixLauncherTestSuite.cc | 13 +
.../src/{activator_with_celix_err.c => activator_stop.c}| 12
libs/framework/src/celix_launcher.c | 3 +--
4 files changed, 23 insertions(+), 11 deletions(-)
copy libs/framework/gtest/src/{activator_with_celix_err.c => activator_stop.c}
(73%)
(celix) branch hotfix/test-package-failure updated: Update to macOS-12.
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch hotfix/test-package-failure in repository https://gitbox.apache.org/repos/asf/celix.git The following commit(s) were added to refs/heads/hotfix/test-package-failure by this push: new 1606b4993 Update to macOS-12. 1606b4993 is described below commit 1606b4993d3aa090b25312b7c269976786fa9b6f Author: PengZheng AuthorDate: Mon Jun 24 16:25:54 2024 +0800 Update to macOS-12. --- .github/workflows/conan_create.yml | 2 +- .github/workflows/macos.yml| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conan_create.yml b/.github/workflows/conan_create.yml index 575cab429..8754f9d1f 100644 --- a/.github/workflows/conan_create.yml +++ b/.github/workflows/conan_create.yml @@ -76,7 +76,7 @@ jobs: conan remove -c celix/* mac-build: -runs-on: macOS-11 +runs-on: macOS-12 timeout-minutes: 120 steps: - name: Checkout source code diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 54872e504..84814a086 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -16,7 +16,7 @@ env: jobs: macos-build-conan: -runs-on: macOS-11 +runs-on: macOS-12 timeout-minutes: 120 steps: - name: Checkout source code
(celix) branch hotfix/test-package-failure created (now 5712dabe2)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch hotfix/test-package-failure in repository https://gitbox.apache.org/repos/asf/celix.git at 5712dabe2 Fix test_package error. This branch includes the following new commits: new 5712dabe2 Fix test_package error. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(celix) 01/01: Fix test_package error.
This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a commit to branch hotfix/test-package-failure
in repository https://gitbox.apache.org/repos/asf/celix.git
commit 5712dabe2269f631c99d772487ccee556e6c5fa8
Author: PengZheng
AuthorDate: Mon Jun 24 17:56:09 2024 +0800
Fix test_package error.
---
libs/framework/gtest/src/CelixLauncherTestSuite.cc | 9 -
libs/framework/src/celix_launcher.c| 7 +--
2 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/libs/framework/gtest/src/CelixLauncherTestSuite.cc
b/libs/framework/gtest/src/CelixLauncherTestSuite.cc
index d422d577c..fa1d7fc8b 100644
--- a/libs/framework/gtest/src/CelixLauncherTestSuite.cc
+++ b/libs/framework/gtest/src/CelixLauncherTestSuite.cc
@@ -192,15 +192,6 @@ TEST_F(CelixLauncherTestSuite,
LaunchWithInvalidConfigPropertiesTest) {
//Then the launch will exit
auto status =
future.wait_for(std::chrono::milliseconds{LAUNCH_WAIT_TIMEOUT});
EXPECT_EQ(status, std::future_status::ready);
-
-//When launching the framework with a properties set with a negative
shutdown period
-auto* props = celix_properties_create();
-ASSERT_TRUE(props != nullptr);
-celix_properties_setDouble(props,
CELIX_LAUNCHER_SHUTDOWN_PERIOD_IN_SECONDS, -1.0);
-future = launchInThread({"programName"}, props, 1);
-//Then launch will exit
-status = future.wait_for(std::chrono::milliseconds{LAUNCH_WAIT_TIMEOUT});
-EXPECT_EQ(status, std::future_status::ready);
}
diff --git a/libs/framework/src/celix_launcher.c
b/libs/framework/src/celix_launcher.c
index edf04d412..34abbfdb2 100644
--- a/libs/framework/src/celix_launcher.c
+++ b/libs/framework/src/celix_launcher.c
@@ -182,9 +182,12 @@ int celix_launcher_launchAndWait(int argc, char* argv[],
const char* embeddedCon
return CELIX_LAUNCHER_ERROR_EXIT_CODE;
}
status = celix_launcher_setGlobalFramework(framework);
-if (status == CELIX_SUCCESS) {
-celix_framework_waitForStop(framework);
+if (status != CELIX_SUCCESS) {
+
celix_bundleContext_log(celix_framework_getFrameworkContext(framework),
CELIX_LOG_LEVEL_WARNING,
+"Failed to schedule celix_shutdown_check");
+status = CELIX_SUCCESS;
}
+celix_framework_waitForStop(framework);
celix_launcher_resetLauncher();
#ifndef CELIX_NO_CURLINIT
// Cleanup Curl
(celix) branch feature/devcontainer updated (95a34d842 -> 00dc17aac)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch feature/devcontainer in repository https://gitbox.apache.org/repos/asf/celix.git from 95a34d842 Remove sudo in run_unit_test_discovery_zeroconf. add 00dc17aac Fix test_package error. No new revisions were added by this update. Summary of changes: libs/framework/gtest/src/CelixLauncherTestSuite.cc | 9 - libs/framework/src/celix_launcher.c| 7 +-- 2 files changed, 5 insertions(+), 11 deletions(-)
(celix) branch feature/devcontainer updated (d3b1e15d3 -> 95a34d842)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch feature/devcontainer in repository https://gitbox.apache.org/repos/asf/celix.git from d3b1e15d3 Enable address sanitizer in test_package. add 95a34d842 Remove sudo in run_unit_test_discovery_zeroconf. No new revisions were added by this update. Summary of changes: bundles/remote_services/discovery_zeroconf/gtest/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(celix) branch feature/devcontainer updated (50e1193e8 -> d3b1e15d3)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch feature/devcontainer in repository https://gitbox.apache.org/repos/asf/celix.git from 50e1193e8 Update to macOS-12. add d3b1e15d3 Enable address sanitizer in test_package. No new revisions were added by this update. Summary of changes: examples/conan_test_package/CMakeLists.txt | 13 + examples/conan_test_package/conanfile.py| 1 + examples/conan_test_package_v2/conanfile.py | 1 + 3 files changed, 15 insertions(+)
(celix) branch feature/devcontainer updated (52001cb40 -> 50e1193e8)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch feature/devcontainer in repository https://gitbox.apache.org/repos/asf/celix.git from 52001cb40 Fix conan option format. add 50e1193e8 Update to macOS-12. No new revisions were added by this update. Summary of changes: .github/workflows/conan_create.yml | 2 +- .github/workflows/macos.yml| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
(celix) branch feature/devcontainer updated (14398f453 -> 52001cb40)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch feature/devcontainer in repository https://gitbox.apache.org/repos/asf/celix.git from 14398f453 Fix ctest dynamic linking error. add 52001cb40 Fix conan option format. No new revisions were added by this update. Summary of changes: .github/workflows/conan_create.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(celix) branch feature/devcontainer updated (1e772076f -> 14398f453)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch feature/devcontainer in repository https://gitbox.apache.org/repos/asf/celix.git from 1e772076f Fix ctest warning. add 14398f453 Fix ctest dynamic linking error. No new revisions were added by this update. Summary of changes: .github/workflows/conan_create.yml | 2 +- .github/workflows/containers.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
(celix) branch feature/devcontainer updated (d4d41cedb -> 1e772076f)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch feature/devcontainer in repository https://gitbox.apache.org/repos/asf/celix.git from d4d41cedb Merge branch 'master' into feature/devcontainer add 1e772076f Fix ctest warning. No new revisions were added by this update. Summary of changes: .github/workflows/containers.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
(celix) branch feature/devcontainer updated (d20f2b48c -> d4d41cedb)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch feature/devcontainer in repository https://gitbox.apache.org/repos/asf/celix.git from d20f2b48c Remove openssl 1.1.1 override for Conan build on Ubuntu. add a779cbfc8 Fix wrong conanrun.sh path. add 2c28348ee gh-685: Remove of old properties load and store add 74f425794 gh-685: Refactor config prop cmake gen and test config props add 0a0709a2d gh-685: Improve error handling for properties save/load add 0566315d6 gh-685: Rename properties load2/loadFromString2 to load/loadFromString add b8c6ab5ca gh-685: Change space sep in auto start bundle to comma seperator add 55b3ae817 gh-685: Fix properties encoding usage in rsa shm add 74053780d gh-685: Fix macos specific file utils tests add 68098de8c gh-685: Fix macos specific file utils tests add 64e3647ab gh-685: Fix memleak in bundle archive add 0c859f0af gh-685: Fix memleak in bundle archive add ddf0a779b gh-685: Refactor celix launcher add 87ab2b3bd Merge branch 'refs/heads/master' into feature/685-update-container-config-properties-usage add 5b4cd3a6b gh-685: Replace sigabbrev_np usage with strsignal add fe5aa598d gh-685: Replace constexpr with define add 25df868ea gh-685: Add celix launcher test suite with error injection add e06e2ad0b gh-685: Fix tms_tests and improve several error handling issues add bf0011a45 gh-685: Improve celix_launcher coverage and fix memleaks add a01495644 Make various lock guard deinit explicitly callable so that locks can be released manually. add 8b0e0e0c4 gh-685: Add bundle entry guard add f237f4b20 gh-685: Add rsa shm test case add 17a5adac5 Cleanup bundle cache on installation failure and fix use-after-free. add ad9e542c1 gh-685: Refactor launcher global framework handling add 621c2be4b gh-685: Improve error handling of launcher. add 8f4fafcdf gh-215: Implement async-signal-safe launcher shutdown. add 58860bbf1 Merge pull request #751 from apache/feature/685-update-container-config-properties-usage add 49a52527e Merge branch 'master' into feature/215-stop-launcher-by-signal add b5214cf99 gh-215: Reset launcher on error. add e07b2e812 gh-215: Remove all remaining scheduled events for an inactive dispatcher. add d384c8653 gh-215: Remove all remaining scheduled events for an inactive dispatcher. add 61d0f6900 gh-215: Minor documentation improvement. add 2378bac0e [CID 349739]: Release a lock guard manually. add 63683c03d Merge pull request #753 from apache/feature/215-stop-launcher-by-signal add 049efdd54 [CID 392574]: Destroy held lock. add f16b2d0b6 Merge pull request #755 from apache/hotfix/coverity-fix add 63445a3fa Avoid schedule event to an inactive framework. add 39e2282f8 Merge pull request #756 from apache/hotfix/shutdown-hang add d4d41cedb Merge branch 'master' into feature/devcontainer No new revisions were added by this update. Summary of changes: .github/workflows/containers.yml | 2 +- CHANGES.md | 6 +- .../gtest/client.properties.in | 21 +- .../gtest/config.properties.in | 25 +- .../gtest/server.properties.in | 37 +- .../gtest/src/rsa_client_server_tests.cc | 42 +- .../gtest/src/rsa_tests.cc | 25 +- .../gtest/src/RsaShmClientServerUnitTestSuite.cc | 40 ++ .../rsa_shm/src/rsa_shm_client.c | 9 +- .../rsa_shm/src/rsa_shm_server.c | 6 +- .../topology_manager/tms_tst/CMakeLists.txt| 22 +- .../topology_manager/tms_tst/tms_tests.cpp | 218 - bundles/shell/remote_shell/src/shell_mediator.c| 2 - cmake/cmake_celix/BundlePackaging.cmake| 26 +- cmake/cmake_celix/ContainerPackaging.cmake | 129 +++--- documents/containers.md| 48 +- documents/framework.md | 4 +- documents/properties_encoding.md | 4 +- .../bundle_with_private_lib/CMakeLists.txt | 2 +- .../celix-examples/hello_world_c/CMakeLists.txt| 3 +- libs/framework/gtest/CMakeLists.txt| 8 +- libs/framework/gtest/config.properties.in | 23 +- libs/framework/gtest/empty.properties.in | 1 + libs/framework/gtest/framework1.properties.in | 25 +- libs/framework/gtest/framework2.properties.in | 25 +- .../gtest/install_and_start_bundles.properties.in | 33 +- .../BundleArchiveWithErrorInjectionTestSuite.cc| 22 +- .../src/CelixBundleCacheErrorInjectionTestSuite.cc | 45 +- .../gtest/src/CelixBundleCacheTestSuite.cc | 23 +- .../src/CelixBundleContextBundlesTestSuite.cc | 9 + .../framework/gtest/src/Ce
(celix) branch feature/devcontainer updated (d1ba2bf50 -> d20f2b48c)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch feature/devcontainer in repository https://gitbox.apache.org/repos/asf/celix.git from d1ba2bf50 Avoid the introduction of openssl dependency. add d20f2b48c Remove openssl 1.1.1 override for Conan build on Ubuntu. No new revisions were added by this update. Summary of changes: .github/workflows/containers.yml | 3 ++- .github/workflows/ubuntu.yml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
(celix) branch feature/devcontainer updated (6606e7710 -> d1ba2bf50)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch feature/devcontainer in repository https://gitbox.apache.org/repos/asf/celix.git from 6606e7710 Replace usage of tags for github action to hashes add d1ba2bf50 Avoid the introduction of openssl dependency. No new revisions were added by this update. Summary of changes: conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(celix) branch hotfix/openssl-update deleted (was bb912e0b2)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch hotfix/openssl-update in repository https://gitbox.apache.org/repos/asf/celix.git was bb912e0b2 Update civetweb to 1.16 and replace LD_LIBRARY_PATH by DYLD_LIBRARY_PATH to fix macOS CI. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(celix) branch hotfix/openssl-update created (now bb912e0b2)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch hotfix/openssl-update in repository https://gitbox.apache.org/repos/asf/celix.git at bb912e0b2 Update civetweb to 1.16 and replace LD_LIBRARY_PATH by DYLD_LIBRARY_PATH to fix macOS CI. No new revisions were added by this update.
(celix) branch hotfix/shutdown-hang deleted (was 63445a3fa)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch hotfix/shutdown-hang in repository https://gitbox.apache.org/repos/asf/celix.git was 63445a3fa Avoid schedule event to an inactive framework. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(celix) 01/01: Merge pull request #756 from apache/hotfix/shutdown-hang
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/celix.git commit 39e2282f8fe138016c9938201cab5ce1cfcfb971 Merge: f16b2d0b6 63445a3fa Author: PengZheng AuthorDate: Mon Jun 24 09:44:15 2024 +0800 Merge pull request #756 from apache/hotfix/shutdown-hang Hotfix/Avoid scheduling event to an inactive framework. .../framework/gtest/src/ScheduledEventTestSuite.cc | 23 ++ libs/framework/src/framework.c | 9 +++-- 2 files changed, 30 insertions(+), 2 deletions(-)
(celix) branch master updated (f16b2d0b6 -> 39e2282f8)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/celix.git from f16b2d0b6 Merge pull request #755 from apache/hotfix/coverity-fix add 63445a3fa Avoid schedule event to an inactive framework. new 39e2282f8 Merge pull request #756 from apache/hotfix/shutdown-hang The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../framework/gtest/src/ScheduledEventTestSuite.cc | 23 ++ libs/framework/src/framework.c | 9 +++-- 2 files changed, 30 insertions(+), 2 deletions(-)
(celix) branch hotfix/shutdown-hang created (now 63445a3fa)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch hotfix/shutdown-hang in repository https://gitbox.apache.org/repos/asf/celix.git at 63445a3fa Avoid schedule event to an inactive framework. This branch includes the following new commits: new 63445a3fa Avoid schedule event to an inactive framework. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(celix) 01/01: Avoid schedule event to an inactive framework.
This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a commit to branch hotfix/shutdown-hang
in repository https://gitbox.apache.org/repos/asf/celix.git
commit 63445a3fa18109b20f8168c66a2ce536a6dbcd55
Author: PengZheng
AuthorDate: Sun Jun 23 18:13:37 2024 +0800
Avoid schedule event to an inactive framework.
---
.../framework/gtest/src/ScheduledEventTestSuite.cc | 23 ++
libs/framework/src/framework.c | 9 +++--
2 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/libs/framework/gtest/src/ScheduledEventTestSuite.cc
b/libs/framework/gtest/src/ScheduledEventTestSuite.cc
index 9edbbb282..f2dd53f55 100644
--- a/libs/framework/gtest/src/ScheduledEventTestSuite.cc
+++ b/libs/framework/gtest/src/ScheduledEventTestSuite.cc
@@ -21,6 +21,7 @@
#include "celix/FrameworkFactory.h"
#include "celix_bundle_context.h"
+#include "celix_framework.h"
#include "celix_scheduled_event.h"
class ScheduledEventTestSuite : public ::testing::Test {
@@ -761,3 +762,25 @@ TEST_F(ScheduledEventTestSuite,
ScheduledEventTimeoutLogTest) {
EXPECT_GE(logCount.load(), 2);
}
#endif
+
+TEST_F(ScheduledEventTestSuite, ScheduledEventForInvactiveFramework) {
+// Given a framework that is stopped
+celix_framework_stopBundle(fw->getCFramework(), CELIX_FRAMEWORK_BUNDLE_ID);
+celix_framework_waitForStop(fw->getCFramework());
+// When a scheduled event is added
+std::atomic count{0};
+auto callback = [](void* data) {
+auto* count = static_cast*>(data);
+count->fetch_add(1);
+};
+
+celix_scheduled_event_options_t opts{};
+opts.initialDelayInSeconds = 0.01;
+opts.callbackData = &count;
+opts.callback = callback;
+long eventId =
celix_bundleContext_scheduleEvent(fw->getFrameworkBundleContext()->getCBundleContext(),
&opts);
+EXPECT_LT(eventId, 0);
+
+// Then the event is not added
+EXPECT_EQ(0, count.load());
+}
diff --git a/libs/framework/src/framework.c b/libs/framework/src/framework.c
index 0b317c91a..4706a4ae6 100644
--- a/libs/framework/src/framework.c
+++ b/libs/framework/src/framework.c
@@ -2583,8 +2583,13 @@ long celix_framework_scheduleEvent(celix_framework_t* fw,
celix_bundleEntry_decreaseUseCount(bndEntry);
celixThreadMutex_lock(&fw->dispatcher.mutex);
-celix_longHashMap_put(fw->dispatcher.scheduledEvents, id, event);
-celixThreadCondition_broadcast(&fw->dispatcher.cond); //notify dispatcher
thread for newly added scheduled event
+if (fw->dispatcher.active) {
+celix_longHashMap_put(fw->dispatcher.scheduledEvents, id, event);
+celixThreadCondition_broadcast(&fw->dispatcher.cond); //notify
dispatcher thread for newly added scheduled event
+} else {
+celix_scheduledEvent_release(event);
+id = -1L;
+}
celixThreadMutex_unlock(&fw->dispatcher.mutex);
return id;
(celix) branch hotfix/coverity-fix deleted (was 049efdd54)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch hotfix/coverity-fix in repository https://gitbox.apache.org/repos/asf/celix.git was 049efdd54 [CID 392574]: Destroy held lock. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(celix) 01/01: Merge pull request #755 from apache/hotfix/coverity-fix
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/celix.git commit f16b2d0b601cd10b579e60bc82ced9ae15972b9f Merge: 63683c03d 049efdd54 Author: PengZheng AuthorDate: Sun Jun 23 12:44:19 2024 +0800 Merge pull request #755 from apache/hotfix/coverity-fix Hotfix/[CID 392574]: Destroy held lock. bundles/shell/remote_shell/src/shell_mediator.c | 2 -- 1 file changed, 2 deletions(-)
(celix) branch master updated (63683c03d -> f16b2d0b6)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/celix.git from 63683c03d Merge pull request #753 from apache/feature/215-stop-launcher-by-signal add 049efdd54 [CID 392574]: Destroy held lock. new f16b2d0b6 Merge pull request #755 from apache/hotfix/coverity-fix The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: bundles/shell/remote_shell/src/shell_mediator.c | 2 -- 1 file changed, 2 deletions(-)
(celix) branch hotfix/coverity-fix created (now 049efdd54)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch hotfix/coverity-fix in repository https://gitbox.apache.org/repos/asf/celix.git at 049efdd54 [CID 392574]: Destroy held lock. This branch includes the following new commits: new 049efdd54 [CID 392574]: Destroy held lock. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(celix) 01/01: [CID 392574]: Destroy held lock.
This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a commit to branch hotfix/coverity-fix
in repository https://gitbox.apache.org/repos/asf/celix.git
commit 049efdd541fc6122a72c287d91e43b4f25dfdb3b
Author: PengZheng
AuthorDate: Sun Jun 23 12:29:26 2024 +0800
[CID 392574]: Destroy held lock.
---
bundles/shell/remote_shell/src/shell_mediator.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/bundles/shell/remote_shell/src/shell_mediator.c
b/bundles/shell/remote_shell/src/shell_mediator.c
index 636296031..5ad3e6212 100644
--- a/bundles/shell/remote_shell/src/shell_mediator.c
+++ b/bundles/shell/remote_shell/src/shell_mediator.c
@@ -85,8 +85,6 @@ celix_status_t shellMediator_stop(shell_mediator_pt instance)
{
celix_status_t shellMediator_destroy(shell_mediator_pt instance) {
celix_status_t status = CELIX_SUCCESS;
- celixThreadMutex_lock(&instance->mutex);
-
instance->shellService = NULL;
serviceTracker_destroy(instance->tracker);
celix_logHelper_destroy(instance->loghelper);
(celix) branch feature/215-stop-launcher-by-signal deleted (was 2378bac0e)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch feature/215-stop-launcher-by-signal in repository https://gitbox.apache.org/repos/asf/celix.git was 2378bac0e [CID 349739]: Release a lock guard manually. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(celix) 01/01: Merge pull request #753 from apache/feature/215-stop-launcher-by-signal
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/celix.git commit 63683c03d3446cfeaf3424b9d71f1536e6017279 Merge: 58860bbf1 2378bac0e Author: PengZheng AuthorDate: Sun Jun 16 12:59:29 2024 +0800 Merge pull request #753 from apache/feature/215-stop-launcher-by-signal Feature/215 async-signal-safe launcher shutdown libs/framework/gtest/src/CelixLauncherTestSuite.cc | 20 +++- .../framework/gtest/src/ScheduledEventTestSuite.cc | 14 +++ libs/framework/include/celix_launcher.h| 9 ++ libs/framework/src/bundle_context.c| 2 +- libs/framework/src/celix_launcher.c| 108 +++-- libs/framework/src/celix_launcher_private.h| 9 -- libs/framework/src/framework.c | 10 +- 7 files changed, 127 insertions(+), 45 deletions(-)
(celix) branch master updated (58860bbf1 -> 63683c03d)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/celix.git from 58860bbf1 Merge pull request #751 from apache/feature/685-update-container-config-properties-usage add 8f4fafcdf gh-215: Implement async-signal-safe launcher shutdown. add 49a52527e Merge branch 'master' into feature/215-stop-launcher-by-signal add b5214cf99 gh-215: Reset launcher on error. add e07b2e812 gh-215: Remove all remaining scheduled events for an inactive dispatcher. add d384c8653 gh-215: Remove all remaining scheduled events for an inactive dispatcher. add 61d0f6900 gh-215: Minor documentation improvement. add 2378bac0e [CID 349739]: Release a lock guard manually. new 63683c03d Merge pull request #753 from apache/feature/215-stop-launcher-by-signal The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: libs/framework/gtest/src/CelixLauncherTestSuite.cc | 20 +++- .../framework/gtest/src/ScheduledEventTestSuite.cc | 14 +++ libs/framework/include/celix_launcher.h| 9 ++ libs/framework/src/bundle_context.c| 2 +- libs/framework/src/celix_launcher.c| 108 +++-- libs/framework/src/celix_launcher_private.h| 9 -- libs/framework/src/framework.c | 10 +- 7 files changed, 127 insertions(+), 45 deletions(-)
(celix) branch feature/215-stop-launcher-by-signal updated (61d0f6900 -> 2378bac0e)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch feature/215-stop-launcher-by-signal in repository https://gitbox.apache.org/repos/asf/celix.git from 61d0f6900 gh-215: Minor documentation improvement. add 2378bac0e [CID 349739]: Release a lock guard manually. No new revisions were added by this update. Summary of changes: libs/framework/src/bundle_context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(celix) branch feature/215-stop-launcher-by-signal updated (d384c8653 -> 61d0f6900)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch feature/215-stop-launcher-by-signal in repository https://gitbox.apache.org/repos/asf/celix.git from d384c8653 gh-215: Remove all remaining scheduled events for an inactive dispatcher. add 61d0f6900 gh-215: Minor documentation improvement. No new revisions were added by this update. Summary of changes: libs/framework/src/celix_launcher.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
(celix) branch feature/215-stop-launcher-by-signal updated (e07b2e812 -> d384c8653)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch feature/215-stop-launcher-by-signal in repository https://gitbox.apache.org/repos/asf/celix.git from e07b2e812 gh-215: Remove all remaining scheduled events for an inactive dispatcher. add d384c8653 gh-215: Remove all remaining scheduled events for an inactive dispatcher. No new revisions were added by this update. Summary of changes: libs/framework/src/framework.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(celix) branch feature/215-stop-launcher-by-signal updated (b5214cf99 -> e07b2e812)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch feature/215-stop-launcher-by-signal in repository https://gitbox.apache.org/repos/asf/celix.git from b5214cf99 gh-215: Reset launcher on error. add e07b2e812 gh-215: Remove all remaining scheduled events for an inactive dispatcher. No new revisions were added by this update. Summary of changes: libs/framework/src/framework.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
(celix) branch feature/215-stop-launcher-by-signal updated (49a52527e -> b5214cf99)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch feature/215-stop-launcher-by-signal in repository https://gitbox.apache.org/repos/asf/celix.git from 49a52527e Merge branch 'master' into feature/215-stop-launcher-by-signal add b5214cf99 gh-215: Reset launcher on error. No new revisions were added by this update. Summary of changes: libs/framework/src/celix_launcher.c | 3 +++ 1 file changed, 3 insertions(+)
(celix) branch feature/215-stop-launcher-by-signal created (now 49a52527e)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch feature/215-stop-launcher-by-signal in repository https://gitbox.apache.org/repos/asf/celix.git at 49a52527e Merge branch 'master' into feature/215-stop-launcher-by-signal This branch includes the following new commits: new 8f4fafcdf gh-215: Implement async-signal-safe launcher shutdown. new 49a52527e Merge branch 'master' into feature/215-stop-launcher-by-signal The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(celix) 01/02: gh-215: Implement async-signal-safe launcher shutdown.
This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a commit to branch feature/215-stop-launcher-by-signal
in repository https://gitbox.apache.org/repos/asf/celix.git
commit 8f4fafcdfa4449d31eaa591404a8ad9e88c2b1b5
Author: PengZheng
AuthorDate: Wed Jun 12 15:26:51 2024 +0800
gh-215: Implement async-signal-safe launcher shutdown.
---
libs/framework/gtest/src/CelixLauncherTestSuite.cc | 20 +++-
.../framework/gtest/src/ScheduledEventTestSuite.cc | 14 +++
libs/framework/include/celix_launcher.h| 9 ++
libs/framework/src/celix_launcher.c| 106 +++--
libs/framework/src/celix_launcher_private.h| 9 --
libs/framework/src/framework.c | 7 ++
6 files changed, 122 insertions(+), 43 deletions(-)
diff --git a/libs/framework/gtest/src/CelixLauncherTestSuite.cc
b/libs/framework/gtest/src/CelixLauncherTestSuite.cc
index 55fc2cfbb..d422d577c 100644
--- a/libs/framework/gtest/src/CelixLauncherTestSuite.cc
+++ b/libs/framework/gtest/src/CelixLauncherTestSuite.cc
@@ -19,10 +19,12 @@
#include
+#include
#include
#include
#include
#include
+#include
#include "celix_constants.h"
#include "celix_launcher.h"
@@ -190,19 +192,31 @@ TEST_F(CelixLauncherTestSuite,
LaunchWithInvalidConfigPropertiesTest) {
//Then the launch will exit
auto status =
future.wait_for(std::chrono::milliseconds{LAUNCH_WAIT_TIMEOUT});
EXPECT_EQ(status, std::future_status::ready);
+
+//When launching the framework with a properties set with a negative
shutdown period
+auto* props = celix_properties_create();
+ASSERT_TRUE(props != nullptr);
+celix_properties_setDouble(props,
CELIX_LAUNCHER_SHUTDOWN_PERIOD_IN_SECONDS, -1.0);
+future = launchInThread({"programName"}, props, 1);
+//Then launch will exit
+status = future.wait_for(std::chrono::milliseconds{LAUNCH_WAIT_TIMEOUT});
+EXPECT_EQ(status, std::future_status::ready);
}
+
TEST_F(CelixLauncherTestSuite, StopLauncherWithSignalTest) {
+auto* props = celix_properties_create();
// When launching the framework
-auto future = launchInThread({"programName"}, nullptr, 0);
+celix_properties_setDouble(props,
CELIX_LAUNCHER_SHUTDOWN_PERIOD_IN_SECONDS, 0.01);
+auto future = launchInThread({"programName"}, props, 0);
// Then the launch will not exit, because the framework is running
auto status =
future.wait_for(std::chrono::milliseconds{LAUNCH_WAIT_TIMEOUT});
EXPECT_EQ(status, std::future_status::timeout);
-// When I stop the framework by mimicking a SIGINT signal
+// When I stop the framework by sending a SIGINT signal
int signal = SIGINT;
-celix_launcher_stopInternal(&signal);
+EXPECT_EQ(0, pthread_kill(pthread_self(), signal));
// Then the launch will exit
status = future.wait_for(std::chrono::milliseconds{LAUNCH_WAIT_TIMEOUT});
diff --git a/libs/framework/gtest/src/ScheduledEventTestSuite.cc
b/libs/framework/gtest/src/ScheduledEventTestSuite.cc
index 56949ff6d..9edbbb282 100644
--- a/libs/framework/gtest/src/ScheduledEventTestSuite.cc
+++ b/libs/framework/gtest/src/ScheduledEventTestSuite.cc
@@ -231,7 +231,21 @@ TEST_F(ScheduledEventTestSuite,
InvalidOptionsAndArgumentsTest) {
auto ctx = fw->getFrameworkBundleContext();
celix_scheduled_event_options_t opts{}; // no callback
long scheduledEventId =
celix_bundleContext_scheduleEvent(ctx->getCBundleContext(), &opts);
+// Then I expect an error
+EXPECT_LT(scheduledEventId, 0);
+
+// When I create a scheduled event with negative initial delay
+opts.name = "Invalid scheduled event test";
+opts.initialDelayInSeconds = -1;
+opts.callback = [](void* /*data*/) { FAIL() << "Scheduled event called,
but should not be called"; };
+scheduledEventId =
celix_bundleContext_scheduleEvent(ctx->getCBundleContext(), &opts);
+// Then I expect an error
+EXPECT_LT(scheduledEventId, 0);
+// When I create a scheduled event with negative interval value
+opts.initialDelayInSeconds = 0.1;
+opts.intervalInSeconds = -1;
+scheduledEventId =
celix_bundleContext_scheduleEvent(ctx->getCBundleContext(), &opts);
// Then I expect an error
EXPECT_LT(scheduledEventId, 0);
diff --git a/libs/framework/include/celix_launcher.h
b/libs/framework/include/celix_launcher.h
index 97c6fa870..0db497e9e 100644
--- a/libs/framework/include/celix_launcher.h
+++ b/libs/framework/include/celix_launcher.h
@@ -28,6 +28,15 @@
extern "C" {
#endif
+/**
+ * @brief Celix launcher environment property to specify interval of the
periodic shutdown check performed by launcher.
+ *
+ * The launcher will perform a periodic check to see whether to perform a
shutdown, and if so, the launcher will
+ * stop and destroy the framework. The interval of th
(celix) 02/02: Merge branch 'master' into feature/215-stop-launcher-by-signal
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch feature/215-stop-launcher-by-signal in repository https://gitbox.apache.org/repos/asf/celix.git commit 49a52527ec17daea68004498b5e8508b5d738a02 Merge: 8f4fafcdf 58860bbf1 Author: PengZheng AuthorDate: Wed Jun 12 15:27:15 2024 +0800 Merge branch 'master' into feature/215-stop-launcher-by-signal .../gtest/src/CelixEventAdminTestSuite.cc | 41 +++--- .../gtest/src/CelixEventAdminTestSuiteBaseClass.h | 17 ++--- 2 files changed, 40 insertions(+), 18 deletions(-)
(celix) branch feature/685-update-container-config-properties-usage updated (ad9e542c1 -> 621c2be4b)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch feature/685-update-container-config-properties-usage in repository https://gitbox.apache.org/repos/asf/celix.git from ad9e542c1 gh-685: Refactor launcher global framework handling add 621c2be4b gh-685: Improve error handling of launcher. No new revisions were added by this update. Summary of changes: libs/framework/src/celix_launcher.c | 17 - 1 file changed, 8 insertions(+), 9 deletions(-)
(celix) branch feature/685-update-container-config-properties-usage updated (f237f4b20 -> 17a5adac5)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch feature/685-update-container-config-properties-usage in repository https://gitbox.apache.org/repos/asf/celix.git from f237f4b20 gh-685: Add rsa shm test case add 17a5adac5 Cleanup bundle cache on installation failure and fix use-after-free. No new revisions were added by this update. Summary of changes: libs/framework/gtest/CMakeLists.txt| 6 ++- .../src/CelixBundleContextBundlesTestSuite.cc | 9 libs/framework/src/bundle.c| 2 +- libs/framework/src/framework.c | 49 ++ libs/framework/src/framework_private.h | 2 +- 5 files changed, 39 insertions(+), 29 deletions(-)
(celix) branch master updated (fd4b1385a -> 16579ba9b)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/celix.git from fd4b1385a Merge pull request #750 from apache/hotfix/747-codecov-fix add 66ab9bc65 Resolve issue 749 add 21172764c Use feature/promise to synchronize thread in unit test new 16579ba9b Merge pull request #752 from xuzhenbao/bugfix_749 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../gtest/src/CelixEventAdminTestSuite.cc | 41 +++--- .../gtest/src/CelixEventAdminTestSuiteBaseClass.h | 17 ++--- 2 files changed, 40 insertions(+), 18 deletions(-)
(celix) 01/01: Merge pull request #752 from xuzhenbao/bugfix_749
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/celix.git commit 16579ba9bd6dfbaa4d2c5e20687360de88aa1b06 Merge: fd4b1385a 21172764c Author: PengZheng AuthorDate: Sat Jun 8 19:24:02 2024 +0800 Merge pull request #752 from xuzhenbao/bugfix_749 Resolve issue #749 .../gtest/src/CelixEventAdminTestSuite.cc | 41 +++--- .../gtest/src/CelixEventAdminTestSuiteBaseClass.h | 17 ++--- 2 files changed, 40 insertions(+), 18 deletions(-)
(celix) branch feature/685-update-container-config-properties-usage updated (bf0011a45 -> a01495644)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch feature/685-update-container-config-properties-usage in repository https://gitbox.apache.org/repos/asf/celix.git from bf0011a45 gh-685: Improve celix_launcher coverage and fix memleaks add a01495644 Make various lock guard deinit explicitly callable so that locks can be released manually. No new revisions were added by this update. Summary of changes: libs/utils/include/celix_threads.h | 5 - 1 file changed, 4 insertions(+), 1 deletion(-)
(celix) branch feature/685-properties-json-serialization deleted (was 2eed6936)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch feature/685-properties-json-serialization in repository https://gitbox.apache.org/repos/asf/celix.git was 2eed6936 gh-685: Improve exception usage in C++ properties store/load The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(celix) branch master updated (06ecb85f -> e4df2aa4)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/celix.git from 06ecb85f Merge pull request #745 from apache/hotfix/openssl-update add 3acdb746 gh-685: Initial properties save/load setup add 9511610b gh-685: Add jansson dep for simple properties save/load add de072564 gh-685: Add json prop loading for primitive and initial arr. add 04bccbd3 gh-685: Add support for nested obj properties decoding add 77cd6b37 gh-685: Rename prop serialization sources to prop encoding add 72c785df gh-685: Add initial setup for properties decode flags add 8e03a828 gh-685: Add support for a flat and nested flag for prop encoding add 0ceaeb8f gh-685: Add additional prop encoding test based on test cov add 99e503aa gh-685: Add error injection test for properties encoding add 56c67673 gh-685: Separate version ei testing to prevent own ei code inteference add ac2b1319 gh-685: Refactor assert to prevent used var add 0e589441 gh-685: Fix several memleaks in properties encoding add ae4464ca gh-685: Fix incorrect celix_autoptr usage add a4814f3f gh-685: Fix incorrect celix_autoptr usage add aa29987d gh-685: Add properties encoding documentation add c46a483b gh-685: Some whitespace corrections add 4f84298d Merge branch 'refs/heads/master' into feature/685-properties-json-serialization add 19a22169 gh-685: Fix celix_properties_setVersion ei test add 7aa44860 gh-685: Add JSON C++ save/load wrapper methods add 3a761223 gh-685: Fix memleak and add missing test add dbe1468d gh-685: Add decode of unsupported JSON obj/array arrays add 0b0edbe4 gh-685: Replace jsonpath seperator from / to . add 769a9e55 gh-685: Improve jansson error handling in properties encode add a6a48e5f gh-685: Avoid insertion into non-object and add test for key collision. add f3cec786 Merge branch 'master' into feature/685-properties-json-serialization add 83682fd5 gh-685: Encode list containing NAN/INF and some minor documentation improvements. add 2eed6936 gh-685: Improve exception usage in C++ properties store/load new e4df2aa4 Merge pull request #743 from apache/feature/685-properties-json-serialization The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGES.md |2 + conanfile.py |4 +- documents/README.md|1 + documents/properties_encoding.md | 333 ++ libs/error_injector/jansson/CMakeLists.txt |3 + libs/error_injector/jansson/include/jansson_ei.h |3 + libs/error_injector/jansson/src/jansson_ei.cc | 65 +- libs/framework/include/celix/FrameworkExceptions.h |2 +- .../include/celix/ScheduledEventBuilder.h |4 +- libs/utils/CMakeLists.txt |4 +- .../error_injector/celix_version/CMakeLists.txt|1 + .../celix_version/include/celix_version_ei.h |2 + .../celix_version/src/celix_version_ei.cc |9 +- libs/utils/gtest/CMakeLists.txt| 18 +- libs/utils/gtest/src/CelixUtilsTestSuite.cc| 32 + libs/utils/gtest/src/CxxExceptionsTestSuite.cc | 52 + .../PropertiesEncodingErrorInjectionTestSuite.cc | 385 +++ .../utils/gtest/src/PropertiesEncodingTestSuite.cc | 1161 .../gtest/src/PropertiesErrorInjectionTestSuite.cc |8 +- libs/utils/gtest/src/PropertiesTestSuite.cc|8 + libs/utils/include/celix/Exception.h | 33 - libs/utils/include/celix/Exceptions.h | 71 ++ libs/utils/include/celix/Filter.h |2 +- libs/utils/include/celix/IOException.h | 51 - libs/utils/include/celix/Properties.h | 188 +++- libs/utils/include/celix_properties.h | 353 +- libs/utils/include/celix_utils.h | 55 + libs/utils/src/celix_properties_private.h |7 + libs/utils/src/properties.c|5 +- libs/utils/src/properties_encoding.c | 644 +++ 30 files changed, 3384 insertions(+), 122 deletions(-) create mode 100644 documents/properties_encoding.md create mode 100644 libs/utils/gtest/src/CxxExceptionsTestSuite.cc create mode 100644 libs/utils/gtest/src/PropertiesEncodingErrorInjectionTestSuite.cc create mode 100644 libs/utils/gtest/src/PropertiesEncodingTestSuite.cc delete mode 100644 libs/utils/include/celix/Exception.h create mode 100644 libs/utils/include/celix/Exceptions.h delete mode 10064
(celix) 01/01: Merge pull request #743 from apache/feature/685-properties-json-serialization
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/celix.git commit e4df2aa47fccb39c4cf0694435ef5cb9009dc6d5 Merge: 06ecb85f 2eed6936 Author: PengZheng AuthorDate: Fri May 24 11:15:32 2024 +0800 Merge pull request #743 from apache/feature/685-properties-json-serialization Feature/685 properties json serialization CHANGES.md |2 + conanfile.py |4 +- documents/README.md|1 + documents/properties_encoding.md | 333 ++ libs/error_injector/jansson/CMakeLists.txt |3 + libs/error_injector/jansson/include/jansson_ei.h |3 + libs/error_injector/jansson/src/jansson_ei.cc | 65 +- libs/framework/include/celix/FrameworkExceptions.h |2 +- .../include/celix/ScheduledEventBuilder.h |4 +- libs/utils/CMakeLists.txt |4 +- .../error_injector/celix_version/CMakeLists.txt|1 + .../celix_version/include/celix_version_ei.h |2 + .../celix_version/src/celix_version_ei.cc |9 +- libs/utils/gtest/CMakeLists.txt| 18 +- libs/utils/gtest/src/CelixUtilsTestSuite.cc| 32 + libs/utils/gtest/src/CxxExceptionsTestSuite.cc | 52 + .../PropertiesEncodingErrorInjectionTestSuite.cc | 385 +++ .../utils/gtest/src/PropertiesEncodingTestSuite.cc | 1161 .../gtest/src/PropertiesErrorInjectionTestSuite.cc |8 +- libs/utils/gtest/src/PropertiesTestSuite.cc|8 + libs/utils/include/celix/Exception.h | 33 - libs/utils/include/celix/Exceptions.h | 71 ++ libs/utils/include/celix/Filter.h |2 +- libs/utils/include/celix/IOException.h | 51 - libs/utils/include/celix/Properties.h | 188 +++- libs/utils/include/celix_properties.h | 353 +- libs/utils/include/celix_utils.h | 55 + libs/utils/src/celix_properties_private.h |7 + libs/utils/src/properties.c|5 +- libs/utils/src/properties_encoding.c | 644 +++ 30 files changed, 3384 insertions(+), 122 deletions(-)
(celix) branch feature/685-properties-json-serialization updated (f3cec786 -> 83682fd5)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch feature/685-properties-json-serialization in repository https://gitbox.apache.org/repos/asf/celix.git from f3cec786 Merge branch 'master' into feature/685-properties-json-serialization add 83682fd5 gh-685: Encode list containing NAN/INF and some minor documentation improvements. No new revisions were added by this update. Summary of changes: .../PropertiesEncodingErrorInjectionTestSuite.cc | 2 +- .../utils/gtest/src/PropertiesEncodingTestSuite.cc | 30 ++ libs/utils/include/celix/Properties.h | 2 +- libs/utils/include/celix_properties.h | 16 ++-- libs/utils/src/properties_encoding.c | 24 ++--- 5 files changed, 61 insertions(+), 13 deletions(-)
(celix) branch feature/685-properties-json-serialization updated (769a9e55 -> f3cec786)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch feature/685-properties-json-serialization in repository https://gitbox.apache.org/repos/asf/celix.git from 769a9e55 gh-685: Improve jansson error handling in properties encode add a6a48e5f gh-685: Avoid insertion into non-object and add test for key collision. add ab2f7ba0 Use more reliable synchronization method in test case. add 0802579e Merge pull request #744 from apache/hotfix/shaky-framework-test add bb912e0b Update civetweb to 1.16 and replace LD_LIBRARY_PATH by DYLD_LIBRARY_PATH to fix macOS CI. add 06ecb85f Merge pull request #745 from apache/hotfix/openssl-update add f3cec786 Merge branch 'master' into feature/685-properties-json-serialization No new revisions were added by this update. Summary of changes: .github/workflows/macos.yml| 4 ++-- cmake/Findcivetweb.cmake | 3 ++- conanfile.py | 2 -- .../framework/gtest/src/CelixFrameworkTestSuite.cc | 16 ++--- libs/framework/src/framework_private.h | 5 .../utils/gtest/src/PropertiesEncodingTestSuite.cc | 27 +- libs/utils/src/properties_encoding.c | 9 +--- 7 files changed, 44 insertions(+), 22 deletions(-)
(celix) branch master updated (0802579e -> 06ecb85f)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/celix.git from 0802579e Merge pull request #744 from apache/hotfix/shaky-framework-test add bb912e0b Update civetweb to 1.16 and replace LD_LIBRARY_PATH by DYLD_LIBRARY_PATH to fix macOS CI. new 06ecb85f Merge pull request #745 from apache/hotfix/openssl-update The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/macos.yml | 4 ++-- cmake/Findcivetweb.cmake| 3 ++- conanfile.py| 2 -- 3 files changed, 4 insertions(+), 5 deletions(-)
(celix) branch hotfix/openssl-update deleted (was bb912e0b)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch hotfix/openssl-update in repository https://gitbox.apache.org/repos/asf/celix.git was bb912e0b Update civetweb to 1.16 and replace LD_LIBRARY_PATH by DYLD_LIBRARY_PATH to fix macOS CI. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(celix) 01/01: Merge pull request #745 from apache/hotfix/openssl-update
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/celix.git commit 06ecb85f9be004489b265407f64a2a66adc5a10c Merge: 0802579e bb912e0b Author: PengZheng AuthorDate: Thu Apr 25 18:40:00 2024 +0800 Merge pull request #745 from apache/hotfix/openssl-update Hotfix/macos-build-brew-fix .github/workflows/macos.yml | 4 ++-- cmake/Findcivetweb.cmake| 3 ++- conanfile.py| 2 -- 3 files changed, 4 insertions(+), 5 deletions(-)
(celix) branch hotfix/openssl-update created (now bb912e0b)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch hotfix/openssl-update in repository https://gitbox.apache.org/repos/asf/celix.git at bb912e0b Update civetweb to 1.16 and replace LD_LIBRARY_PATH by DYLD_LIBRARY_PATH to fix macOS CI. This branch includes the following new commits: new bb912e0b Update civetweb to 1.16 and replace LD_LIBRARY_PATH by DYLD_LIBRARY_PATH to fix macOS CI. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(celix) branch hotfix/openssl-update deleted (was 9ac52392)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch hotfix/openssl-update in repository https://gitbox.apache.org/repos/asf/celix.git was 9ac52392 Revert "Update to OpenSSL 3.0." This change permanently discards the following revisions: discard 9ac52392 Revert "Update to OpenSSL 3.0." discard a36401d7 Update to OpenSSL 3.0. discard d3fedd4f Change DYLD_LIBRARY_PATH. discard f45a5bb5 Use latest macOS and OpenSSL 1.1. discard a7a46928 Use latest macOS and latest OpenSSL. discard a7361b6c Revert "Revert "Suppress all gcc warnings for civetweb on macOS."" discard 547efb83 Revert "Revert "Suppress certain gcc warnings on macOS."" discard dd10a9f5 Revert "Suppress certain gcc warnings on macOS." discard 84f9ba69 Revert "Suppress all gcc warnings for civetweb on macOS." discard 5cb658f2 Revert "Fix libcrypto loading error on macOS." discard 3318b77c Revert "Try to fix libcrypto loading error on macOS." discard 87b20200 Revert "Revert "Try to fix libcrypto loading error on macOS."" discard 5d176511 Revert "Try to fix libcrypto loading error on macOS." discard 320d50f7 Revert "Try to fix libcrypto loading error on macOS." discard ff800bb2 Revert "Try to fix libcrypto loading error on macOS." discard a6f17322 Revert "Use macOS-13 rather than macOS-14." discard b6ac6e6c Use macOS-13 rather than macOS-14. discard 7539b88f Try to fix libcrypto loading error on macOS. discard 6ea0da85 Try to fix libcrypto loading error on macOS. discard 1b44a8d6 Try to fix libcrypto loading error on macOS. discard 20a721d9 Revert "Try to fix libcrypto loading error on macOS." discard 8f505748 Try to fix libcrypto loading error on macOS. discard 7fcd6dbc Fix libcrypto loading error on macOS. discard 25fd38d6 Suppress all gcc warnings for civetweb on macOS. discard 5283eb39 Suppress certain gcc warnings on macOS. discard 500c1e77 Allow OpenSSL 3.0 to be used.
(celix) 01/01: Update civetweb to 1.16 and replace LD_LIBRARY_PATH by DYLD_LIBRARY_PATH to fix macOS CI.
This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a commit to branch hotfix/openssl-update
in repository https://gitbox.apache.org/repos/asf/celix.git
commit bb912e0b261d38d0127736f241f7482515bffac6
Author: PengZheng
AuthorDate: Thu Apr 25 15:07:40 2024 +0800
Update civetweb to 1.16 and replace LD_LIBRARY_PATH by DYLD_LIBRARY_PATH to
fix macOS CI.
---
.github/workflows/macos.yml | 4 ++--
cmake/Findcivetweb.cmake| 3 ++-
conanfile.py| 2 --
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 08cb8da9..54872e50 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -75,7 +75,7 @@ jobs:
uses: actions/checkout@v3.3.0
- name: Install dependencies
run: |
- brew install lcov jansson rapidjson libzip ccache ninja
+ brew install lcov jansson rapidjson libzip ccache ninja openssl@1.1
- name: Prepare ccache timestamp
id: ccache_cache_timestamp
run: |
@@ -104,5 +104,5 @@ jobs:
- name: Test
run: |
cd $GITHUB_WORKSPACE/build
- export
LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi
+ export DYLD_LIBRARY_PATH=$(brew --prefix
openssl@1.1)/lib/:$DYLD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi
ctest --output-on-failure
diff --git a/cmake/Findcivetweb.cmake b/cmake/Findcivetweb.cmake
index 46310ed1..dc8aa91e 100644
--- a/cmake/Findcivetweb.cmake
+++ b/cmake/Findcivetweb.cmake
@@ -21,11 +21,12 @@ if (NOT civetweb_FOUND)
set(CIVETWEB_ENABLE_WEBSOCKETS TRUE CACHE BOOL "" FORCE)
set(CIVETWEB_BUILD_TESTING FALSE CACHE BOOL "" FORCE)
set(BUILD_SHARED_LIBS TRUE CACHE BOOL "" FORCE)
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error")
FetchContent_Declare(
civetweb
GIT_REPOSITORY https://github.com/civetweb/civetweb.git
#GIT_REPOSITORY https://gitee.com/mirrors/civetweb.git
-GIT_TAGeefb26f82b233268fc98577d265352720d477ba4 # V1.15
+GIT_TAGd7ba35bbb649209c66e582d5a0244ba988a15159 # V1.16
)
FetchContent_MakeAvailable(civetweb)
if (NOT TARGET civetweb::civetweb)
diff --git a/conanfile.py b/conanfile.py
index 609082c8..dbb748ad 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -340,8 +340,6 @@ class CelixConan(ConanFile):
self.requires("mdnsresponder/1310.140.1")
# 'libzip/1.10.1' requires 'zlib/1.2.13' while 'libcurl/7.64.1'
requires 'zlib/1.2.12'
self.requires("zlib/1.2.13", override=True)
-# the latest civetweb (1.16) is not ready for openssl3
-self.requires("openssl/1.1.1t", override=True)
self.validate()
def generate(self):
(celix) branch hotfix/openssl-update updated: Revert "Update to OpenSSL 3.0."
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch hotfix/openssl-update in repository https://gitbox.apache.org/repos/asf/celix.git The following commit(s) were added to refs/heads/hotfix/openssl-update by this push: new 9ac52392 Revert "Update to OpenSSL 3.0." 9ac52392 is described below commit 9ac52392966a1937a5916e031a0a0e28f43cd8d0 Author: PengZheng AuthorDate: Thu Apr 25 18:15:08 2024 +0800 Revert "Update to OpenSSL 3.0." This reverts commit a36401d78af0d9668a2cef4c070411a9a712e1d6. --- .github/workflows/macos.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 2bbdfeed..54872e50 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -75,7 +75,7 @@ jobs: uses: actions/checkout@v3.3.0 - name: Install dependencies run: | - brew install lcov jansson rapidjson libzip ccache ninja openssl + brew install lcov jansson rapidjson libzip ccache ninja openssl@1.1 - name: Prepare ccache timestamp id: ccache_cache_timestamp run: | @@ -104,5 +104,5 @@ jobs: - name: Test run: | cd $GITHUB_WORKSPACE/build - export DYLD_LIBRARY_PATH=$(brew --prefix openssl)/lib/:$DYLD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi + export DYLD_LIBRARY_PATH=$(brew --prefix openssl@1.1)/lib/:$DYLD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi ctest --output-on-failure
(celix) branch hotfix/openssl-update updated: Update to OpenSSL 3.0.
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch hotfix/openssl-update in repository https://gitbox.apache.org/repos/asf/celix.git The following commit(s) were added to refs/heads/hotfix/openssl-update by this push: new a36401d7 Update to OpenSSL 3.0. a36401d7 is described below commit a36401d78af0d9668a2cef4c070411a9a712e1d6 Author: PengZheng AuthorDate: Thu Apr 25 18:14:04 2024 +0800 Update to OpenSSL 3.0. --- .github/workflows/macos.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 54872e50..2bbdfeed 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -75,7 +75,7 @@ jobs: uses: actions/checkout@v3.3.0 - name: Install dependencies run: | - brew install lcov jansson rapidjson libzip ccache ninja openssl@1.1 + brew install lcov jansson rapidjson libzip ccache ninja openssl - name: Prepare ccache timestamp id: ccache_cache_timestamp run: | @@ -104,5 +104,5 @@ jobs: - name: Test run: | cd $GITHUB_WORKSPACE/build - export DYLD_LIBRARY_PATH=$(brew --prefix openssl@1.1)/lib/:$DYLD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi + export DYLD_LIBRARY_PATH=$(brew --prefix openssl)/lib/:$DYLD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi ctest --output-on-failure
(celix) branch hotfix/openssl-update updated: Change DYLD_LIBRARY_PATH.
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch hotfix/openssl-update in repository https://gitbox.apache.org/repos/asf/celix.git The following commit(s) were added to refs/heads/hotfix/openssl-update by this push: new d3fedd4f Change DYLD_LIBRARY_PATH. d3fedd4f is described below commit d3fedd4fd43bb54f896965d2e86f28e6df62d7ed Author: PengZheng AuthorDate: Thu Apr 25 18:01:23 2024 +0800 Change DYLD_LIBRARY_PATH. --- .github/workflows/macos.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 2f4a8b59..54872e50 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -104,6 +104,5 @@ jobs: - name: Test run: | cd $GITHUB_WORKSPACE/build - export DYLD_LIBRARY_PATH=/usr/local/opt/openssl/lib:$DYLD_LIBRARY_PATH - export LD_LIBRARY_PATH=/usr/local/opt/openssl/lib:/usr/local/lib:$LD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi + export DYLD_LIBRARY_PATH=$(brew --prefix openssl@1.1)/lib/:$DYLD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi ctest --output-on-failure
(celix) branch hotfix/openssl-update updated: Use latest macOS and OpenSSL 1.1.
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch hotfix/openssl-update in repository https://gitbox.apache.org/repos/asf/celix.git The following commit(s) were added to refs/heads/hotfix/openssl-update by this push: new f45a5bb5 Use latest macOS and OpenSSL 1.1. f45a5bb5 is described below commit f45a5bb5fd7cacf72b77f2bd74acb928b85dcc60 Author: PengZheng AuthorDate: Thu Apr 25 17:51:37 2024 +0800 Use latest macOS and OpenSSL 1.1. --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 2857a2af..2f4a8b59 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -75,7 +75,7 @@ jobs: uses: actions/checkout@v3.3.0 - name: Install dependencies run: | - brew install lcov jansson rapidjson libzip ccache ninja openssl + brew install lcov jansson rapidjson libzip ccache ninja openssl@1.1 - name: Prepare ccache timestamp id: ccache_cache_timestamp run: |
(celix) branch hotfix/openssl-update updated: Use latest macOS and latest OpenSSL.
This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a commit to branch hotfix/openssl-update
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to refs/heads/hotfix/openssl-update by this
push:
new a7a46928 Use latest macOS and latest OpenSSL.
a7a46928 is described below
commit a7a46928af65fba6e2df3649b37a9cd37db32b31
Author: PengZheng
AuthorDate: Thu Apr 25 17:49:13 2024 +0800
Use latest macOS and latest OpenSSL.
---
.github/workflows/macos.yml | 5 +++--
cmake/Findcivetweb.cmake| 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 08cb8da9..2857a2af 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -75,7 +75,7 @@ jobs:
uses: actions/checkout@v3.3.0
- name: Install dependencies
run: |
- brew install lcov jansson rapidjson libzip ccache ninja
+ brew install lcov jansson rapidjson libzip ccache ninja openssl
- name: Prepare ccache timestamp
id: ccache_cache_timestamp
run: |
@@ -104,5 +104,6 @@ jobs:
- name: Test
run: |
cd $GITHUB_WORKSPACE/build
- export
LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi
+ export
DYLD_LIBRARY_PATH=/usr/local/opt/openssl/lib:$DYLD_LIBRARY_PATH
+ export
LD_LIBRARY_PATH=/usr/local/opt/openssl/lib:/usr/local/lib:$LD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi
ctest --output-on-failure
diff --git a/cmake/Findcivetweb.cmake b/cmake/Findcivetweb.cmake
index 00bc77e9..dc8aa91e 100644
--- a/cmake/Findcivetweb.cmake
+++ b/cmake/Findcivetweb.cmake
@@ -21,7 +21,7 @@ if (NOT civetweb_FOUND)
set(CIVETWEB_ENABLE_WEBSOCKETS TRUE CACHE BOOL "" FORCE)
set(CIVETWEB_BUILD_TESTING FALSE CACHE BOOL "" FORCE)
set(BUILD_SHARED_LIBS TRUE CACHE BOOL "" FORCE)
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-atomic-implicit-seq-cst
-Wno-error")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error")
FetchContent_Declare(
civetweb
GIT_REPOSITORY https://github.com/civetweb/civetweb.git
(celix) 02/02: Revert "Revert "Suppress all gcc warnings for civetweb on macOS.""
This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a commit to branch hotfix/openssl-update
in repository https://gitbox.apache.org/repos/asf/celix.git
commit a7361b6cdcfcd5325c9729f81333dd7aa3f924d2
Author: PengZheng
AuthorDate: Thu Apr 25 17:40:31 2024 +0800
Revert "Revert "Suppress all gcc warnings for civetweb on macOS.""
This reverts commit 84f9ba6914963f0bf112374cbd88f4189fcda0ab.
---
cmake/Findcivetweb.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/Findcivetweb.cmake b/cmake/Findcivetweb.cmake
index 6cc6546a..00bc77e9 100644
--- a/cmake/Findcivetweb.cmake
+++ b/cmake/Findcivetweb.cmake
@@ -21,7 +21,7 @@ if (NOT civetweb_FOUND)
set(CIVETWEB_ENABLE_WEBSOCKETS TRUE CACHE BOOL "" FORCE)
set(CIVETWEB_BUILD_TESTING FALSE CACHE BOOL "" FORCE)
set(BUILD_SHARED_LIBS TRUE CACHE BOOL "" FORCE)
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-atomic-implicit-seq-cst
-Wno-alloca -Wno-cast-align -Wno-undef -Wno-date-time")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-atomic-implicit-seq-cst
-Wno-error")
FetchContent_Declare(
civetweb
GIT_REPOSITORY https://github.com/civetweb/civetweb.git
(celix) branch hotfix/openssl-update updated (dd10a9f5 -> a7361b6c)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch hotfix/openssl-update in repository https://gitbox.apache.org/repos/asf/celix.git from dd10a9f5 Revert "Suppress certain gcc warnings on macOS." new 547efb83 Revert "Revert "Suppress certain gcc warnings on macOS."" new a7361b6c Revert "Revert "Suppress all gcc warnings for civetweb on macOS."" The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: cmake/Findcivetweb.cmake | 1 + 1 file changed, 1 insertion(+)
(celix) 01/02: Revert "Revert "Suppress certain gcc warnings on macOS.""
This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a commit to branch hotfix/openssl-update
in repository https://gitbox.apache.org/repos/asf/celix.git
commit 547efb832836a6f6802f70a295985d8c0938b528
Author: PengZheng
AuthorDate: Thu Apr 25 17:40:31 2024 +0800
Revert "Revert "Suppress certain gcc warnings on macOS.""
This reverts commit dd10a9f5f0aadea2b0bce33893703d6ddde69c2a.
---
cmake/Findcivetweb.cmake | 1 +
1 file changed, 1 insertion(+)
diff --git a/cmake/Findcivetweb.cmake b/cmake/Findcivetweb.cmake
index abd14e4c..6cc6546a 100644
--- a/cmake/Findcivetweb.cmake
+++ b/cmake/Findcivetweb.cmake
@@ -21,6 +21,7 @@ if (NOT civetweb_FOUND)
set(CIVETWEB_ENABLE_WEBSOCKETS TRUE CACHE BOOL "" FORCE)
set(CIVETWEB_BUILD_TESTING FALSE CACHE BOOL "" FORCE)
set(BUILD_SHARED_LIBS TRUE CACHE BOOL "" FORCE)
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-atomic-implicit-seq-cst
-Wno-alloca -Wno-cast-align -Wno-undef -Wno-date-time")
FetchContent_Declare(
civetweb
GIT_REPOSITORY https://github.com/civetweb/civetweb.git
(celix) 04/09: Revert "Try to fix libcrypto loading error on macOS."
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch hotfix/openssl-update in repository https://gitbox.apache.org/repos/asf/celix.git commit 5d1765110d998bb03ab1748be5f59eac605279ab Author: PengZheng AuthorDate: Thu Apr 25 17:36:02 2024 +0800 Revert "Try to fix libcrypto loading error on macOS." This reverts commit 1b44a8d6612403389f44d91a95b9791cf9c56e09. --- .github/workflows/macos.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index de1ad1ab..8d3f9030 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -104,6 +104,5 @@ jobs: - name: Test run: | cd $GITHUB_WORKSPACE/build - export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi - ln -s /usr/local/opt/openssl/lib/libcrypto.3.dylib /usr/local/lib/libcrypto.dylib + export LD_LIBRARY_PATH=/usr/local/opt/openssl/lib:/usr/local/lib:$LD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi ctest --output-on-failure
(celix) 08/09: Revert "Suppress all gcc warnings for civetweb on macOS."
This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a commit to branch hotfix/openssl-update
in repository https://gitbox.apache.org/repos/asf/celix.git
commit 84f9ba6914963f0bf112374cbd88f4189fcda0ab
Author: PengZheng
AuthorDate: Thu Apr 25 17:36:04 2024 +0800
Revert "Suppress all gcc warnings for civetweb on macOS."
This reverts commit 25fd38d6d237947bd3a6b04e44924d3d40a880fa.
---
cmake/Findcivetweb.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/Findcivetweb.cmake b/cmake/Findcivetweb.cmake
index 00bc77e9..6cc6546a 100644
--- a/cmake/Findcivetweb.cmake
+++ b/cmake/Findcivetweb.cmake
@@ -21,7 +21,7 @@ if (NOT civetweb_FOUND)
set(CIVETWEB_ENABLE_WEBSOCKETS TRUE CACHE BOOL "" FORCE)
set(CIVETWEB_BUILD_TESTING FALSE CACHE BOOL "" FORCE)
set(BUILD_SHARED_LIBS TRUE CACHE BOOL "" FORCE)
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-atomic-implicit-seq-cst
-Wno-error")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-atomic-implicit-seq-cst
-Wno-alloca -Wno-cast-align -Wno-undef -Wno-date-time")
FetchContent_Declare(
civetweb
GIT_REPOSITORY https://github.com/civetweb/civetweb.git
(celix) 01/09: Revert "Use macOS-13 rather than macOS-14."
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch hotfix/openssl-update in repository https://gitbox.apache.org/repos/asf/celix.git commit a6f17322aa529d6c54a4e473d6252e90cf27 Author: PengZheng AuthorDate: Thu Apr 25 17:36:01 2024 +0800 Revert "Use macOS-13 rather than macOS-14." This reverts commit b6ac6e6cc3f5bc8f9e7786633befb1e3a99670b5. --- .github/workflows/macos.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 177a9b24..b2a268ac 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -68,14 +68,14 @@ jobs: source deactivate_conanrun.sh macos-build-brew: -runs-on: macOS-13 +runs-on: macOS-latest timeout-minutes: 120 steps: - name: Checkout source code uses: actions/checkout@v3.3.0 - name: Install dependencies run: | - brew install lcov jansson rapidjson libzip ccache ninja + brew install lcov jansson rapidjson libzip ccache ninja openssl - name: Prepare ccache timestamp id: ccache_cache_timestamp run: | @@ -104,5 +104,6 @@ jobs: - name: Test run: | cd $GITHUB_WORKSPACE/build + export DYLD_LIBRARY_PATH=/usr/local/opt/openssl/lib:$DYLD_LIBRARY_PATH export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi ctest --output-on-failure
(celix) 06/09: Revert "Try to fix libcrypto loading error on macOS."
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch hotfix/openssl-update in repository https://gitbox.apache.org/repos/asf/celix.git commit 3318b77cdf254decd297e2599b4047f08fdcd434 Author: PengZheng AuthorDate: Thu Apr 25 17:36:03 2024 +0800 Revert "Try to fix libcrypto loading error on macOS." This reverts commit 8f50574832ed6ff54883f2c2e90f84f01d2a5e62. --- .github/workflows/macos.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 29388c85..8d3f9030 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -104,6 +104,5 @@ jobs: - name: Test run: | cd $GITHUB_WORKSPACE/build - export /usr/local/lib:$LD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi - ln -s /usr/local/opt/openssl/lib/libcrypto.3.dylib /usr/local/lib/libcrypto.dylib + export LD_LIBRARY_PATH=/usr/local/opt/openssl/lib:/usr/local/lib:$LD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi ctest --output-on-failure
(celix) branch hotfix/openssl-update updated (b6ac6e6c -> dd10a9f5)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch hotfix/openssl-update in repository https://gitbox.apache.org/repos/asf/celix.git from b6ac6e6c Use macOS-13 rather than macOS-14. new a6f17322 Revert "Use macOS-13 rather than macOS-14." new ff800bb2 Revert "Try to fix libcrypto loading error on macOS." new 320d50f7 Revert "Try to fix libcrypto loading error on macOS." new 5d176511 Revert "Try to fix libcrypto loading error on macOS." new 87b20200 Revert "Revert "Try to fix libcrypto loading error on macOS."" new 3318b77c Revert "Try to fix libcrypto loading error on macOS." new 5cb658f2 Revert "Fix libcrypto loading error on macOS." new 84f9ba69 Revert "Suppress all gcc warnings for civetweb on macOS." new dd10a9f5 Revert "Suppress certain gcc warnings on macOS." The 9 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/macos.yml | 2 +- cmake/Findcivetweb.cmake| 1 - 2 files changed, 1 insertion(+), 2 deletions(-)
(celix) 07/09: Revert "Fix libcrypto loading error on macOS."
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch hotfix/openssl-update in repository https://gitbox.apache.org/repos/asf/celix.git commit 5cb658f23ce6cd665d8689c4b662c58b34d474e4 Author: PengZheng AuthorDate: Thu Apr 25 17:36:04 2024 +0800 Revert "Fix libcrypto loading error on macOS." This reverts commit 7fcd6dbc2f36f07371aea25b98323e78e89137eb. --- .github/workflows/macos.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 8d3f9030..08cb8da9 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -75,7 +75,7 @@ jobs: uses: actions/checkout@v3.3.0 - name: Install dependencies run: | - brew install lcov jansson rapidjson libzip ccache ninja openssl + brew install lcov jansson rapidjson libzip ccache ninja - name: Prepare ccache timestamp id: ccache_cache_timestamp run: | @@ -104,5 +104,5 @@ jobs: - name: Test run: | cd $GITHUB_WORKSPACE/build - export LD_LIBRARY_PATH=/usr/local/opt/openssl/lib:/usr/local/lib:$LD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi + export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi ctest --output-on-failure
(celix) 05/09: Revert "Revert "Try to fix libcrypto loading error on macOS.""
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch hotfix/openssl-update in repository https://gitbox.apache.org/repos/asf/celix.git commit 87b20200c04ebe2d376ee7e2f4768c00a8de2a3d Author: PengZheng AuthorDate: Thu Apr 25 17:36:03 2024 +0800 Revert "Revert "Try to fix libcrypto loading error on macOS."" This reverts commit 20a721d92c2105ef82c1be9f03ddc45ad81ffd47. --- .github/workflows/macos.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 8d3f9030..29388c85 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -104,5 +104,6 @@ jobs: - name: Test run: | cd $GITHUB_WORKSPACE/build - export LD_LIBRARY_PATH=/usr/local/opt/openssl/lib:/usr/local/lib:$LD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi + export /usr/local/lib:$LD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi + ln -s /usr/local/opt/openssl/lib/libcrypto.3.dylib /usr/local/lib/libcrypto.dylib ctest --output-on-failure
(celix) 02/09: Revert "Try to fix libcrypto loading error on macOS."
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch hotfix/openssl-update in repository https://gitbox.apache.org/repos/asf/celix.git commit ff800bb207b5699ea771c98979381f4f7f5b9767 Author: PengZheng AuthorDate: Thu Apr 25 17:36:02 2024 +0800 Revert "Try to fix libcrypto loading error on macOS." This reverts commit 7539b88f3a03d615c1cdafe152c47a0b75b61dd5. --- .github/workflows/macos.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index b2a268ac..05ee8013 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -104,6 +104,8 @@ jobs: - name: Test run: | cd $GITHUB_WORKSPACE/build - export DYLD_LIBRARY_PATH=/usr/local/opt/openssl/lib:$DYLD_LIBRARY_PATH export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi + cd /usr/local/lib + ln -s /usr/local/opt/openssl/lib/libcrypto.3.dylib libcrypto.dylib + cd $GITHUB_WORKSPACE/build ctest --output-on-failure
(celix) 09/09: Revert "Suppress certain gcc warnings on macOS."
This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a commit to branch hotfix/openssl-update
in repository https://gitbox.apache.org/repos/asf/celix.git
commit dd10a9f5f0aadea2b0bce33893703d6ddde69c2a
Author: PengZheng
AuthorDate: Thu Apr 25 17:36:04 2024 +0800
Revert "Suppress certain gcc warnings on macOS."
This reverts commit 5283eb395b505ca4edef0adab285edb3afef7f47.
---
cmake/Findcivetweb.cmake | 1 -
1 file changed, 1 deletion(-)
diff --git a/cmake/Findcivetweb.cmake b/cmake/Findcivetweb.cmake
index 6cc6546a..abd14e4c 100644
--- a/cmake/Findcivetweb.cmake
+++ b/cmake/Findcivetweb.cmake
@@ -21,7 +21,6 @@ if (NOT civetweb_FOUND)
set(CIVETWEB_ENABLE_WEBSOCKETS TRUE CACHE BOOL "" FORCE)
set(CIVETWEB_BUILD_TESTING FALSE CACHE BOOL "" FORCE)
set(BUILD_SHARED_LIBS TRUE CACHE BOOL "" FORCE)
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-atomic-implicit-seq-cst
-Wno-alloca -Wno-cast-align -Wno-undef -Wno-date-time")
FetchContent_Declare(
civetweb
GIT_REPOSITORY https://github.com/civetweb/civetweb.git
(celix) 03/09: Revert "Try to fix libcrypto loading error on macOS."
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch hotfix/openssl-update in repository https://gitbox.apache.org/repos/asf/celix.git commit 320d50f7b4f155b02b1346dbe65dc2af45981f55 Author: PengZheng AuthorDate: Thu Apr 25 17:36:02 2024 +0800 Revert "Try to fix libcrypto loading error on macOS." This reverts commit 6ea0da85234bf1f5bf4ecab4feb8d87c97c9ff38. --- .github/workflows/macos.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 05ee8013..de1ad1ab 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -105,7 +105,5 @@ jobs: run: | cd $GITHUB_WORKSPACE/build export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi - cd /usr/local/lib - ln -s /usr/local/opt/openssl/lib/libcrypto.3.dylib libcrypto.dylib - cd $GITHUB_WORKSPACE/build + ln -s /usr/local/opt/openssl/lib/libcrypto.3.dylib /usr/local/lib/libcrypto.dylib ctest --output-on-failure
(celix) branch hotfix/openssl-update updated: Use macOS-13 rather than macOS-14.
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch hotfix/openssl-update in repository https://gitbox.apache.org/repos/asf/celix.git The following commit(s) were added to refs/heads/hotfix/openssl-update by this push: new b6ac6e6c Use macOS-13 rather than macOS-14. b6ac6e6c is described below commit b6ac6e6cc3f5bc8f9e7786633befb1e3a99670b5 Author: PengZheng AuthorDate: Thu Apr 25 17:04:26 2024 +0800 Use macOS-13 rather than macOS-14. --- .github/workflows/macos.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index b2a268ac..177a9b24 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -68,14 +68,14 @@ jobs: source deactivate_conanrun.sh macos-build-brew: -runs-on: macOS-latest +runs-on: macOS-13 timeout-minutes: 120 steps: - name: Checkout source code uses: actions/checkout@v3.3.0 - name: Install dependencies run: | - brew install lcov jansson rapidjson libzip ccache ninja openssl + brew install lcov jansson rapidjson libzip ccache ninja - name: Prepare ccache timestamp id: ccache_cache_timestamp run: | @@ -104,6 +104,5 @@ jobs: - name: Test run: | cd $GITHUB_WORKSPACE/build - export DYLD_LIBRARY_PATH=/usr/local/opt/openssl/lib:$DYLD_LIBRARY_PATH export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi ctest --output-on-failure
(celix) branch hotfix/openssl-update updated: Try to fix libcrypto loading error on macOS.
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch hotfix/openssl-update in repository https://gitbox.apache.org/repos/asf/celix.git The following commit(s) were added to refs/heads/hotfix/openssl-update by this push: new 7539b88f Try to fix libcrypto loading error on macOS. 7539b88f is described below commit 7539b88f3a03d615c1cdafe152c47a0b75b61dd5 Author: PengZheng AuthorDate: Thu Apr 25 16:56:06 2024 +0800 Try to fix libcrypto loading error on macOS. --- .github/workflows/macos.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 05ee8013..b2a268ac 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -104,8 +104,6 @@ jobs: - name: Test run: | cd $GITHUB_WORKSPACE/build + export DYLD_LIBRARY_PATH=/usr/local/opt/openssl/lib:$DYLD_LIBRARY_PATH export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi - cd /usr/local/lib - ln -s /usr/local/opt/openssl/lib/libcrypto.3.dylib libcrypto.dylib - cd $GITHUB_WORKSPACE/build ctest --output-on-failure
(celix) branch hotfix/openssl-update updated: Try to fix libcrypto loading error on macOS.
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch hotfix/openssl-update in repository https://gitbox.apache.org/repos/asf/celix.git The following commit(s) were added to refs/heads/hotfix/openssl-update by this push: new 6ea0da85 Try to fix libcrypto loading error on macOS. 6ea0da85 is described below commit 6ea0da85234bf1f5bf4ecab4feb8d87c97c9ff38 Author: PengZheng AuthorDate: Thu Apr 25 16:49:38 2024 +0800 Try to fix libcrypto loading error on macOS. --- .github/workflows/macos.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index de1ad1ab..05ee8013 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -105,5 +105,7 @@ jobs: run: | cd $GITHUB_WORKSPACE/build export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi - ln -s /usr/local/opt/openssl/lib/libcrypto.3.dylib /usr/local/lib/libcrypto.dylib + cd /usr/local/lib + ln -s /usr/local/opt/openssl/lib/libcrypto.3.dylib libcrypto.dylib + cd $GITHUB_WORKSPACE/build ctest --output-on-failure
(celix) 02/02: Try to fix libcrypto loading error on macOS.
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch hotfix/openssl-update in repository https://gitbox.apache.org/repos/asf/celix.git commit 1b44a8d6612403389f44d91a95b9791cf9c56e09 Author: PengZheng AuthorDate: Thu Apr 25 16:44:38 2024 +0800 Try to fix libcrypto loading error on macOS. --- .github/workflows/macos.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 8d3f9030..de1ad1ab 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -104,5 +104,6 @@ jobs: - name: Test run: | cd $GITHUB_WORKSPACE/build - export LD_LIBRARY_PATH=/usr/local/opt/openssl/lib:/usr/local/lib:$LD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi + export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi + ln -s /usr/local/opt/openssl/lib/libcrypto.3.dylib /usr/local/lib/libcrypto.dylib ctest --output-on-failure
(celix) 01/02: Revert "Try to fix libcrypto loading error on macOS."
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch hotfix/openssl-update in repository https://gitbox.apache.org/repos/asf/celix.git commit 20a721d92c2105ef82c1be9f03ddc45ad81ffd47 Author: PengZheng AuthorDate: Thu Apr 25 16:44:06 2024 +0800 Revert "Try to fix libcrypto loading error on macOS." This reverts commit 8f50574832ed6ff54883f2c2e90f84f01d2a5e62. --- .github/workflows/macos.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 29388c85..8d3f9030 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -104,6 +104,5 @@ jobs: - name: Test run: | cd $GITHUB_WORKSPACE/build - export /usr/local/lib:$LD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi - ln -s /usr/local/opt/openssl/lib/libcrypto.3.dylib /usr/local/lib/libcrypto.dylib + export LD_LIBRARY_PATH=/usr/local/opt/openssl/lib:/usr/local/lib:$LD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi ctest --output-on-failure
(celix) branch hotfix/openssl-update updated (8f505748 -> 1b44a8d6)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch hotfix/openssl-update in repository https://gitbox.apache.org/repos/asf/celix.git from 8f505748 Try to fix libcrypto loading error on macOS. new 20a721d9 Revert "Try to fix libcrypto loading error on macOS." new 1b44a8d6 Try to fix libcrypto loading error on macOS. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(celix) branch hotfix/openssl-update updated: Try to fix libcrypto loading error on macOS.
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch hotfix/openssl-update in repository https://gitbox.apache.org/repos/asf/celix.git The following commit(s) were added to refs/heads/hotfix/openssl-update by this push: new 8f505748 Try to fix libcrypto loading error on macOS. 8f505748 is described below commit 8f50574832ed6ff54883f2c2e90f84f01d2a5e62 Author: PengZheng AuthorDate: Thu Apr 25 16:40:52 2024 +0800 Try to fix libcrypto loading error on macOS. --- .github/workflows/macos.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 8d3f9030..29388c85 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -104,5 +104,6 @@ jobs: - name: Test run: | cd $GITHUB_WORKSPACE/build - export LD_LIBRARY_PATH=/usr/local/opt/openssl/lib:/usr/local/lib:$LD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi + export /usr/local/lib:$LD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi + ln -s /usr/local/opt/openssl/lib/libcrypto.3.dylib /usr/local/lib/libcrypto.dylib ctest --output-on-failure
(celix) branch hotfix/openssl-update updated: Fix libcrypto loading error on macOS.
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch hotfix/openssl-update in repository https://gitbox.apache.org/repos/asf/celix.git The following commit(s) were added to refs/heads/hotfix/openssl-update by this push: new 7fcd6dbc Fix libcrypto loading error on macOS. 7fcd6dbc is described below commit 7fcd6dbc2f36f07371aea25b98323e78e89137eb Author: PengZheng AuthorDate: Thu Apr 25 16:30:16 2024 +0800 Fix libcrypto loading error on macOS. --- .github/workflows/macos.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 08cb8da9..8d3f9030 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -75,7 +75,7 @@ jobs: uses: actions/checkout@v3.3.0 - name: Install dependencies run: | - brew install lcov jansson rapidjson libzip ccache ninja + brew install lcov jansson rapidjson libzip ccache ninja openssl - name: Prepare ccache timestamp id: ccache_cache_timestamp run: | @@ -104,5 +104,5 @@ jobs: - name: Test run: | cd $GITHUB_WORKSPACE/build - export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi + export LD_LIBRARY_PATH=/usr/local/opt/openssl/lib:/usr/local/lib:$LD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi ctest --output-on-failure
(celix) branch hotfix/openssl-update updated: Suppress all gcc warnings for civetweb on macOS.
This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a commit to branch hotfix/openssl-update
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to refs/heads/hotfix/openssl-update by this
push:
new 25fd38d6 Suppress all gcc warnings for civetweb on macOS.
25fd38d6 is described below
commit 25fd38d6d237947bd3a6b04e44924d3d40a880fa
Author: PengZheng
AuthorDate: Thu Apr 25 15:49:11 2024 +0800
Suppress all gcc warnings for civetweb on macOS.
---
cmake/Findcivetweb.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/Findcivetweb.cmake b/cmake/Findcivetweb.cmake
index 6cc6546a..00bc77e9 100644
--- a/cmake/Findcivetweb.cmake
+++ b/cmake/Findcivetweb.cmake
@@ -21,7 +21,7 @@ if (NOT civetweb_FOUND)
set(CIVETWEB_ENABLE_WEBSOCKETS TRUE CACHE BOOL "" FORCE)
set(CIVETWEB_BUILD_TESTING FALSE CACHE BOOL "" FORCE)
set(BUILD_SHARED_LIBS TRUE CACHE BOOL "" FORCE)
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-atomic-implicit-seq-cst
-Wno-alloca -Wno-cast-align -Wno-undef -Wno-date-time")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-atomic-implicit-seq-cst
-Wno-error")
FetchContent_Declare(
civetweb
GIT_REPOSITORY https://github.com/civetweb/civetweb.git
(celix) branch hotfix/openssl-update updated: Suppress certain gcc warnings on macOS.
This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a commit to branch hotfix/openssl-update
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to refs/heads/hotfix/openssl-update by this
push:
new 5283eb39 Suppress certain gcc warnings on macOS.
5283eb39 is described below
commit 5283eb395b505ca4edef0adab285edb3afef7f47
Author: PengZheng
AuthorDate: Thu Apr 25 15:44:20 2024 +0800
Suppress certain gcc warnings on macOS.
---
cmake/Findcivetweb.cmake | 1 +
1 file changed, 1 insertion(+)
diff --git a/cmake/Findcivetweb.cmake b/cmake/Findcivetweb.cmake
index abd14e4c..6cc6546a 100644
--- a/cmake/Findcivetweb.cmake
+++ b/cmake/Findcivetweb.cmake
@@ -21,6 +21,7 @@ if (NOT civetweb_FOUND)
set(CIVETWEB_ENABLE_WEBSOCKETS TRUE CACHE BOOL "" FORCE)
set(CIVETWEB_BUILD_TESTING FALSE CACHE BOOL "" FORCE)
set(BUILD_SHARED_LIBS TRUE CACHE BOOL "" FORCE)
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-atomic-implicit-seq-cst
-Wno-alloca -Wno-cast-align -Wno-undef -Wno-date-time")
FetchContent_Declare(
civetweb
GIT_REPOSITORY https://github.com/civetweb/civetweb.git
(celix) 01/01: Allow OpenSSL 3.0 to be used.
This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a commit to branch hotfix/openssl-update
in repository https://gitbox.apache.org/repos/asf/celix.git
commit 500c1e77715fe66e7a18444184becaeeaca72b1d
Author: PengZheng
AuthorDate: Thu Apr 25 15:07:40 2024 +0800
Allow OpenSSL 3.0 to be used.
---
cmake/Findcivetweb.cmake | 2 +-
conanfile.py | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/cmake/Findcivetweb.cmake b/cmake/Findcivetweb.cmake
index 46310ed1..abd14e4c 100644
--- a/cmake/Findcivetweb.cmake
+++ b/cmake/Findcivetweb.cmake
@@ -25,7 +25,7 @@ if (NOT civetweb_FOUND)
civetweb
GIT_REPOSITORY https://github.com/civetweb/civetweb.git
#GIT_REPOSITORY https://gitee.com/mirrors/civetweb.git
-GIT_TAGeefb26f82b233268fc98577d265352720d477ba4 # V1.15
+GIT_TAGd7ba35bbb649209c66e582d5a0244ba988a15159 # V1.16
)
FetchContent_MakeAvailable(civetweb)
if (NOT TARGET civetweb::civetweb)
diff --git a/conanfile.py b/conanfile.py
index 609082c8..dbb748ad 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -340,8 +340,6 @@ class CelixConan(ConanFile):
self.requires("mdnsresponder/1310.140.1")
# 'libzip/1.10.1' requires 'zlib/1.2.13' while 'libcurl/7.64.1'
requires 'zlib/1.2.12'
self.requires("zlib/1.2.13", override=True)
-# the latest civetweb (1.16) is not ready for openssl3
-self.requires("openssl/1.1.1t", override=True)
self.validate()
def generate(self):
(celix) branch hotfix/openssl-update created (now 500c1e77)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch hotfix/openssl-update in repository https://gitbox.apache.org/repos/asf/celix.git at 500c1e77 Allow OpenSSL 3.0 to be used. This branch includes the following new commits: new 500c1e77 Allow OpenSSL 3.0 to be used. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(celix) branch master updated (cb381850 -> 0802579e)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/celix.git from cb381850 Merge pull request #721 from apache/feature/674-improve-properties add ab2f7ba0 Use more reliable synchronization method in test case. new 0802579e Merge pull request #744 from apache/hotfix/shaky-framework-test The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: libs/framework/gtest/src/CelixFrameworkTestSuite.cc | 16 libs/framework/src/framework_private.h | 5 - 2 files changed, 8 insertions(+), 13 deletions(-)
(celix) branch hotfix/shaky-framework-test created (now ab2f7ba0)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch hotfix/shaky-framework-test in repository https://gitbox.apache.org/repos/asf/celix.git at ab2f7ba0 Use more reliable synchronization method in test case. This branch includes the following new commits: new ab2f7ba0 Use more reliable synchronization method in test case. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(celix) 01/01: Merge pull request #744 from apache/hotfix/shaky-framework-test
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/celix.git commit 0802579e4250a395639b6b84ab490e65571c18de Merge: cb381850 ab2f7ba0 Author: PengZheng AuthorDate: Wed Apr 17 18:31:34 2024 +0800 Merge pull request #744 from apache/hotfix/shaky-framework-test Hotfix/shaky-framework-test-fix libs/framework/gtest/src/CelixFrameworkTestSuite.cc | 16 libs/framework/src/framework_private.h | 5 - 2 files changed, 8 insertions(+), 13 deletions(-)
