Improving the Win32 installer.

diff --git a/package/Win-NSIS/fg-install-header.bmp b/package/Win-NSIS/fg-install-header.bmp
new file mode 100644 (file)
index 0000000..42c2cbf
Binary files /dev/null and b/package/Win-NSIS/fg-install-header.bmp differ

diff --git a/package/Win-NSIS/flightgear-nightly.nsi b/package/Win-NSIS/flightgear-nightly.nsi
index 08155b3d74f3d439b81a69355be577d380061159..77a5f975309b2e60170ff99fcc80c1ecd47d18b5 100644 (file)
--- a/package/Win-NSIS/flightgear-nightly.nsi
+++ b/package/Win-NSIS/flightgear-nightly.nsi
@@ -27,18 +27,29 @@ AutoCloseWindow true
 
 !define ThirdPartyBinDir "3rdParty\bin"
 
+!define MUI_ICON "flightgear\projects\VC90\flightgear.ico"
+!define MUI_UNICON "flightgear\projects\VC90\flightgear.ico"
+
 !define MUI_HEADERIMAGE
 !define MUI_HEADERIMAGE_RIGHT
-;!define MUI_HEADERIMAGE_BITMAP "logo.bmp" ; optional
-!define MUI_ABORTWARNING
+!define MUI_HEADERIMAGE_BITMAP "flightgear\package\Win-NSIS\fg-install-header.bmp" ; optional
+
+
+
 ;!define MUI_WELCOMEFINISHPAGE_BITMAP "welcome.bmp"
 ;!define MUI_UNWELCOMEFINISHPAGE_BITMAP "welcome.bmp"
 
 !insertmacro MUI_PAGE_WELCOME
-;!insertmacro MUI_PAGE_LICENSE "License.txt"
+; include GPL license page
+!insertmacro MUI_PAGE_LICENSE "flightgear\Copying"
 !insertmacro MUI_PAGE_DIRECTORY
 !insertmacro MUI_PAGE_INSTFILES
 
+!define MUI_FINISHPAGE_RUN $INSTDIR\fgrun.exe
+!define MUI_FINISHPAGE_RUN_TEXT "Run FlightGear now"
+!insertmacro MUI_PAGE_FINISH
+
+
 !insertmacro MUI_UNPAGE_CONFIRM
 !insertmacro MUI_UNPAGE_INSTFILES
 
@@ -83,9 +94,9 @@ Section "" ;No components page, name is not important
   File ${OSGPluginsDir}\osgdb_txf.dll
   
   
+  Exec '"$INSTDIR\fgrun.exe"  --silent --fg-exe="$INSTDIR\fgfs.exe" --ts-exe="$INSTDIR\terrasync.exe" '
   
-  
-  CreateShortCut "$SMPROGRAMS\FlightGear-nightly.lnk" "$INSTDIR\fgrun.exe"
+  CreateShortCut "$SMPROGRAMS\FlightGear-nightly.lnk" "$INSTDIR\fgrun.exe" 
   WriteUninstaller "$INSTDIR\FlightGear_Uninstall.exe"
   
   WriteRegStr HKLM ${UninstallKey} "DisplayName" "FlightGear Nightly"