From fa55a8976233733aeed24e22abcf3eedca11abf3 Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Fri, 2 Apr 2021 22:49:44 -0500 Subject: [PATCH] renames, add circleci --- .circleci/config.yml | 24 +++++++++++++++++++ CMakeLists.txt | 4 ++-- ...codeviewer.desktop => Gcodeviewer.desktop} | 0 .../{SuperSlicer.desktop => Slic3r.desktop} | 0 4 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 .circleci/config.yml rename src/platform/unix/{SuperGcodeviewer.desktop => Gcodeviewer.desktop} (100%) rename src/platform/unix/{SuperSlicer.desktop => Slic3r.desktop} (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 000000000..90394714f --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,24 @@ +version: 2 +jobs: + build: + docker: + - image: slic3r/appimage-build + + working_directory: /build + steps: + - checkout + - run: + name: Build with CMake + command: | + mkdir /build/build + cd /build/cmake + DCC=gcc CXX=g++ cmake /build -DCMAKE_INSTALL_PREFIX=/build.Slic3r -DCMAKE_PREFIX_PATH=/opt/dependencies/destdir/usr/local -DSLIC3R_STATIC=1 -DSLIC3R_BUILD_TESTS=OFF + cmake --build . -j4 + cmake --install . + pushd /build.Slic3r + echo -e '#!/bin/bash\nDIR=$(readlink -f "$0" | xargs dirname)\nexport LD_LIBRARY_PATH="$DIR/bin"\nexec "$DIR/bin/Slic3r" "$@"' > /build.Slic3r/Slic3r + chmod u+x Slic3r + tar -czf /build/Slic3r.tar.gz . + popd + - store_artifacts: + path: /build/Slic3r.tar.gz diff --git a/CMakeLists.txt b/CMakeLists.txt index dac17761a..274ffcc73 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -518,12 +518,12 @@ elseif (SLIC3R_FHS) set(SLIC3R_FHS_RESOURCES "${CMAKE_INSTALL_FULL_DATAROOTDIR}/Slic3r") install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${SLIC3R_FHS_RESOURCES}") install(FILES src/platform/unix/Slic3r.desktop DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications) - install(FILES src/platform/unix/SuperGcodeviewer.desktop DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications) + install(FILES src/platform/unix/Gcodeviewer.desktop DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications) install(FILES resources/icons/Slic3r_192px.png DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/pixmaps RENAME Slic3r.png) install(FILES resources/icons/PrusaSlicer-gcodeviewer_192px.png DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/pixmaps RENAME Slic3r-gcodeviewer.png) else () install(FILES src/platform/unix/Slic3r.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/resources/applications) - install(FILES src/platform/unix/SuperGcodeviewer.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/resources/applications) + install(FILES src/platform/unix/Gcodeviewer.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/resources/applications) install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/resources") endif () diff --git a/src/platform/unix/SuperGcodeviewer.desktop b/src/platform/unix/Gcodeviewer.desktop similarity index 100% rename from src/platform/unix/SuperGcodeviewer.desktop rename to src/platform/unix/Gcodeviewer.desktop diff --git a/src/platform/unix/SuperSlicer.desktop b/src/platform/unix/Slic3r.desktop similarity index 100% rename from src/platform/unix/SuperSlicer.desktop rename to src/platform/unix/Slic3r.desktop