diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 8a0bcae..a192c0b 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -14,6 +14,7 @@ jobs: timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_TEMP: D:\\tmp steps: - task: PythonScript@0 @@ -35,7 +36,7 @@ jobs: - script: | call activate base - mamba.exe install 'python=3.9' conda-build conda pip boa 'conda-forge-ci-setup=3' -c conda-forge --strict-channel-priority --yes + mamba.exe install "python=3.9" conda-build conda pip boa conda-forge-ci-setup=3 "py-lief<0.12" -c conda-forge --strict-channel-priority --yes displayName: Install conda-build - script: set PYTHONUNBUFFERED=1 @@ -72,6 +73,9 @@ jobs: - script: | set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + set "TEMP=$(UPLOAD_TEMP)" + if not exist "%TEMP%\" md "%TEMP%" + set "TMP=%TEMP%" call activate base upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml displayName: Upload package diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index eb384d8..4ef7c65 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -3,7 +3,7 @@ VERBOSE_AT: c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos6 channel_sources: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index addd242..0550831 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -5,7 +5,7 @@ VERBOSE_AT: c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_arch: - aarch64 cdt_name: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 3c0f856..5d8428d 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -3,7 +3,7 @@ VERBOSE_AT: c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos7 channel_sources: diff --git a/.ci_support/migrations/icu70.yaml b/.ci_support/migrations/icu70.yaml deleted file mode 100644 index 726d5e2..0000000 --- a/.ci_support/migrations/icu70.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -icu: -- '70' -migrator_ts: 1648069834.8412466 diff --git a/.circleci/config.yml b/.circleci/config.yml index 3e61aa2..8b4ef2f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ # This file was generated automatically from conda-smithy. To update this configuration, # update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: yaml -*- +# -*- mode: jinja-yaml -*- version: 2 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a6b09f6..84431a6 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -33,9 +33,9 @@ CONDARC mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 736a39a..b3abaeb 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -23,11 +23,10 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base -echo -e "\n\nInstalling ['conda-forge-ci-setup=3'] and conda-build." mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" diff --git a/README.md b/README.md index f314b95..bad01b6 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Home: http://xmlsoft.org/ Package license: MIT -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/libxml2-feedstock/blob/main/LICENSE.txt) +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/libxml2-pr-feedstock/blob/main/LICENSE.txt) Summary: The XML C parser and toolkit of Gnome @@ -28,8 +28,8 @@ Current build status
- - + + @@ -37,43 +37,43 @@ Current build status diff --git a/recipe/activate.bat b/recipe/activate.bat new file mode 100644 index 0000000..6f7667c --- /dev/null +++ b/recipe/activate.bat @@ -0,0 +1,2 @@ +set xml_catalog_files_libxslt=%XML_CATALOG_FILES% +set XML_CATALOG_FILES=%CONDA_PREFIX%\etc\xml\catalog diff --git a/recipe/activate.ps1 b/recipe/activate.ps1 new file mode 100644 index 0000000..9c771e1 --- /dev/null +++ b/recipe/activate.ps1 @@ -0,0 +1,2 @@ +$Env:xml_catalog_files_libxslt = "$Env:XML_CATALOG_FILES" +$Env:XML_CATALOG_FILES = "$Env:CONDA_PREFIX\etc\xml\catalog" diff --git a/recipe/activate.sh b/recipe/activate.sh new file mode 100644 index 0000000..6e1c408 --- /dev/null +++ b/recipe/activate.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +export xml_catalog_files_libxslt="${XML_CATALOG_FILES}" +export XML_CATALOG_FILES="${CONDA_PREFIX}/etc/xml/catalog" diff --git a/recipe/bld.bat b/recipe/bld.bat index 3a36a50..bd94898 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -24,3 +24,11 @@ del %LIBRARY_PREFIX%\bin\runsuite.exe || exit 1 del %LIBRARY_PREFIX%\bin\runtest.exe || exit 1 del %LIBRARY_PREFIX%\bin\runxmlconf.exe || exit 1 copy %LIBRARY_LIB%\libxml2.lib %LIBRARY_LIB%\xml2.lib || exit 1 + +setlocal EnableDelayedExpansion +for %%F in (activate deactivate) DO ( + if not exist %PREFIX%\etc\conda\%%F.d mkdir %PREFIX%\etc\conda\%%F.d + copy %RECIPE_DIR%\%%F.bat %PREFIX%\etc\conda\%%F.d\%PKG_NAME%_%%F.bat + copy %RECIPE_DIR%\%%F.ps1 %PREFIX%\etc\conda\%%F.d\%PKG_NAME%_%%F.ps1 + copy %RECIPE_DIR%\%%F.sh %PREFIX%\etc\conda\%%F.d\%PKG_NAME%_%%F.sh +) diff --git a/recipe/build.sh b/recipe/build.sh index 05f5e7c..56d4a3b 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -35,3 +35,8 @@ make install rm -rf ${PREFIX}/share/doc rm -rf ${PREFIX}/share/gtk-doc rm -rf ${PREFIX}/share/man + +for f in "activate" "deactivate"; do + mkdir -p "${PREFIX}/etc/conda/${f}.d" + cp "${RECIPE_DIR}/${f}.sh" "${PREFIX}/etc/conda/${f}.d/${PKG_NAME}_${f}.sh" +done diff --git a/recipe/deactivate.bat b/recipe/deactivate.bat new file mode 100644 index 0000000..45799c9 --- /dev/null +++ b/recipe/deactivate.bat @@ -0,0 +1,6 @@ +if defined xml_catalog_files_libxslt ( + set XML_CATALOG_FILES=%xml_catalog_files_libxslt% +) else ( + set XML_CATALOG_FILES= +) +set xml_catalog_files_libxslt= diff --git a/recipe/deactivate.ps1 b/recipe/deactivate.ps1 new file mode 100644 index 0000000..5c36433 --- /dev/null +++ b/recipe/deactivate.ps1 @@ -0,0 +1,6 @@ +if ($Env:xml_catalog_files_libxslt) { + $Env:XML_CATALOG_FILES = "$Env:xml_catalog_files_libxslt" +} else { + $Env:XML_CATALOG_FILES = '' +} +$Env:xml_catalog_files_libxslt = '' diff --git a/recipe/deactivate.sh b/recipe/deactivate.sh new file mode 100644 index 0000000..1d341fa --- /dev/null +++ b/recipe/deactivate.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +if test -n "${xml_catalog_files_libxslt}"; then + export XML_CATALOG_FILES="${xml_catalog_files_libxslt}" +else + unset XML_CATALOG_FILES +fi +unset xml_catalog_files_libxslt diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a4b4161..07e7e46 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,7 @@ source: - 0004-CVE-2017-8872.patch build: - number: 0 + number: 1 run_exports: # remove symbols at minor versions. # https://abi-laboratory.pro/tracker/timeline/libxml2/
linux_64 - - variant + + variant
linux_aarch64 - - variant + + variant
linux_ppc64le - - variant + + variant
osx_64 - - variant + + variant
osx_arm64 - - variant + + variant
win_64 - - variant + + variant