Updated version number to 12.12, fixed some minor packaging issues.

diff --git a/package.sh b/package.sh
index 3c95415fe125c6639a1997ebaa79c642542075b5..acc7fc69d8e97fbdde157d063cded7ea8d06991b 100755 (executable)
--- a/package.sh
+++ b/package.sh
@@ -16,7 +16,7 @@ BUILD_TARGET=${1:-all}
 ##Do we need to create the final archive
 ARCHIVE_FOR_DISTRIBUTION=1
 ##Which version name are we appending to the final archive
-BUILD_NAME=12.11
+BUILD_NAME=12.12
 TARGET_DIR=Cura-${BUILD_NAME}-${BUILD_TARGET}
 
 ##Which versions of external programs to use

diff --git a/scripts/win32/installer.nsi b/scripts/win32/installer.nsi
index 60e5ee82ed51cf15f8698ecc601b5b49fd946dfe..a9d639de10b797e34c85b44b474629d21af3c2ba 100644 (file)
--- a/scripts/win32/installer.nsi
+++ b/scripts/win32/installer.nsi
@@ -26,7 +26,7 @@ SetCompressor /SOLID lzma
 !include "MUI2.nsh"
 !include Library.nsh
 
-!define MUI_ICON "dist/Cura/cura.ico"
+!define MUI_ICON "dist/Cura/resources/cura.ico"
 !define MUI_BGCOLOR FFFFFF
 
 ; Directory page defines
@@ -92,7 +92,7 @@ Section "Cura ${VERSION}"
   
   CreateDirectory "$SMPROGRAMS\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\Cura\cura.ico" 0
+  CreateShortCut "$SMPROGRAMS\Cura ${VERSION}\Cura ${VERSION}.lnk" "$INSTDIR\python\pythonw.exe" '-m "Cura.cura"' "$INSTDIR\Cura\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"
@@ -118,7 +118,7 @@ SectionEnd
 Section "Open STL files with Cura"
        WriteRegStr HKCR .stl "" "Cura STL model file"
        DeleteRegValue HKCR .stl "Content Type"
-       WriteRegStr HKCR "Cura STL model file\DefaultIcon" "" "$INSTDIR\Cura\stl.ico,0"
+       WriteRegStr HKCR "Cura STL model file\DefaultIcon" "" "$INSTDIR\Cura\resources\stl.ico,0"
        WriteRegStr HKCR "Cura STL model file\shell" "" "open"
        WriteRegStr HKCR "Cura STL model file\shell\open\command" "" '"$INSTDIR\python\pythonw.exe" "$INSTDIR\Cura\cura.py" "%1"'
 SectionEnd
@@ -126,7 +126,7 @@ SectionEnd
 Section /o "Open OBJ files with Cura"
        WriteRegStr HKCR .obj "" "Cura OBJ model file"
        DeleteRegValue HKCR .obj "Content Type"
-       WriteRegStr HKCR "Cura OBJ model file\DefaultIcon" "" "$INSTDIR\Cura\stl.ico,0"
+       WriteRegStr HKCR "Cura OBJ model file\DefaultIcon" "" "$INSTDIR\Cura\resources\stl.ico,0"
        WriteRegStr HKCR "Cura OBJ model file\shell" "" "open"
        WriteRegStr HKCR "Cura OBJ model file\shell\open\command" "" '"$INSTDIR\python\pythonw.exe" "$INSTDIR\Cura\cura.py" "%1"'
 SectionEnd

diff --git a/setup.py b/setup.py
index 1cf22659e9c5946d9ae60887a6a1441bbb53d94e..c9c9d83be2943c8c40171defcfe55ae82c1b8b62 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -9,8 +9,8 @@ if sys.platform.startswith('darwin'):
     DATA_FILES = ['Cura/LICENSE', 'Cura/resources/images', 'Cura/resources/meshes', 'Cura/resources/example/', 'Cura/resources/firmware/']
     PLIST = {
         u'CFBundleName': u'Cura',
-        u'CFBundleShortVersionString': u'12.11',
-        u'CFBundleVersion': u'12.11',
+        u'CFBundleShortVersionString': u'12.12',
+        u'CFBundleVersion': u'12.12',
         u'CFBundleIdentifier': u'com.ultimaker.Cura',
         u'LSMinimumSystemVersion': u'10.6',
         u'LSApplicationCategoryType': u'public.app-category.graphics-design',