Merge tag '15.01-RC8' into upstream

Conflicts:
	Cura/gui/sceneView.py
	Cura/util/profile.py
	Cura/util/sliceEngine.py
	package.sh
	resources/meshes/ultimaker2_platform.stl

6 files changed, 98 insertions, 16 deletions

diff --git a/scripts/linux/fedora/.gitignore b/scripts/linux/fedora/.gitignore
new file mode 100644
index 0000000000..ea03173056
--- /dev/null
+++ b/scripts/linux/fedora/.gitignore
@@ -0,0 +1,2 @@
+/RPMS/
+/SRPMS/
diff --git a/scripts/linux/fedora/rpm.spec b/scripts/linux/fedora/rpm.spec
new file mode 100644
index 0000000000..230aebf4c0
--- /dev/null
+++ b/scripts/linux/fedora/rpm.spec
@@ -0,0 +1,82 @@
+%global _curaName      __curaName__
+%global _baseDir       __basedir__
+%global _version       __version__
+%global _gitCura       __gitCura__
+%global _gitCuraEngine __gitCuraEngine__
+%global _gitPower      __gitPower__
+
+
+Name:             %{_curaName}
+Version:          %{_version}
+Release:          1%{?dist}
+Summary:          3D printing software aimed at RepRaps and the Ultimaker
+Group:            Applications/Engineering
+
+License:          GPLv2+
+URL:              https://github.com/daid/Cura.git
+Source0:          %{_curaName}-%{_version}.tar.gz
+
+BuildRequires:    libstdc++-static, glibc-static
+Requires:         wxPython, curl
+Requires:         python3-setuptools >= 0.6.34
+Requires:         python3-PyOpenGL >= 3.0.2, PyOpenGL >= 3.0.2
+Requires:         python3-pyserial >= 2.6, pyserial >= 2.6
+Requires:         python3-numpy >= 1.6.2, numpy >= 1.6.2
+Requires:         python3-power >= 1.2
+
+
+%description
+%{_curaName} is a full software solution for 3D printing, aimed at RepRaps and
+the Ultimaker.
+
+It's free software payed for and maintained by Ultimaker.
+
+
+%prep
+%setup -q -n %{name}-%{version}
+
+
+%build
+make -C CuraEngine VERSION=%{_version}
+
+dstDir="%{_baseDir}/usr/share/cura"
+
+rm    -frv "$dstDir"
+mkdir -pv  "$dstDir"
+
+cp -av -t  "$dstDir" \
+  Cura \
+  resources \
+  plugins \
+  CuraEngine/build/CuraEngine \
+  Power/power \
+  scripts/linux/cura.py
+
+echo "%{_version}" > "$dstDir/Cura/version"
+cat > "$dstDir/Cura/versions" << EOF
+# Git SHAs of software used to build %{_curaName}
+Cura       : %{_gitCura}
+CuraEngine : %{_gitCuraEngine}
+Power      : %{_gitPower}
+EOF
+
+
+%install
+mkdir -pv "%{buildroot}"
+cp -av -t "%{buildroot}" "%{_baseDir}/usr"
+
+
+%files
+%defattr(-,root,root)
+%{_bindir}/cura
+%attr(644, root, root) %{_datarootdir}/applications/cura.desktop
+%attr(755, root, root) %{_datarootdir}/cura/Cura/cura.py
+%attr(755, root, root) %{_datarootdir}/cura/Cura/util/pymclevel/mce.py
+%attr(755, root, root) %{_datarootdir}/cura/CuraEngine
+%attr(755, root, root) %{_datarootdir}/cura/cura.py
+%{_datarootdir}/cura
+
+
+%changelog
+* Wed Jan 14 2015 Ferry Huberts <ferry.huberts@pelagic.nl>
+- Initial packaging, currently at version 15.01.RC7
diff --git a/scripts/linux/fedora/usr/bin/cura b/scripts/linux/fedora/usr/bin/cura
new file mode 100755
index 0000000000..bd9ef0e1a4
--- /dev/null
+++ b/scripts/linux/fedora/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/fedora/usr/share/.gitignore b/scripts/linux/fedora/usr/share/.gitignore
new file mode 100644
index 0000000000..90e6af15ef
--- /dev/null
+++ b/scripts/linux/fedora/usr/share/.gitignore
@@ -0,0 +1 @@
+/cura/
diff --git a/scripts/linux/fedora/usr/share/applications/cura.desktop b/scripts/linux/fedora/usr/share/applications/cura.desktop
new file mode 100755
index 0000000000..25dcc7f364
--- /dev/null
+++ b/scripts/linux/fedora/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=Graphics;3DGraphics;Engineering;Development;
diff --git a/scripts/win32/installer.nsi b/scripts/win32/installer.nsi
index 83b86d3c74..2f474d9715 100644
--- a/scripts/win32/installer.nsi
+++ b/scripts/win32/installer.nsi
@@ -156,7 +156,7 @@ SectionEnd
 Function LaunchLink
   ; Write start menu entries for all users
   SetShellVarContext all
-  ExecShell "" "$SMPROGRAMS\Cura ${VERSION}\Cura ${VERSION}.lnk"
+  Exec '"$WINDIR\explorer.exe" "$SMPROGRAMS\Cura ${VERSION}\Cura ${VERSION}.lnk"'
 FunctionEnd
 
 Section "Install Arduino Drivers"
@@ -197,21 +197,6 @@ Section /o "Open AMF files with Cura"
 	WriteRegStr HKCR "Cura AMF model file\shell\open\command" "" '"$INSTDIR\python\pythonw.exe" -c "import os; os.chdir(\"$INSTDIR\"); import Cura.cura; Cura.cura.main()" "%1"'
 SectionEnd
 
-Section /o "Uninstall other Cura versions"
-	StrCpy $0 0
-	loop:
-		EnumRegKey $1 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall" $0
-		StrCmp $1 "" done
-		IntOp $0 $0 + 1
-		StrCmp $1 "Cura_${VERSION}" loop
-		${StrContains} $2 "Cura_" $1
-		StrCmp $2 "" loop
-		
-		ReadRegStr $3 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\$1" "UninstallString"
-		ExecWait '$3 /S _?=$INSTDIR'
-	done:
-SectionEnd
-
 ;--------------------------------
 
 ; Uninstaller