♻️ Name fixes & update python_requires range (#20)

kammce · web-flow · commit d75b8817a2a5 · 2025-05-27T18:18:47.000-07:00
* 📌 Use range for python_requires

* ♻️ libhal-lpc40 -&gt; libhal-arm-mcu/lpc40

* 💚 Fix mach-o error in mac
diff --git a/.clangd b/.clangd
@@ -1,8 +1,3 @@
-If:
-  PathMatch: demos/.*
-  CompileFlags:
-    CompilationDatabase: demos
-Else:
-  CompileFlags:
-    CompilationDatabase: .
-
+CompileFlags:
+  CompilationDatabase: .
+  BuiltinHeaders: QueryDriver
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-# Copyright 2024 Khalil Estell
+# Copyright 2024 - 2025 Khalil Estell and the libhal contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/.github/workflows/take.yml b/.github/workflows/take.yml
@@ -1,4 +1,4 @@
-# Copyright 2024 Khalil Estell
+# Copyright 2024 - 2025 Khalil Estell and the libhal contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/.github/workflows/update_name.yml b/.github/workflows/update_name.yml
@@ -1,4 +1,4 @@
-# Copyright 2024 Khalil Estell
+# Copyright 2024 - 2025 Khalil Estell and the libhal contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md
@@ -116,8 +116,8 @@ bootstrap.module.add_demo_requirements(self)
 ```
 
 Must be invoked in order to add the appropriate platform libraries to the
-`ConanFile` class. These platform libraries are usually `libhal-lpc40`,
-`libhal-stm32f1` and `libhal-micromod`. Note that bootstrap must be updated to
+`ConanFile` class. These platform libraries are usually `libhal-arm-mcu`,
+`libhal-linux` and `libhal-micromod`. Note that bootstrap must be updated to
 support additional platforms. If you attempt to use a profile with a platform
 name outside of what is supported by `libhal-bootstrap` then this API does
 nothing except include `libhal-util`.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2024 Khalil Estell
+# Copyright 2024 - 2025 Khalil Estell and the libhal contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/conanfile.py b/conanfile.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Khalil Estell
+# Copyright 2024 - 2025 Khalil Estell and the libhal contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ class libhal___device___conan(ConanFile):
     topics = ("__device__", "libhal", "driver")
     settings = "compiler", "build_type", "os", "arch"
 
-    python_requires = "libhal-bootstrap/[^4.2.1]"
+    python_requires = "libhal-bootstrap/[>=4.3.0 <5]"
     python_requires_extend = "libhal-bootstrap.library"
 
     def requirements(self):
diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2024 Khalil Estell
+# Copyright 2024 - 2025 Khalil Estell and the libhal contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/demos/applications/__device__.cpp b/demos/applications/__device__.cpp
@@ -1,4 +1,4 @@
-// Copyright 2024 Khalil Estell
+// Copyright 2024 - 2025 Khalil Estell and the libhal contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/demos/conanfile.py b/demos/conanfile.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Khalil Estell
+# Copyright 2024 - 2025 Khalil Estell and the libhal contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 
 
 class demos(ConanFile):
-    python_requires = "libhal-bootstrap/[^4.2.1]"
+    python_requires = "libhal-bootstrap/[>=4.3.0 <5]"
     python_requires_extend = "libhal-bootstrap.demo"
 
     def requirements(self):
diff --git a/demos/main.cpp b/demos/main.cpp
@@ -1,4 +1,4 @@
-// Copyright 2024 Khalil Estell
+// Copyright 2024 - 2025 Khalil Estell and the libhal contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/demos/platforms/lpc4078.cpp b/demos/platforms/lpc4078.cpp
@@ -1,4 +1,4 @@
-// Copyright 2024 Khalil Estell
+// Copyright 2024 - 2025 Khalil Estell and the libhal contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/demos/platforms/micromod.cpp b/demos/platforms/micromod.cpp
@@ -1,4 +1,4 @@
-// Copyright 2024 Khalil Estell
+// Copyright 2024 - 2025 Khalil Estell and the libhal contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/demos/platforms/stm32f103c8.cpp b/demos/platforms/stm32f103c8.cpp
@@ -1,4 +1,4 @@
-// Copyright 2024 Khalil Estell
+// Copyright 2024 - 2025 Khalil Estell and the libhal contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/demos/resource_list.hpp b/demos/resource_list.hpp
@@ -1,4 +1,4 @@
-// Copyright 2024 Khalil Estell
+// Copyright 2024 - 2025 Khalil Estell and the libhal contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/include/libhal-__device__/__device__.hpp b/include/libhal-__device__/__device__.hpp
@@ -1,4 +1,4 @@
-// Copyright 2024 Khalil Estell
+// Copyright 2024 - 2025 Khalil Estell and the libhal contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,5 +16,7 @@
 
 namespace hal::__device__ {   // NOLINT
 struct __device___replace_me  // NOLINT
-{};
+{
+  __device___replace_me();
+};
 }  // namespace hal::__device__
diff --git a/src/__device__.cpp b/src/__device__.cpp
@@ -1,4 +1,4 @@
-// Copyright 2024 Khalil Estell
+// Copyright 2024 - 2025 Khalil Estell and the libhal contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,5 +14,18 @@
 
 #include "libhal-__device__/__device__.hpp"
 
-namespace hal::__device__ {  // NOLINT
+namespace {
+int do_something_variable = 0;
+}
+
+namespace hal::__device__ {
+__device___replace_me::__device___replace_me()
+{
+  // Do nothing here, but give something to be contained in the .a archive file.
+  // Otherwise `apple-clang` tends to get upset with a message:
+  //
+  //     ld: archive member '/' not a mach-o file in 'libhal-__device__.a'
+  //
+  do_something_variable++;
+}
 }  // namespace hal::__device__
diff --git a/test_package/CMakeLists.txt b/test_package/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2024 Khalil Estell
+# Copyright 2024 - 2025 Khalil Estell and the libhal contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,12 +13,10 @@
 # limitations under the License.
 
 cmake_minimum_required(VERSION 3.15)
+
 project(test_package LANGUAGES CXX)
 
 find_package(libhal-__device__ REQUIRED CONFIG)
 
 add_executable(${PROJECT_NAME} main.cpp)
-target_include_directories(${PROJECT_NAME} PUBLIC .)
-target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_20)
-set_target_properties(${PROJECT_NAME} PROPERTIES CXX_EXTENSIONS OFF)
 target_link_libraries(${PROJECT_NAME} PRIVATE libhal::__device__)
diff --git a/test_package/conanfile.py b/test_package/conanfile.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Khalil Estell
+# Copyright 2024 - 2025 Khalil Estell and the libhal contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 
 class TestPackageConan(ConanFile):
     settings = "os", "arch", "compiler", "build_type"
-    python_requires = "libhal-bootstrap/[^4.2.1]"
+    python_requires = "libhal-bootstrap/[>=4.3.0 <5]"
     python_requires_extend = "libhal-bootstrap.library_test_package"
 
     def requirements(self):
diff --git a/test_package/main.cpp b/test_package/main.cpp
@@ -1,4 +1,4 @@
-// Copyright 2024 Khalil Estell
+// Copyright 2024 - 2025 Khalil Estell and the libhal contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/tests/__device__.test.cpp b/tests/__device__.test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2024 Khalil Estell
+// Copyright 2024 - 2025 Khalil Estell and the libhal contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@ boost::ut::suite test___device__ = []() {  // NOLINT
 
   "__device__::__device__()"_test = []() {
     // Setup
+    [[maybe_unused]] hal::__device__::__device___replace_me bar;
     // Exercise
     // Verify
   };
diff --git a/tests/main.test.cpp b/tests/main.test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2024 Khalil Estell
+// Copyright 2024 - 2025 Khalil Estell and the libhal contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Copyright 2024 Khalil Estell`
	`1`	`+# Copyright 2024 - 2025 Khalil Estell and the libhal contributors`
`2`	`2`	`#`
`3`	`3`	`# Licensed under the Apache License, Version 2.0 (the "License");`
`4`	`4`	`# you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright 2024 Khalil Estell`
	`1`	`+// Copyright 2024 - 2025 Khalil Estell and the libhal contributors`
`2`	`2`	`//`
`3`	`3`	`// Licensed under the Apache License, Version 2.0 (the "License");`
`4`	`4`	`// you may not use this file except in compliance with the License.`