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.

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

Make shared boost the default, simpler VERSION_STRING, fix Doxygen #158

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
else
version="$(date '+%Y.%-m.%-d').dev${GITHUB_RUN_NUMBER}"
fi
echo "${version}" > src/git-tag.txt
echo "${version}" > VERSION

if [ "${{ matrix.docker_image }}" != "" ]; then
export OCL_DOCKER_IMAGE="${{ matrix.docker_image }}"
Expand All @@ -81,13 +81,13 @@ jobs:
fi

./install.sh \
--build-library cxx \
--build-type release \
--install-ci-deps \
--install-boost \
--boost-prefix $(pwd) \
--install \
--install-prefix $(pwd)/dist
--install-prefix $(pwd)/dist \
cxx
- uses: actions/upload-artifact@v3
with:
name: ${{ matrix.os_short }}-cxx-${{ matrix.architecture }}
Expand Down Expand Up @@ -156,7 +156,7 @@ jobs:
else
version="$(date '+%Y.%-m.%-d')-dev.${GITHUB_RUN_NUMBER}"
fi
echo "${version}" > src/git-tag.txt
echo "${version}" > VERSION

if [ "${{ matrix.docker_image }}" != "" ]; then
export OCL_DOCKER_IMAGE="${{ matrix.docker_image }}"
Expand All @@ -169,14 +169,14 @@ jobs:
fi

./install.sh \
--build-library nodejs \
--build-type release \
--install-ci-deps \
--install-boost \
--boost-prefix $(pwd) \
--node-architecture ${{ matrix.node_architecture }} \
--install \
--install-prefix $(pwd)/dist
--install-prefix $(pwd)/dist \
nodejs
- uses: actions/upload-artifact@v3
with:
name: ${{ matrix.os_short }}-nodejs-${{ matrix.node_architecture }}
Expand Down Expand Up @@ -272,7 +272,7 @@ jobs:
version="$(date '+%Y.%-m.%-d').dev${GITHUB_RUN_NUMBER}"
fi
sed -i.bak "s/^version = .*/version = \"${version}\"/g" pyproject.toml && rm pyproject.toml.bak
echo "${version}" > src/git-tag.txt
echo "${version}" > VERSION
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
if: matrix.architecture == 'aarch64'
Expand Down Expand Up @@ -330,13 +330,13 @@ jobs:
shell: bash
run: |
./install.sh \
--build-library emscripten \
--build-type release \
--install-ci-deps \
--install-boost \
--boost-prefix $(pwd) \
--install \
--install-prefix $(pwd)/dist
--install-prefix $(pwd)/dist \
emscripten
- uses: actions/upload-artifact@v3
with:
name: emscripten
Expand Down
20 changes: 6 additions & 14 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ jobs:
fi
./install.sh \
--install-ci-deps \
--build-library cxx \
--build-type release \
--install-boost \
--boost-prefix $(pwd) \
--install \
--test
--test \
cxx
nodejs:
name: ${{ matrix.os_short }} node.js
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -76,14 +76,14 @@ jobs:
fi
./install.sh \
--install-ci-deps \
--build-library nodejs \
--build-type release \
--node-architecture x64 \
--install-boost \
--boost-prefix $(pwd) \
--install \
--install-prefix $(pwd)/src/npmpackage/build/Release/${{ matrix.libdir }} \
--test
--test \
nodejs
python:
name: ${{ matrix.os_short }} python
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -113,19 +113,11 @@ jobs:
- name: Install
shell: bash
run: |
if [ "${{ matrix.os_short }}" == "linux" ]; then
export OCL_INSTALL_BOOST="1"
export OCL_BOOST_WITH_PYTHON="1"
export OCL_BOOST_PREFIX="$(pwd)"
else
export OCL_INSTALL_BOOST_FROM_REPO="1"
fi
./install.sh \
--build-library python \
--build-type release \
--install-system-deps \
--python-executable python \
--python-pip-install \
--test
--test \
python || (pip install delvewheel && cd /c/hostedtoolcache/windows/Python/3.10.11/x64/lib/site-packages/opencamlib && ls -lah && delvewheel show opencamlib || delvewheel show ocl.pyd)
env:
CMAKE_GENERATOR: ${{ matrix.cmake_generator }}
11 changes: 6 additions & 5 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ Install
- Visual Studio Build Tools (https://visualstudio.microsoft.com/visual-cpp-build-tools/)
- Git (https://git-scm.com/download/win)
- CMake (https://git-scm.com/download/win)
- Boost (https://www.boost.org/users/download/)

By downloading the installers from the internet, or by using your package manager.

Expand Down Expand Up @@ -228,7 +229,7 @@ Now you can compile OpenCAMLib like this (make sure to replace the ``path/to/``
mkdir build
cd build
emcmake cmake \
-D CMAKE_BUILD_TYPE="Release" \
-D CMAKE_BUILD_TYPE="RelWithDebInfo" \
-D BUILD_EMSCRIPTEN_LIB="ON" \
-D USE_OPENMP="OFF" \
-D CMAKE_INSTALL_PREFIX="/path/to/opencamlib/src/npmpackage/build" \
Expand Down Expand Up @@ -262,10 +263,10 @@ Next, use cmake-js to compile the library:
--directory ".." \
--out "." \
--parallel 4 \
--CD BUILD_NODEJS_LIB="ON" \
--CD USE_OPENMP="ON" \
--CD CMAKE_INSTALL_PREFIX="/path/to/opencamlib/build/Release/$(node --print 'process.platform')-nodejs-$(node --print 'process.arch')" \
--CD BOOST_ROOT="/path/to/boost" \
--CDBUILD_NODEJS_LIB="ON" \
--CDUSE_OPENMP="ON" \
--CDCMAKE_INSTALL_PREFIX="/path/to/opencamlib/build/Release/$(node --print 'process.platform')-nodejs-$(node --print 'process.arch')" \
--CDBOOST_ROOT="/path/to/boost" \
--config "Release"

===================
Expand Down
1 change: 1 addition & 0 deletions VERSION
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2023.09.6
Loading
Loading