Skip to content

Commit

Permalink
Merge pull request #86 from regro-cf-autotick-bot/4.13.1_h9af473
Browse files Browse the repository at this point in the history
gap v4.13.1
  • Loading branch information
saraedum authored Jun 14, 2024
2 parents d598f1e + 0b39f4a commit ce6077b
Show file tree
Hide file tree
Showing 14 changed files with 69 additions and 81 deletions.
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-osx.yml

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
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
- '1'
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
- '1'
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
- '1'
8 changes: 5 additions & 3 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.9'
- '10.13'
channel_sources:
- conda-forge
channel_targets:
Expand Down Expand Up @@ -45,4 +47,4 @@ target_platform:
zeromq:
- 4.3.5
zlib:
- '1.2'
- '1'
4 changes: 3 additions & 1 deletion .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand Down Expand Up @@ -45,4 +47,4 @@ target_platform:
zeromq:
- 4.3.5
zlib:
- '1.2'
- '1'
4 changes: 2 additions & 2 deletions .gitattributes

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

7 changes: 7 additions & 0 deletions .scripts/build_steps.sh

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

7 changes: 7 additions & 0 deletions .scripts/run_osx_build.sh

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

34 changes: 8 additions & 26 deletions recipe/install-core.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,32 +1,14 @@
#!/bin/bash
set -exo pipefail

INSTALL_DIR="$PREFIX/share/gap"

mkdir -p "$INSTALL_DIR"
source $RECIPE_DIR/install-shared.sh

make install

set +e
pushd pkg
# Remove all object files and temporary files.
find . \( \
-name "*.o" \
-o -name "*.lo" \
-o -name "*.la" \
-o -name "*.lai" \
-o -name ".libs" \
-o -name "config.log" \
-o -name "config.status" \
-o -name "libtool" \
\) -exec rm -rf {} \;
popd
echo "done"
set -e

mkdir -p "$INSTALL_DIR/pkg"
cd pkg
for GAP_PKG_NAME in smallgrp transgrp primgrp gapdoc utils;
do
echo "GAP_PKG_NAME: $GAP_PKG_NAME"
mv $GAP_PKG_NAME $INSTALL_DIR/pkg/$GAP_PKG_NAME
for pkg in smallgrp \
transgrp \
primgrp \
gapdoc \
utils; do
mv pkg/$pkg $INSTALL_DIR/pkg/$pkg
done
24 changes: 4 additions & 20 deletions recipe/install-defaults.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,21 +1,7 @@
INSTALL_DIR="$PREFIX/share/gap"
#!/bin/bash
set -exo pipefail

set +e
pushd pkg
# Remove all object files and temporary files.
find . \( \
-name "*.o" \
-o -name "*.lo" \
-o -name "*.la" \
-o -name "*.lai" \
-o -name ".libs" \
-o -name "config.log" \
-o -name "config.status" \
-o -name "libtool" \
\) -exec rm -rf {} \;

echo "done"
set -e
source $RECIPE_DIR/install-shared.sh

for pkg in atlasrep \
autpgrp \
Expand All @@ -32,7 +18,5 @@ for pkg in atlasrep \
resclasses \
sophus \
tomlib ; do
mv $pkg $INSTALL_DIR/pkg/$pkg
mv pkg/$pkg $INSTALL_DIR/pkg/$pkg
done

popd
29 changes: 8 additions & 21 deletions recipe/install-full.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,33 +1,20 @@
INSTALL_DIR="$PREFIX/share/gap"
#!/bin/bash
set -exo pipefail

rm -rf "$INSTALL_DIR/pkg"
source $RECIPE_DIR/install-shared.sh

set +e
pushd pkg
# Remove all object files and temporary files.
find . \( \
-name "*.o" \
-o -name "*.lo" \
-o -name "*.la" \
-o -name "*.lai" \
-o -name ".libs" \
-o -name "config.log" \
-o -name "config.status" \
-o -name "libtool" \
\) -exec rm -rf {} \;

echo "done"
popd
set -e

mv pkg $INSTALL_DIR/pkg
for pkg in `ls pkg/`; do
mv pkg/$pkg $INSTALL_DIR/pkg/$pkg
done

pushd $INSTALL_DIR/pkg/jupyterkernel/

sed -i.bak "s@ GAP=gap@ GAP=$PREFIX/bin/gap@g" bin/jupyter-kernel-gap
rm bin/jupyter-kernel-gap.bak
rm setup.py
cp $RECIPE_DIR/setup.py setup.py
cp $RECIPE_DIR/gap-mode.json etc/
python -m pip install . --no-deps
rm -rf $SP_DIR/gap_jupyter-*

popd
17 changes: 17 additions & 0 deletions recipe/install-shared.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/bin/bash

INSTALL_DIR="$PREFIX/share/gap"

mkdir -p "$INSTALL_DIR/pkg"

# Remove all object files and temporary files.
find pkg \( \
-name "*.o" \
-o -name "*.lo" \
-o -name "*.la" \
-o -name "*.lai" \
-o -name ".libs" \
-o -name "config.log" \
-o -name "config.status" \
-o -name "libtool" \
\) -exec rm -rf {} \; || true
8 changes: 4 additions & 4 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = "4.13.0" %}
{% set version = "4.13.1" %}
{% set name = "gap-split" %}

package:
Expand All @@ -7,7 +7,7 @@ package:

source:
url: https://github.com/gap-system/gap/releases/download/v{{ version }}/gap-{{ version }}.tar.gz
sha256: cc76ecbe33d6719450a593e613fb87e9e4247faa876f632dd0f97c398f92265d
sha256: 9794dbdba6fb998e0a2d0aa8ce21fc8848ad3d3f9cc9993b0b8e20be7e1dbeba
patches:
- 0001-Allow-cross-building-packages.patch
- 0002-Do-not-run-prerequisites.sh.patch
Expand Down Expand Up @@ -88,8 +88,8 @@ outputs:
script: install-full.sh
build:
ignore_run_exports:
- python
- python_abi
- python *
- python_abi *
requirements:
build:
- {{ compiler('cxx') }}
Expand Down

0 comments on commit ce6077b

Please sign in to comment.