From 62bbcf22ee879f2c68dfc3f649b381554ced59e8 Mon Sep 17 00:00:00 2001 From: Bartek Kryza Date: Sun, 22 Jan 2023 19:35:49 +0100 Subject: [PATCH] Updated packaging Makefile rules --- Makefile | 4 ++-- packaging/README.md | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 0548e318..88d266db 100644 --- a/Makefile +++ b/Makefile @@ -142,10 +142,10 @@ docs: fedora_36: mkdir -p packaging/_BUILD/fedora/36 git archive --format=tar.gz --prefix=clang-uml-$(PKG_VERSION)/ v$(GIT_VERSION) >packaging/_BUILD/fedora/36/clang-uml-$(PKG_VERSION).tar.gz - docker run --cpus="8" -v $(PWD):$(PWD) fedora:36 sh -c "dnf install -y make git && cd ${PWD} && make OS=fedora DIST=36 VERSION=${PKG_VERSION} COMMIT=${GIT_COMMIT} BRANCH=${GIT_BRANCH} -C packaging rpm" + docker run --cpuset-cpus=0-7 -v $(PWD):$(PWD) fedora:36 sh -c "dnf install -y make git && cd ${PWD} && make OS=fedora DIST=36 VERSION=${PKG_VERSION} COMMIT=${GIT_COMMIT} BRANCH=${GIT_BRANCH} -C packaging rpm" .PHONY: fedora_37 fedora_37: mkdir -p packaging/_BUILD/fedora/37 git archive --format=tar.gz --prefix=clang-uml-$(PKG_VERSION)/ v$(GIT_VERSION) >packaging/_BUILD/fedora/37/clang-uml-$(PKG_VERSION).tar.gz - docker run --cpus="8" -v $(PWD):$(PWD) fedora:37 sh -c "dnf install -y make git && cd ${PWD} && make OS=fedora DIST=37 VERSION=${PKG_VERSION} COMMIT=${GIT_COMMIT} BRANCH=${GIT_BRANCH} -C packaging rpm" + docker run --cpuset-cpus=0-7 -v $(PWD):$(PWD) fedora:37 sh -c "dnf install -y make git && cd ${PWD} && make OS=fedora DIST=37 VERSION=${PKG_VERSION} COMMIT=${GIT_COMMIT} BRANCH=${GIT_BRANCH} -C packaging rpm" diff --git a/packaging/README.md b/packaging/README.md index 438e7cc5..99a8056b 100644 --- a/packaging/README.md +++ b/packaging/README.md @@ -34,8 +34,8 @@ find packaging/_BUILD/fedora ## Anaconda ```bash -docker run --rm -v $PWD:$PWD continuumio/miniconda3 bash -conda install conda-build make +docker run --rm -v $PWD:$PWD -it continuumio/miniconda3 bash +conda install conda-build make anaconda-client cd packaging make CONDA_TOKEN= conda ``` @@ -46,6 +46,8 @@ First build release configuration using `cmake` and `msbuild` according to the [documentation](../docs/installation.md#visual-studio-native-build). ```bash -cd -cpack -C "Release" -G NSIS64 +cmake -S clang-uml -B .\clang-uml-build-pkg\ -DCMAKE_PREFIX_PATH="C:\clang-uml" -Thost=x64 +cd .\clang-uml-build-pkg\ +msbuild .\clang-uml.vcxproj -maxcpucount /p:Configuration=RelWithDebInfo +cpack -C "RelWithDebInfo" -G NSIS64 ``` \ No newline at end of file