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

This commit is contained in:
daid303 2012-12-20 09:27:06 +01:00
parent d8923b891b
commit 3b37498d2e
3 changed files with 7 additions and 7 deletions

View file

@ -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

View file

@ -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

View file

@ -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',