diff options
author | Youness Alaoui <kakaroto@kakaroto.homelinux.net> | 2015-01-29 20:42:10 +0300 |
---|---|---|
committer | Youness Alaoui <kakaroto@kakaroto.homelinux.net> | 2015-01-29 20:42:10 +0300 |
commit | 92ea7c0b112e3b7488728e686cd81f2e93193253 (patch) | |
tree | db714ddf4565695eecf16aed1b3f39259e9a9dd7 /scripts | |
parent | 01c86f198b540e27efd21347e7147fc08c815895 (diff) | |
parent | 7e5c1b8a004c69e23bc12e4ee578999da3e2ef39 (diff) |
Merge branch 'master' into AO-build
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/linux/debian_armhf/DEBIAN/control | 14 | ||||
-rw-r--r-- | scripts/linux/debian_armhf/DEBIAN/postinst | 1 | ||||
-rwxr-xr-x | scripts/linux/debian_armhf/usr/bin/cura | 2 | ||||
-rwxr-xr-x | scripts/linux/debian_armhf/usr/share/applications/cura.desktop | 10 | ||||
-rw-r--r-- | scripts/win32/installer.nsi | 11 |
5 files changed, 32 insertions, 6 deletions
diff --git a/scripts/linux/debian_armhf/DEBIAN/control b/scripts/linux/debian_armhf/DEBIAN/control new file mode 100644 index 0000000000..05029d00eb --- /dev/null +++ b/scripts/linux/debian_armhf/DEBIAN/control @@ -0,0 +1,14 @@ +Package: cura +Version: 14.01 +Section: misc +Priority: optional +Architecture: armhf +Essential: no +Depends: python-wxgtk2.8, python-opengl, python-serial, python-numpy +Maintainer: Daid <daid303@gmail.com> +Provides: cura +Installed-Size: 10000 +Description: Cura is a full software solution for 3D printing, + aimed at RepRaps and the Ultimaker. It's free software payed for + and maintained by Ultimaker. + diff --git a/scripts/linux/debian_armhf/DEBIAN/postinst b/scripts/linux/debian_armhf/DEBIAN/postinst new file mode 100644 index 0000000000..1a2485251c --- /dev/null +++ b/scripts/linux/debian_armhf/DEBIAN/postinst @@ -0,0 +1 @@ +#!/bin/sh diff --git a/scripts/linux/debian_armhf/usr/bin/cura b/scripts/linux/debian_armhf/usr/bin/cura new file mode 100755 index 0000000000..bd9ef0e1a4 --- /dev/null +++ b/scripts/linux/debian_armhf/usr/bin/cura @@ -0,0 +1,2 @@ +#!/bin/sh +PYTHONPATH=$PYTHONPATH:/usr/share/cura/ /usr/bin/python /usr/share/cura/cura.py "$@" diff --git a/scripts/linux/debian_armhf/usr/share/applications/cura.desktop b/scripts/linux/debian_armhf/usr/share/applications/cura.desktop new file mode 100755 index 0000000000..b7f665a4cc --- /dev/null +++ b/scripts/linux/debian_armhf/usr/share/applications/cura.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Application +Name=Cura +Comment=Cura +Icon=/usr/share/cura/resources/images/c.png +Exec=/usr/bin/python /usr/share/cura/cura.py +Path=/usr/share/cura/ +StartupNotify=true +Terminal=false +Categories=GNOME;GTK;Utility; diff --git a/scripts/win32/installer.nsi b/scripts/win32/installer.nsi index 2f11ad2444..83b86d3c74 100644 --- a/scripts/win32/installer.nsi +++ b/scripts/win32/installer.nsi @@ -151,9 +151,6 @@ Section "Cura ${VERSION}" CreateShortCut "$SMPROGRAMS\Cura ${VERSION}\Uninstall Cura ${VERSION}.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0 CreateShortCut "$SMPROGRAMS\Cura ${VERSION}\Cura ${VERSION}.lnk" "$INSTDIR\python\pythonw.exe" '-m "Cura.cura"' "$INSTDIR\resources\cura.ico" 0 - ; Give all users write permissions in the install directory, so they can read/write profile and preferences files. - AccessControl::GrantOnFile "$INSTDIR" "(S-1-5-32-545)" "FullAccess" - SectionEnd Function LaunchLink @@ -168,9 +165,11 @@ Section "Install Arduino Drivers" File /r "drivers\" ${If} ${RunningX64} - ExecWait '"$INSTDIR\drivers\dpinst64.exe" /lm' + IfSilent +2 + ExecWait '"$INSTDIR\drivers\dpinst64.exe" /lm' ${Else} - ExecWait '"$INSTDIR\drivers\dpinst32.exe" /lm' + IfSilent +2 + ExecWait '"$INSTDIR\drivers\dpinst32.exe" /lm' ${EndIf} SectionEnd @@ -209,7 +208,7 @@ Section /o "Uninstall other Cura versions" StrCmp $2 "" loop ReadRegStr $3 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\$1" "UninstallString" - ExecWait '"$3" /S _?=$INSTDIR' + ExecWait '$3 /S _?=$INSTDIR' done: SectionEnd |