FG-Win64-nightly: apply update from Win32-nightly

diff --git a/package/Win-NSIS/flightgear64-nightly-vs2010.nsi b/package/Win-NSIS/flightgear64-nightly-vs2010.nsi
index 8a0c591b94d8c20953250a147774f72f75f4f618..27d4d77097f6e6f32091794ea7b80bf70f0e28de 100644 (file)
--- a/package/Win-NSIS/flightgear64-nightly-vs2010.nsi
+++ b/package/Win-NSIS/flightgear64-nightly-vs2010.nsi
@@ -26,7 +26,9 @@ AutoCloseWindow true
                
 !define UninstallKey "Software\Microsoft\Windows\CurrentVersion\Uninstall\FlightGear64-nightly-2010"
 !define FGBinDir "install\msvc100-64\FlightGear\bin"
+!define FGShareDir "install\msvc100-64\FlightGear\share"
 !define FGRunDir "install\msvc100-64\fgrun"
+!define RTIInstallDir "install\msvc100-64\OpenRTI"
 !define OSGInstallDir "install\msvc100-64\OpenSceneGraph"
 !define OSGPluginsDir "${OSGInstallDir}\bin\osgPlugins-${OSGVersion}"
 
@@ -50,7 +52,7 @@ AutoCloseWindow true
 !insertmacro MUI_PAGE_DIRECTORY
 !insertmacro MUI_PAGE_INSTFILES
 
-!define MUI_FINISHPAGE_RUN $INSTDIR\fgrun.exe
+!define MUI_FINISHPAGE_RUN $INSTDIR\bin\fgrun.exe
 !define MUI_FINISHPAGE_RUN_TEXT "Run FlightGear now"
 !insertmacro MUI_PAGE_FINISH
 
@@ -65,12 +67,17 @@ Section "" ;No components page, name is not important
         
   SetShellVarContext all
   ; Set output path to the installation directory.
-  SetOutPath $INSTDIR
+  SetOutPath $INSTDIR\share\flightgear
+  File ${FGShareDir}\flightgear\positions.txt
+  File ${FGShareDir}\flightgear\special_frequencies.txt
   
+  SetOutPath $INSTDIR\bin
   File ${FGBinDir}\fgfs.exe
   File ${FGBinDir}\fgjs.exe
+  File ${FGBinDir}\terrasync.exe
   File ${FGRunDir}\bin\fgrun.exe
-  
+  File ${FGBinDir}\fgcom.exe
+
   File ${OSGInstallDir}\bin\osg${OSGSoNumber}-osg.dll
   File ${OSGInstallDir}\bin\osg${OSGSoNumber}-osgDB.dll
   File ${OSGInstallDir}\bin\osg${OSGSoNumber}-osgGA.dll
@@ -84,13 +91,17 @@ Section "" ;No components page, name is not important
   File ${OSGInstallDir}\bin\ot13-OpenThreads.dll
   
   File ${ThirdPartyBinDir}\*.dll
+
+  File ${RTIInstallDir}\bin\FedTime.dll
+  File ${RTIInstallDir}\bin\RTI-NG.dll
+  File ${RTIInstallDir}\bin\OpenRTI.dll
   
   ; VC runtime redistributables
-  File "$%VCINSTALLDIR%\redist\x64\Microsoft.VC100.CRT\*.dll"
+  File "$%VCINSTALLDIR%\redist\x86\Microsoft.VC100.CRT\*.dll"
   
   File /r ${FGRunDir}\share\locale
   
-  SetOutPath $INSTDIR\osgPlugins-${OSGVersion}
+  SetOutPath $INSTDIR\bin\osgPlugins-${OSGVersion}
   File ${OSGPluginsDir}\osgdb_ac.dll
   File ${OSGPluginsDir}\osgdb_osg.dll
   File ${OSGPluginsDir}\osgdb_osga.dll
@@ -116,18 +127,20 @@ Section "" ;No components page, name is not important
   File ${OSGPluginsDir}\osgdb_deprecated_osgparticle.dll
   
   
-  Exec '"$INSTDIR\fgrun.exe"  --silent --fg-exe="$INSTDIR\fgfs.exe" '
+  Exec '"$INSTDIR\bin\fgrun.exe"  --silent --fg-exe="$INSTDIR\bin\fgfs.exe" --ts-exe="$INSTDIR\bin\terrasync.exe" '
   
   CreateDirectory "$SMPROGRAMS\FlightGear"
-  CreateShortCut "$SMPROGRAMS\FlightGear\FlightGear64-nightly-2010.lnk" "$INSTDIR\fgrun.exe" 
+  CreateShortCut "$SMPROGRAMS\FlightGear\FlightGear64-nightly-2010.lnk" "$INSTDIR\bin\fgrun.exe"
+  CreateShortCut "$SMPROGRAMS\FlightGear\FGCom-nightly-2010.lnk" "$INSTDIR\bin\fgcom.exe"
+  CreateShortCut "$SMPROGRAMS\FlightGear\FGCom-testing-nightly-2010.lnk" "$INSTDIR\bin\fgcom.exe" "-f910"
   
   
-  WriteUninstaller "$INSTDIR\FlightGear_Uninstall.exe"
+  WriteUninstaller "$INSTDIR\bin\FlightGear_Uninstall.exe"
   
   WriteRegStr HKLM ${UninstallKey} "DisplayName" "FlightGear64 Nightly (vs2010 build)"
   WriteRegStr HKLM ${UninstallKey} "DisplayVersion" "${FGVersion}"
-  WriteRegStr HKLM ${UninstallKey} "UninstallString" "$INSTDIR\FlightGear_Uninstall.exe"
-  WriteRegStr HKLM ${UninstallKey} "UninstallPath" "$INSTDIR\FlightGear_Uninstall.exe"
+  WriteRegStr HKLM ${UninstallKey} "UninstallString" "$INSTDIR\bin\FlightGear_Uninstall.exe"
+  WriteRegStr HKLM ${UninstallKey} "UninstallPath" "$INSTDIR\bin\FlightGear_Uninstall.exe"
   WriteRegDWORD HKLM ${UninstallKey} "NoModify" 1
   WriteRegDWORD HKLM ${UninstallKey} "NoRepair" 1
   WriteRegStr HKLM ${UninstallKey} "URLInfoAbout" "http://www.flightgear.org/"
@@ -142,6 +155,8 @@ Section "Uninstall"
   
   
   Delete "$SMPROGRAMS\FlightGear\FlightGear64-nightly-2010.lnk"
+  Delete "$SMPROGRAMS\FlightGear\FGCom-nightly-2010.lnk"
+  Delete "$SMPROGRAMS\FlightGear\FGCom-testing-nightly-2010.lnk"
   ; only delete the FlightGear group if it's empty
   RMDir "$SMPROGRAMS\FlightGear"