Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set and clear XML_CATALOG_FILES on activation and deactivation, respectively #82

Merged
merged 2 commits into from
Jan 10, 2023
Merged

Set and clear XML_CATALOG_FILES on activation and deactivation, respectively #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39918ba
Set and clear XML_CATALOG_FILES on activation and deactivation, respe…
hattne Jan 9, 2023
d95f925
MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.22.1, and co…
hattne Jan 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .azure-pipelines/azure-pipelines-win.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .ci_support/linux_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ VERBOSE_AT:
c_compiler:
- gcc
c_compiler_version:
- '10'
- '11'
cdt_name:
- cos6
channel_sources:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ VERBOSE_AT:
c_compiler:
- gcc
c_compiler_version:
- '10'
- '11'
cdt_arch:
- aarch64
cdt_name:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ VERBOSE_AT:
c_compiler:
- gcc
c_compiler_version:
- '10'
- '11'
cdt_name:
- cos7
channel_sources:
Expand Down
7 changes: 0 additions & 7 deletions .ci_support/migrations/icu70.yaml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .scripts/build_steps.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions .scripts/run_osx_build.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 15 additions & 15 deletions README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions recipe/activate.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
set xml_catalog_files_libxslt=%XML_CATALOG_FILES%
set XML_CATALOG_FILES=%CONDA_PREFIX%\etc\xml\catalog
2 changes: 2 additions & 0 deletions recipe/activate.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
$Env:xml_catalog_files_libxslt = "$Env:XML_CATALOG_FILES"
$Env:XML_CATALOG_FILES = "$Env:CONDA_PREFIX\etc\xml\catalog"
4 changes: 4 additions & 0 deletions recipe/activate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash

export xml_catalog_files_libxslt="${XML_CATALOG_FILES}"
export XML_CATALOG_FILES="${CONDA_PREFIX}/etc/xml/catalog"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should also add the system location separated by a space.

8 changes: 8 additions & 0 deletions recipe/bld.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
5 changes: 5 additions & 0 deletions recipe/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 6 additions & 0 deletions recipe/deactivate.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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=
6 changes: 6 additions & 0 deletions recipe/deactivate.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 = ''
8 changes: 8 additions & 0 deletions recipe/deactivate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down