From 997bf131a5580d2e406e4805e5b62c8d937b5db0 Mon Sep 17 00:00:00 2001 From: Leandro Date: Mon, 27 Apr 2020 13:47:56 -0300 Subject: [PATCH 1/5] Add linux assets --- assets/linux/flatcam-beta | 10 ++++++++++ assets/linux/flatcam-beta.desktop | 7 +++++++ assets/linux/icon.png | Bin 0 -> 2285 bytes 3 files changed, 17 insertions(+) create mode 100755 assets/linux/flatcam-beta create mode 100644 assets/linux/flatcam-beta.desktop create mode 100644 assets/linux/icon.png diff --git a/assets/linux/flatcam-beta b/assets/linux/flatcam-beta new file mode 100755 index 00000000..3eed9aaa --- /dev/null +++ b/assets/linux/flatcam-beta @@ -0,0 +1,10 @@ +#!/bin/bash + +current_path=$(dirname $0) +cd $current_path +current_path=$(pwd) +cd - + +script_path=$(dirname $current_path) + +python3 $script_path/FlatCAM.py $* diff --git a/assets/linux/flatcam-beta.desktop b/assets/linux/flatcam-beta.desktop new file mode 100644 index 00000000..0b729b4f --- /dev/null +++ b/assets/linux/flatcam-beta.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=FlatCAM Beta +Exec=./bin/flatcam-beta +Type=Application +StartupNotify=true +Icon=./assets/icon.png +Comment=G-Code from GERBERS diff --git a/assets/linux/icon.png b/assets/linux/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5f6d1726773f05f1208303ec321e86e27c61782f GIT binary patch literal 2285 zcmbtWc{J2*8~zzXmTXC7iFZayNw$QB#xnLWM5biVGBjgfvQ9#JEu)u-4B|z^XU$I2 zFfz(g_FcBJH(rbkM&I<$d%p9X_mA(K?~nVr&wcK5J?B36xvuMZo+8Z+`FO;5007`K zHbPjjGVWJ!ak5Uz4d-rFVhgY`)CDT~Bvx1j*h9xm2LP(^yob<eV@`=uQ9t@Kb&T z8`Y=eJ^*mV7$bD7Lmf799+vR=oS{}mF6}>FuaT+IPgkvB>X_6VLS(#6EYr0{Z=d*K za0iOW=#qq_7j>CWuh+QY*I}P3X@@f!y*UTD0q(G+p6n&Y&|o=?cF@;z5aF(+LR(BF ziwWU0pg;fu_?7_l2(e{KgA@(HT->xT?}~|PJ_7_f+hzLN=<2)IhTtwipPAPD_I6z{ zB^NM3!7iJQtQ`N(3QVHF-cPJ z+!<12*pcz?~JU( z5Crbz7V{v)tN+iqg2fCu+mz-InmO~}hgxhup_+4|B!HiM!&}f$znz2uF0Y*?j>R~T*-jN%Ns?>;%Wn9)voBx*|ukRh+aIB zzB*iItml;ISna~WWFFYkagyubyoXBiG3?=N*(g#N-GmTqAqz&m4GUUtR$q2?L%Hs* zk9%#TJx(*S7w6isjfx^&TFFh~P0h%lo?mefTpfBE#oR9nBa2d=2#nUpow@3ndg*I! z5>Hj&idFCj!}Y1ATXbB&CQPT5`!A;Y>m8V|P${iZAJ991^c1$O^9t>ADqN~=T0#nMtpcUA_gIcgPZukHeuUS|2i9Fm6&oEc_ zn+MaE`zejOMngWC@t&g<_OmqhOfZzp5_g@PlYk0iJgO(8{ay6WB(3(31Ud99`O#2~ zo9O~Sq+*Sz>g}#6ryhM2(H#Agv^3dj&V|60*;aZ9V+GE^#TDo=Ac3GzrX^JlE#fra z@w7Bv@Dz(Nwdg@>KFH<&@D-;NF0#Zw8P4AgZ3#)uQ0=wR%Hoy5;=w9siswL~ac9E$ z&^M!No)XRoaMhzF@#32=Tr|Uy-LAbHSNS=wLF&ta4d%c?tdl*ZK`8RbbnC-yRLug% ztA+PTEE&Ac>emM&osQ?S6fI*$Qbq1A_ZO7Lc|t+5n{%AuTg0nqm!u86-@amrwB*-% zb3;aR(3+UzLBgeHB7o~L2@U_)VA{+E%(uqF;wV$e)uc5znfhk5+|DDZ5B*&4ZJxpR zKJc@XPVKSWEVnBJP*vo;v5vG07MjOq zni}x4kJN(jXJNP3N$`(B8xwUM{tu>`Z3qdH`66WFEu|B8kh7|ogTpFss%&=T!EVv+ z#-w;S=UQMoZMe*~Fj|7A2w>fnLW}^vlE2r8B=D!)h}=JyU8#z!aPQ69S?-s%fn~*- z1KCdRO+iO^G8Qfp!PtuHOcp;)#A8JTGvgtCir+1UxO0FrqPIpF?pBJN&ZQbbtLc7f zf>OaXSJ?Tv)z!$#_q$ct@`cG!#Np%T;9agH;Z0=M9OVhR`?-8)romoq%P3weme9rZ zIZub(b?5;E1(ngR$3!}7ga0Ppe?Ni$V`J|`UR71<*7i2~ThEJ$!g2POdh)WeiZe$_ zZD+JR*&m^IGZcEedV5tly_CD>- Date: Mon, 27 Apr 2020 13:48:53 -0300 Subject: [PATCH 2/5] Organize installation scritps for Linux (specially Ubuntu) --- Makefile | 41 ++++++++++++++++++++++++++++++++++ setup_ubuntu.sh | 58 ++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 91 insertions(+), 8 deletions(-) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..2a6037f1 --- /dev/null +++ b/Makefile @@ -0,0 +1,41 @@ + +# Install on Ubuntu(-like) systems + +# Install dependencies system-wide (including python modules) +install_dependencies: + sudo -H ./setup_ubuntu.sh + +USER_ID = $(shell id -u) + +LOCAL_PATH = $(shell pwd) +LOCAL_APPS_PATH = ~/.local/share/applications +ASSEST_PATH = assets/linux + +INSTALL_PATH = /usr/share/flatcam-beta +APPS_PATH = /usr/share/applications + +install: +ifeq ($(USER_ID), 0) + @ echo "Installing it system-wide" + cp -rf $(LOCAL_PATH) $(INSTALL_PATH) + ln -sf $(INSTALL_PATH)/assets/linux/flatcam-beta /usr/local/bin + cp -f $(ASSEST_PATH)/flatcam-beta.desktop $(APPS_PATH) + @ sed -i "s|Exec=.*|Exec=$(INSTALL_PATH)/$(ASSEST_PATH)/flatcam-beta|g" $(APPS_PATH)/flatcam-beta.desktop + @ sed -i "s|Icon=.*|Icon=$(INSTALL_PATH)/$(ASSEST_PATH)/icon.png|g" $(APPS_PATH)/flatcam-beta.desktop +else + @ echo "Installing locally for $(USER) only" + cp -f $(ASSEST_PATH)/flatcam-beta.desktop $(LOCAL_APPS_PATH) + @ sed -i "s|Exec=.*|Exec=$(LOCAL_PATH)/$(ASSEST_PATH)/flatcam-beta|g" $(LOCAL_APPS_PATH)/flatcam-beta.desktop + @ sed -i "s|Icon=.*|Icon=$(LOCAL_PATH)/$(ASSEST_PATH)/icon.png|g" $(LOCAL_APPS_PATH)/flatcam-beta.desktop +endif + +remove: +ifeq ($(USER_ID), 0) + @ echo "Uninstalling it system-wide" + rm -rf $(INSTALL_PATH) + rm -f /usr/local/bin/flatcam-beta + rm -r $(APPS_PATH)/flatcam-beta.desktop +else + @ echo "Uninstalling only for $(USER) user" + rm -f $(LOCAL_APPS_PATH)/flatcam-beta.desktop +endif diff --git a/setup_ubuntu.sh b/setup_ubuntu.sh index 50da3fdf..9701e647 100644 --- a/setup_ubuntu.sh +++ b/setup_ubuntu.sh @@ -1,9 +1,51 @@ -#!/bin/bash -sudo apt install --reinstall libpng-dev libfreetype6 libfreetype6-dev libgeos-dev libspatialindex-dev -sudo apt install --reinstall python3-dev python3-pyqt5 python3-pyqt5.qtopengl python3-gdal python3-simplejson -sudo apt install --reinstall python3-pip python3-tk +#!/bin/sh -e -sudo python3 -m pip install --upgrade pyqt5 -sudo python3 -m pip install --upgrade pip numpy shapely rtree tk lxml cycler python-dateutil kiwisolver dill -sudo python3 -m pip install --upgrade vispy pyopengl setuptools svg.path ortools freetype-py fontTools rasterio ezdxf -sudo python3 -m pip install --upgrade matplotlib qrcode reportlab svglib \ No newline at end of file +# Ubuntu packages + +sudo apt-get install -y \ + libfreetype6 \ + libfreetype6-dev \ + libgeos-dev \ + libpng-dev \ + libspatialindex-dev \ + python3-dev \ + python3-gdal \ + python3-pip \ + python3-pyqt5 \ + python3-pyqt5.qtopengl \ + python3-simplejson \ + python3-tk + + +#python3-imaging \ + + +# Python packages + +sudo -H python3 -m pip install --upgrade \ + pip \ + numpy \ + scipy \ + shapely \ + rtree \ + tk \ + lxml \ + cycler \ + python-dateutil \ + kiwisolver \ + dill \ + vispy \ + pyopengl \ + setuptools \ + svg.path \ + ortools \ + freetype-py \ + fontTools \ + rasterio \ + ezdxf \ + matplotlib \ + qrcode \ + reportlab \ + svglib + +sudo -H easy_install -U distribute From fbaaee4cce6bf1e5a125e58be9898a2ca66c837f Mon Sep 17 00:00:00 2001 From: Leandro Date: Mon, 27 Apr 2020 13:49:06 -0300 Subject: [PATCH 3/5] Update Linux install info --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README.md b/README.md index c7756920..ec3f77a1 100644 --- a/README.md +++ b/README.md @@ -61,6 +61,18 @@ sudo apt-get install python3.8-pip - run the file setup_ubuntu.sh and install all the dependencies with the command: ./setup_ubuntu.sh - if the previous command is successful and has no errors, run FlatCAM with the command: python3 FlatCAM.py +- Alternatively you can install it on Ubuntu with: +``` +# Optional if depencencies are missing +make install_dependencies + +# Install for the current user only (using the folder in its place) +make install + +# System-wide instalation +sudo make install +``` + 3. MacOS Instructions from here: https://gist.github.com/natevw/3e6fc929aff358b38c0a#gistcomment-3111878 From 970a21184d65253fc74b0a564f1e086244c3f5b5 Mon Sep 17 00:00:00 2001 From: Leandro Date: Mon, 27 Apr 2020 14:13:46 -0300 Subject: [PATCH 4/5] Remove comment and spicy --- setup_ubuntu.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/setup_ubuntu.sh b/setup_ubuntu.sh index 9701e647..36261f5d 100644 --- a/setup_ubuntu.sh +++ b/setup_ubuntu.sh @@ -17,15 +17,11 @@ sudo apt-get install -y \ python3-tk -#python3-imaging \ - - # Python packages sudo -H python3 -m pip install --upgrade \ pip \ numpy \ - scipy \ shapely \ rtree \ tk \ From f01b3be86961122cad682933ad73c480d7cc1e68 Mon Sep 17 00:00:00 2001 From: Leandro Date: Mon, 27 Apr 2020 14:37:30 -0300 Subject: [PATCH 5/5] Add pyqt5 as requested --- setup_ubuntu.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/setup_ubuntu.sh b/setup_ubuntu.sh index 36261f5d..7700b389 100644 --- a/setup_ubuntu.sh +++ b/setup_ubuntu.sh @@ -41,6 +41,7 @@ sudo -H python3 -m pip install --upgrade \ ezdxf \ matplotlib \ qrcode \ + pyqt5 \ reportlab \ svglib