ndmspc v0.20250923.0 update (alisw#6004)

Author: mvala

ndmspc.sh

@@ -1,38 +1,53 @@
 package: ndmspc
 version: "%(tag_basename)s"
-tag: "v0.20240422.0"
+tag: "v0.20250923.0"
 requires:
   - ROOT
+  - JAliEn-ROOT
+  - nlohmann_json
+  - opentelemetry-cpp
+  - libwebsockets
+  - curl
+  - libuv
 build_requires:
   - CMake
   - ninja
   - alibuild-recipe-tools
+  - "OpenSSL:(?!osx)"
 source: https://gitlab.com/ndmspc/ndmspc.git
 incremental_recipe: |
   [[ $ALIBUILD_NDMSPC_TESTS ]] && CXXFLAGS="${CXXFLAGS} -Werror -Wno-error=deprecated-declarations"
   cmake --build . -- ${JOBS:+-j$JOBS} install
   mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
 ---
-#!/bin/sh
+#!/bin/bash -e
+case $ARCHITECTURE in
+  osx*)
+        [[ -n $OPENSSL_ROOT ]] || OPENSSL_ROOT=$(brew --prefix openssl@3)
+        [[ -n $LIBWEBSOCKETS_ROOT ]] || LIBWEBSOCKETS_ROOT=$(brew --prefix libwebsockets)
+  ;;
+esac
 
 if [[ $ALIBUILD_NDMSPC_TESTS ]]; then
   # Impose extra errors.
   CXXFLAGS="${CXXFLAGS} -Werror -Wno-error=deprecated-declarations"
 fi
 
-# When O2 is built against Gandiva (from Arrow), then we need to use
-# -DLLVM_ROOT=$CLANG_ROOT, since O2's CMake calls into Gandiva's
-# -CMake, which requires it.
-cmake "$SOURCEDIR" "-DCMAKE_INSTALL_PREFIX=$INSTALLROOT"          \
-      -G Ninja                                                    \
-      ${CMAKE_BUILD_TYPE:+"-DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE"} \
-      ${CXXSTD:+"-DCMAKE_CXX_STANDARD=$CXXSTD"}                   \
+cmake "$SOURCEDIR" "-DCMAKE_INSTALL_PREFIX=$INSTALLROOT"                \
+      -G Ninja                                                          \
+      ${CMAKE_BUILD_TYPE:+"-DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE"}       \
+      ${CXXSTD:+"-DCMAKE_CXX_STANDARD=$CXXSTD"}                         \
+      ${PROTOBUF_ROOT:+"-DPROTOBUF_ROOT=$PROTOBUF_ROOT"}                \
+      ${LIBUV_ROOT:+"-DLIBUV_ROOT=$LIBUV_ROOT"}                         \
+      ${LIBWEBSOCKETS_ROOT:+"-DLIBWEBSOCKETS_ROOT=$LIBWEBSOCKETS_ROOT"} \
+      ${NLOHMANN_JSON_ROOT:+"-DNLOHMANN_JSON_ROOT=$NLOHMANN_JSON_ROOT"} \
+      ${CURL_ROOT:+"-DCURL_ROOT=$CURL_ROOT"}                            \
       -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
 
 cmake --build . -- ${JOBS+-j $JOBS} install
 
 # export compile_commands.json in (taken from o2.sh)
-DEVEL_SOURCES="`readlink $SOURCEDIR || echo $SOURCEDIR`"
+DEVEL_SOURCES="$(readlink $SOURCEDIR || echo $SOURCEDIR)"
 if [ "$DEVEL_SOURCES" != "$SOURCEDIR" ]; then
   perl -p -i -e "s|$SOURCEDIR|$DEVEL_SOURCES|" compile_commands.json
   ln -sf $BUILDDIR/compile_commands.json $DEVEL_SOURCES/compile_commands.json
@@ -44,7 +59,7 @@ MODULEFILE="etc/modulefiles/$PKGNAME"
 alibuild-generate-module --bin --lib > "$MODULEFILE"
 cat >> "$MODULEFILE" <<EoF
 # Our environment
-setenv NDMSPC_MACRO_DIR \$PKG_ROOT/macros
-prepend-path ROOT_INCLUDE_PATH \$PKG_ROOT/include
+prepend-path ROOT_DYN_PATH \$PKG_ROOT/lib
+prepend-path ROOT_INCLUDE_PATH \$PKG_ROOT/include/ndmspc
 EoF
 mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles

opentelemetry-cpp.sh

@@ -0,0 +1,52 @@
+package: opentelemetry-cpp
+version: "%(tag_basename)s"
+tag: "v1.22.0"
+requires:
+  - curl
+  - protobuf
+build_requires:
+  - CMake
+  - ninja
+  - alibuild-recipe-tools
+source: https://github.com/open-telemetry/opentelemetry-cpp.git
+incremental_recipe: |
+  [[ $ALIBUILD_NDMSPC_TESTS ]] && CXXFLAGS="${CXXFLAGS} -Werror -Wno-error=deprecated-declarations"
+  cmake --build . -- ${JOBS:+-j$JOBS} install
+  mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
+---
+#!/bin/bash -e
+
+if [[ $ALIBUILD_NDMSPC_TESTS ]]; then
+  # Impose extra errors.
+  CXXFLAGS="${CXXFLAGS} -Werror -Wno-error=deprecated-declarations"
+fi
+
+cmake "$SOURCEDIR" "-DCMAKE_INSTALL_PREFIX=$INSTALLROOT"          \
+      ${CMAKE_BUILD_TYPE:+"-DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE"} \
+      ${CXXSTD:+"-DCMAKE_CXX_STANDARD=$CXXSTD"}                   \
+      -DWITH_BENCHMARK=OFF                                        \
+      -DBUILD_TESTING=OFF                                         \
+      -DWITH_EXAMPLES=OFF                                         \
+      -DWITH_OTLP_FILE=ON                                         \
+      -DWITH_OTLP_HTTP=ON                                         \
+      -DBUILD_SHARED_LIBS=ON                                      \
+      -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
+
+cmake --build . -- ${JOBS+-j $JOBS} install
+
+# export compile_commands.json in (taken from o2.sh)
+DEVEL_SOURCES="$(readlink $SOURCEDIR || echo $SOURCEDIR)"
+if [ "$DEVEL_SOURCES" != "$SOURCEDIR" ]; then
+  perl -p -i -e "s|$SOURCEDIR|$DEVEL_SOURCES|" compile_commands.json
+  ln -sf $BUILDDIR/compile_commands.json $DEVEL_SOURCES/compile_commands.json
+fi
+
+# Modulefile
+mkdir -p etc/modulefiles
+MODULEFILE="etc/modulefiles/$PKGNAME"
+alibuild-generate-module --bin --lib > "$MODULEFILE"
+cat >> "$MODULEFILE" <<EoF
+# Our environment
+prepend-path ROOT_INCLUDE_PATH \$PKG_ROOT/include
+EoF
+mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles