Bump version to 15.05.95

cura/CuraApplication.py

@@ -50,7 +50,7 @@ class CuraApplication(QtApplication):
         if not hasattr(sys, "frozen"):
             Resources.addResourcePath(os.path.join(os.path.abspath(os.path.dirname(__file__)), ".."))
 
-        super().__init__(name = "cura", version = "15.05.94")
+        super().__init__(name = "cura", version = "15.05.95")
 
         self.setRequiredPlugins([
             "CuraEngineBackend",

installer.nsi

@@ -1,5 +1,5 @@
 !ifndef VERSION
-  !define VERSION 'BETA'
+  !define VERSION '15.05.95'
 !endif
 
 ; The name of the installer
@@ -44,6 +44,9 @@ SetCompressor /SOLID lzma
 !define MUI_FINISHPAGE_RUN_TEXT "Start Cura ${VERSION}"
 !define MUI_FINISHPAGE_RUN_FUNCTION "LaunchLink"
 
+;Add an option to show release notes
+!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\release_notes.txt"
+
 ; Pages
 ;!insertmacro MUI_PAGE_WELCOME
 !insertmacro MUI_PAGE_DIRECTORY
@@ -101,10 +104,10 @@ FunctionEnd
 
 Section "Install Visual Studio 2010 Redistributable"
     SetOutPath "$INSTDIR"
-    File "vcredist_2010_x86.exe"
+    File "vcredist_2010_20110908_x86.exe"
     
     IfSilent +2
-      ExecWait '"$INSTDIR\vcredist_2010_x86.exe"'
+      ExecWait '"$INSTDIR\vcredist_2010_20110908_x86.exe" /silent /norestart'
 
 SectionEnd
 

setup.py

@@ -22,7 +22,7 @@ def copytree(src, dst, symlinks=False, ignore=None):
         else:
             shutil.copy2(s, d)
 
-includes = ["sip", "ctypes", "UM", "PyQt5.QtNetwork", "PyQt5._QOpenGLFunctions_2_0", "serial", "Arcus", "google", "google.protobuf", "google.protobuf.descriptor", "xml.etree", "xml.etree.ElementTree", "src"]
+includes = ["sip", "ctypes", "UM", "PyQt5.QtNetwork", "PyQt5._QOpenGLFunctions_2_0", "serial", "Arcus", "google", "google.protobuf", "google.protobuf.descriptor", "xml.etree", "xml.etree.ElementTree", "cura"]
 # Include all the UM modules in the includes. As py2exe fails to properly find all the dependencies due to the plugin architecture.
 for dirpath, dirnames, filenames in os.walk(os.path.dirname(UM.__file__)):
     if "__" in dirpath:
@@ -41,7 +41,7 @@ print("Removing previous distribution package")
 shutil.rmtree("dist", True)
 
 setup(name="Cura",
-        version="2.0",
+        version="15.05.95",
         author="Ultimaker",
         author_email="d.braam@ultimaker.com",
         url="http://software.ultimaker.com/",
@@ -54,7 +54,7 @@ setup(name="Cura",
 print("Coping Cura plugins.")
 shutil.copytree(os.path.dirname(UM.__file__) + "/../plugins", "dist/plugins")
 for path in os.listdir("plugins"):
-	shutil.copytree("plugins/" + path, "dist/plugins/" + path)
+    shutil.copytree("plugins/" + path, "dist/plugins/" + path)
 print("Coping resources.")
 shutil.copytree(os.path.dirname(UM.__file__) + "/../resources", "dist/resources")
 copytree("resources", "dist/resources")
@@ -70,3 +70,7 @@ for site_package in site.getsitepackages():
         shutil.copytree(os.path.join(qt_origin_path, "qml/QtQuick.2"), "dist/qml/QtQuick.2")
         print("Coping PyQt5 svg library from: %s" % qt_origin_path)
         shutil.copy(os.path.join(qt_origin_path, "Qt5Svg.dll"), "dist/Qt5Svg.dll")
+        print("Copying Angle libraries from %s" % qt_origin_path)
+        shutil.copy(os.path.join(qt_origin_path, "libEGL.dll"), "dist/libEGL.dll")
+        shutil.copy(os.path.join(qt_origin_path, "libGLESv2.dll"), "dist/libGLESv2.dll")
+os.rename("dist/cura_app.exe", "dist/Cura.exe")