Skip to content

Commit da140f5

Browse files
PengZhengPengZheng
committed
Drop Conan 1.x support and move test_package to its conventional location.
1 parent e8336a8 commit da140f5

27 files changed

+22
-182
lines changed

‎.github/workflows/conan_create.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
CC: ${{ matrix.compiler[0] }}
6767
CXX: ${{ matrix.compiler[1] }}
6868
run: |
69-
conan create . -c tools.cmake.cmaketoolchain:generator=Ninja -b missing -o celix/*:build_all=True -o celix/*:enable_ccache=True -pr:b default -pr:h default -s:h build_type=${{ matrix.type }} -tf examples/conan_test_package_v2 -o celix/*:celix_cxx17=True -o celix/*:celix_install_deprecated_api=True
69+
conan create . -c tools.cmake.cmaketoolchain:generator=Ninja -b missing -o celix/*:build_all=True -o celix/*:enable_ccache=True -pr:b default -pr:h default -s:h build_type=${{ matrix.type }} -o celix/*:celix_cxx17=True -o celix/*:celix_install_deprecated_api=True
7070
- name: Dependency Deduction Test
7171
env:
7272
CC: ${{ matrix.compiler[0] }}
@@ -116,7 +116,7 @@ jobs:
116116
${{ runner.os }}-ccache-Release-
117117
- name: Create Celix
118118
run: |
119-
conan create . -c tools.cmake.cmaketoolchain:generator=Ninja -b missing -o celix/*:build_all=True -o celix/*:enable_ccache=True -pr:b default -pr:h default -s:b build_type=Release -s:h build_type=Release -tf examples/conan_test_package_v2 -o celix/*:celix_cxx17=True -o celix/*:celix_install_deprecated_api=True -o celix/*:enable_address_sanitizer=True
119+
conan create . -c tools.cmake.cmaketoolchain:generator=Ninja -b missing -o celix/*:build_all=True -o celix/*:enable_ccache=True -pr:b default -pr:h default -s:b build_type=Release -s:h build_type=Release -o celix/*:celix_cxx17=True -o celix/*:celix_install_deprecated_api=True -o celix/*:enable_address_sanitizer=True
120120
- name: Dependency Deduction Test
121121
run: |
122122
conan inspect . | awk 'BEGIN { FS="[\t:]+"; output=0 } /build/ && !/build_all/ && !/build_rsa_remote_service_admin_shm_v2/ && !/build_rsa_discovery_zeroconf/ { if(output) print $1} /^options/ {output=1} /^options_definitions/ {output=0}' | while read option; do conan build . -c tools.cmake.cmaketoolchain:generator=Ninja -b missing -o celix/*:${option}=True -pr:b default -pr:h default -s:b build_type=Release -s:h build_type=Release -of ${option}_dir -o celix/*:celix_cxx17=True -o celix/*:enable_ccache=True -o celix/*:celix_install_deprecated_api=True || exit 1; done

‎conanfile.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class CelixConan(ConanFile):
3333
url = "https://github.com/apache/celix.git"
3434
topics = ("conan", "celix", "osgi", "embedded", "linux", "C/C++")
3535
exports_sources = ("CMakeLists.txt", "bundles*", "cmake*", "!cmake-build*", "examples*", "libs*", "misc*",
36-
"LICENSE", "!examples/conan_test_package*")
36+
"LICENSE")
3737
generators = "CMakeDeps", "VirtualRunEnv"
3838
settings = "os", "arch", "compiler", "build_type"
3939
license = " Apache-2.0"

‎examples/conan_test_package/conanfile.py‎

Lines changed: 0 additions & 136 deletions
This file was deleted.

‎examples/conan_test_package_v2/CMakeLists.txt‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

examples/conan_test_package/CMakeLists.txt renamed to test_package/CMakeLists.txt

File renamed without changes.

examples/conan_test_package/README.md renamed to test_package/README.md

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,14 @@ a Celix package is properly installed in the local Conan cache. To this end, it
3434
To create a Celix package in the local cache with C++ support and verify that it's properly installed, run the following command in the Celix root directory:
3535

3636
```BASH
37-
conan create . celix/2.2.3@zhengpeng/testing -tf examples/conan_test_package/ -o celix:celix_cxx17=True
37+
conan create . -o celix_cxx17=True
3838
```
3939

4040
To verify a Celix package with C++ support is properly installed in the local cache, run the following command in the Celix root directory:
4141

4242
```BASH
43-
conan test examples/conan_test_package/ celix/2.2.3@zhengpeng/testing -o celix:celix_cxx17=True
43+
conan test test_package celix/3.0.0@ -o celix_cxx17=True
4444
```
4545

4646
Though it might not be wise to spend time reading C/C++ codes in this folder, it's instructive to have a look at `conanfile.py` and `CMakeLists.txt`,
47-
which illustrates a non-intrusive way of using Conan with CMake build system. Pay attention to our use of `cmake_paths` `cmake_find_package` generators
48-
and the following line:
49-
50-
```python
51-
cmake.definitions["CMAKE_PROJECT_test_package_INCLUDE"] = os.path.join(self.build_folder, "conan_paths.cmake")
52-
```
47+
which illustrates a non-intrusive way of using Conan with CMake build system.

examples/conan_test_package_v2/conanfile.py renamed to test_package/conanfile.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def test(self):
8383
with chdir(self, self.build_folder):
8484
celix_options = self.dependencies["celix"].options
8585
if celix_options.build_framework:
86-
self.run("./conan_test_package/use_framework", env="conanrun")
86+
self.run("./use_framework", env="conanrun")
8787
if celix_options.build_http_admin:
8888
self.run("./use_http_admin", cwd=os.path.join("deploy", "use_http_admin"), env="conanrun")
8989
if celix_options.build_log_service:
@@ -92,8 +92,8 @@ def test(self):
9292
self.run("./use_syslog_writer", cwd=os.path.join("deploy", "use_syslog_writer"), env="conanrun")
9393
if celix_options.build_remote_service_admin:
9494
self.run("./use_my_rsa", cwd=os.path.join("deploy", "use_my_rsa"), env="conanrun")
95-
self.run("./conan_test_package/use_c_rsa_spi", env="conanrun")
96-
self.run("./conan_test_package/use_rsa_utils", env="conanrun")
95+
self.run("./use_c_rsa_spi", env="conanrun")
96+
self.run("./use_rsa_utils", env="conanrun")
9797

9898
if celix_options.build_rsa_remote_service_admin_dfi and celix_options.build_launcher:
9999
self.run("./use_rsa_dfi", cwd=os.path.join("deploy", "use_rsa_dfi"), env="conanrun")
@@ -109,42 +109,42 @@ def test(self):
109109
self.run("./use_rsa_discovery_zeroconf",
110110
cwd=os.path.join("deploy", "use_rsa_discovery_zeroconf"), env="conanrun")
111111
if celix_options.build_shell:
112-
self.run("./conan_test_package/use_shell", env="conanrun")
112+
self.run("./use_shell", env="conanrun")
113113
if celix_options.celix_cxx17 or celix_options.celix_cxx14:
114-
self.run("./conan_test_package/use_cxx_shell", env="conanrun")
114+
self.run("./use_cxx_shell", env="conanrun")
115115
if celix_options.build_remote_shell:
116116
self.run("./use_remote_shell", cwd=os.path.join("deploy", "use_remote_shell"), env="conanrun")
117117
if celix_options.build_shell_tui:
118118
self.run("./use_shell_tui", cwd=os.path.join("deploy", "use_shell_tui"), env="conanrun")
119119
if celix_options.build_shell_wui:
120120
self.run("./use_shell_wui", cwd=os.path.join("deploy", "use_shell_wui"), env="conanrun")
121121
if celix_options.build_celix_etcdlib:
122-
self.run("./conan_test_package/use_etcd_lib", env="conanrun")
122+
self.run("./use_etcd_lib", env="conanrun")
123123
if celix_options.build_launcher:
124124
self.run("./use_launcher", cwd=os.path.join("deploy", "use_launcher"), env="conanrun")
125125
if celix_options.build_promises:
126-
self.run("./conan_test_package/use_promises", env="conanrun")
126+
self.run("./use_promises", env="conanrun")
127127
if celix_options.build_pushstreams:
128-
self.run("./conan_test_package/use_pushstreams", env="conanrun")
128+
self.run("./use_pushstreams", env="conanrun")
129129
if celix_options.build_log_helper:
130-
self.run("./conan_test_package/use_log_helper", env="conanrun")
130+
self.run("./use_log_helper", env="conanrun")
131131
if celix_options.build_log_service_api:
132-
self.run("./conan_test_package/use_log_service_api", env="conanrun")
132+
self.run("./use_log_service_api", env="conanrun")
133133
if celix_options.build_cxx_remote_service_admin:
134134
self.run("./use_cxx_remote_service_admin",
135135
cwd=os.path.join("deploy", "use_cxx_remote_service_admin"), env="conanrun")
136-
self.run("./conan_test_package/use_rsa_spi", env="conanrun")
136+
self.run("./use_rsa_spi", env="conanrun")
137137
if celix_options.build_shell_api:
138-
self.run("./conan_test_package/use_shell_api", env="conanrun")
138+
self.run("./use_shell_api", env="conanrun")
139139
if celix_options.build_celix_dfi:
140-
self.run("./conan_test_package/use_celix_dfi", env="conanrun")
140+
self.run("./use_celix_dfi", env="conanrun")
141141
if celix_options.build_utils:
142-
self.run("./conan_test_package/use_utils", env="conanrun")
142+
self.run("./use_utils", env="conanrun")
143143
if celix_options.build_event_admin:
144144
self.run("./use_event_admin",
145145
cwd=os.path.join("deploy", "use_event_admin"), env="conanrun")
146-
self.run("./conan_test_package/use_event_admin_api", env="conanrun")
147-
self.run("./conan_test_package/use_event_admin_spi", env="conanrun")
146+
self.run("./use_event_admin_api", env="conanrun")
147+
self.run("./use_event_admin_spi", env="conanrun")
148148
if celix_options.build_event_admin_remote_provider_mqtt:
149149
self.run("./use_event_admin_remote_provider_mqtt",
150150
cwd=os.path.join("deploy", "use_event_admin_remote_provider_mqtt"), env="conanrun")

examples/conan_test_package/hello_bundle.c renamed to test_package/hello_bundle.c

File renamed without changes.

examples/conan_test_package/my_log_writer_activator.c renamed to test_package/my_log_writer_activator.c

File renamed without changes.

examples/conan_test_package/my_rsa_activator.c renamed to test_package/my_rsa_activator.c

File renamed without changes.

0 commit comments

Comments
 (0)