3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-15 02:37:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Bump version to 15.05.95

Browse source
This commit is contained in:
Arjen Hiemstra 2015-06-19 06:10:55 -07:00
parent f1ebb3389d
commit 2c139c4037
3 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/CuraApplication.py
View file

@ -50,7 +50,7 @@ class CuraApplication(QtApplication):
if not hasattr(sys, "frozen"): if not hasattr(sys, "frozen"):
Resources.addResourcePath(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..")) 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([ self.setRequiredPlugins([
"CuraEngineBackend", "CuraEngineBackend",

9
installer.nsi
View file

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

8
setup.py
View file

@ -22,7 +22,7 @@ def copytree(src, dst, symlinks=False, ignore=None):
else: else:
shutil.copy2(s, d) 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. # 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__)): for dirpath, dirnames, filenames in os.walk(os.path.dirname(UM.__file__)):
if "__" in dirpath: if "__" in dirpath:
@ -41,7 +41,7 @@ print("Removing previous distribution package")
shutil.rmtree("dist", True) shutil.rmtree("dist", True)
setup(name="Cura", setup(name="Cura",
version="2.0", version="15.05.95",
author="Ultimaker", author="Ultimaker",
author_email="d.braam@ultimaker.com", author_email="d.braam@ultimaker.com",
url="http://software.ultimaker.com/", url="http://software.ultimaker.com/",
@ -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") 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) print("Coping PyQt5 svg library from: %s" % qt_origin_path)
shutil.copy(os.path.join(qt_origin_path, "Qt5Svg.dll"), "dist/Qt5Svg.dll") 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")