Merge branch 'next' of gitorious.org:fg/flightgear into next

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0d702a18db4a39b92b273bc1817cb70b27bdb53..e6d449217c8eca0305a3796021cf0503586b7289 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 2.6.4)
 
 include (CheckFunctionExists)
 include (CheckCSourceCompiles)

diff --git a/package/Win-NSIS/flightgear-nightly-vs2010.nsi b/package/Win-NSIS/flightgear-nightly-vs2010.nsi
new file mode 100644 (file)
index 0000000..95f5ad9
--- /dev/null
+++ b/package/Win-NSIS/flightgear-nightly-vs2010.nsi
@@ -0,0 +1,153 @@
+!include "MUI.nsh"
+
+!system 'osgversion --so-number > %TEMP%\osg-so-number.txt'
+!system 'osgversion --version-number > %TEMP%\osg-version.txt'
+
+!define /file OSGSoNumber $%TEMP%\osg-so-number.txt
+!define /file OSGVersion $%TEMP%\osg-version.txt
+!define /file FGVersion flightgear\version
+
+!echo "osg-so is ${OSGSoNumber}"
+
+Name "FlightGear Nightly vs2010"
+OutFile fgfs_win32_vs2010_nightly_${FGVersion}.exe
+
+; use LZMA for best compression
+SetCompressor /FINAL /SOLID lzma
+SetCompressorDictSize 64
+
+InstallDir $PROGRAMFILES\FlightGear-nightly-2010
+
+; Request admin privileges for Windows Vista
+RequestExecutionLevel highest
+
+; don't hang around
+AutoCloseWindow true
+               
+!define UninstallKey "Software\Microsoft\Windows\CurrentVersion\Uninstall\FlightGear-nightly-2010"
+!define FGBinDir "install\msvc100\FlightGear\bin"
+!define FGRunDir "install\msvc100\fgrun"
+!define OSGInstallDir "install\msvc100\OpenSceneGraph"
+!define OSGPluginsDir "${OSGInstallDir}\bin\osgPlugins-${OSGVersion}"
+
+!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 "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
+; 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
+
+!insertmacro MUI_LANGUAGE "English"
+
+; The stuff to install
+Section "" ;No components page, name is not important  
+        
+  SetShellVarContext all
+  ; Set output path to the installation directory.
+  SetOutPath $INSTDIR
+  
+  File ${FGBinDir}\fgfs.exe
+  File ${FGBinDir}\fgjs.exe
+  File ${FGBinDir}\terrasync.exe
+  File ${FGRunDir}\bin\fgrun.exe
+  
+  File ${OSGInstallDir}\bin\osg${OSGSoNumber}-osg.dll
+  File ${OSGInstallDir}\bin\osg${OSGSoNumber}-osgDB.dll
+  File ${OSGInstallDir}\bin\osg${OSGSoNumber}-osgGA.dll
+  File ${OSGInstallDir}\bin\osg${OSGSoNumber}-osgParticle.dll
+  File ${OSGInstallDir}\bin\osg${OSGSoNumber}-osgText.dll
+  File ${OSGInstallDir}\bin\osg${OSGSoNumber}-osgUtil.dll
+  File ${OSGInstallDir}\bin\osg${OSGSoNumber}-osgViewer.dll
+  File ${OSGInstallDir}\bin\osg${OSGSoNumber}-osgSim.dll
+  File ${OSGInstallDir}\bin\osg${OSGSoNumber}-osgFX.dll
+  
+  File ${OSGInstallDir}\bin\ot12-OpenThreads.dll
+  
+  File ${ThirdPartyBinDir}\*.dll
+  
+  ; VC runtime redistributables
+  File "$%VCINSTALLDIR%\redist\x86\Microsoft.VC100.CRT\*.dll"
+  
+  File /r ${FGRunDir}\share
+  
+  SetOutPath $INSTDIR\osgPlugins-${OSGVersion}
+  File ${OSGPluginsDir}\osgdb_ac.dll
+  File ${OSGPluginsDir}\osgdb_osg.dll
+  File ${OSGPluginsDir}\osgdb_osga.dll
+  File ${OSGPluginsDir}\osgdb_3ds.dll
+  File ${OSGPluginsDir}\osgdb_mdl.dll
+  File ${OSGPluginsDir}\osgdb_jpeg.dll
+  File ${OSGPluginsDir}\osgdb_rgb.dll  
+  File ${OSGPluginsDir}\osgdb_png.dll
+  File ${OSGPluginsDir}\osgdb_dds.dll
+  File ${OSGPluginsDir}\osgdb_txf.dll
+  File ${OSGPluginsDir}\osgdb_serializers_osg.dll
+  File ${OSGPluginsDir}\osgdb_serializers_osganimation.dll
+  File ${OSGPluginsDir}\osgdb_serializers_osgfx.dll
+  File ${OSGPluginsDir}\osgdb_serializers_osgmanipulator.dll
+  File ${OSGPluginsDir}\osgdb_serializers_osgparticle.dll
+  File ${OSGPluginsDir}\osgdb_serializers_osgshadow.dll
+  File ${OSGPluginsDir}\osgdb_serializers_osgsim.dll
+  File ${OSGPluginsDir}\osgdb_serializers_osgterrain.dll
+  File ${OSGPluginsDir}\osgdb_serializers_osgtext.dll
+  File ${OSGPluginsDir}\osgdb_serializers_osgvolume.dll
+  File ${OSGPluginsDir}\osgdb_deprecated_osg.dll
+  File ${OSGPluginsDir}\osgdb_deprecated_osgparticle.dll
+  
+  
+  Exec '"$INSTDIR\fgrun.exe"  --silent --fg-exe="$INSTDIR\fgfs.exe" --ts-exe="$INSTDIR\terrasync.exe" '
+  
+  CreateDirectory "$SMPROGRAMS\FlightGear"
+  CreateShortCut "$SMPROGRAMS\FlightGear\FlightGear-nightly-2010.lnk" "$INSTDIR\fgrun.exe" 
+  
+  
+  WriteUninstaller "$INSTDIR\FlightGear_Uninstall.exe"
+  
+  WriteRegStr HKLM ${UninstallKey} "DisplayName" "FlightGear Nightly (vs2010 build)"
+  WriteRegStr HKLM ${UninstallKey} "DisplayVersion" "${FGVersion}"
+  WriteRegStr HKLM ${UninstallKey} "UninstallString" "$INSTDIR\FlightGear_Uninstall.exe"
+  WriteRegStr HKLM ${UninstallKey} "UninstallPath" "$INSTDIR\FlightGear_Uninstall.exe"
+  WriteRegDWORD HKLM ${UninstallKey} "NoModify" 1
+  WriteRegDWORD HKLM ${UninstallKey} "NoRepair" 1
+  WriteRegStr HKLM ${UninstallKey} "URLInfoAbout" "http://www.flightgear.org/"
+ 
+SectionEnd
+
+
+
+Section "Uninstall"
+   
+  SetShellVarContext all
+  
+  
+  Delete "$SMPROGRAMS\FlightGear\FlightGear-nightly-2010.lnk"
+  ; only delete the FlightGear group if it's empty
+  RMDir "$SMPROGRAMS\FlightGear"
+  
+  RMDir /r "$INSTDIR"
+  
+  DeleteRegKey HKLM ${UninstallKey}
+
+SectionEnd
+ 

diff --git a/package/Win32-Inno/FlightGear-devel.iss b/package/Win32-Inno/FlightGear-devel.iss
index d10ebf4532e8706d829c9b53325607f4ee7bd38c..43d0874d5b5bd65839bb896b05ffcaab9ab6d214 100644 (file)
--- a/package/Win32-Inno/FlightGear-devel.iss
+++ b/package/Win32-Inno/FlightGear-devel.iss
@@ -36,7 +36,7 @@ DefaultGroupName=FlightGear {#FGVER}
 LicenseFile=X:\data\COPYING
 Uninstallable=yes
 SetupIconFile=x:\flightgear.ico
-VersionInfoVersion=2.0.0.0
+VersionInfoVersion=2.5.0.0
 WizardImageFile=X:\setupimg.bmp
 WizardImageStretch=No
 WizardSmallImageFile=X:\setupsmall.bmp

diff --git a/projects/VC90/FlightGear/FlightGear.vcproj b/projects/VC90/FlightGear/FlightGear.vcproj
index c2e799c8d883b139d2bd02b0bd6e8bac3cc965ee..c9f3558c81105d2cb0c94cc35e4dfa185cc2e2e9 100644 (file)
--- a/projects/VC90/FlightGear/FlightGear.vcproj
+++ b/projects/VC90/FlightGear/FlightGear.vcproj
@@ -836,6 +836,14 @@
                        <Filter\r
                                Name="models"\r
                                >\r
+                               <File\r
+                                       RelativePath="..\..\..\src\FDM\JSBSim\models\FGAccelerations.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\..\src\FDM\JSBSim\models\FGAccelerations.h"\r
+                                       >\r
+                               </File>\r
                                <File\r
                                        RelativePath="..\..\..\src\Fdm\JSBSim\models\FGAerodynamics.cpp"\r
                                        >\r
@@ -1023,6 +1031,22 @@
                                                RelativePath="..\..\..\src\Fdm\JSBSim\models\atmosphere\FGMSISData.cpp"\r
                                                >\r
                                        </File>\r
+                                       <File\r
+                                               RelativePath="..\..\..\src\FDM\JSBSim\models\atmosphere\FGStandardAtmosphere.cpp"\r
+                                               >\r
+                                       </File>\r
+                                       <File\r
+                                               RelativePath="..\..\..\src\FDM\JSBSim\models\atmosphere\FGStandardAtmosphere.h"\r
+                                               >\r
+                                       </File>\r
+                                       <File\r
+                                               RelativePath="..\..\..\src\FDM\JSBSim\models\atmosphere\FGWinds.cpp"\r
+                                               >\r
+                                       </File>\r
+                                       <File\r
+                                               RelativePath="..\..\..\src\FDM\JSBSim\models\atmosphere\FGWinds.h"\r
+                                               >\r
+                                       </File>\r
                                </Filter>\r
                                <Filter\r
                                        Name="flight_control"\r
@@ -1083,14 +1107,6 @@
                                                RelativePath="..\..\..\src\Fdm\JSBSim\models\flight_control\FGGain.h"\r
                                                >\r
                                        </File>\r
-                                       <File\r
-                                               RelativePath="..\..\..\src\Fdm\JSBSim\models\flight_control\FGGradient.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\..\..\src\Fdm\JSBSim\models\flight_control\FGGradient.h"\r
-                                               >\r
-                                       </File>\r
                                        <File\r
                                                RelativePath="..\..\..\src\Fdm\JSBSim\models\flight_control\FGKinemat.cpp"\r
                                                >\r
@@ -4310,19 +4326,19 @@
                        Name="Lib_ATC"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\..\src\ATC\atcdialog.cxx"\r
+                               RelativePath="..\..\..\src\ATC\atc_mgr.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\src\ATC\atcdialog.hxx"\r
+                               RelativePath="..\..\..\src\ATC\atc_mgr.hxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\src\ATC\atc_mgr.cxx"\r
+                               RelativePath="..\..\..\src\ATC\atcdialog.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\src\ATC\atc_mgr.hxx"\r
+                               RelativePath="..\..\..\src\ATC\atcdialog.hxx"\r
                                >\r
                        </File>\r
                        <File\r