diff options
| author | daid <daid303@gmail.com> | 2014-02-13 13:16:30 +0400 |
|---|---|---|
| committer | daid <daid303@gmail.com> | 2014-02-13 13:16:30 +0400 |
| commit | bc6ee3c2d1656c62b06d6efa0b5fe83d33d40dea (patch) | |
| tree | eb7aa35b402be5b649433ed4d608595509c8f09e | |
| parent | 47a57855ac0e82a1114eabe2b02a2a0b980be27c (diff) | |
| parent | 2575d5afbb8c5d0f1683dfb4734eec010634d43a (diff) | |
Merge branch 'SteamEngine' of github.com:daid/Cura into SteamEngine14.02-RC11.14.02-RC1
| -rwxr-xr-x | package.sh | 2 | ||||
| -rw-r--r-- | scripts/win32/installer.nsi | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/package.sh b/package.sh index 5a94a66838..05f840b500 100755 --- a/package.sh +++ b/package.sh @@ -18,7 +18,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 -export BUILD_NAME=14.02-TEST1 +export BUILD_NAME=14.02-RC1 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 c76c7449c4..5a66217cdd 100644 --- 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/resources/cura.ico" +!define MUI_ICON "dist/resources/cura.ico" !define MUI_BGCOLOR FFFFFF ; Directory page defines @@ -95,7 +95,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\resources\cura.ico" 0 + CreateShortCut "$SMPROGRAMS\Cura ${VERSION}\Cura ${VERSION}.lnk" "$INSTDIR\python\pythonw.exe" '-m "Cura.cura"' "$INSTDIR\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" @@ -123,7 +123,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\resources\stl.ico,0" + WriteRegStr HKCR "Cura STL model file\DefaultIcon" "" "$INSTDIR\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" -c "import os; os.chdir(\"$INSTDIR\"); import Cura.cura; Cura.cura.main()" "%1"' SectionEnd @@ -131,7 +131,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\resources\stl.ico,0" + WriteRegStr HKCR "Cura OBJ model file\DefaultIcon" "" "$INSTDIR\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" -c "import os; os.chdir(\"$INSTDIR\"); import Cura.cura; Cura.cura.main()" "%1"' SectionEnd @@ -139,7 +139,7 @@ SectionEnd Section /o "Open AMF files with Cura" WriteRegStr HKCR .amf "" "Cura AMF model file" DeleteRegValue HKCR .amf "Content Type" - WriteRegStr HKCR "Cura AMF model file\DefaultIcon" "" "$INSTDIR\Cura\resources\stl.ico,0" + WriteRegStr HKCR "Cura AMF model file\DefaultIcon" "" "$INSTDIR\resources\stl.ico,0" WriteRegStr HKCR "Cura AMF model file\shell" "" "open" 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 |