Browse Source

Windows Installer tweaks

JoshEngebretson 10 years ago
parent
commit
7eef99acdb

+ 10 - 1
Build/CIScripts/GenWindowsEditor.js

@@ -56,6 +56,12 @@ namespace('build', function() {
 
     bcommon.cleanCreateDir(dstDir);
 
+    process.chdir(srcDir);
+
+    cmds = [ atomicRoot + "Build/Windows/7z/7z.exe x -y EditorData.zip"];
+
+    jake.exec(cmds, function() {
+
     console.log("Generating Windows Editor");
 
     var editorAppFolder = dstDir + "AtomicEditor/";
@@ -84,8 +90,11 @@ namespace('build', function() {
     fs.copySync(srcDir + "Docs",
       editorAppFolder + "Resources/ToolData/Docs/JSDocs");
 
-    complete();
+      complete();
 
+    }, {
+      printStdout: true
+    });
 
   });
 

+ 14 - 0
Build/CIScripts/Windows/Installer/AtomicEditor.nsi

@@ -26,6 +26,13 @@
 
 !include "MUI.nsh"
 
+!define MUI_HEADERIMAGE
+!define MUI_HEADERIMAGE_RIGHT
+!define MUI_HEADERIMAGE_BITMAP "Windows_Installer_Header.bmp"
+!define MUI_WELCOMEFINISHPAGE_BITMAP "Windows_Installer_LeftImage.bmp"
+!define MUI_HEADERIMAGE_UNBITMAP "Windows_Installer_Header.bmp"
+!define MUI_HEADER_TRANSPARENT_TEXT
+
 ;--------------------------------
 ;General
 ;--------------------------------
@@ -50,8 +57,15 @@ InstallDirRegKey HKLM "Software\${coname}\InstallDir" "${prodname}"
 ;Pages
 ;--------------------------------
 
+!insertmacro MUI_PAGE_WELCOME
 !insertmacro MUI_PAGE_DIRECTORY
 !insertmacro MUI_PAGE_INSTFILES
+	; These indented statements modify settings for MUI_PAGE_FINISH
+	!define MUI_FINISHPAGE_NOAUTOCLOSE
+	!define MUI_FINISHPAGE_RUN "$INSTDIR\AtomicEditor\${appexe}"
+	!define MUI_FINISHPAGE_RUN_CHECKED
+	!define MUI_FINISHPAGE_RUN_TEXT "Launch the Atomic Editor"
+!insertmacro MUI_PAGE_FINISH
 
 !insertmacro MUI_UNPAGE_CONFIRM
 !insertmacro MUI_UNPAGE_INSTFILES

BIN
Build/CIScripts/Windows/Installer/Windows_Installer_LeftImage.bmp