From 20901cf6520032934666a75a6c4288c9830a1e55 Mon Sep 17 00:00:00 2001
From: Joseph Lenox <lenox.joseph@gmail.com>
Date: Fri, 2 Apr 2021 23:08:04 -0500
Subject: [PATCH] Revise CircleCI, change build_appimage for icons, etc

---
 .circleci/config.yml                | 38 +++++++++++++++++++++++++++--
 src/platform/unix/Slic3r.desktop    |  4 +--
 src/platform/unix/build_appimage.sh |  8 +++---
 3 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 90394714f..37d761b9c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,16 +9,50 @@ jobs:
       - checkout
       - run:
           name: Build with CMake
+          environment:
+            - CC=gcc
+            - CXX=g++
           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 /build -DCMAKE_INSTALL_PREFIX=/build.Slic3r \
+                         -DCMAKE_PREFIX_PATH=/opt/dependencies/destdir/usr/local \
+                         -DSLIC3R_STATIC=1\
+                         -DSLIC3R_BUILD_TESTS=OFF
+            make -j4 Slic3r
             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
+      - persist_to_workspace:
+          root: /build
+          paths:
+            - /build/Slic3r.tar.gz
       - store_artifacts:
           path: /build/Slic3r.tar.gz
+  package_appimage:
+    machine:
+      image: ubuntu-1604:202007-01
+    working_directory: /build
+    steps:
+      - attach_workspace:
+          at: /tmp/workspace
+      - checkout
+      - run:
+        name: Package AppImage
+        command: |
+          chmod +x /build/src/platform/unix/build_appimage.sh
+          pushd /tmp/workspace
+          tar -xzf Slic3r.tar.gz
+          /build/src/platform/unix/build_appimage.sh /build/Slic3r.AppImage
+      - store_artifacts:
+        path: /build/Slic3r.AppImage
+  workflows:
+    version: 2
+    build_and_package:
+      jobs:
+        - build
+        - test
+        - package_appimage
diff --git a/src/platform/unix/Slic3r.desktop b/src/platform/unix/Slic3r.desktop
index 283243357..644f318ec 100644
--- a/src/platform/unix/Slic3r.desktop
+++ b/src/platform/unix/Slic3r.desktop
@@ -3,11 +3,11 @@ Name=Slic3r
 GenericName=3D Printing Software
 Comment=G-code generator for 3D printers
 Icon=Slic3r
-Exec=superslicer %F
+Exec=Slic3r %F
 Terminal=false
 Type=Application
 MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;application/x-amf;
 Categories=Graphics;3DGraphics;Engineering;
 Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA
 StartupNotify=false
-StartupWMClass=superslicer
+StartupWMClass=Slic3r
diff --git a/src/platform/unix/build_appimage.sh b/src/platform/unix/build_appimage.sh
index 2ac60c613..404907ea4 100644
--- a/src/platform/unix/build_appimage.sh
+++ b/src/platform/unix/build_appimage.sh
@@ -7,16 +7,16 @@ APP_IMAGE=$1
 wget ${APPIMAGETOOLURL} -O ../appimagetool.AppImage
 chmod +x ../appimagetool.AppImage
 
-sed -i -e 's#/usr#././#g' bin/superslicer
-mv superslicer AppRun
+sed -i -e 's#/usr#././#g' bin/Slic3r
+mv Slic3r AppRun
 chmod +x AppRun
 
-cp resources/icons/Slic3r_192px.png superslicer.png
+cp resources/icons/Slic3r_192px.png Slic3r.png
 cat <<EOF > Slic3r.desktop
 [Desktop Entry]
 Name=Slic3r
 Exec=AppRun %F
-Icon=superslicer
+Icon=Slic3r
 Type=Application
 Categories=Utility;
 MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;application/x-amf;