Merge pull request #48 from sbromberger/sbromberger/devenv

Sbromberger/devenv

Author: sbromberger

.devcontainer/Dockerfile

@@ -0,0 +1,22 @@
+# FROM mcr.microsoft.com/devcontainers/cpp:1-ubuntu-24.04
+FROM mcr.microsoft.com/devcontainers/cpp:dev-ubuntu-24.04
+
+ARG REINSTALL_CMAKE_VERSION_FROM_SOURCE="none"
+
+# Optionally install the cmake for vcpkg
+COPY ./reinstall-cmake.sh /tmp/
+
+RUN if [ "${REINSTALL_CMAKE_VERSION_FROM_SOURCE}" != "none" ]; then \
+        chmod +x /tmp/reinstall-cmake.sh && /tmp/reinstall-cmake.sh ${REINSTALL_CMAKE_VERSION_FROM_SOURCE}; \
+    fi \
+    && rm -f /tmp/reinstall-cmake.sh
+
+# [Optional] Uncomment this section to install additional vcpkg ports.
+# RUN su vscode -c "${VCPKG_ROOT}/vcpkg install clangd"
+
+# [Optional] Uncomment this section to install additional packages.
+# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+#     && apt-get -y install --no-install-recommends <your-package-list-here>
+RUN apt update && export DEBIAN_FRONTEND=noninteractive && apt -y install clangd-19 clang-tidy-19 python3-pip
+RUN update-alternatives --install /usr/bin/clangd clangd /usr/bin/clangd-19 100
+RUN update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-19 100

.devcontainer/devcontainer.json

@@ -0,0 +1,21 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/cpp
+{
+	"name": "C++",
+	"build": {
+		"dockerfile": "Dockerfile"
+	},
+	"containerEnv": {
+    	"CLIPPY_BACKEND_PATH": "${containerWorkspaceFolder}/build/test"
+  	},
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"llvm-vs-code-extensions.vscode-clangd",
+				"ms-python.python"
+				// add other extensions as needed
+			]
+		}
+	},
+	"postCreateCommand": "pip install --break-system-packages -r  ${containerWorkspaceFolder}/test/requirements.txt"
+}

.devcontainer/reinstall-cmake.sh

@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+#-------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
+#-------------------------------------------------------------------------------------------------------------
+#
+set -e
+
+CMAKE_VERSION=${1:-"none"}
+
+if [ "${CMAKE_VERSION}" = "none" ]; then
+    echo "No CMake version specified, skipping CMake reinstallation"
+    exit 0
+fi
+
+# Cleanup temporary directory and associated files when exiting the script.
+cleanup() {
+    EXIT_CODE=$?
+    set +e
+    if [[ -n "${TMP_DIR}" ]]; then
+        echo "Executing cleanup of tmp files"
+        rm -Rf "${TMP_DIR}"
+    fi
+    exit $EXIT_CODE
+}
+trap cleanup EXIT
+
+
+echo "Installing CMake..."
+apt-get -y purge --auto-remove cmake
+mkdir -p /opt/cmake
+
+architecture=$(dpkg --print-architecture)
+case "${architecture}" in
+    arm64)
+        ARCH=aarch64 ;;
+    amd64)
+        ARCH=x86_64 ;;
+    *)
+        echo "Unsupported architecture ${architecture}."
+        exit 1
+        ;;
+esac
+
+CMAKE_BINARY_NAME="cmake-${CMAKE_VERSION}-linux-${ARCH}.sh"
+CMAKE_CHECKSUM_NAME="cmake-${CMAKE_VERSION}-SHA-256.txt"
+TMP_DIR=$(mktemp -d -t cmake-XXXXXXXXXX)
+
+echo "${TMP_DIR}"
+cd "${TMP_DIR}"
+
+curl -sSL "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/${CMAKE_BINARY_NAME}" -O
+curl -sSL "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/${CMAKE_CHECKSUM_NAME}" -O
+
+sha256sum -c --ignore-missing "${CMAKE_CHECKSUM_NAME}"
+sh "${TMP_DIR}/${CMAKE_BINARY_NAME}" --prefix=/opt/cmake --skip-license
+
+ln -s /opt/cmake/bin/cmake /usr/local/bin/cmake
+ln -s /opt/cmake/bin/ctest /usr/local/bin/ctest

.github/workflows/pr.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.9'
+          python-version: '3.10'
 
       - name: Install dependencies
         run: |
@@ -20,13 +20,13 @@ jobs:
 
 
       - name: Install Boost
-        uses: MarkusJx/install-boost@v2.4.5
+        uses: MarkusJx/install-boost@v2
         id: install-boost
         with:
           # REQUIRED: Specify the required boost version
           # A list of supported versions can be found here:
           # https://github.com/MarkusJx/prebuilt-boost/blob/main/versions-manifest.json
-          boost_version: 1.83.0
+          boost_version: 1.87.0
           # OPTIONAL: Specify a platform version
           # platform_version: 18.04
           # OPTIONAL: Specify a custom install location

.gitignore

@@ -1,3 +1,4 @@
+.DS_Store
 /.cache
 /**/build
 /.idea/
@@ -6,11 +7,10 @@ CMakeDoxygenDefaults.cmake
 DartConfiguration.tcl
 __pycache__
 /.vscode
-/.devcontainer
 *.dSYM
 testbracket
 testmvmap
 testdf
 test/TestGraph/testgraph
 test/include/wheredev
-a.out
+a.out

CMakeLists.txt

@@ -3,11 +3,16 @@
 #
 # SPDX-License-Identifier: MIT
 
-# Works with 3.11 and tested through 3.15 (not tested yet)
-cmake_minimum_required(VERSION 3.14)
+
+cmake_minimum_required(VERSION 3.26)
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 set(ALLOW_DUPLICATE_CUSTOM_TARGETS TRUE)
 
+# Avoid warning about DOWNLOAD_EXTRACT_TIMESTAMP in CMake 3.24:
+if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
+cmake_policy(SET CMP0135 NEW)
+endif()
+
 project(CLIPPy
     VERSION 0.2
     DESCRIPTION "Command Line Interface Plus Python"
@@ -32,7 +37,7 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
     # Note this needs to be done in the main CMakeLists
     # since it calls enable_testing, which must be in the
     # main CMakeLists.
-    include(CTest)
+    # include(CTest)
 
     # Docs only available if this is the main app
     find_package(Doxygen)
@@ -72,26 +77,41 @@ endif()
 
 #
 # Boost
-set(BOOST_URL 
-    "https://github.com/boostorg/boost/releases/download/boost-1.87.0/boost-1.87.0-cmake.tar.gz" 
+# Download and build Boost::json
+set(BOOST_URL
+    "https://github.com/boostorg/boost/releases/download/boost-1.87.0/boost-1.87.0-cmake.tar.gz"
     CACHE STRING "URL to fetch Boost tarball")
 
-#
-# Boost
+
+set(BOOST_INCLUDE_LIBRARIES json lexical_cast range)
+set(BUILD_SHARED_LIBS ON)
 FetchContent_Declare(
-    Boost 
-    URL ${BOOST_URL}
-)
-set(BOOST_INCLUDE_LIBRARIES json)
+    Boost
+    URL ${BOOST_URL})
 FetchContent_MakeAvailable(Boost)
 
+
 #
 # JSONLogic
-FetchContent_Declare(jsonlogic
-    GIT_REPOSITORY https://github.com/LLNL/jsonlogic.git
-    GIT_TAG master
-)
-FetchContent_MakeAvailable(jsonlogic)
+# find_package(jsonlogic QUIET)
+# if (NOT jsonlogic_FOUND)
+#     message(STATUS "jsonlogic not found, doing stuff")
+    set(Boost_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/boost-install) # needed for jsonlogic
+
+    FetchContent_Declare(jsonlogic
+        GIT_REPOSITORY https://github.com/LLNL/jsonlogic.git
+        GIT_TAG master
+        SOURCE_SUBDIR cpp
+    )
+    # set(jsonlogic_INCLUDE_DIR ${jsonlogic_SOURCE_DIR}/cpp/include/jsonlogic)
+    FetchContent_MakeAvailable(jsonlogic)
+    message(STATUS "jsonlogic source dir: ${jsonlogic_SOURCE_DIR}")
+
+    
+# else()
+# message(STATUS "jsonlogic found, weird")
+
+# endif()
 
 ### Require out-of-source builds
 file(TO_CMAKE_PATH "${PROJECT_BINARY_DIR}/CMakeLists.txt" LOC_PATH)
@@ -106,9 +126,12 @@ option(TEST_WITH_SLURM "Run tests with Slurm" OFF)
 # Header-only library, so likely not have src dir 
 # add_subdirectory(src)
 
+message(STATUS "CMAKE_PROJECT_NAME: ${CMAKE_PROJECT_NAME}")
+message(STATUS "PROJECT_NAME: ${PROJECT_NAME}")
 # Testing & examples are only available if this is the main app
 # Emergency override MODERN_CMAKE_BUILD_TESTING provided as well
 if((CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME OR MODERN_CMAKE_BUILD_TESTING) AND BUILD_TESTING)
+    message(STATUS "adding test subdir")
     add_subdirectory(test)
     # Example codes are here.
     #add_subdirectory(examples)

CMakePresets.json

@@ -0,0 +1,14 @@
+{
+  "version": 2,
+  "configurePresets": [
+    {
+      "name": "default",
+      "cacheVariables": {
+        "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
+        "BUILD_TESTING": "ON"
+      },
+      "generator": "Unix Makefiles",
+      "binaryDir": "${sourceDir}/build"
+    }
+  ]
+}