diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index d25d71bcc9..0000000000 --- a/.dockerignore +++ /dev/null @@ -1,4 +0,0 @@ -.git -.github -resources/materials -CuraEngine \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index 6dbe51a09e..0000000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -name: CI -on: - push: - branches: - - master - - 'WIP**' - - '4.*' - - 'CURA-*' - pull_request: -jobs: - build: - runs-on: ubuntu-latest - container: ultimaker/cura-build-environment - steps: - - name: Checkout Cura - uses: actions/checkout@v2 - - name: Build - run: docker/build.sh - - name: Test - run: docker/test.sh diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 68255c56b9..0000000000 --- a/Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -FROM ultimaker/cura-build-environment:1 - -# Environment vars for easy configuration -ENV CURA_APP_DIR=/srv/cura - -# Ensure our sources dir exists -RUN mkdir $CURA_APP_DIR - -# Setup CuraEngine -ENV CURA_ENGINE_BRANCH=master -WORKDIR $CURA_APP_DIR -RUN git clone -b $CURA_ENGINE_BRANCH --depth 1 https://github.com/Ultimaker/CuraEngine -WORKDIR $CURA_APP_DIR/CuraEngine -RUN mkdir build -WORKDIR $CURA_APP_DIR/CuraEngine/build -RUN cmake3 .. -RUN make -RUN make install - -# TODO: setup libCharon - -# Setup Uranium -ENV URANIUM_BRANCH=master -WORKDIR $CURA_APP_DIR -RUN git clone -b $URANIUM_BRANCH --depth 1 https://github.com/Ultimaker/Uranium - -# Setup materials -ENV MATERIALS_BRANCH=master -WORKDIR $CURA_APP_DIR -RUN git clone -b $MATERIALS_BRANCH --depth 1 https://github.com/Ultimaker/fdm_materials materials - -# Setup Cura -WORKDIR $CURA_APP_DIR/Cura -ADD . . -RUN mv $CURA_APP_DIR/materials resources/materials - -# Make sure Cura can find CuraEngine -RUN ln -s /usr/local/bin/CuraEngine $CURA_APP_DIR/Cura - -# Run Cura -WORKDIR $CURA_APP_DIR/Cura -ENV PYTHONPATH=${PYTHONPATH}:$CURA_APP_DIR/Uranium -RUN chmod +x ./CuraEngine -RUN chmod +x ./run_in_docker.sh -CMD "./run_in_docker.sh" diff --git a/build.sh b/build.sh deleted file mode 100644 index 7da99d0de5..0000000000 --- a/build.sh +++ /dev/null @@ -1,34 +0,0 @@ -set -e -set -u - -export OLD_PWD=`pwd` -export CMAKE=/c/software/PCL/cmake-3.0.1-win32-x86/bin/cmake.exe -export MAKE=mingw32-make.exe -export PATH=/c/mingw-w64/i686-4.9.2-posix-dwarf-rt_v3-rev1/mingw32/bin:$PATH - -mkdir -p /c/software/protobuf/_build -cd /c/software/protobuf/_build -$CMAKE ../ -$MAKE install - -mkdir -p /c/software/libArcus/_build -cd /c/software/libArcus/_build -$CMAKE ../ -$MAKE install - -mkdir -p /c/software/PinkUnicornEngine/_build -cd /c/software/PinkUnicornEngine/_build -$CMAKE ../ -$MAKE - -cd $OLD_PWD -export PYTHONPATH=`pwd`/../libArcus/python:/c/Software/Uranium/ -/c/python34/python setup.py py2exe - -cp /c/software/PinkUnicornEngine/_build/CuraEngine.exe dist/ -cp /c/software/libArcus/_install/bin/libArcus.dll dist/ -cp /c/mingw-w64/i686-4.9.2-posix-dwarf-rt_v3-rev1/mingw32/bin/libgcc_s_dw2-1.dll dist/ -cp /c/mingw-w64/i686-4.9.2-posix-dwarf-rt_v3-rev1/mingw32/bin/libwinpthread-1.dll dist/ -cp /c/mingw-w64/i686-4.9.2-posix-dwarf-rt_v3-rev1/mingw32/bin/libstdc++-6.dll dist/ - -/c/program\ files\ \(x86\)/NSIS/makensis.exe installer.nsi diff --git a/docker/build.sh b/docker/build.sh deleted file mode 100755 index 1092ba4852..0000000000 --- a/docker/build.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/usr/bin/env bash - -# Abort at the first error. -set -e - -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -PROJECT_DIR="$( cd "${SCRIPT_DIR}/.." && pwd )" - -# Make sure that environment variables are set properly -export PATH="${CURA_BUILD_ENV_PATH}/bin:${PATH}" -export PKG_CONFIG_PATH="${CURA_BUILD_ENV_PATH}/lib/pkgconfig:${PKG_CONFIG_PATH}" -export LD_LIBRARY_PATH="${CURA_BUILD_ENV_PATH}/lib:${LD_LIBRARY_PATH}" - -cd "${PROJECT_DIR}" - - - -# -# Clone Uranium and set PYTHONPATH first -# - -# Check the branch to use for Uranium. -# It tries the following branch names and uses the first one that's available. -# - GITHUB_HEAD_REF: the branch name of a PR. If it's not a PR, it will be empty. -# - GITHUB_BASE_REF: the branch a PR is based on. If it's not a PR, it will be empty. -# - GITHUB_REF: the branch name if it's a branch on the repository; -# refs/pull/123/merge if it's a pull_request. -# - master: the master branch. It should always exist. - -# For debugging. -echo "GITHUB_REF: ${GITHUB_REF}" -echo "GITHUB_HEAD_REF: ${GITHUB_HEAD_REF}" -echo "GITHUB_BASE_REF: ${GITHUB_BASE_REF}" - -GIT_REF_NAME_LIST=( "${GITHUB_HEAD_REF}" "${GITHUB_BASE_REF}" "${GITHUB_REF}" "master" ) -for git_ref_name in "${GIT_REF_NAME_LIST[@]}" -do - if [ -z "${git_ref_name}" ]; then - continue - fi - git_ref_name="$(basename "${git_ref_name}")" - # Skip refs/pull/1234/merge as pull requests use it as GITHUB_REF - if [[ "${git_ref_name}" == "merge" ]]; then - echo "Skip [${git_ref_name}]" - continue - fi - URANIUM_BRANCH="${git_ref_name}" - output="$(git ls-remote --heads https://github.com/Ultimaker/Uranium.git "${URANIUM_BRANCH}")" - if [ -n "${output}" ]; then - echo "Found Uranium branch [${URANIUM_BRANCH}]." - break - else - echo "Could not find Uranium branch [${URANIUM_BRANCH}], try next." - fi -done - -echo "Using Uranium branch ${URANIUM_BRANCH} ..." -git clone --depth=1 -b "${URANIUM_BRANCH}" https://github.com/Ultimaker/Uranium.git "${PROJECT_DIR}"/Uranium -export PYTHONPATH="${PROJECT_DIR}/Uranium:.:${PYTHONPATH}" - -mkdir build -cd build -cmake \ - -DCMAKE_BUILD_TYPE=Debug \ - -DCMAKE_PREFIX_PATH="${CURA_BUILD_ENV_PATH}" \ - -DURANIUM_DIR="${PROJECT_DIR}/Uranium" \ - -DBUILD_TESTS=ON \ - -DPRINT_PLUGIN_LIST=OFF \ - -DGENERATE_TRANSLATIONS=OFF \ - .. -make diff --git a/docker/test.sh b/docker/test.sh deleted file mode 100755 index bae2bf785e..0000000000 --- a/docker/test.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash -cd build -ctest -j4 --output-on-failure -T Test diff --git a/test-in-docker.sh b/test-in-docker.sh deleted file mode 100755 index e5a1116646..0000000000 --- a/test-in-docker.sh +++ /dev/null @@ -1,5 +0,0 @@ -sudo rm -rf ./build ./Uranium -sudo docker run -it --rm \ - -v "$(pwd):/srv/cura" ultimaker/cura-build-environment \ - /srv/cura/docker/build.sh -sudo rm -rf ./build ./Uranium