port proj to the new hadron

.github/workflows/build.yml

@@ -10,6 +10,10 @@ on:
         type: boolean
         required: true
         description: build the native module
+      standalone:
+        type: boolean
+        default: false
+        description: standalone native build
       wasm:
         type: boolean
         required: true
@@ -58,9 +62,6 @@ jobs:
       with:
         node-version: 20
 
-    - name: Setup Visual Studio (Windows)
-      uses: ilammy/msvc-dev-cmd@v1
-      if: runner.os == 'Windows'
     - name: Setup emscripten (WASM)
       uses: mymindstorm/setup-emsdk@v14
       if: inputs.wasm
@@ -73,9 +74,9 @@ jobs:
         name: swig-generated
         path: swig
 
-    - name: Install dependencies
+    - name: Install xpm
       run: |
-        npm install --skip-proj-wasm --skip-proj-native
+        npm install xpm
         npx xpm install
 
     - name: Get conan home
@@ -91,28 +92,32 @@ jobs:
         path: ${{ steps.conan_home.outputs.path }}
         key: conan-${{ inputs.id }}
 
-    - name: Set the npm build options
-      shell: bash
-      run: |
-        echo "${{ inputs.inline_projdb && 'npm_config_enable_inline_projdb' || 'npm_config_disable_inline_projdb' }}=true" >> $GITHUB_ENV
-        echo "${{ inputs.enable_tiff && 'npm_config_enable_tiff' || 'npm_config_disable_tiff' }}=true" >> $GITHUB_ENV
-
     - name: Build the native version
       shell: bash
       run: |
-        npm install --skip-proj-wasm --build-from-source --verbose --foreground-scripts         \
+        npm install --proj_js_skip_wasm --proj_js_build-from-source                             \
+          --verbose --foreground-scripts                                                        \
+          ${{ inputs.standalone && '--enable-standalone-build' }}                               \
           ${{ inputs.enable_tiff && '--enable-tiff' || '--disable-tiff' }}                      \
           ${{ inputs.inline_projdb && '--enable-inline-projdb' || '--disable-inline-projdb' }}
       if: inputs.native
 
     - name: Build the WASM version
       shell: bash
       run: |
-        npm install --skip-proj-native --build-wasm-from-source --verbose --foreground-scripts  \
+        npm install --proj_js_skip_native --proj_js_build-wasm-from-source                      \
+          --verbose --foreground-scripts                                                        \
           ${{ inputs.enable_tiff && '--enable-tiff' || '--disable-tiff' }}                      \
           ${{ inputs.inline_projdb && '--enable-inline-projdb' || '--disable-inline-projdb' }}
       if: inputs.wasm
 
+    - name: Set the npm build options for a custom build
+      shell: bash
+      if: inputs.asan || inputs.codecov
+      run: |
+        echo "${{ inputs.inline_projdb && 'npm_config_enable_inline_projdb' || 'npm_config_disable_inline_projdb' }}=true" >> $GITHUB_ENV
+        echo "${{ inputs.enable_tiff && 'npm_config_enable_tiff' || 'npm_config_disable_tiff' }}=true" >> $GITHUB_ENV
+
     - name: Build the native ASAN version
       if: inputs.asan
       run: |
@@ -125,7 +130,7 @@ jobs:
       run: |
         npm run configure:native
         npx xpm run configure --config native -- -Db_coverage=true
-        npm run build:native
+        npx xpm run build --config native
 
     - name: Check WASM module size
       run: |

.github/workflows/lock.yml

@@ -0,0 +1,44 @@
+name: Create conan lock
+on:
+  workflow_dispatch
+
+jobs:
+  native:
+    strategy:
+      max-parallel: 1
+      matrix:
+        platform: [ubuntu-latest, windows-latest, macos-latest]
+    runs-on: ${{ matrix.platform }}
+
+    steps:
+    - name: Setup Node.js 22
+      uses: actions/setup-node@v4
+      with:
+        node-version: 22
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        ref: ${{ github.ref }}
+    - name: Install xPacks
+      run: |
+        npm install
+        npx xpm install
+    - name: Create conan lock (native)
+      run: npx xpm run lock --config native
+      env:
+        npm_config_enable_conan: true
+    - name: Create conan lock (native-xpack)
+      run: npx xpm run lock --config native
+      env:
+        npm_config_enable_conan: true
+        npm_config_enable_standalone_build: true
+    - name: Create conan lock (WASM)
+      run: npx xpm run lock --config wasm
+      if: matrix.platform == 'ubuntu-latest'
+      env:
+        npm_config_enable_conan: true
+    - name: Commit conan lock
+      uses: EndBug/add-and-commit@v9
+      with:
+        message: 'Update conan lock for ${{ matrix.platform }}'
+        add: conan.lock

.github/workflows/run.yml

@@ -17,7 +17,7 @@ jobs:
     - name: Setup Node.js
       uses: actions/setup-node@v4
     - name: Install dependencies
-      run: npm ci --skip-proj-wasm --skip-proj-native
+      run: npm ci --proj_js_skip_native --proj_js_skip_wasm
     - name: Lint
       run: npm run lint
 
@@ -46,6 +46,27 @@ jobs:
       id: native-${{ matrix.platform }}-${{ matrix.enable_tiff && 'tiff' || 'no_tiff'}}
       enable_tiff: ${{ matrix.enable_tiff }}
 
+  build-standalone:
+    name: Standalone build native ${{ matrix.platform && '' || '' }}
+    needs: swig
+    if: false
+
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [ubuntu-latest, macos-latest, windows-latest]
+
+    uses:
+      ./.github/workflows/build.yml
+    with:
+      platform: ${{ matrix.platform }}
+      native: true
+      wasm: false
+      standalone: true
+      id: native-${{ matrix.platform }}-standalone
+      enable_tiff: true
+
+
   build-wasm:
     name: Build WASM ${{ matrix.enable_tiff && '' || '' }}
     needs: swig
@@ -134,7 +155,7 @@ jobs:
         path: lib/binding
 
     - name: Install dependencies
-      run: npm install --skip-proj-wasm --skip-proj-native
+      run: npm install --proj_js_skip_native --proj_js_skip_wasm
 
     - name: Run the Node.js tests
       run: npm run test:nodejs
@@ -183,7 +204,7 @@ jobs:
 
     - name: Install dependencies
       run: |
-        npm install --skip-proj-wasm --skip-proj-native
+        npm install --proj_js_skip_native --proj_js_skip_wasm
         npx xpm install
 
     - name: Get ASAN libname
@@ -234,7 +255,7 @@ jobs:
 
     - name: Install dependencies
       run: |
-        npm install --skip-proj-wasm --skip-proj-native
+        npm install --proj_js_skip_native --proj_js_skip_wasm
         npx xpm install
 
     - name: Run the Node.js tests

.github/workflows/swig.yml

@@ -18,6 +18,7 @@ jobs:
         submodules: true
     - uses: mmomtchev/setup-swig@main
       with:
+        token: ${{ secrets.GITHUB_TOKEN }}
         branch: jse
         version: v5.0.6
 

conanfile.py

@@ -32,20 +32,25 @@ class PROJDependencies(ConanFile):
 
   def requirements(self):
     if self.options.curl and self.settings.arch != 'wasm':
-      self.requires('libcurl/[>=8.6.0 <8.7.0]')
+      self.requires('libcurl/[>=8.6.0 <9]')
 
     if self.options.tiff:
-      self.requires('libtiff/[>=4.6.0 <4.7.0]')
+      self.requires('libtiff/[>=4.6.0 <5]')
 
-    self.requires('sqlite3/[>=3.45.0 <3.46.0]')
+    self.requires('sqlite3/[>=3.45.0 <4]')
 
     self.tool_requires('pkgconf/2.1.0')
-    self.tool_requires('sqlite3/[>=3.45.0 <3.46.0]')
+    self.tool_requires('sqlite3/<host_version>')
 
   def configure(self):
     if self.settings.arch == 'wasm':
       self.options['libwebp/*'].with_simd = False
 
+    if self.settings.os == 'Windows':
+      self.options['libcurl/*'].with_ssl = 'schannel'
+    elif self.settings.os == 'Macos':
+      self.options['libcurl/*'].with_ssl = 'darwinssl'
+
   # We don't want the conan build system - conan works best with the platforms' defaults
   # We always use ninja on all platforms (this is the meson approach)
   #

hadron/clang-darwin.profile

@@ -1,37 +0,0 @@
-[buildenv]
-CC=clang
-CXX=clang++
-LD=ld64.lld
-AR=llvm-ar
-AS=llvm-as
-RANLIB=llvm-ranlib
-NM=llvm-nm
-STRIP=llvm-strip
-OBJDUMP=llvm-objdump
-
-[settings]
-arch={{ {"arm64": "armv8"}.get(platform.machine(), platform.machine()) }}
-build_type=Release
-compiler=clang
-compiler.cppstd=gnu17
-compiler.version=17
-compiler.libcxx=libc++
-os=Macos
-
-# For autotools-based projects
-# (we can't simply add it generally, because the recipe will also set
-# the CMake generator for CMake-based projects)
-[tool_requires]
-libffi/*: make/4.4.1
-libiconv/*: make/4.4.1
-util-linux-libuuid/*: make/4.4.1
-xz_utils/*: make/4.4.1
-libmount/*: make/4.4.1
-libxml2/*: make/4.4.1
-
-[conf]
-# By using clang we are already out of the paved road
-tools.cmake.cmaketoolchain:generator=Ninja
-tools.build:sharedlinkflags=['-fuse-ld=lld']
-tools.build:exelinkflags=['-fuse-ld=lld']
-tools.cmake.cmaketoolchain:extra_variables={'CMAKE_LINKER': 'ld64.lld', 'CMAKE_AR': 'llvm-ar', 'CMAKE_AS': 'llvm-as', 'CMAKE_RANLIB': 'llvm-ranlib', 'CMAKE_NM': 'llvm-nm', 'CMAKE_STRIP': 'llvm-strip', 'CMAKE_OBJDUMP': 'llvm-objdump'}

hadron/clang-linux.profile

@@ -1,37 +0,0 @@
-[buildenv]
-CC=clang
-CXX=clang++
-LD=ld.lld
-AR=llvm-ar
-AS=llvm-as
-RANLIB=llvm-ranlib
-NM=llvm-nm
-STRIP=llvm-strip
-OBJDUMP=llvm-objdump
-
-[settings]
-arch=x86_64
-build_type=Release
-compiler=clang
-compiler.cppstd=gnu17
-compiler.version=17
-compiler.libcxx=libstdc++11
-os=Linux
-
-# For autotools-based projects
-# (we can't simply add it generally, because the recipe will also set
-# the CMake generator for CMake-based projects)
-[tool_requires]
-libffi/*: make/4.4.1
-libiconv/*: make/4.4.1
-util-linux-libuuid/*: make/4.4.1
-xz_utils/*: make/4.4.1
-libmount/*: make/4.4.1
-libxml2/*: make/4.4.1
-
-[conf]
-# By using clang we are already out of the paved road
-tools.cmake.cmaketoolchain:generator=Ninja
-tools.build:sharedlinkflags=['-Wl,--exclude-libs,ALL', '-fuse-ld=lld']
-tools.build:exelinkflags=['-fuse-ld=lld']
-tools.cmake.cmaketoolchain:extra_variables={'CMAKE_LINKER': 'ld.lld', 'CMAKE_AR': 'llvm-ar', 'CMAKE_AS': 'llvm-as', 'CMAKE_RANLIB': 'llvm-ranlib', 'CMAKE_NM': 'llvm-nm', 'CMAKE_STRIP': 'llvm-strip', 'CMAKE_OBJDUMP': 'llvm-objdump'}

hadron/clang-win32.profile

@@ -1,38 +1,2 @@
-[buildenv]
-# This is needed because on Windows xpm uses npm-style .cmd redirects
-# from xpacks/.bin to the actual installation directory
-CC=clang.cmd
-CXX=clang++.cmd
-LD=clang-ld.cmd
-AR=llvm-ar.cmd
-RANLIB=llvm-ranlib.cmd
-AS=x86_64-w64-mingw32-as.cmd
-NM=llvm-nm.cmd
-STRIP=llvm-strip.cmd
-OBJDUMP=llvm-objdump.cmd
-NINJA=ninja.cmd
-RC=llvm-windres.cmd
-WINDRES=llvm-windres.cmd
-# This is the only way to bring in the ninja xPack on Windows where ninja is called ninja.cmd
-# until conan implements a tools.cmake.make_program settings item
-PATH=+(path){{ os.path.dirname(os.getenv("npm_package_json")).replace("\\", "/") }}/xpacks/@xpack-dev-tools/ninja-build/.content/bin
-
-[settings]
-arch=x86_64
-build_type=Release
-compiler=clang
-compiler.cppstd=gnu17
-compiler.version=17
-os=Windows
-
-[conf]
-# clang tends to be pickier than MSVC when it comes to C/C++ compliance
-tools.build:cflags=['-Wno-incompatible-function-pointer-types']
-tools.build:sharedlinkflags=['-l:libc++.a', '-static-libgcc']
-tools.build:exelinkflags=['-l:libc++.a', '-static-libgcc']
-# The second most probable to work generator on Windows is Ninja
-# (the first one is not free)
-tools.cmake.cmaketoolchain:generator=Ninja
-# a better solution might be in the works:
-# https://github.com/conan-io/conan/issues/15544
-tools.cmake.cmaketoolchain:extra_variables={'CMAKE_AR': 'llvm-ar.cmd', 'CMAKE_RANLIB': 'llvm-ranlib.cmd', 'CMAKE_AS': 'x86_64-w64-mingw32-as.cmd', 'CMAKE_NM': 'llvm-nm.cmd', 'CMAKE_STRIP': 'llvm-strip.cmd', 'CMAKE_OBJDUMP': 'llvm-objdump.cmd'}
+[replace_tool_requires]
+libtool/*: autoconf/2.72