Compare commits
107 Commits
release/2.
...
release/2.
| Author | SHA1 | Date | |
|---|---|---|---|
|
a717c77ee9 | ||
|
|
48ad2d326f | ||
|
|
81f5a48973 | ||
|
|
f1f4fcb0d8 | ||
|
|
083269de80 | ||
|
|
23b0f4eea4 | ||
|
|
e13daffc46 | ||
|
|
154afebc45 | ||
|
|
302b1ff5b7 | ||
|
|
2cb313c6f1 | ||
|
|
3ea2728b69 | ||
|
|
0d7f99e261 | ||
|
|
2382a0600a | ||
|
|
41356c1aba | ||
|
|
0a40a36041 | ||
|
|
b400a2adc1 | ||
|
|
3b202ff607 | ||
|
|
69c46231d7 | ||
|
|
d8897780d2 | ||
|
|
f15b661076 | ||
|
|
e25d5289e2 | ||
|
|
e528468bd4 | ||
|
|
022f1791d9 | ||
|
|
05f4f85b27 | ||
|
|
e7011cab66 | ||
|
|
8b782ce69b | ||
|
|
7190575775 | ||
|
|
06800a6c56 | ||
|
|
3e0eefa8f5 | ||
|
|
5a31e3133f | ||
|
|
3d99ef3ea2 | ||
|
|
a3c2a9424a | ||
|
|
eebf4dbcaf | ||
|
|
868f7df661 | ||
|
|
26e6b859a5 | ||
|
|
72d2bb9044 | ||
|
|
7ef17cc4b2 | ||
|
|
9c0ccec847 | ||
|
|
35bc589a04 | ||
|
|
57cafd62e1 | ||
|
|
561b221448 | ||
|
|
4c54c5feb6 | ||
|
|
1ff0264a57 | ||
|
|
4eb511c33d | ||
|
|
ffa12d720b | ||
|
|
45a38fe121 | ||
|
|
eaed135885 | ||
|
|
444ebf92e7 | ||
|
|
7f31b781cd | ||
|
|
a0b8fdd867 | ||
|
|
a226592697 | ||
|
|
0dc89062f2 | ||
|
|
beb8dfebc8 | ||
|
|
e0c104c494 | ||
|
|
856c1108a2 | ||
|
|
4e737a93f1 | ||
|
|
5cd7da7e4c | ||
|
|
f350707547 | ||
|
|
6f13418057 | ||
|
|
d7a3e9d743 | ||
|
|
53b0de6b12 | ||
|
|
bcebb30a35 | ||
|
|
cd10243834 | ||
|
|
f596081cb6 | ||
|
|
3fbecf9997 | ||
|
|
5cd7c88bab | ||
|
|
324df28baa | ||
|
|
52e9019363 | ||
|
|
39924c29ee | ||
|
|
675002e298 | ||
|
|
a71117b58f | ||
|
|
3a9abdb092 | ||
|
|
bea03a5011 | ||
|
|
1e00b6a679 | ||
|
|
4d3fffd8e4 | ||
|
|
ad3595fdc6 | ||
|
|
0b66e49bc4 | ||
|
|
32521d47a7 | ||
|
|
47b9af454a | ||
|
|
b61f1403db | ||
|
|
0afd203f54 | ||
|
|
0b71935b7c | ||
|
|
0b54827835 | ||
|
|
e4348d7086 | ||
|
|
768400600c | ||
|
|
a3f33c5e97 | ||
|
|
c90b114ac9 | ||
|
|
f1ed5ae3eb | ||
|
|
a22928912d | ||
|
|
035dab673a | ||
|
|
d54131041d | ||
|
|
cfde12ad6d | ||
|
|
accced5c0e | ||
|
|
b894a457d7 | ||
|
|
427964586c | ||
|
|
d243047bf8 | ||
|
|
cf87d84cfe | ||
|
|
eb5c64e656 | ||
|
|
85635d4f68 | ||
|
|
db795fbca7 | ||
|
|
bcd325c78d | ||
|
|
4c949dff4d | ||
|
|
bf9d84fb3a | ||
|
|
379aa18877 | ||
|
|
9f8fb2fc03 | ||
|
|
ade63a8bc3 | ||
|
|
fdf2311152 |
6
.gitignore
vendored
6
.gitignore
vendored
@@ -5,3 +5,9 @@ install
|
||||
boost_1_44_0
|
||||
InstallConfig.iss
|
||||
Output
|
||||
output
|
||||
fgBuild
|
||||
sgBuild
|
||||
image
|
||||
macflightgear
|
||||
fgdata
|
||||
|
||||
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -4,3 +4,6 @@
|
||||
[submodule "flightgear"]
|
||||
path = flightgear
|
||||
url = git://gitorious.org/fg/flightgear.git
|
||||
[submodule "maclauncher"]
|
||||
path = maclauncher
|
||||
url = git://gitorious.org/fg/maclauncher.git
|
||||
|
||||
173
FlightGear.iss
173
FlightGear.iss
@@ -21,16 +21,16 @@
|
||||
#include "InstallConfig.iss"
|
||||
|
||||
#if GetEnv("VSINSTALLDIR") == ""
|
||||
#define VSInstallDir "C:\Program Files\Microsoft Visual Studio 9.0"
|
||||
#define VSInstallDir "C:\Program Files (x86)\Microsoft Visual Studio 10.0"
|
||||
#else
|
||||
#define VSInstallDir GetEnv("VSINSTALLDIR")
|
||||
#endif
|
||||
|
||||
#define VCInstallDir VSInstallDir + "\VC"
|
||||
#define OSGInstallDir "X:\install\msvc90\OpenSceneGraph"
|
||||
#define OSGInstallDir "X:\install\msvc100\OpenSceneGraph"
|
||||
#define OSGPluginsDir OSGInstallDir + "\bin\osgPlugins-" + OSGVersion
|
||||
|
||||
#define OSG64InstallDir "X:\install\msvc90-64\OpenSceneGraph"
|
||||
#define OSG64InstallDir "X:\install\msvc100-64\OpenSceneGraph"
|
||||
#define OSG64PluginsDir OSG64InstallDir + "\bin\osgPlugins-" + OSGVersion
|
||||
|
||||
[Setup]
|
||||
@@ -46,79 +46,129 @@ DefaultDirName={pf}\FlightGear
|
||||
DefaultGroupName=FlightGear {#FGVersion}
|
||||
LicenseFile=X:\flightgear\COPYING
|
||||
Uninstallable=yes
|
||||
SetupIconFile=X:\flightgear\projects\VC90\flightgear.ico
|
||||
SetupIconFile=X:\flightgear\package\flightgear.ico
|
||||
VersionInfoVersion={#FGVersion}.0
|
||||
WizardImageFile=X:\flightgear\package\Win32-Inno\setupimg.bmp
|
||||
WizardImageStretch=No
|
||||
WizardSmallImageFile=X:\flightgear\package\Win32-Inno\setupsmall.bmp
|
||||
VersionInfoCompany=The FlightGear Team
|
||||
UninstallDisplayIcon=X:\flightgear\projects\VC90\flightgear.ico
|
||||
ArchitecturesInstallIn64BitMode=x64
|
||||
ArchitecturesAllowed=x86 x64
|
||||
|
||||
[Tasks]
|
||||
; NOTE: The following entry contains English phrases ("Create a desktop icon" and "Additional icons"). You are free to translate them into another language if required.
|
||||
Name: "desktopicon"; Description: "Create a &desktop icon"; GroupDescription: "Additional icons:"
|
||||
Name: "insoal"; Description: "Install OpenAL (the sound engine)"
|
||||
Name: "force32"; Description: "Force 32bit install on 64bit system"; Check: Is64BitInstallMode
|
||||
|
||||
[Files]
|
||||
; NOTE: run subst X: F:\ (or whatever path the expanded tree resides at)
|
||||
;Source: "X:\*.txt"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "X:\flightgear\projects\VC90\Win32\Release\*.exe"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion
|
||||
Source: "X:\flightgear\projects\VC90\x64\Release\*.exe"; DestDir: "{app}\bin\Win64"; Flags: ignoreversion skipifsourcedoesntexist
|
||||
|
||||
Source: "X:\fgrun\msvc\9.0\Win32\Release\fgrun.exe"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion
|
||||
Source: "X:\fgrun\msvc\9.0\Win32\Release\locale\*"; DestDir: "{app}\bin\Win32\locale"; Flags: ignoreversion recursesubdirs
|
||||
|
||||
Source: "X:\fgrun\msvc\9.0\x64\Release\fgrun.exe"; DestDir: "{app}\bin\Win64"; Flags: ignoreversion
|
||||
Source: "X:\fgrun\msvc\9.0\Win32\Release\locale\*"; DestDir: "{app}\bin\Win64\locale"; Flags: ignoreversion recursesubdirs
|
||||
Source: "X:\install\msvc100\FlightGear\bin\fgfs.exe"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
Source: "X:\install\msvc100-64\FlightGear\bin\fgfs.exe"; DestDir: "{app}\bin\Win64"; Flags: ignoreversion skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
|
||||
;Unconditional install
|
||||
Source: "X:\install\msvc100\FlightGear\bin\fgadmin.exe"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion
|
||||
Source: "X:\install\msvc100\FlightGear\bin\terrasync.exe"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion
|
||||
Source: "X:\install\msvc100\FlightGear\bin\js_demo.exe"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion
|
||||
Source: "X:\install\msvc100\FlightGear\bin\fgjs.exe"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion
|
||||
Source: "X:\install\msvc100\FlightGear\bin\fgpanel.exe"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion
|
||||
Source: "X:\install\msvc100\FlightGear\bin\GPSsmooth.exe"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion
|
||||
Source: "X:\install\msvc100\FlightGear\bin\UGsmooth.exe"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion
|
||||
Source: "X:\install\msvc100\FlightGear\bin\MIDGsmooth.exe"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion
|
||||
Source: "X:\install\msvc100\FlightGear\bin\metar.exe"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion
|
||||
Source: "X:\install\msvc100\FlightGear\bin\yasim.exe"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion
|
||||
Source: "X:\3rdParty\bin\*.dll"; DestDir: "{app}\bin\Win32"
|
||||
Source: "X:\3rdParty.x64\bin\*.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
|
||||
|
||||
Source: "{#VCInstallDir}\redist\x86\Microsoft.VC90.CRT\*.dll"; DestDir: "{app}\bin\Win32"
|
||||
Source: "{#VCInstallDir}\redist\x64\Microsoft.VC90.CRT\*.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
|
||||
Source: "X:\install\msvc100\FGRun\bin\fgrun.exe"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion ; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
Source: "X:\install\msvc100\FGRun\share\locale\*"; DestDir: "{app}\bin\Win32\locale"; Flags: ignoreversion recursesubdirs; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
|
||||
Source: "X:\install\msvc100-64\FGRun\bin\fgrun.exe"; DestDir: "{app}\bin\Win64"; Flags: ignoreversion skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
Source: "X:\install\msvc100-64\FGRun\share\locale\*"; DestDir: "{app}\bin\Win64\locale"; Flags: ignoreversion recursesubdirs skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
|
||||
Source: "X:\3rdParty.x64\bin\*.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
|
||||
Source: "{#VCInstallDir}\redist\x86\Microsoft.VC100.CRT\*.dll"; DestDir: "{app}\bin\Win32"
|
||||
Source: "{#VCInstallDir}\redist\x64\Microsoft.VC100.CRT\*.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
Source: "X:\3rdParty\bin\vcredist_x86.exe"; DestDir: "{app}\bin\Win32"; Flags: skipifsourcedoesntexist
|
||||
Source: "X:\3rdParty.x64\bin\vcredist_x64.exe"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
|
||||
Source: "X:\3rdParty\bin\oalinst.exe"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion skipifsourcedoesntexist
|
||||
|
||||
Source: "X:\data\*.*"; DestDir: "{app}\data"; Flags: ignoreversion recursesubdirs skipifsourcedoesntexist
|
||||
|
||||
Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osg.dll"; DestDir: "{app}\bin\Win32"
|
||||
Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgDB.dll"; DestDir: "{app}\bin\Win32"
|
||||
Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgGA.dll"; DestDir: "{app}\bin\Win32"
|
||||
Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgParticle.dll"; DestDir: "{app}\bin\Win32"
|
||||
Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgText.dll"; DestDir: "{app}\bin\Win32"
|
||||
Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgUtil.dll"; DestDir: "{app}\bin\Win32"
|
||||
Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgViewer.dll"; DestDir: "{app}\bin\Win32"
|
||||
Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgSim.dll"; DestDir: "{app}\bin\Win32"
|
||||
Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgFX.dll"; DestDir: "{app}\bin\Win32"
|
||||
Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osg.dll"; DestDir: "{app}\bin\Win32"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgDB.dll"; DestDir: "{app}\bin\Win32"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgGA.dll"; DestDir: "{app}\bin\Win32"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgParticle.dll"; DestDir: "{app}\bin\Win32"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgText.dll"; DestDir: "{app}\bin\Win32"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgUtil.dll"; DestDir: "{app}\bin\Win32"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgViewer.dll"; DestDir: "{app}\bin\Win32"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgSim.dll"; DestDir: "{app}\bin\Win32"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgFX.dll"; DestDir: "{app}\bin\Win32"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
|
||||
Source: "{#OSGInstallDir}\bin\ot12-OpenThreads.dll"; DestDir: "{app}\bin\Win32"
|
||||
Source: "{#OSGInstallDir}\bin\ot12-OpenThreads.dll"; DestDir: "{app}\bin\Win32"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
|
||||
Source: "{#OSGPluginsDir}\osgdb_ac.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"
|
||||
Source: "{#OSGPluginsDir}\osgdb_osg.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"
|
||||
Source: "{#OSGPluginsDir}\osgdb_3ds.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"
|
||||
Source: "{#OSGPluginsDir}\osgdb_mdl.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"
|
||||
Source: "{#OSGPluginsDir}\osgdb_jpeg.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"
|
||||
Source: "{#OSGPluginsDir}\osgdb_rgb.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"
|
||||
Source: "{#OSGPluginsDir}\osgdb_png.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"
|
||||
Source: "{#OSGPluginsDir}\osgdb_txf.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"
|
||||
Source: "{#OSGPluginsDir}\osgdb_ac.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
Source: "{#OSGPluginsDir}\osgdb_osg.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
Source: "{#OSGPluginsDir}\osgdb_osga.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
Source: "{#OSGPluginsDir}\osgdb_3ds.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
Source: "{#OSGPluginsDir}\osgdb_mdl.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
Source: "{#OSGPluginsDir}\osgdb_jpeg.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
Source: "{#OSGPluginsDir}\osgdb_rgb.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
Source: "{#OSGPluginsDir}\osgdb_png.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
Source: "{#OSGPluginsDir}\osgdb_dds.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
Source: "{#OSGPluginsDir}\osgdb_txf.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
Source: "{#OSGPluginsDir}\osgdb_freetype.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
Source: "{#OSGPluginsDir}\osgdb_serializers_osg.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
Source: "{#OSGPluginsDir}\osgdb_serializers_osganimation.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
Source: "{#OSGPluginsDir}\osgdb_serializers_osgfx.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
Source: "{#OSGPluginsDir}\osgdb_serializers_osgmanipulator.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
Source: "{#OSGPluginsDir}\osgdb_serializers_osgparticle.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
Source: "{#OSGPluginsDir}\osgdb_serializers_osgshadow.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
Source: "{#OSGPluginsDir}\osgdb_serializers_osgsim.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
Source: "{#OSGPluginsDir}\osgdb_serializers_osgterrain.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
Source: "{#OSGPluginsDir}\osgdb_serializers_osgtext.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
Source: "{#OSGPluginsDir}\osgdb_serializers_osgvolume.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
Source: "{#OSGPluginsDir}\osgdb_deprecated_osg.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
Source: "{#OSGPluginsDir}\osgdb_deprecated_osgparticle.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
|
||||
Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osg.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist
|
||||
Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgDB.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist
|
||||
Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgGA.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist
|
||||
Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgParticle.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist
|
||||
Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgText.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist
|
||||
Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgUtil.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist
|
||||
Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgViewer.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist
|
||||
Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgSim.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist
|
||||
Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgFX.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist
|
||||
Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osg.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgDB.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgGA.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgParticle.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgText.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgUtil.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgViewer.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgSim.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgFX.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
|
||||
Source: "{#OSG64InstallDir}\bin\ot12-OpenThreads.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist
|
||||
Source: "{#OSG64InstallDir}\bin\ot12-OpenThreads.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
|
||||
Source: "{#OSG64PluginsDir}\osgdb_ac.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist
|
||||
Source: "{#OSG64PluginsDir}\osgdb_osg.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist
|
||||
Source: "{#OSG64PluginsDir}\osgdb_3ds.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist
|
||||
Source: "{#OSG64PluginsDir}\osgdb_mdl.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist
|
||||
Source: "{#OSG64PluginsDir}\osgdb_jpeg.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist
|
||||
Source: "{#OSG64PluginsDir}\osgdb_rgb.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist
|
||||
Source: "{#OSG64PluginsDir}\osgdb_png.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist
|
||||
Source: "{#OSG64PluginsDir}\osgdb_txf.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist
|
||||
Source: "{#OSG64PluginsDir}\osgdb_ac.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
Source: "{#OSG64PluginsDir}\osgdb_osg.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
Source: "{#OSG64PluginsDir}\osgdb_osga.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
Source: "{#OSG64PluginsDir}\osgdb_3ds.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
Source: "{#OSG64PluginsDir}\osgdb_mdl.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
Source: "{#OSG64PluginsDir}\osgdb_jpeg.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
Source: "{#OSG64PluginsDir}\osgdb_rgb.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
Source: "{#OSG64PluginsDir}\osgdb_png.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
Source: "{#OSG64PluginsDir}\osgdb_dds.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
Source: "{#OSG64PluginsDir}\osgdb_txf.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
Source: "{#OSG64PluginsDir}\osgdb_freetype.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
Source: "{#OSG64PluginsDir}\osgdb_serializers_osg.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
Source: "{#OSG64PluginsDir}\osgdb_serializers_osganimation.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
Source: "{#OSG64PluginsDir}\osgdb_serializers_osgfx.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
Source: "{#OSG64PluginsDir}\osgdb_serializers_osgmanipulator.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
Source: "{#OSG64PluginsDir}\osgdb_serializers_osgparticle.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
Source: "{#OSG64PluginsDir}\osgdb_serializers_osgshadow.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
Source: "{#OSG64PluginsDir}\osgdb_serializers_osgsim.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
Source: "{#OSG64PluginsDir}\osgdb_serializers_osgterrain.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
Source: "{#OSG64PluginsDir}\osgdb_serializers_osgtext.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
Source: "{#OSG64PluginsDir}\osgdb_serializers_osgvolume.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
Source: "{#OSG64PluginsDir}\osgdb_deprecated_osg.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
Source: "{#OSG64PluginsDir}\osgdb_deprecated_osgparticle.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
|
||||
[Dirs]
|
||||
; Make the user installable scenery directory
|
||||
@@ -126,24 +176,27 @@ Name: "{app}\scenery"; Permissions: everyone-modify
|
||||
Name: "{code:TerrasyncDir}"; Permissions: everyone-modify
|
||||
|
||||
[Icons]
|
||||
Name: "{group}\FlightGear Launcher"; Filename: "{app}\bin\Win32\fgrun.exe"; WorkingDir: "{app}";
|
||||
Name: "{group}\FlightGear Launcher"; Filename: "{app}\bin\Win32\fgrun.exe"; WorkingDir: "{app}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
Name: "{group}\FlightGear Launcher"; Filename: "{app}\bin\Win64\fgrun.exe"; WorkingDir: "{app}"; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
; Name: "{group}\FlightGear"; Filename: "{app}\bin\Win32\fgfs.exe"; Parameters: "--fg-root=."; WorkingDir: "{app}";
|
||||
Name: "{group}\FlightGear Manual"; Filename: "{app}\data\Docs\getstart.pdf"
|
||||
Name: "{group}\FlightGear Documentation"; Filename: "{app}\data\Docs\index.html"
|
||||
Name: "{group}\Flightgear Wiki"; Filename: "http://wiki.flightgear.org"
|
||||
Name: "{userdesktop}\FlightGear {#FGVersion}"; Filename: "{app}\bin\Win32\fgrun.exe"; WorkingDir: "{app}"; Tasks: desktopicon
|
||||
Name: "{userdesktop}\FlightGear {#FGVersion}"; Filename: "{app}\bin\Win32\fgrun.exe"; WorkingDir: "{app}"; Tasks: desktopicon; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
Name: "{userdesktop}\FlightGear {#FGVersion}"; Filename: "{app}\bin\Win64\fgrun.exe"; WorkingDir: "{app}"; Tasks: desktopicon; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
|
||||
Name: "{group}\Tools\Install & Uninstall Scenery"; Filename: "{app}\bin\Win32\fgadmin.exe"; WorkingDir: "{app}";
|
||||
Name: "{group}\Tools\TerraSync"; Filename: "{app}\bin\Win32\terrasync.exe"; Parameters: "-S -p 5505 -d ""{app}\terrasync"""; WorkingDir: "{app}";
|
||||
Name: "{group}\Tools\Install & Uninstall Scenery"; Filename: "{app}\bin\Win32\fgadmin.exe"; WorkingDir: "{app}"
|
||||
Name: "{group}\Tools\TerraSync"; Filename: "{app}\bin\Win32\terrasync.exe"; Parameters: "-S -p 5505 -d ""{app}\terrasync"""; WorkingDir: "{app}"
|
||||
Name: "{group}\Tools\Uninstall FlightGear"; Filename: "{uninstallexe}"
|
||||
|
||||
Name: "{group}\Tools\js_demo"; Filename: "{app}\bin\Win32\js_demo.exe"
|
||||
Name: "{group}\Tools\fgjs"; Filename: "cmd"; Parameters: "/k fgjs.exe ""--fg-root={app}\data"""; WorkingDir: "{app}\bin\Win32";
|
||||
Name: "{group}\Tools\GPSsmooth"; Filename: "cmd"; Parameters: "/k ""{app}\bin\Win32\GPSsmooth.exe"" -h"; WorkingDir: "{app}\bin\Win32";
|
||||
Name: "{group}\Tools\UGsmooth"; Filename: "cmd"; Parameters: "/k ""{app}\bin\Win32\UGsmooth.exe"" -h"; WorkingDir: "{app}\bin\Win32";
|
||||
Name: "{group}\Tools\MIDSsmooth"; Filename: "cmd"; Parameters: "/k ""{app}\bin\Win32\MIDSsmooth.exe"" -h"; WorkingDir: "{app}\bin\Win32";
|
||||
Name: "{group}\Tools\MIDGsmooth"; Filename: "cmd"; Parameters: "/k ""{app}\bin\Win32\MIDGsmooth.exe"" -h"; WorkingDir: "{app}\bin\Win32";
|
||||
Name: "{group}\Tools\metar"; Filename: "cmd"; Parameters: "/k ""{app}\bin\Win32\metar.exe"" -h"; WorkingDir: "{app}\bin\Win32";
|
||||
Name: "{group}\Tools\yasim"; Filename: "cmd"; Parameters: "/k ""{app}\bin\Win32\yasim.exe"" -h"; WorkingDir: "{app}\bin\Win32";
|
||||
Name: "{group}\Tools\fgpanel"; Filename: "cmd"; Parameters: "/k ""{app}\bin\Win32\fgpanel.exe"" -h"; WorkingDir: "{app}\bin\Win32";
|
||||
|
||||
Name: "{group}\Tools\Explore Documentation Folder"; Filename: "{app}\data\Docs"
|
||||
|
||||
@@ -151,9 +204,15 @@ Name: "{group}\Tools\Explore Documentation Folder"; Filename: "{app}\data\Docs"
|
||||
; Name: "{userdesktop}\FlightGear v2.0.0"; Filename: "{app}\bin\Win32\fgfs.exe"; Parameters: "--fg-root=."; WorkingDir: "{app}"; Tasks: desktopicon
|
||||
|
||||
[Run]
|
||||
filename: "cmd.exe"; WorkingDir: "{app}\bin\Win32"; Parameters: "/C del msvc*.dll"; Check: FileExists(ExpandConstant('{app}\bin\Win32\vcredist_x86.exe'))
|
||||
filename: "cmd.exe"; WorkingDir: "{app}\bin\Win64"; Parameters: "/C del msvc*.dll"; Check: FileExists(ExpandConstant('{app}\bin\Win64\vcredist_x64.exe'))
|
||||
filename: "{app}\bin\Win32\vcredist_x86.exe"; WorkingDir: "{app}\bin\Win32"; Parameters: "/passive /norestart"; Description: "Installing MS Visual C++ runtime components"; Check: FileExists(ExpandConstant('{app}\bin\Win32\vcredist_x86.exe'))
|
||||
filename: "{app}\bin\Win64\vcredist_x64.exe"; WorkingDir: "{app}\bin\Win64"; Parameters: "/passive /norestart"; Description: "Installing MS Visual C++ runtime components"; Check: Is64BitInstallMode and not IsTaskSelected('force32') and FileExists(ExpandConstant('{app}\bin\Win64\vcredist_x64.exe'))
|
||||
filename: "{app}\bin\Win32\oalinst.exe"; WorkingDir: "{app}\bin\Win32"; Description: "Installing OpenAL"; Check: IsTaskSelected('insoal') and FileExists(ExpandConstant('{app}\bin\Win32\oalinst.exe'))
|
||||
|
||||
; Put installation directory into the fgrun.prefs
|
||||
filename: "{app}\bin\Win32\fgrun.exe"; WorkingDir: "{app}\bin\Win32"; Parameters: "--silent ""--fg-exe={app}\bin\Win32\fgfs.exe"" ""--ts-exe={app}\bin\Win32\terrasync.exe"" ""--fg-root={app}\data"" ""--fg-scenery={app}\data\Scenery;{app}\scenery;{code:TerrasyncDir}"" --ts-dir=3"
|
||||
filename: "{app}\bin\Win32\fgrun.exe"; WorkingDir: "{app}\bin\Win32"; Parameters: "--silent ""--fg-exe={app}\bin\Win32\fgfs.exe"" ""--ts-exe={app}\bin\Win32\terrasync.exe"" ""--fg-root={app}\data"" ""--fg-scenery={app}\data\Scenery;{app}\scenery;{code:TerrasyncDir}"" --ts-dir=3 --version={#FGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
|
||||
filename: "{app}\bin\Win64\fgrun.exe"; WorkingDir: "{app}\bin\Win64"; Parameters: "--silent ""--fg-exe={app}\bin\Win64\fgfs.exe"" ""--ts-exe={app}\bin\Win32\terrasync.exe"" ""--fg-root={app}\data"" ""--fg-scenery={app}\data\Scenery;{app}\scenery;{code:TerrasyncDir}"" --ts-dir=3 --version={#FGVersion}"; Check: Is64BitInstallMode and not IsTaskSelected('force32')
|
||||
|
||||
; Put installation and source directories into the fgadmin.prefs
|
||||
filename: "{app}\bin\Win32\fgadmin.exe"; WorkingDir: "{app}\bin\Win32"; Parameters: "--silent ""--install-source={src}\..\Scenery"" ""--scenery-dest={app}\scenery"""
|
||||
|
||||
@@ -2,12 +2,14 @@
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>English</string>
|
||||
<key>CFBundleIconFile</key>
|
||||
<string>FlightGear.icns</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleGetInfoString</key>
|
||||
<string>FlightGear nightly build</string>
|
||||
<string>FlightGear, the open-source flight simulator, <%= fgVersion %>. ©1996-<%= fgCurrentYear%>, The FlightGear Project</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
@@ -19,11 +21,13 @@
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string><%= fgVersion %></string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>10.5.0</string>
|
||||
<string>10.6.0</string>
|
||||
<key>NSMainNibFile</key>
|
||||
<string>MainMenu</string>
|
||||
<key>NSPrincipalClass</key>
|
||||
<string>NSApplication</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string>©1996-<%= fgCurrentYear%>, The FlightGear Project</string>
|
||||
</dict>
|
||||
</plist>
|
||||
|
||||
|
||||
38
base-package.rules
Normal file
38
base-package.rules
Normal file
@@ -0,0 +1,38 @@
|
||||
- .git
|
||||
- *.xcf
|
||||
- *.tex
|
||||
|
||||
+ /fgdata/Aircraft/Generic
|
||||
+ /fgdata/Aircraft/Instruments
|
||||
+ /fgdata/Aircraft/Instruments-3d
|
||||
|
||||
+ /fgdata/Aircraft/UIUC
|
||||
+ /fgdata/Aircraft/c172p
|
||||
+ /fgdata/Aircraft/777
|
||||
+ /fgdata/Aircraft/777-200
|
||||
+ /fgdata/Aircraft/b1900d
|
||||
+ /fgdata/Aircraft/ufo
|
||||
+ /fgdata/Aircraft/CitationX
|
||||
+ /fgdata/Aircraft/ZLT-NT
|
||||
+ /fgdata/Aircraft/dhc2
|
||||
+ /fgdata/Aircraft/Cub
|
||||
+ /fgdata/Aircraft/sopwithCamel
|
||||
+ /fgdata/Aircraft/f-14b
|
||||
+ /fgdata/Aircraft/ASK13
|
||||
+ /fgdata/Aircraft/bo105
|
||||
+ /fgdata/Aircraft/Dragonfly
|
||||
+ /fgdata/Aircraft/SenecaII
|
||||
+ /fgdata/Aircraft/A6M2
|
||||
|
||||
- /fgdata/Aircraft/*
|
||||
|
||||
- /fgdata/Textures.high/*.new
|
||||
- /fgdata/Textures.high/*.orig
|
||||
- /fgdata/Textures.high/*.save
|
||||
- /fgdata/Textures/Unused
|
||||
- /fgdata/Textures/*.orig
|
||||
- /fgdata/Docs/source
|
||||
- /fgdata/Models/Airspace
|
||||
- /fgdata/Models/MNUAV
|
||||
|
||||
|
||||
373
download_and_compile.sh
Executable file → Normal file
373
download_and_compile.sh
Executable file → Normal file
@@ -18,7 +18,7 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
|
||||
VERSION="1.4"
|
||||
VERSION="1.31"
|
||||
|
||||
#COMPILE GIT FGFS
|
||||
|
||||
@@ -27,6 +27,8 @@ VERSION="1.4"
|
||||
#######################################################
|
||||
# Special thanks to Alessandro Garosi for FGComGui and
|
||||
# other patches
|
||||
# Thanks to "pac1" for patches for fgrun compilation
|
||||
# Thanks to "F-JJTH" for bug fixes and suggestions
|
||||
|
||||
|
||||
|
||||
@@ -119,18 +121,28 @@ fi
|
||||
|
||||
|
||||
#######################################################
|
||||
# Last stable revision: currently FlightGear 2.0 with OSG 2.8.3
|
||||
# Last stable revision: currently FlightGear 2.4.0 with 3.0.1
|
||||
PLIB_STABLE_REVISION="2163"
|
||||
OSG_STABLE_REVISION="http://www.openscenegraph.org/svn/osg/OpenSceneGraph/tags/OpenSceneGraph-2.8.3"
|
||||
SIMGEAR_STABLE_REVISION="937297561fcc4daadedd1f7c49efd39291ebd5df"
|
||||
FGFS_STABLE_REVISION="a5017f218fe68fbfb05cfef9e85214b198ed8f0b"
|
||||
FGFS_DATA_STABLE_REVISION="061d4ec7f7037e4c71f7163d38d443e59225f399"
|
||||
FGRUN_STABLE_REVISION="554"
|
||||
FGCOM_STABLE_REVISION="234"
|
||||
OSG_STABLE_REVISION="http://www.openscenegraph.org/svn/osg/OpenSceneGraph/tags/OpenSceneGraph-3.0.1"
|
||||
|
||||
# common stable branch for flightgear, simgear and fgdata
|
||||
FGSG_STABLE_GIT_BRANCH="release/2.6.0"
|
||||
|
||||
# unstable branch: next for sg/fg, master for fgdata
|
||||
FGSG_UNSTABLE_GIT_BRANCH="next"
|
||||
FGDATA_UNSTABLE_GIT_BRANCH="master"
|
||||
|
||||
# stable GIT revision: release tag
|
||||
SIMGEAR_STABLE_REVISION="version/2.6.0-final"
|
||||
FGFS_STABLE_REVISION="version/2.6.0-final"
|
||||
FGFS_DATA_STABLE_REVISION="version/2.6.0-final"
|
||||
|
||||
FGRUN_STABLE_REVISION="655"
|
||||
FGCOM_STABLE_REVISION="261"
|
||||
FGCOMGUI_STABLE_REVISION="46"
|
||||
|
||||
# Current developer revision: latest FlightGear GIT (2.3.0) with OSG 2.9.9
|
||||
OSG_UNSTABLE_REVISION="http://www.openscenegraph.org/svn/osg/OpenSceneGraph/tags/OpenSceneGraph-2.9.9"
|
||||
# Current developer revision: latest FlightGear GIT (2.5.0) with OSG 3.0.1
|
||||
OSG_UNSTABLE_REVISION="http://www.openscenegraph.org/svn/osg/OpenSceneGraph/tags/OpenSceneGraph-3.0.1"
|
||||
|
||||
#######################################################
|
||||
# set script to stop if an error occours
|
||||
@@ -142,7 +154,7 @@ if [ "$WHATTOBUILD" = "--help" ]
|
||||
then
|
||||
echo "$0 Version $VERSION"
|
||||
echo "Usage:"
|
||||
echo "./$0 [-u] [-h] [-s] [-e] [-g] [-a y|n] [-c y|n] [-p y|n] [-d y|n] [-r y|n] [ALL|PLIB|OSG|SIMGEAR|FGFS|FGRUN|FGCOM|FGCOMGUI|ATLAS] [UPDATE]"
|
||||
echo "./$0 [-u] [-h] [-s] [-e] [-g] [-a y|n] [-c y|n] [-p y|n] [-d y|n] [-r y|n] [ALL|PLIB|OSG|SIMGEAR|FGFS|FGO|FGRUN|FGCOM|FGCOMGUI|ATLAS] [UPDATE]"
|
||||
echo "* without options it recompiles: PLIB,OSG,SIMGEAR,FGFS,FGRUN"
|
||||
echo "* Using ALL compiles everything"
|
||||
echo "* Adding UPDATE it does not rebuild all (faster but to use only after one successfull first compile)"
|
||||
@@ -246,16 +258,19 @@ fi
|
||||
|
||||
|
||||
# default is hardy
|
||||
DISTRO_PACKAGES="libglut3-dev libopenal-dev libalut-dev libalut0 libfltk1.1-dev libfltk1.1 cvs subversion cmake make build-essential automake zlib1g-dev zlib1g libwxgtk2.8-0 libwxgtk2.8-dev fluid gawk gettext libjpeg62-dev libjpeg62 libxi-dev libxi6 libxmu-dev libxmu6 libboost-dev libasound2-dev libasound2 libpng12-dev libpng12-0 libjasper1 libjasper-dev libopenexr-dev libtiff4-dev libboost-serialization-dev git-core libhal-dev boost-build libqt4-dev scons"
|
||||
|
||||
DISTRO_PACKAGES="libopenal-dev libalut-dev libalut0 libfltk1.1-dev libfltk1.1 cvs subversion cmake make build-essential automake zlib1g-dev zlib1g libwxgtk2.8-0 libwxgtk2.8-dev fluid gawk gettext libxi-dev libxi6 libxmu-dev libxmu6 libboost-dev libasound2-dev libasound2 libpng12-dev libpng12-0 libjasper1 libjasper-dev libopenexr-dev libboost-serialization-dev git-core libhal-dev libqt4-dev scons python-tk python-imaging-tk libsvn-dev libglew1.5-dev "
|
||||
|
||||
UBUNTU_PACKAGES="freeglut3-dev libjpeg62-dev libjpeg62 libapr1-dev "
|
||||
DEBIAN_PACKAGES="freeglut3-dev libjpeg8-dev libjpeg8 "
|
||||
|
||||
# checking linux distro and version to differ needed packages
|
||||
if [ "$DISTRIB_ID" = "Ubuntu" ]
|
||||
then
|
||||
echo "$DISTRIB_ID $DISTRIB_RELEASE" >> $LOGFILE
|
||||
DISTRO_PACKAGES="$DISTRO_PACKAGES $UBUNTU_PACKAGES"
|
||||
else
|
||||
echo "DEBIAN I SUPPOUSE" >> $LOGFILE
|
||||
DISTRO_PACKAGES="$DISTRO_PACKAGES $DEBIAN_PACKAGES"
|
||||
fi
|
||||
echo "$LOGSEP" >> $LOGFILE
|
||||
|
||||
@@ -331,6 +346,10 @@ SUB_INSTALL_DIR=install
|
||||
INSTALL_DIR=$CBD/$SUB_INSTALL_DIR
|
||||
|
||||
|
||||
cd "$CBD"
|
||||
mkdir -p build
|
||||
|
||||
|
||||
#######################################################
|
||||
# PLIB
|
||||
#######################################################
|
||||
@@ -341,7 +360,6 @@ INSTALL_DIR_PLIB=$INSTALL_DIR/$PLIB_INSTALL_DIR
|
||||
cd "$CBD"
|
||||
|
||||
#svn co http://plib.svn.sourceforge.net/svnroot/plib/trunk plib
|
||||
#cd plib
|
||||
|
||||
if [ "$WHATTOBUILD" = "" -o "$WHATTOBUILD" = "PLIB" -o "$WHATTOBUILD" = "ALL" ]
|
||||
then
|
||||
@@ -355,27 +373,12 @@ then
|
||||
echo "INSTALL_DIR_PLIB=$INSTALL_DIR_PLIB" >> $LOGFILE
|
||||
|
||||
|
||||
#we rebuild plib only if not in update
|
||||
#if [ "$DOWNLOAD" = "y" ]
|
||||
#then
|
||||
#echo -n "DOWNLOADING FROM http://plib.sourceforge.net/dist/plib-1.8.5.tar.gz ... " >> $LOGFILE
|
||||
#wget -c http://plib.sourceforge.net/dist/plib-1.8.5.tar.gz
|
||||
#echo " OK" >> $LOGFILE
|
||||
|
||||
#echo -n "UNPACKING plib-1.8.5.tar.gz ... " >> $LOGFILE
|
||||
#tar zxvf plib-1.8.5.tar.gz
|
||||
#echo " OK" >> $LOGFILE
|
||||
#fi
|
||||
#cd plib-1.8.5
|
||||
|
||||
|
||||
PLIB_STABLE_REVISION_=""
|
||||
if [ "$STABLE" = "STABLE" ]
|
||||
then
|
||||
PLIB_STABLE_REVISION_=" -r $PLIB_STABLE_REVISION"
|
||||
fi
|
||||
|
||||
#we rebuild plib only if not in update, using svn version tagged 1.8.6
|
||||
if [ "$DOWNLOAD" = "y" ]
|
||||
then
|
||||
if [ -d "plib/.svn" ]
|
||||
@@ -396,20 +399,31 @@ then
|
||||
|
||||
if [ "$RECONFIGURE" = "y" ]
|
||||
then
|
||||
|
||||
cd "$CBD"
|
||||
mkdir -p build/plib
|
||||
|
||||
|
||||
cd plib
|
||||
|
||||
echo "AUTOGEN plib" >> $LOGFILE
|
||||
./autogen.sh 2>&1 | tee -a $LOGFILE
|
||||
echo "CONFIGURING plib" >> $LOGFILE
|
||||
./configure --prefix="$INSTALL_DIR_PLIB" --exec-prefix="$INSTALL_DIR_PLIB" 2>&1 | tee -a $LOGFILE
|
||||
cd "$CBD"/build/plib
|
||||
../../plib/configure --prefix="$INSTALL_DIR_PLIB" --exec-prefix="$INSTALL_DIR_PLIB" 2>&1 | tee -a $LOGFILE
|
||||
else
|
||||
echo "NO RECONFIGURE FOR plib" >> $LOGFILE
|
||||
fi
|
||||
|
||||
|
||||
if [ "$COMPILE" = "y" ]
|
||||
then
|
||||
|
||||
echo "MAKE plib" >> $LOGFILE
|
||||
echo "make $JOPTION $OOPTION" >> $LOGFILE
|
||||
make $JOPTION $OOPTION 2>&1 | tee -a $LOGFILE
|
||||
|
||||
cd "$CBD"/build/plib
|
||||
make $JOPTION $OOPTION 2>&1 | tee -a $LOGFILE
|
||||
|
||||
if [ ! -d $INSTALL_DIR_PLIB ]
|
||||
then
|
||||
@@ -422,12 +436,11 @@ then
|
||||
make install 2>&1 | tee -a $LOGFILE
|
||||
fi
|
||||
|
||||
cd -
|
||||
cd "$CBD"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
|
||||
#######################################################
|
||||
# OpenSceneGraph
|
||||
#######################################################
|
||||
@@ -460,12 +473,17 @@ then
|
||||
then
|
||||
if [ "$RECONFIGURE" = "y" ]
|
||||
then
|
||||
cd "$CBD"
|
||||
mkdir -p build/osg
|
||||
cd "$CBD"/build/osg
|
||||
echo -n "RECONFIGURE OSG ... " >> $LOGFILE
|
||||
rm -f CMakeCache.txt
|
||||
cmake .
|
||||
rm -f ../../OpenSceneGraph/CMakeCache.txt
|
||||
cmake ../../OpenSceneGraph/
|
||||
echo " OK" >> $LOGFILE
|
||||
|
||||
cmake -D CMAKE_BUILD_TYPE="Release" -D CMAKE_CXX_FLAGS="-O3 -D__STDC_CONSTANT_MACROS" -D CMAKE_C_FLAGS="-O3" -D CMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_OSG" . 2>&1 | tee -a $LOGFILE
|
||||
|
||||
|
||||
cmake -D CMAKE_BUILD_TYPE="Release" -D CMAKE_CXX_FLAGS="-O3 -D__STDC_CONSTANT_MACROS" -D CMAKE_C_FLAGS="-O3" -D CMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_OSG" ../../OpenSceneGraph/ 2>&1 | tee -a $LOGFILE
|
||||
|
||||
echo "RECONFIGURE OSG DONE." >> $LOGFILE
|
||||
|
||||
@@ -475,6 +493,7 @@ then
|
||||
if [ "$COMPILE" = "y" ]
|
||||
then
|
||||
echo "COMPILING OSG" >> $LOGFILE
|
||||
cd "$CBD"/build/osg
|
||||
make $JOPTION $OOPTION 2>&1 | tee -a $LOGFILE
|
||||
|
||||
if [ ! -d $INSTALL_DIR_OSG ]
|
||||
@@ -500,6 +519,8 @@ then
|
||||
cd -
|
||||
fi
|
||||
|
||||
|
||||
|
||||
#######################################################
|
||||
# SIMGEAR
|
||||
#######################################################
|
||||
@@ -538,16 +559,27 @@ then
|
||||
|
||||
cd simgear
|
||||
|
||||
git fetch origin
|
||||
if [ "$STABLE" = "STABLE" ]
|
||||
then
|
||||
git pull origin
|
||||
# switch to stable branch
|
||||
# create local stable branch, ignore errors if it exists
|
||||
git branch -f $FGSG_STABLE_GIT_BRANCH origin/$FGSG_STABLE_GIT_BRANCH 2> /dev/null || true
|
||||
# switch to stable branch. No error is reported if we're already on the branch.
|
||||
git checkout -f $FGSG_STABLE_GIT_BRANCH
|
||||
# get indicated stable version
|
||||
git reset --hard $SIMGEAR_STABLE_REVISION
|
||||
else
|
||||
# switch to unstable branch
|
||||
# create local unstable branch, ignore errors if it exists
|
||||
git branch -f $FGSG_UNSTABLE_GIT_BRANCH origin/$FGSG_UNSTABLE_GIT_BRANCH 2> /dev/null || true
|
||||
# switch to unstable branch. No error is reported if we're already on the branch.
|
||||
git checkout -f $FGSG_UNSTABLE_GIT_BRANCH
|
||||
# pull latest version from the unstable branch
|
||||
git pull
|
||||
fi
|
||||
|
||||
git pull
|
||||
cd ..
|
||||
|
||||
|
||||
|
||||
echo " OK" >> $LOGFILE
|
||||
cd ..
|
||||
@@ -560,17 +592,25 @@ then
|
||||
then
|
||||
if [ "$RECONFIGURE" = "y" ]
|
||||
then
|
||||
echo "AUTOGEN SIMGEAR" >> $LOGFILE
|
||||
./autogen.sh 2>&1 | tee -a $LOGFILE
|
||||
|
||||
echo "CONFIGURE SIMGEAR" >> $LOGFILE
|
||||
echo ./configure $DEBUG --prefix="$INSTALL_DIR_SIMGEAR" --exec-prefix="$INSTALL_DIR_SIMGEAR" --with-osg="$INSTALL_DIR_OSG" --with-plib="$INSTALL_DIR_PLIB" --with-jpeg-factory --with-boost-libdir=/usr/include/boost
|
||||
./configure $DEBUG --prefix="$INSTALL_DIR_SIMGEAR" --exec-prefix="$INSTALL_DIR_SIMGEAR" --with-osg="$INSTALL_DIR_OSG" --with-plib="$INSTALL_DIR_PLIB" --with-jpeg-factory --with-boost-libdir=/usr/include/boost 2>&1 | tee -a $LOGFILE
|
||||
cd "$CBD"
|
||||
mkdir -p build/simgear
|
||||
cd "$CBD"/build/simgear
|
||||
echo -n "RECONFIGURE SIMGEAR ... " >> $LOGFILE
|
||||
rm -f ../../simgear/simgear/CMakeCache.txt
|
||||
cmake -D CMAKE_BUILD_TYPE="Release" -D CMAKE_CXX_FLAGS="-O3 -D__STDC_CONSTANT_MACROS" -D CMAKE_C_FLAGS="-O3" -D CMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_SIMGEAR" -D CMAKE_PREFIX_PATH=$INSTALL_DIR_OSG ../../simgear/simgear/ 2>&1 | tee -a $LOGFILE
|
||||
echo " OK" >> $LOGFILE
|
||||
|
||||
|
||||
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$COMPILE" = "y" ]
|
||||
then
|
||||
|
||||
|
||||
cd "$CBD"/build/simgear
|
||||
echo "MAKE SIMGEAR" >> $LOGFILE
|
||||
echo "make $JOPTION $OOPTION " >> $LOGFILE
|
||||
make $JOPTION $OOPTION 2>&1 | tee -a $LOGFILE
|
||||
@@ -623,14 +663,26 @@ then
|
||||
|
||||
cd flightgear
|
||||
|
||||
git fetch origin
|
||||
if [ "$STABLE" = "STABLE" ]
|
||||
then
|
||||
git pull origin
|
||||
# switch to stable branch
|
||||
# create local stable branch, ignore errors if it exists
|
||||
git branch -f $FGSG_STABLE_GIT_BRANCH origin/$FGSG_STABLE_GIT_BRANCH 2> /dev/null || true
|
||||
# switch to stable branch. No error is reported if we're already on the branch.
|
||||
git checkout -f $FGSG_STABLE_GIT_BRANCH
|
||||
# get indicated stable version
|
||||
git reset --hard $FGFS_STABLE_REVISION
|
||||
else
|
||||
# switch to unstable branch
|
||||
# create local unstable branch, ignore errors if it exists
|
||||
git branch -f $FGSG_UNSTABLE_GIT_BRANCH origin/$FGSG_UNSTABLE_GIT_BRANCH 2> /dev/null || true
|
||||
# switch to unstable branch. No error is reported if we're already on the branch.
|
||||
git checkout -f $FGSG_UNSTABLE_GIT_BRANCH
|
||||
# pull latest version from the unstable branch
|
||||
git pull
|
||||
fi
|
||||
|
||||
|
||||
git pull
|
||||
cd ..
|
||||
|
||||
echo " OK" >> $LOGFILE
|
||||
@@ -643,17 +695,45 @@ then
|
||||
then
|
||||
if [ "$RECONFIGURE" = "y" ]
|
||||
then
|
||||
echo "AUTOGEN FGFS" >> $LOGFILE
|
||||
./autogen.sh 2>&1 | tee -a $LOGFILE
|
||||
#echo "AUTOGEN FGFS" >> $LOGFILE
|
||||
#./autogen.sh 2>&1 | tee -a $LOGFILE
|
||||
#echo "CONFIGURE FGFS" >> $LOGFILE
|
||||
#echo ./configure "$DEBUG" $WITH_EVENT_INPUT --prefix=$INSTALL_DIR_FGFS --exec-prefix=$INSTALL_DIR_FGFS --with-osg="$INSTALL_DIR_OSG" --with-simgear="$INSTALL_DIR_SIMGEAR" --with-plib="$INSTALL_DIR_PLIB"
|
||||
#./configure "$DEBUG" $WITH_EVENT_INPUT --prefix=$INSTALL_DIR_FGFS --exec-prefix=$INSTALL_DIR_FGFS --with-osg="$INSTALL_DIR_OSG" --with-simgear="$INSTALL_DIR_SIMGEAR" --with-plib="$INSTALL_DIR_PLIB" 2>&1 | tee -a $LOGFILE
|
||||
|
||||
|
||||
cd "$CBD"
|
||||
mkdir -p build/fgfs
|
||||
cd "$CBD"/build/fgfs
|
||||
|
||||
|
||||
echo -n "RECONFIGURE FGFS ... " >> $LOGFILE
|
||||
rm -f ../../fgfs/flightgear/CMakeCache.txt
|
||||
|
||||
# REMOVING BAD LINES IN CMakeLists.txt
|
||||
#echo "REMOVING BAD LINES IN CMakeLists.txt"
|
||||
#cat utils/fgadmin/src/CMakeLists.txt | sed /X11_Xft_LIB/d | sed /X11_Xinerama_LIB/d > utils/fgadmin/src/CMakeLists_without_err.txt
|
||||
#cp -f utils/fgadmin/src/CMakeLists_without_err.txt utils/fgadmin/src/CMakeLists.txt
|
||||
|
||||
|
||||
cmake -D CMAKE_BUILD_TYPE="Release" -D "WITH_FGPANEL=OFF" -D CMAKE_CXX_FLAGS="-O3 -D__STDC_CONSTANT_MACROS" -D CMAKE_C_FLAGS="-O3" -D CMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_FGFS" -D "CMAKE_PREFIX_PATH=$INSTALL_DIR_OSG;$INSTALL_DIR_PLIB;$INSTALL_DIR_SIMGEAR" ../../fgfs/flightgear 2>&1 | tee -a $LOGFILE
|
||||
|
||||
echo " OK" >> $LOGFILE
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
echo "CONFIGURE FGFS" >> $LOGFILE
|
||||
echo ./configure "$DEBUG" $WITH_EVENT_INPUT --prefix=$INSTALL_DIR_FGFS --exec-prefix=$INSTALL_DIR_FGFS --with-osg="$INSTALL_DIR_OSG" --with-simgear="$INSTALL_DIR_SIMGEAR" --with-plib="$INSTALL_DIR_PLIB"
|
||||
./configure "$DEBUG" $WITH_EVENT_INPUT --prefix=$INSTALL_DIR_FGFS --exec-prefix=$INSTALL_DIR_FGFS --with-osg="$INSTALL_DIR_OSG" --with-simgear="$INSTALL_DIR_SIMGEAR" --with-plib="$INSTALL_DIR_PLIB" 2>&1 | tee -a $LOGFILE
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$COMPILE" = "y" ]
|
||||
then
|
||||
cd "$CBD"
|
||||
mkdir -p build/fgfs
|
||||
cd "$CBD"/build/fgfs
|
||||
|
||||
echo "MAKE FGFS" >> $LOGFILE
|
||||
echo "make $JOPTION $OOPTION" >> $LOGFILE
|
||||
make $JOPTION $OOPTION 2>&1 | tee -a $LOGFILE
|
||||
@@ -675,24 +755,68 @@ then
|
||||
EXDIR=$(pwd)
|
||||
cd $INSTALL_DIR_FGFS
|
||||
echo -n "GIT DATA FROM git://gitorious.org/fg/fgdata.git ... " >> $LOGFILE
|
||||
#cvs -z5 -d :pserver:cvsguest:guest@cvs.flightgear.org:/var/cvs/FlightGear-0.9 login
|
||||
#cvs -z5 -d :pserver:cvsguest@cvs.flightgear.org:/var/cvs/FlightGear-0.9 co data
|
||||
|
||||
if [ -d "fgdata" ]
|
||||
then
|
||||
cd fgdata
|
||||
then
|
||||
echo "fgdata exists already."
|
||||
else
|
||||
# no repository yet - need to clone a fresh one
|
||||
git clone git://gitorious.org/fg/fgdata.git fgdata
|
||||
fi
|
||||
|
||||
cd fgdata
|
||||
|
||||
git fetch origin
|
||||
if [ "$STABLE" = "STABLE" ]
|
||||
then
|
||||
# switch to stable branch
|
||||
# create local stable branch, ignore errors if it exists
|
||||
git branch -f $FGSG_STABLE_GIT_BRANCH origin/$FGSG_STABLE_GIT_BRANCH 2> /dev/null || true
|
||||
# switch to stable branch. No error is reported if we're already on the branch.
|
||||
git checkout -f $FGSG_STABLE_GIT_BRANCH
|
||||
# get indicated stable version
|
||||
git reset --hard $FGFS_DATA_STABLE_REVISION
|
||||
else
|
||||
# switch to unstable branch
|
||||
# create local unstable branch, ignore errors if it exists
|
||||
git branch -f $FGDATA_UNSTABLE_GIT_BRANCH origin/$FGDATA_UNSTABLE_GIT_BRANCH 2> /dev/null || true
|
||||
# switch to unstable branch. No error is reported if we're already on the branch.
|
||||
git checkout -f $FGDATA_UNSTABLE_GIT_BRANCH
|
||||
# pull latest version from the unstable branch
|
||||
git pull
|
||||
fi
|
||||
|
||||
cd ..
|
||||
|
||||
|
||||
#cd $INSTALL_DIR_FGFS
|
||||
#echo -n "GIT DATA FROM git://gitorious.org/flightgear-aircraft/c172p.git ... " >> $LOGFILE
|
||||
|
||||
#if [ ! -d "aircrafts" ]
|
||||
#then
|
||||
# mkdir "aircrafts"
|
||||
# ln ../fgdata/Aircraft/Generic/ . -s
|
||||
# ln ../fgdata/Aircraft/Instruments . -s
|
||||
# ln ../fgdata/Aircraft/Instruments-3d/ . -s
|
||||
#fi
|
||||
|
||||
#cd aircrafts
|
||||
|
||||
#if [ -d "c172p" ]
|
||||
#then
|
||||
# echo "c172p exists already."
|
||||
#else
|
||||
#
|
||||
# git clone git://gitorious.org/flightgear-aircraft/c172p.git
|
||||
# fi
|
||||
#
|
||||
# cd c172p
|
||||
# git fetch origin
|
||||
|
||||
|
||||
|
||||
|
||||
if [ "$STABLE" = "STABLE" ]
|
||||
then
|
||||
git pull origin
|
||||
git reset --hard $FGFS_DATA_STABLE_REVISION
|
||||
fi
|
||||
|
||||
git pull
|
||||
cd ..
|
||||
else
|
||||
git clone git://gitorious.org/fg/fgdata.git
|
||||
fi
|
||||
|
||||
|
||||
echo " OK" >> $LOGFILE
|
||||
@@ -701,6 +825,10 @@ then
|
||||
fi
|
||||
fi
|
||||
|
||||
cd "$CBD"
|
||||
|
||||
# IF SEPARATED FOLDER FOR AIRCRAFTS
|
||||
# --fg-aircraft=\$PWD/../aircrafts
|
||||
cat > run_fgfs.sh << ENDOFALL
|
||||
#!/bin/sh
|
||||
cd \$(dirname \$0)
|
||||
@@ -720,13 +848,6 @@ gdb --directory="\$P1"/fgfs/source/src/ --args fgfs --fg-root=\$PWD/../fgdata/
|
||||
ENDOFALL2
|
||||
chmod 755 run_fgfs_debug.sh
|
||||
|
||||
#echo "#!/bin/sh" > run_fgfs.sh
|
||||
#echo "cd \$(dirname \$0)" >> run_fgfs.sh
|
||||
#echo "cd $SUB_INSTALL_DIR/$FGFS_INSTALL_DIR/bin" >> run_fgfs.sh
|
||||
#echo "export LD_LIBRARY_PATH=../../$PLIB_INSTALL_DIR/lib:../../$OSG_INSTALL_DIR/lib:../../$SIMGEAR_INSTALL_DIR/lib" >> run_fgfs.sh
|
||||
#echo "./fgfs --fg-root=\$PWD/../fgdata/ \$@" >> run_fgfs.sh
|
||||
#chmod 755 run_fgfs.sh
|
||||
|
||||
SCRIPT=run_terrasync.sh
|
||||
echo "#!/bin/sh" > $SCRIPT
|
||||
echo "cd \$(dirname \$0)" >> $SCRIPT
|
||||
@@ -737,7 +858,41 @@ ENDOFALL2
|
||||
|
||||
fi
|
||||
|
||||
#######################################################
|
||||
# FGO!
|
||||
#######################################################
|
||||
FGO_INSTALL_DIR=fgo
|
||||
INSTALL_DIR_FGO=$INSTALL_DIR/$FGO_INSTALL_DIR
|
||||
cd "$CBD"
|
||||
if [ "$WHATTOBUILD" = "" -o "$WHATTOBUILD" = "FGO" -o "$WHATTOBUILD" = "ALL" ]
|
||||
then
|
||||
echo "****************************************" | tee -a $LOGFILE
|
||||
echo "***************** FGO ******************" | tee -a $LOGFILE
|
||||
echo "****************************************" | tee -a $LOGFILE
|
||||
|
||||
if [ "$DOWNLOAD" = "y" ]
|
||||
then
|
||||
wget http://sites.google.com/site/erobosprojects/flightgear/add-ons/fgo/download/fgo-1-3-1.tar.gz?attredirects=0 -O fgo-1-3-1.tar.gz
|
||||
cd install
|
||||
tar zxvf ../fgo-1-3-1.tar.gz
|
||||
|
||||
cat fgo/src/gui.py | sed s/"self.process = subprocess.Popen".*/"self.process = subprocess.Popen(self.options, cwd=self.FG_working_dir,env=os.environ)"/g > fgo/src/gui.py-new
|
||||
mv fgo/src/gui.py-new fgo/src/gui.py
|
||||
cd ..
|
||||
|
||||
fi
|
||||
|
||||
SCRIPT=run_fgo.sh
|
||||
echo "#!/bin/sh" > $SCRIPT
|
||||
echo "cd \$(dirname \$0)" >> $SCRIPT
|
||||
echo "cd $SUB_INSTALL_DIR" >> $SCRIPT
|
||||
echo "p=\$(pwd)" >> $SCRIPT
|
||||
echo "cd $FGO_INSTALL_DIR" >> $SCRIPT
|
||||
echo "export LD_LIBRARY_PATH=\$p/plib/lib:\$p/OpenSceneGraph/lib:\$p/simgear/lib" >> $SCRIPT
|
||||
echo "python fgo" >> $SCRIPT
|
||||
chmod 755 $SCRIPT
|
||||
|
||||
fi
|
||||
|
||||
|
||||
#######################################################
|
||||
@@ -767,39 +922,30 @@ then
|
||||
svn $FGRUN_STABLE_REVISION_ co http://fgrun.svn.sourceforge.net/svnroot/fgrun/trunk fgrun
|
||||
echo " OK" >> $LOGFILE
|
||||
|
||||
#echo -n "Patching fgrun ... " >> $LOGFILE
|
||||
#cd fgrun/
|
||||
|
||||
#MF=src/wizard_funcs.cxx && cat $MF | awk '{o=$0} /#include <plib\/netSocket.h>/ {o=o"\n#include <plib/sg.h>"} {print o}' > "$MF"2 && mv "$MF"2 "$MF"
|
||||
#MF=src/AirportBrowser.cxx && cat $MF | awk '{o=$0} /#include <iomanip>/ {o=o"\n#include <math.h>"} {print o}' > "$MF"2 && mv "$MF"2 "$MF"
|
||||
#MF=src/run_posix.cxx && cat $MF | awk '{o=$0} /#include <string>/ {o=o"\n#include <string.h>"} {print o}' > "$MF"2 && mv "$MF"2 "$MF"
|
||||
|
||||
#Thanks to Brandano.....
|
||||
#if [ ! -e "compile-fix-20100102.patch" ]
|
||||
#then
|
||||
# wget http://brisa.homelinux.net/fgfs/compile-fix-20100102.patch
|
||||
#fi
|
||||
#patch -p0 < compile-fix-20100102.patch
|
||||
|
||||
#cd -
|
||||
fi
|
||||
#cd fgrun/trunk/fgrun/
|
||||
cd fgrun/fgrun/
|
||||
|
||||
if [ ! "$UPDATE" = "UPDATE" ]
|
||||
then
|
||||
if [ "$RECONFIGURE" = "y" ]
|
||||
then
|
||||
echo "AUTOGEN FGRUN" >> $LOGFILE
|
||||
./autogen.sh 2>&1 | tee -a $LOGFILE
|
||||
echo "CONFIGURE FGRUN" >> $LOGFILE
|
||||
cd "$CBD"
|
||||
mkdir -p build/fgrun
|
||||
cd "$CBD"/build/fgrun
|
||||
|
||||
echo -n "RECONFIGURE FGRUN ... " >> $LOGFILE
|
||||
rm -f ../../fgrun/fgrun/CMakeCache.txt
|
||||
|
||||
./configure --prefix=$INSTALL_DIR_FGRUN --exec-prefix=$INSTALL_DIR_FGRUN --with-osg="$INSTALL_DIR_OSG" --with-simgear="$INSTALL_DIR_SIMGEAR" CPPFLAGS="-I$INSTALL_DIR_PLIB/include" LDFLAGS="-L$INSTALL_DIR_PLIB/lib" 2>&1 | tee -a $LOGFILE
|
||||
cmake -D CMAKE_BUILD_TYPE="Release" -D CMAKE_CXX_FLAGS="-O3 -D__STDC_CONSTANT_MACROS" -D CMAKE_C_FLAGS="-O3" -D CMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_FGRUN" -D "CMAKE_PREFIX_PATH=$INSTALL_DIR_OSG;$INSTALL_DIR_PLIB;$INSTALL_DIR_SIMGEAR" ../../fgrun/fgrun/ 2>&1 | tee -a $LOGFILE
|
||||
|
||||
echo " OK" >> $LOGFILE
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$COMPILE" = "y" ]
|
||||
then
|
||||
cd "$CBD"/build/fgrun
|
||||
|
||||
echo "MAKE FGRUN" >> $LOGFILE
|
||||
echo "make $JOPTION $OOPTION" >> $LOGFILE
|
||||
make $JOPTION $OOPTION 2>1 | tee -a $LOGFILE
|
||||
@@ -807,14 +953,16 @@ then
|
||||
echo "INSTALL FGRUN" >> $LOGFILE
|
||||
make install 2>&1 | tee -a $LOGFILE
|
||||
fi
|
||||
cd -
|
||||
|
||||
cd "$CBD"
|
||||
|
||||
SCRIPT=run_fgrun.sh
|
||||
echo "#!/bin/sh" > $SCRIPT
|
||||
echo "cd \$(dirname \$0)" >> $SCRIPT
|
||||
echo "cd $SUB_INSTALL_DIR/$FGRUN_INSTALL_DIR/bin" >> $SCRIPT
|
||||
echo "export LD_LIBRARY_PATH=../../$PLIB_INSTALL_DIR/lib:../../$OSG_INSTALL_DIR/lib:../../$SIMGEAR_INSTALL_DIR/lib" >> $SCRIPT
|
||||
echo "./fgrun --fg-exe=\$PWD/../../$FGFS_INSTALL_DIR/bin/fgfs --fg-root=\$PWD/../../$FGFS_INSTALL_DIR/fgdata \$@" >> $SCRIPT
|
||||
#echo "export FG_AIRCRAFTS=\$PWD/../../$FGFS_INSTALL_DIR/aircrafts" >> $SCRIPT
|
||||
echo "./fgrun --fg-exe=\$PWD/../../$FGFS_INSTALL_DIR/bin/fgfs --fg-root=\$PWD/../../$FGFS_INSTALL_DIR/fgdata \$@" >> $SCRIPT
|
||||
chmod 755 $SCRIPT
|
||||
|
||||
|
||||
@@ -865,9 +1013,6 @@ then
|
||||
cp Makefile Makefile.original
|
||||
cat Makefile | sed s/\\//MY_SLASH_HERE/g > Makefile_NOSLASHES
|
||||
|
||||
|
||||
|
||||
|
||||
# 1
|
||||
INSTALL_DIR_PLIB_NO_SLASHES=$(echo "$INSTALL_DIR_PLIB" | sed -e 's/\//MY_SLASH_HERE/g')
|
||||
cat Makefile_NOSLASHES | sed s/PLIB_PREFIX\ *:=\ *MY_SLASH_HEREusrMY_SLASH_HERElocalMY_SLASH_HEREsrcMY_SLASH_HEREfgfs-builderMY_SLASH_HEREinstall/PLIB_PREFIX\ :=\ $INSTALL_DIR_PLIB_NO_SLASHES/g > Makefile_temp
|
||||
@@ -906,7 +1051,6 @@ then
|
||||
fi
|
||||
|
||||
|
||||
|
||||
mkdir -p "$INSTALL_DIR_FGCOM"/bin
|
||||
|
||||
if [ "$COMPILE" = "y" ]
|
||||
@@ -918,7 +1062,7 @@ then
|
||||
echo "INSTALL FGCOM" >> $LOGFILE
|
||||
make install 2>&1 | tee -a $LOGFILE
|
||||
fi
|
||||
cd -
|
||||
cd "$CBD"
|
||||
|
||||
echo "#!/bin/sh" > run_fgcom.sh
|
||||
echo "cd \$(dirname \$0)" >> run_fgcom.sh
|
||||
@@ -974,7 +1118,7 @@ then
|
||||
echo "INSTALL FGCOM" >> $LOGFILE
|
||||
scons install 2>&1 | tee -a $LOGFILE
|
||||
fi
|
||||
cd -
|
||||
cd "$CBD"
|
||||
|
||||
echo "#!/bin/sh" > run_fgcomgui.sh
|
||||
echo "cd \$(dirname \$0)" >> run_fgcomgui.sh
|
||||
@@ -1004,22 +1148,10 @@ then
|
||||
|
||||
if [ "$DOWNLOAD" = "y" ]
|
||||
then
|
||||
#echo "Downloading from http://ovh.dl.sourceforge.net/project/atlas/atlas/0.3.0/Atlas-0.3.0.tar.gz ... " >> $LOGFILE
|
||||
#wget -c http://ovh.dl.sourceforge.net/project/atlas/atlas/0.3.0/Atlas-0.3.0.tar.gz
|
||||
#echo " OK" >> $LOGFILE
|
||||
#tar zxvf Atlas-0.3.0.tar.gz
|
||||
|
||||
|
||||
echo -n "CSV FROM atlas.cvs.sourceforge.net:/cvsroot/atlas ... " >> $LOGFILE
|
||||
cvs -z3 -d:pserver:anonymous@atlas.cvs.sourceforge.net:/cvsroot/atlas co Atlas
|
||||
echo " OK" >> $LOGFILE
|
||||
|
||||
#echo -n "CSV PATCH FROM http://janodesbois.free.fr ... " >> $LOGFILE
|
||||
#cd Atlas
|
||||
#wget http://janodesbois.free.fr/doc/atlas-CVS.diff
|
||||
#patch -p0 < atlas-CVS.diff
|
||||
#cd ..
|
||||
#echo " OK" >> $LOGFILE
|
||||
echo "fixing old function name \".get_gbs_center2(\" in Subbucket.cxx"
|
||||
cd Atlas/src
|
||||
cp Subbucket.cxx Subbucket.cxx.original
|
||||
@@ -1027,16 +1159,21 @@ then
|
||||
cd "$CBD"
|
||||
fi
|
||||
cd Atlas
|
||||
#cd Atlas-0.3.0
|
||||
|
||||
if [ ! "$UPDATE" = "UPDATE" ]
|
||||
then
|
||||
if [ "$RECONFIGURE" = "y" ]
|
||||
then
|
||||
|
||||
cd "$CBD"
|
||||
mkdir -p build/atlas
|
||||
|
||||
cd Atlas
|
||||
echo "AUTOGEN ATLAS" >> $LOGFILE
|
||||
./autogen.sh 2>&1 | tee -a $LOGFILE
|
||||
echo "CONFIGURE ATLAS" >> $LOGFILE
|
||||
./configure --prefix=$INSTALL_DIR_ATLAS --exec-prefix=$INSTALL_DIR_ATLAS --with-plib=$INSTALL_DIR_PLIB --with-simgear="$INSTALL_DIR_SIMGEAR" --with-fgbase="$INSTALL_DIR_FGFS/fgdata" CXXFLAGS="$CXXFLAGS -I$CBD/OpenSceneGraph/include" 2>&1 | tee -a $LOGFILE
|
||||
cd "$CBD"/build/atlas
|
||||
../../Atlas/configure --prefix=$INSTALL_DIR_ATLAS --exec-prefix=$INSTALL_DIR_ATLAS --with-plib=$INSTALL_DIR_PLIB --with-simgear="$INSTALL_DIR_SIMGEAR" --with-fgbase="$INSTALL_DIR_FGFS/fgdata" CXXFLAGS="$CXXFLAGS -I$CBD/OpenSceneGraph/include" 2>&1 | tee -a $LOGFILE
|
||||
make clean
|
||||
fi
|
||||
fi
|
||||
@@ -1044,12 +1181,14 @@ then
|
||||
then
|
||||
echo "MAKE ATLAS" >> $LOGFILE
|
||||
echo "make $JOPTION $OOPTION" >> $LOGFILE
|
||||
|
||||
cd "$CBD"/build/atlas
|
||||
make $JOPTION $OOPTION 2>&1 | tee -a $LOGFILE
|
||||
|
||||
echo "INSTALL ATLAS" >> $LOGFILE
|
||||
make install 2>&1 | tee -a $LOGFILE
|
||||
fi
|
||||
cd -
|
||||
cd "$CBD"
|
||||
|
||||
echo "#!/bin/sh" > run_atlas.sh
|
||||
echo "cd \$(dirname \$0)" >> run_atlas.sh
|
||||
|
||||
Submodule flightgear updated: 118d8fbca5...8039b6cb8f
@@ -1,9 +1,26 @@
|
||||
#!/bin/sh
|
||||
|
||||
cd simgear
|
||||
./autogen.sh
|
||||
./configure --prefix=$WORKSPACE/dist --with-osg=$WORKSPACE/dist
|
||||
if [ "$WORKSPACE" == "" ]; then
|
||||
echo "ERROR: Missing WORKSPACE environment variable."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
#####################################################################################
|
||||
# remove old and create fresh build directories
|
||||
rm -rf sgBuild
|
||||
rm -rf fgBuild
|
||||
mkdir -p sgBuild
|
||||
mkdir -p fgBuild
|
||||
mkdir -p output
|
||||
rm -rf output/*
|
||||
rm -rf $WORKSPACE/dist/include/simgear $WORKSPACE/dist/libSim* $WORKSPACE/dist/libsg*.a
|
||||
|
||||
#####################################################################################
|
||||
echo "Starting on SimGear"
|
||||
cd sgBuild
|
||||
cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DSIMGEAR_SHARED:BOOL="ON" ../simgear
|
||||
|
||||
# compile
|
||||
make
|
||||
|
||||
if [ $? -ne '0' ]; then
|
||||
@@ -12,13 +29,17 @@ if [ $? -ne '0' ]; then
|
||||
fi
|
||||
|
||||
make install
|
||||
make dist
|
||||
|
||||
# build source package and copy to output
|
||||
make package_source
|
||||
cp simgear-*.tar.bz2 ../output/.
|
||||
|
||||
#####################################################################################
|
||||
echo "Starting on FlightGear"
|
||||
cd ../fgBuild
|
||||
cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DSIMGEAR_SHARED:BOOL="ON" ../flightgear
|
||||
|
||||
cd ../flightgear
|
||||
./autogen.sh
|
||||
./configure --prefix=$WORKSPACE/dist --with-osg=$WORKSPACE/dist
|
||||
# compile
|
||||
make
|
||||
|
||||
if [ $? -ne '0' ]; then
|
||||
@@ -27,4 +48,8 @@ if [ $? -ne '0' ]; then
|
||||
fi
|
||||
|
||||
make install
|
||||
make dist
|
||||
|
||||
# build source package and copy to output
|
||||
make package_source
|
||||
cp flightgear-*.tar.bz2 ../output/.
|
||||
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
SDK_PATH="/Developer/SDKs/MacOSX10.6.sdk"
|
||||
OSX_TARGET="10.6"
|
||||
|
||||
svn co https://macflightgear.svn.sourceforge.net/svnroot/macflightgear/trunk/FlightGearOSX macflightgear
|
||||
|
||||
pushd macflightgear
|
||||
|
||||
# compile the stub executable
|
||||
gcc -o FlightGear -mmacosx-version-min=$OSX_TARGET -isysroot $SDK_PATH -arch i386 main.m \
|
||||
-framework Cocoa -framework RubyCocoa -framework Foundation -framework AppKit
|
||||
|
||||
popd
|
||||
|
||||
72
hudson_mac_build_release.sh
Executable file
72
hudson_mac_build_release.sh
Executable file
@@ -0,0 +1,72 @@
|
||||
#!/bin/sh
|
||||
|
||||
if [ "$WORKSPACE" == "" ]; then
|
||||
echo "ERROR: Missing WORKSPACE environment variable."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
###############################################################################
|
||||
# remove old and create fresh build directories
|
||||
rm -rf sgBuild
|
||||
rm -rf fgBuild
|
||||
mkdir -p sgBuild
|
||||
mkdir -p fgBuild
|
||||
mkdir -p output
|
||||
rm -rf output/*
|
||||
rm -rf $WORKSPACE/dist/include/simgear $WORKSPACE/dist/libSim* $WORKSPACE/dist/libsg*.a
|
||||
|
||||
###############################################################################
|
||||
echo "Starting on SimGear"
|
||||
pushd sgBuild
|
||||
cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -G Xcode ../simgear
|
||||
|
||||
# compile
|
||||
xcodebuild -configuration Release -target install build
|
||||
|
||||
if [ $? -ne '0' ]; then
|
||||
echo "make simgear failed"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
popd
|
||||
|
||||
################################################################################
|
||||
echo "Starting on FlightGear"
|
||||
pushd fgBuild
|
||||
cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -G Xcode ../flightgear
|
||||
|
||||
xcodebuild -configuration Release -target install build
|
||||
|
||||
if [ $? -ne '0' ]; then
|
||||
echo "make flightgear failed"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
popd
|
||||
|
||||
chmod +x $WORKSPACE/dist/bin/osgversion
|
||||
|
||||
################################################################################
|
||||
echo "Building Macflightgear launcher"
|
||||
|
||||
OSX_TARGET="10.6"
|
||||
|
||||
pushd maclauncher/FlightGearOSX
|
||||
|
||||
# compile the stub executable
|
||||
gcc -o FlightGear -mmacosx-version-min=$OSX_TARGET -isysroot $SDK_PATH -arch i386 main.m \
|
||||
-framework Cocoa -framework RubyCocoa -framework Foundation -framework AppKit
|
||||
|
||||
popd
|
||||
|
||||
################################################################################
|
||||
echo "Syncing base packages files from sphere.telascience.org"
|
||||
rsync -avz --filter 'merge base-package.rules' \
|
||||
-e ssh jturner@sphere.telascience.org:/home/jturner/fgdata .
|
||||
|
||||
# run the unlock script now - we need to do this right before code-signing,
|
||||
# or the keychain may automatically re-lock after some period of time
|
||||
unlock-keychain.sh
|
||||
|
||||
echo "Running package script"
|
||||
./hudson_mac_package_release.rb
|
||||
@@ -1,9 +1,11 @@
|
||||
#!/usr/bin/ruby
|
||||
|
||||
require 'ERB'
|
||||
require 'fileutils' #I know, no underscore is not ruby-like
|
||||
include FileUtils
|
||||
|
||||
$osgLibs = ['osgFX', 'osgParticle', 'osg', 'osgGA', 'osgText', 'osgUtil', 'osgSim', 'osgViewer', 'osgDB']
|
||||
$osgPlugins = ['ac', 'osg', 'freetype', 'qt', 'imageio', 'rgb', 'txf', 'mdl', '3ds']
|
||||
$osgPlugins = ['ac', 'osg', 'freetype', 'imageio', 'rgb', 'txf', 'mdl', '3ds']
|
||||
|
||||
def runOsgVersion(option)
|
||||
env = "export DYLD_LIBRARY_PATH=#{Dir.pwd}/dist/lib"
|
||||
@@ -15,10 +17,17 @@ osgVersion = runOsgVersion('version-number')
|
||||
$osgSoVersion=runOsgVersion('so-number')
|
||||
$openThreadsSoVersion=runOsgVersion('openthreads-soversion-number')
|
||||
|
||||
$codeSignIdentity = ENV['FG_CODESIGN_IDENTITY']
|
||||
puts "Code signing identity is #{$codeSignIdentity}"
|
||||
|
||||
puts "osgVersion=#{osgVersion}, so-number=#{$osgSoVersion}"
|
||||
|
||||
$alutSourcePath='/Library/Frameworks/ALUT.framework'
|
||||
|
||||
$svnLibs = ['svn_client', 'svn_wc', 'svn_delta', 'svn_diff', 'svn_ra',
|
||||
'svn_ra_local', 'svn_repos', 'svn_fs', 'svn_fs_fs', 'svn_fs_util',
|
||||
'svn_ra_svn', 'svn_subr', 'svn_ra_neon']
|
||||
|
||||
def fix_install_names(object)
|
||||
#puts "fixing install names for #{object}"
|
||||
|
||||
@@ -32,15 +41,39 @@ def fix_install_names(object)
|
||||
newName= "@executable_path/../Frameworks/#{oldName}"
|
||||
`install_name_tool -change #{oldName} #{newName} #{object}`
|
||||
|
||||
alutBundlePath = "@executable_path/../Frameworks/Alut.framework"
|
||||
alutBundlePath = "@executable_path/../Frameworks/ALUT.framework"
|
||||
alutLib = "Versions/A/ALUT"
|
||||
`install_name_tool -change #{$alutSourcePath}/#{alutLib} #{alutBundlePath}/#{alutLib} #{object}`
|
||||
end
|
||||
|
||||
prefixDir=Dir.pwd + "/dist"
|
||||
$prefixDir=Dir.pwd + "/dist"
|
||||
dmgDir=Dir.pwd + "/image"
|
||||
srcDir=Dir.pwd + "/flightgear"
|
||||
|
||||
def fix_svn_install_names(object)
|
||||
$svnLibs.each do |l|
|
||||
fileName = "lib#{l}-1.0.dylib"
|
||||
newName = "@executable_path/../Frameworks/#{fileName}"
|
||||
`install_name_tool -change #{fileName} #{newName} #{object}`
|
||||
end
|
||||
end
|
||||
|
||||
def copy_svn_libs()
|
||||
puts "Copying Subversion client libraries"
|
||||
$svnLibs.each do |l|
|
||||
libFile = "lib#{l}-1.0.dylib"
|
||||
path = "#{$frameworksDir}/#{libFile}"
|
||||
`cp #{$prefixDir}/lib/#{libFile} #{$frameworksDir}`
|
||||
fix_svn_install_names(path)
|
||||
# `install_name_tool -id #{libFile} #{path}`
|
||||
end
|
||||
end
|
||||
|
||||
def code_sign(path)
|
||||
puts "Signing #{path}"
|
||||
`codesign -s "#{$codeSignIdentity}" #{path}`
|
||||
end
|
||||
|
||||
|
||||
puts "Erasing previous image dir"
|
||||
`rm -rf #{dmgDir}`
|
||||
@@ -48,56 +81,72 @@ puts "Erasing previous image dir"
|
||||
bundle=dmgDir + "/FlightGear.app"
|
||||
contents=bundle + "/Contents"
|
||||
macosDir=contents + "/MacOS"
|
||||
frameworksDir=contents +"/Frameworks"
|
||||
$frameworksDir=contents +"/Frameworks"
|
||||
resourcesDir=contents+"/Resources"
|
||||
osgPluginsDir=contents+"/PlugIns/osgPlugins-#{osgVersion}"
|
||||
|
||||
# for writing copyright year to Info.plist
|
||||
t = Time.new
|
||||
fgCurrentYear = t.year
|
||||
|
||||
fgVersion = File.read("#{srcDir}/version").strip
|
||||
volName="\"FlightGear #{fgVersion}\""
|
||||
|
||||
dmgPath = Dir.pwd + "/fg_mac_#{fgVersion}.dmg"
|
||||
dmgPath = Dir.pwd + "/output/fg_mac_#{fgVersion}.dmg"
|
||||
|
||||
puts "Creating directory structure"
|
||||
`mkdir -p #{macosDir}`
|
||||
`mkdir -p #{frameworksDir}`
|
||||
`mkdir -p #{$frameworksDir}`
|
||||
`mkdir -p #{resourcesDir}`
|
||||
`mkdir -p #{osgPluginsDir}`
|
||||
|
||||
puts "Copying binaries"
|
||||
bins = ['fgfs', 'terrasync']
|
||||
bins = ['fgfs', 'fgjs', 'fgcom', 'fgviewer']
|
||||
bins.each do |b|
|
||||
`cp #{prefixDir}/bin/#{b} #{resourcesDir}/#{b}`
|
||||
fix_install_names("#{resourcesDir}/#{b}")
|
||||
if !File.exist?("#{$prefixDir}/bin/#{b}")
|
||||
next
|
||||
end
|
||||
|
||||
outPath = "#{macosDir}/#{b}"
|
||||
`cp #{$prefixDir}/bin/#{b} #{outPath}`
|
||||
fix_install_names(outPath)
|
||||
fix_svn_install_names(outPath)
|
||||
end
|
||||
|
||||
puts "copying libraries"
|
||||
$osgLibs.each do |l|
|
||||
libFile = "lib#{l}.#{$osgSoVersion}.dylib"
|
||||
`cp #{prefixDir}/lib/#{libFile} #{frameworksDir}`
|
||||
fix_install_names("#{frameworksDir}/#{libFile}")
|
||||
`cp #{$prefixDir}/lib/#{libFile} #{$frameworksDir}`
|
||||
fix_install_names("#{$frameworksDir}/#{libFile}")
|
||||
end
|
||||
|
||||
# and not forgetting OpenThreads
|
||||
libFile = "libOpenThreads.#{$openThreadsSoVersion}.dylib"
|
||||
`cp #{prefixDir}/lib/#{libFile} #{frameworksDir}`
|
||||
`cp #{$prefixDir}/lib/#{libFile} #{$frameworksDir}`
|
||||
|
||||
$osgPlugins.each do |p|
|
||||
pluginFile = "osgdb_#{p}.so"
|
||||
`cp #{prefixDir}/lib/osgPlugins-#{osgVersion}/#{pluginFile} #{osgPluginsDir}`
|
||||
`cp #{$prefixDir}/lib/osgPlugins-#{osgVersion}/#{pluginFile} #{osgPluginsDir}`
|
||||
fix_install_names("#{osgPluginsDir}/#{pluginFile}")
|
||||
end
|
||||
|
||||
copy_svn_libs()
|
||||
|
||||
# custom ALUT
|
||||
# must copy frameworks using ditto
|
||||
`ditto #{$alutSourcePath} #{frameworksDir}/ALUT.framework`
|
||||
`ditto #{$alutSourcePath} #{$frameworksDir}/ALUT.framework`
|
||||
|
||||
# Macflightgear launcher
|
||||
puts "Copying Macflightgear launcher files"
|
||||
|
||||
Dir.chdir "macflightgear" do
|
||||
Dir.chdir "maclauncher/FlightGearOSX" do
|
||||
`cp FlightGear #{macosDir}`
|
||||
`rsync -a --exclude=\".svn\" *.rb *.lproj *.sh *.tiff #{resourcesDir}`
|
||||
`rsync -a *.rb *.lproj *.sh *.tiff #{resourcesDir}`
|
||||
end
|
||||
|
||||
if File.exist?("#{$prefixDir}/bin/fgcom-data")
|
||||
puts "Copying FGCom data files"
|
||||
`ditto #{$prefixDir}/bin/fgcom-data #{resourcesDir}/fgcom-data`
|
||||
end
|
||||
|
||||
# Info.plist
|
||||
@@ -111,6 +160,18 @@ File.open("#{contents}/Info.plist", 'w') { |f|
|
||||
`cp #{srcDir}/package/mac/FlightGear.icns #{resourcesDir}/FlightGear.icns`
|
||||
`cp #{srcDir}/COPYING #{dmgDir}`
|
||||
|
||||
puts "Copying base package files into the image"
|
||||
`rsync -a fgdata/ #{resourcesDir}/data`
|
||||
|
||||
# code sign all executables in MacOS dir. Do this last since reource
|
||||
# changes will invalidate the signature!
|
||||
Dir.foreach(macosDir) do |b|
|
||||
if b == '.' or b == '..' then
|
||||
next
|
||||
end
|
||||
code_sign("#{macosDir}/#{b}")
|
||||
end
|
||||
|
||||
puts "Creating DMG"
|
||||
|
||||
createArgs = "-format UDBZ -imagekey bzip2-level=9 -quiet -volname #{volName}"
|
||||
|
||||
@@ -1,12 +1,15 @@
|
||||
|
||||
IF NOT DEFINED WORKSPACE SET WORKSPACE=%~dp0
|
||||
|
||||
ECHO #define SIMGEAR_VERSION "2.2.0" > %WORKSPACE%\simgear\simgear\version.h
|
||||
cd %WORKSPACE%\simgear\projects\VC90
|
||||
msbuild SimGear.vcproj /p:Configuration=Release /m
|
||||
ECHO #define SIMGEAR_VERSION "2.8.0" > %WORKSPACE%\simgear\simgear\version.h
|
||||
rem set PATH=%PATH%;D:\Program Files (x86)\CMake 2.8\bin
|
||||
rem call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\Tools\vsvars32.bat"
|
||||
md build-sg
|
||||
md build-fg
|
||||
cd build-sg
|
||||
cmake ..\simgear -G "Visual Studio 10" -DMSVC_3RDPARTY_ROOT=%WORKSPACE% -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc100/SimGear
|
||||
cmake --build . --config Release --target INSTALL
|
||||
|
||||
cd %WORKSPACE%\flightgear
|
||||
call scripts\tools\version.bat
|
||||
SET HAVE_VERSION_H=1
|
||||
cd %WORKSPACE%\flightgear\projects\VC90
|
||||
msbuild FlightGear.sln /p:Configuration=Release /m
|
||||
cd ..\build-fg
|
||||
cmake ..\flightgear -G "Visual Studio 10" -DMSVC_3RDPARTY_ROOT=%WORKSPACE% -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc100/FlightGear -DFLTK_FLUID_EXECUTABLE=%WORKSPACE%/3rdParty/bin/fluid.exe
|
||||
cmake --build . --config Release --target INSTALL
|
||||
|
||||
@@ -1,13 +1,15 @@
|
||||
|
||||
IF NOT DEFINED WORKSPACE SET WORKSPACE=%~dp0
|
||||
|
||||
ECHO #define SIMGEAR_VERSION "2.2.0" > %WORKSPACE%\simgear\simgear\version.h
|
||||
cd %WORKSPACE%\simgear\projects\VC90
|
||||
msbuild SimGear.vcproj /p:Configuration=Release /p:Platform=x64
|
||||
|
||||
cd %WORKSPACE%\flightgear
|
||||
call scripts\tools\version.bat
|
||||
SET HAVE_VERSION_H=1
|
||||
cd %WORKSPACE%\flightgear\projects\VC90
|
||||
msbuild FlightGear.sln /p:Configuration=Release /p:Platform=x64
|
||||
ECHO #define SIMGEAR_VERSION "2.8.0" > %WORKSPACE%\simgear\simgear\version.h
|
||||
rem set PATH=%PATH%;D:\Program Files (x86)\CMake 2.8\bin
|
||||
rem call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" amd64
|
||||
md build-sg64
|
||||
md build-fg64
|
||||
cd build-sg64
|
||||
cmake ..\SimGear -G "Visual Studio 10 Win64" -DMSVC_3RDPARTY_ROOT=%WORKSPACE% -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc100-64/SimGear
|
||||
cmake --build . --config Release --target INSTALL
|
||||
|
||||
cd ..\build-fg64
|
||||
cmake ..\flightgear -G "Visual Studio 10 Win64" -DMSVC_3RDPARTY_ROOT=%WORKSPACE% -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc100-64/FlightGear -DFLTK_FLUID_EXECUTABLE=%WORKSPACE%/3rdParty/bin/fluid.exe
|
||||
cmake --build . --config Release --target INSTALL
|
||||
|
||||
@@ -4,12 +4,12 @@ IF NOT DEFINED WORKSPACE SET WORKSPACE=%~dp0
|
||||
ECHO Packaging root is %WORKSPACE%
|
||||
|
||||
subst X: /D
|
||||
subst X: %WORKSPACE%
|
||||
subst X: %WORKSPACE%.
|
||||
|
||||
REM construct information file to be read by Inno-setup
|
||||
|
||||
|
||||
set PATH=%WORKSPACE%\install\msvc90\OpenSceneGraph\bin;%PATH%
|
||||
set PATH=%WORKSPACE%\install\msvc100\OpenSceneGraph\bin;%PATH%
|
||||
REM indirect way to get command output into an environment variable
|
||||
osgversion --so-number > %TEMP%\osg-so-number.txt
|
||||
osgversion --version-number > %TEMP%\osg-version.txt
|
||||
|
||||
1
maclauncher
Submodule
1
maclauncher
Submodule
Submodule maclauncher added at 7ffef2cb26
2
simgear
2
simgear
Submodule simgear updated: e55017bbfc...b1baddd6dc
Reference in New Issue
Block a user