Fix repackaging (#89)

automerged PR by conda-forge/automerge-action
conda-forge · Mar 25, 2024 · a2434bb · a2434bb
2 parents 1b899a6 + fed3f9d
commit a2434bb
Show file tree

Hide file tree

Showing 12 changed files with 91 additions and 82 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
diff --git a/build-locally.py b/build-locally.py
diff --git a/recipe/bld.bat b/recipe/bld.bat
diff --git a/recipe/build.sh b/recipe/build.sh
diff --git a/recipe/build_libsolv.bat b/recipe/build_libsolv.bat
@@ -0,0 +1,42 @@
+if /I "%PKG_NAME%" == "libsolv" (
+
+    cmake -B build/ ^
+        -G "Ninja" ^
+        -D ENABLE_CONDA=ON ^
+        -D MULTI_SEMANTICS=ON ^
+        -D WITHOUT_COOKIEOPEN=ON ^
+        -D CMAKE_MSVC_RUNTIME_LIBRARY="MultiThreadedDLL" ^
+        -D DISABLE_SHARED=OFF ^
+        -D ENABLE_STATIC=OFF ^
+        %CMAKE_ARGS%
+    if errorlevel 1 exit 1
+
+    cmake --build build/ --parallel %CPU_COUNT%
+    if errorlevel 1 exit 1
+
+    cmake --install build/
+    if errorlevel 1 exit 1
+
+)
+
+if /I "%PKG_NAME%" == "libsolv-static" (
+
+    cmake -B build_static/ ^
+        -G "Ninja" ^
+        -D ENABLE_CONDA=ON ^
+        -D MULTI_SEMANTICS=ON ^
+        -D WITHOUT_COOKIEOPEN=ON ^
+        -D CMAKE_MSVC_RUNTIME_LIBRARY="MultiThreadedDLL" ^
+        -D CMAKE_RELEASE_POSTFIX="_static" ^
+        -D DISABLE_SHARED=ON ^
+        -D ENABLE_STATIC=ON ^
+        %CMAKE_ARGS%
+    if errorlevel 1 exit 1
+
+    cmake --build build_static/ --parallel %CPU_COUNT%
+    if errorlevel 1 exit 1
+
+    cmake --install build_static/
+    if errorlevel 1 exit 1
+
+)
diff --git a/recipe/build_libsolv.sh b/recipe/build_libsolv.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+if [[ $PKG_NAME == "libsolv" ]]; then
+
+    cmake -B build/ \
+        -G Ninja \
+        -D ENABLE_CONDA=ON \
+        -D MULTI_SEMANTICS=ON \
+        -D DISABLE_SHARED=OFF \
+        -D ENABLE_STATIC=OFF \
+        ${CMAKE_ARGS}
+    cmake --build build/ --parallel ${CPU_COUNT} --verbose
+    cmake --install build/
+
+elif [[ $PKG_NAME == "libsolv-static" ]]; then
+
+    cmake -B build_static/ \
+        -G Ninja \
+        -D ENABLE_CONDA=ON \
+        -D MULTI_SEMANTICS=ON \
+        -D DISABLE_SHARED=ON \
+        -D ENABLE_STATIC=ON \
+        ${CMAKE_ARGS}
+    cmake --build build_static/ --parallel ${CPU_COUNT} --verbose
+    cmake --install build_static/
+
+fi
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -24,7 +24,7 @@ source:
     - no_error_subdir_mismatch.patch
 
 build:
-  number: 0
+  number: 1
   run_exports:
     - {{ pin_subpackage(name, max_pin='x.x') }}
 
@@ -39,15 +39,8 @@ requirements:
 
 outputs:
   - name: libsolv
-    files:
-      - "{{ install_prefix }}/bin/"
-      - "{{ install_prefix }}/include/solv/"
-      - "{{ install_prefix }}/lib/libsolv*.{{ shlib_ext }}*"  # [unix]
-      - "{{ install_prefix }}/lib/solv.lib"                   # [win]
-      - "{{ install_prefix }}/lib/solvext.lib"                # [win]
-      - "{{ install_prefix }}/lib/pkgconfig/libsolv*"
-      - "{{ install_prefix }}/share/cmake"
-      - "{{ install_prefix }}/share/man"
+    script: build_libsolv.sh   # [unix]
+    script: build_libsolv.bat  # [win]
     requirements:
       build:
         - {{ compiler('c') }}
@@ -86,10 +79,8 @@ outputs:
         - cmake --build build --target test
 
   - name: libsolv-static
-    files:
-      - "{{ install_prefix }}/lib/libsolv*.a*"         # [unix]
-      - "{{ install_prefix }}/lib/solv_static.lib"     # [win]
-      - "{{ install_prefix }}/lib/solvext_static.lib"  # [win]
+    script: build_libsolv.sh   # [unix]
+    script: build_libsolv.bat  # [win]
     requirements:
       build:
         - {{ compiler('c') }}