From cf87d84cfe831068cfb0190da00d00ad2a582153 Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Tue, 17 Jan 2012 22:27:31 +0100 Subject: [PATCH 01/35] Bump fg+sg references to release/2.6.0 --- flightgear | 2 +- simgear | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flightgear b/flightgear index 118d8fb..979fc97 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit 118d8fbca5d98e994d572e4c922f76ba2cab9e52 +Subproject commit 979fc9785b2f91e1a7551dc1cd28743e2310759a diff --git a/simgear b/simgear index e55017b..5a6b760 160000 --- a/simgear +++ b/simgear @@ -1 +1 @@ -Subproject commit e55017bbfce20a999bc9173260f402b2ec3819d0 +Subproject commit 5a6b76084796f7f6c4e41b2ad717de3305d45099 From d243047bf8cfb9ebea4b507442fdc43c42dceccd Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Tue, 17 Jan 2012 22:36:46 +0100 Subject: [PATCH 02/35] Update jenkins releae build script to use CMake --- hudson_build_release.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hudson_build_release.sh b/hudson_build_release.sh index a91f480..710b8ef 100755 --- a/hudson_build_release.sh +++ b/hudson_build_release.sh @@ -1,8 +1,7 @@ #!/bin/sh cd simgear -./autogen.sh -./configure --prefix=$WORKSPACE/dist --with-osg=$WORKSPACE/dist +cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist make @@ -17,8 +16,7 @@ make dist echo "Starting on FlightGear" cd ../flightgear -./autogen.sh -./configure --prefix=$WORKSPACE/dist --with-osg=$WORKSPACE/dist +cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist make if [ $? -ne '0' ]; then From 427964586c31ca0203fa1ec5c9c9e86f68a79de7 Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Tue, 17 Jan 2012 23:43:12 +0100 Subject: [PATCH 03/35] Fix jenkins release build script Properly build the source package. --- flightgear | 2 +- hudson_build_release.sh | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/flightgear b/flightgear index 979fc97..0c78392 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit 979fc9785b2f91e1a7551dc1cd28743e2310759a +Subproject commit 0c78392cc0112a3b5cb9312ab8039693994877c9 diff --git a/hudson_build_release.sh b/hudson_build_release.sh index 710b8ef..d94046d 100755 --- a/hudson_build_release.sh +++ b/hudson_build_release.sh @@ -3,6 +3,8 @@ cd simgear cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist +# first make source package (clean directory), finally compile +make package_source make if [ $? -ne '0' ]; then @@ -11,12 +13,14 @@ if [ $? -ne '0' ]; then fi make install -make dist echo "Starting on FlightGear" cd ../flightgear cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist + +# first source package (clean directory), finally compile +make package_source make if [ $? -ne '0' ]; then @@ -25,4 +29,4 @@ if [ $? -ne '0' ]; then fi make install -make dist + From b894a457d7a2955dd123e47f4cffdd3c7fa33ebb Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Wed, 18 Jan 2012 00:32:16 +0100 Subject: [PATCH 04/35] Build release using separate directories. Don't build in the git repositories' directories - so they're always fresh and clean... --- hudson_build_release.sh | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/hudson_build_release.sh b/hudson_build_release.sh index d94046d..7a7ec29 100755 --- a/hudson_build_release.sh +++ b/hudson_build_release.sh @@ -1,10 +1,19 @@ #!/bin/sh -cd simgear -cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist +# remove old and create fresh build directories +rm -rf sgBuild +rm -rf fgBuild +mkdir -p sgBuild +mkdir -p fgBuild +mkdir -p output +# clear output directory +rm -rf output/* -# first make source package (clean directory), finally compile -make package_source +echo "Starting on SimGear" +cd sgBuild +cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist ../simgear + +# compile make if [ $? -ne '0' ]; then @@ -14,13 +23,16 @@ fi make install +# build source package and copy to output +make package_source +cp simgear-*.tar.bz2 ../output/. + echo "Starting on FlightGear" -cd ../flightgear -cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist +cd ../fgBuild +cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist ../flightgear -# first source package (clean directory), finally compile -make package_source +# compile make if [ $? -ne '0' ]; then @@ -30,3 +42,6 @@ fi make install +# build source package and copy to output +make package_source + From accced5c0eb362001088f2120d3e27a327fe6dcc Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Wed, 18 Jan 2012 01:08:33 +0100 Subject: [PATCH 05/35] Also copy flightgear result to output directory. --- hudson_build_release.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/hudson_build_release.sh b/hudson_build_release.sh index 7a7ec29..5d569e9 100755 --- a/hudson_build_release.sh +++ b/hudson_build_release.sh @@ -44,4 +44,5 @@ make install # build source package and copy to output make package_source +cp flightgear-*.tar.bz2 ../output/. From cfde12ad6d7e75187a088ca7d2192069b4b46053 Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Wed, 18 Jan 2012 20:45:21 +0100 Subject: [PATCH 06/35] Switch Linux release build to "SHARED_SIMGEAR". --- .gitignore | 3 +++ hudson_build_release.sh | 14 ++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6380c51..930f8e0 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,6 @@ install boost_1_44_0 InstallConfig.iss Output +output +fgBuild +sgBuild diff --git a/hudson_build_release.sh b/hudson_build_release.sh index 5d569e9..0be787c 100755 --- a/hudson_build_release.sh +++ b/hudson_build_release.sh @@ -1,17 +1,23 @@ #!/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 -# clear output directory rm -rf output/* +##################################################################################### echo "Starting on SimGear" cd sgBuild -cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist ../simgear +cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DSIMGEAR_SHARED:BOOL="ON" ../simgear # compile make @@ -27,10 +33,10 @@ make install make package_source cp simgear-*.tar.bz2 ../output/. +##################################################################################### echo "Starting on FlightGear" - cd ../fgBuild -cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist ../flightgear +cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DSIMGEAR_SHARED:BOOL="ON" ../flightgear # compile make From d54131041d34390d09576cfaf5614b5d9f7e6932 Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Wed, 18 Jan 2012 21:43:34 +0100 Subject: [PATCH 07/35] Bump flightgear revision. --- flightgear | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flightgear b/flightgear index 0c78392..9a6eef6 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit 0c78392cc0112a3b5cb9312ab8039693994877c9 +Subproject commit 9a6eef65a66a8a4c7e591f75460627cde6aa7356 From 035dab673a4ad5316e1c0a513efabcc79f9f939e Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Wed, 18 Jan 2012 22:40:04 +0100 Subject: [PATCH 08/35] Wipe artifacts of previous build. --- hudson_build_release.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/hudson_build_release.sh b/hudson_build_release.sh index 0be787c..76c75bd 100755 --- a/hudson_build_release.sh +++ b/hudson_build_release.sh @@ -13,6 +13,7 @@ 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" From a22928912d394ff01406cb66e342bac8947a87bc Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Sun, 22 Jan 2012 12:49:01 +0100 Subject: [PATCH 09/35] Bump version to fg/sg release head. --- flightgear | 2 +- simgear | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flightgear b/flightgear index 9a6eef6..3b53c3b 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit 9a6eef65a66a8a4c7e591f75460627cde6aa7356 +Subproject commit 3b53c3b1bf59f882f3950240f52c9f0350991d62 diff --git a/simgear b/simgear index 5a6b760..73f9cd0 160000 --- a/simgear +++ b/simgear @@ -1 +1 @@ -Subproject commit 5a6b76084796f7f6c4e41b2ad717de3305d45099 +Subproject commit 73f9cd05cd2524740a11227cab4813255d649733 From f1ed5ae3eb964f5fe6b0285af2810366cc8fb7d7 Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Sun, 22 Jan 2012 19:17:52 +0100 Subject: [PATCH 10/35] Bump --- flightgear | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flightgear b/flightgear index 3b53c3b..32fb06f 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit 3b53c3b1bf59f882f3950240f52c9f0350991d62 +Subproject commit 32fb06f8a55cf9ef45717311506975bacf53cf18 From a3f33c5e9750867d070aee6c1e20802205a24e75 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier Date: Mon, 23 Jan 2012 09:04:47 +0100 Subject: [PATCH 11/35] First try at building Windows release with VS2010 and Cmake --- hudson_win_build32.bat | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/hudson_win_build32.bat b/hudson_win_build32.bat index 77669d5..77bacff 100644 --- a/hudson_win_build32.bat +++ b/hudson_win_build32.bat @@ -1,12 +1,16 @@ 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.6.0" > %WORKSPACE%\simgear\simgear\version.h +rem xcopy D:\FGFSHudson\boost_1_44_0\* D:\FGFSHudsonCMake\SimGear\boost_1_44_0\ /s /y /q +set PATH=%PATH%;D:\Program Files (x86)\CMake 2.8\bin +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 From 768400600cf7898d908a18f0d7fdba3f7b897f49 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier Date: Mon, 23 Jan 2012 23:29:26 +0100 Subject: [PATCH 12/35] Adapt Inno-setup packaging to new build system --- FlightGear.iss | 24 +++++++++++++----------- hudson_win_package_release.bat | 2 +- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/FlightGear.iss b/FlightGear.iss index b9e394f..bbb20ae 100755 --- a/FlightGear.iss +++ b/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] @@ -61,20 +61,20 @@ Name: "desktopicon"; Description: "Create a &desktop icon"; GroupDescription: "A [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:\install\msvc100\FlightGear\bin\*.exe"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion +Source: "X:\install\msvc100-64\FlightGear\bin\*.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:\install\msvc100\FGRun\bin\fgrun.exe"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion +Source: "X:\install\msvc100\FGRun\share\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-64\FGRun\bin\fgrun.exe"; DestDir: "{app}\bin\Win64"; Flags: ignoreversion +Source: "X:\install\msvc100-64\FGRun\share\locale\*"; DestDir: "{app}\bin\Win64\locale"; Flags: ignoreversion recursesubdirs 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: "{#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:\data\*.*"; DestDir: "{app}\data"; Flags: ignoreversion recursesubdirs skipifsourcedoesntexist @@ -100,6 +100,7 @@ Source: "{#OSGPluginsDir}\osgdb_rgb.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{ Source: "{#OSGPluginsDir}\osgdb_png.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}" Source: "{#OSGPluginsDir}\osgdb_dds.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}" Source: "{#OSGPluginsDir}\osgdb_txf.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}" +Source: "{#OSGPluginsDir}\osgdb_freetype.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}" Source: "{#OSGPluginsDir}\osgdb_serializers_osg.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}" Source: "{#OSGPluginsDir}\osgdb_serializers_osganimation.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}" Source: "{#OSGPluginsDir}\osgdb_serializers_osgfx.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}" @@ -135,6 +136,7 @@ Source: "{#OSG64PluginsDir}\osgdb_rgb.dll"; DestDir: "{app}\bin\Win64\osgPlugins Source: "{#OSG64PluginsDir}\osgdb_png.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist Source: "{#OSG64PluginsDir}\osgdb_dds.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_freetype.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist Source: "{#OSG64PluginsDir}\osgdb_serializers_osg.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist Source: "{#OSG64PluginsDir}\osgdb_serializers_osganimation.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist Source: "{#OSG64PluginsDir}\osgdb_serializers_osgfx.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist diff --git a/hudson_win_package_release.bat b/hudson_win_package_release.bat index d058849..abf20c6 100644 --- a/hudson_win_package_release.bat +++ b/hudson_win_package_release.bat @@ -9,7 +9,7 @@ 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 From e4348d7086c7ee3fec24377b92cfc73f367f1a4c Mon Sep 17 00:00:00 2001 From: Frederic Bouvier Date: Tue, 24 Jan 2012 08:06:20 +0100 Subject: [PATCH 13/35] Move setting environment variable out of the build script --- hudson_win_build32.bat | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hudson_win_build32.bat b/hudson_win_build32.bat index 77bacff..57e50fe 100644 --- a/hudson_win_build32.bat +++ b/hudson_win_build32.bat @@ -2,9 +2,8 @@ IF NOT DEFINED WORKSPACE SET WORKSPACE=%~dp0 ECHO #define SIMGEAR_VERSION "2.6.0" > %WORKSPACE%\simgear\simgear\version.h -rem xcopy D:\FGFSHudson\boost_1_44_0\* D:\FGFSHudsonCMake\SimGear\boost_1_44_0\ /s /y /q -set PATH=%PATH%;D:\Program Files (x86)\CMake 2.8\bin -call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\Tools\vsvars32.bat" +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 From 0b5482783592dd7c6b05975259e5114ef27e8422 Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Wed, 25 Jan 2012 18:01:18 +0100 Subject: [PATCH 14/35] Bump. --- flightgear | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flightgear b/flightgear index 32fb06f..49b5bc9 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit 32fb06f8a55cf9ef45717311506975bacf53cf18 +Subproject commit 49b5bc904282f2661e1e7177447dc2fb7732d780 From 0b71935b7c7834920b76791a8ffef04220370372 Mon Sep 17 00:00:00 2001 From: James Turner Date: Wed, 25 Jan 2012 19:04:25 +0000 Subject: [PATCH 15/35] Bump for bug 620 fix. (Cocoa menus) --- flightgear | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flightgear b/flightgear index 49b5bc9..c729a37 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit 49b5bc904282f2661e1e7177447dc2fb7732d780 +Subproject commit c729a3758d12e4c7ef7fa1a06ce3fa4397599806 From 0afd203f54dafbeada5137aa3721a58b69ec003b Mon Sep 17 00:00:00 2001 From: Frederic Bouvier Date: Wed, 25 Jan 2012 21:11:50 +0100 Subject: [PATCH 16/35] First try at building a 64-bit version of the release : simgear --- hudson_win_build64.bat | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/hudson_win_build64.bat b/hudson_win_build64.bat index 4d235de..f2fdced 100644 --- a/hudson_win_build64.bat +++ b/hudson_win_build64.bat @@ -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.6.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 +rem 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 +rem cd ..\build-fg64 +rem 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 +rem cmake --build . --config Release --target INSTALL From b61f1403dbd36c56adb23a15d350ab08a209e8e8 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier Date: Wed, 25 Jan 2012 21:58:41 +0100 Subject: [PATCH 17/35] Second try at building a 64-bit version of the release : flightgear --- hudson_win_build64.bat | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hudson_win_build64.bat b/hudson_win_build64.bat index f2fdced..ba12920 100644 --- a/hudson_win_build64.bat +++ b/hudson_win_build64.bat @@ -5,11 +5,11 @@ ECHO #define SIMGEAR_VERSION "2.6.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 -rem md build-fg64 +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 -rem cd ..\build-fg64 -rem 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 -rem 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 From 47b9af454a3178a1922ea419603a66a15ee6b69e Mon Sep 17 00:00:00 2001 From: Frederic Bouvier Date: Thu, 26 Jan 2012 08:59:53 +0100 Subject: [PATCH 18/35] Try to fix fgsetup build by Inno Setup --- FlightGear.iss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FlightGear.iss b/FlightGear.iss index bbb20ae..e9f9d3b 100755 --- a/FlightGear.iss +++ b/FlightGear.iss @@ -67,8 +67,8 @@ Source: "X:\install\msvc100-64\FlightGear\bin\*.exe"; DestDir: "{app}\bin\Win64" Source: "X:\install\msvc100\FGRun\bin\fgrun.exe"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion Source: "X:\install\msvc100\FGRun\share\locale\*"; DestDir: "{app}\bin\Win32\locale"; Flags: ignoreversion recursesubdirs -Source: "X:\install\msvc100-64\FGRun\bin\fgrun.exe"; DestDir: "{app}\bin\Win64"; Flags: ignoreversion -Source: "X:\install\msvc100-64\FGRun\share\locale\*"; DestDir: "{app}\bin\Win64\locale"; Flags: ignoreversion recursesubdirs +Source: "X:\install\msvc100-64\FGRun\bin\fgrun.exe"; DestDir: "{app}\bin\Win64"; Flags: ignoreversion skipifsourcedoesntexist +Source: "X:\install\msvc100-64\FGRun\share\locale\*"; DestDir: "{app}\bin\Win64\locale"; Flags: ignoreversion recursesubdirs skipifsourcedoesntexist Source: "X:\3rdParty\bin\*.dll"; DestDir: "{app}\bin\Win32" Source: "X:\3rdParty.x64\bin\*.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode From 32521d47a7f73045d370a51d3d397416fac48712 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier Date: Fri, 27 Jan 2012 01:09:51 +0100 Subject: [PATCH 19/35] Improve dual (32/64bit) setup on windows (not complete) --- hudson_win_package_release.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hudson_win_package_release.bat b/hudson_win_package_release.bat index abf20c6..402db03 100644 --- a/hudson_win_package_release.bat +++ b/hudson_win_package_release.bat @@ -4,7 +4,7 @@ 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 From 0b66e49bc4a2317486f4fee1ba4a214e275fe6f5 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier Date: Fri, 27 Jan 2012 09:05:36 +0100 Subject: [PATCH 20/35] Working dual (32/64bit) setup on windows --- FlightGear.iss | 181 +++++++++++++++++++++++++++---------------------- 1 file changed, 99 insertions(+), 82 deletions(-) diff --git a/FlightGear.iss b/FlightGear.iss index e9f9d3b..af28a33 100755 --- a/FlightGear.iss +++ b/FlightGear.iss @@ -53,102 +53,116 @@ 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: "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:\install\msvc100\FlightGear\bin\*.exe"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion -Source: "X:\install\msvc100-64\FlightGear\bin\*.exe"; DestDir: "{app}\bin\Win64"; Flags: ignoreversion skipifsourcedoesntexist +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') -Source: "X:\install\msvc100\FGRun\bin\fgrun.exe"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion -Source: "X:\install\msvc100\FGRun\share\locale\*"; DestDir: "{app}\bin\Win32\locale"; Flags: ignoreversion recursesubdirs +;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\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:\install\msvc100-64\FGRun\bin\fgrun.exe"; DestDir: "{app}\bin\Win64"; Flags: ignoreversion skipifsourcedoesntexist -Source: "X:\install\msvc100-64\FGRun\share\locale\*"; DestDir: "{app}\bin\Win64\locale"; Flags: ignoreversion recursesubdirs skipifsourcedoesntexist +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:\3rdParty\bin\*.dll"; DestDir: "{app}\bin\Win32" -Source: "X:\3rdParty.x64\bin\*.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode +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: "{#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:\3rdParty\bin\*.dll"; DestDir: "{app}\bin\Win32"; Check: not Is64BitInstallMode or 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"; Check: not Is64BitInstallMode or IsTaskSelected('force32') +Source: "{#VCInstallDir}\redist\x64\Microsoft.VC100.CRT\*.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32') 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_osga.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_dds.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}" -Source: "{#OSGPluginsDir}\osgdb_txf.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}" -Source: "{#OSGPluginsDir}\osgdb_freetype.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}" -Source: "{#OSGPluginsDir}\osgdb_serializers_osg.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}" -Source: "{#OSGPluginsDir}\osgdb_serializers_osganimation.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}" -Source: "{#OSGPluginsDir}\osgdb_serializers_osgfx.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}" -Source: "{#OSGPluginsDir}\osgdb_serializers_osgmanipulator.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}" -Source: "{#OSGPluginsDir}\osgdb_serializers_osgparticle.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}" -Source: "{#OSGPluginsDir}\osgdb_serializers_osgshadow.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}" -Source: "{#OSGPluginsDir}\osgdb_serializers_osgsim.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}" -Source: "{#OSGPluginsDir}\osgdb_serializers_osgterrain.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}" -Source: "{#OSGPluginsDir}\osgdb_serializers_osgtext.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}" -Source: "{#OSGPluginsDir}\osgdb_serializers_osgvolume.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}" -Source: "{#OSGPluginsDir}\osgdb_deprecated_osg.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}" -Source: "{#OSGPluginsDir}\osgdb_deprecated_osgparticle.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_osga.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_dds.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_freetype.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist -Source: "{#OSG64PluginsDir}\osgdb_serializers_osg.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist -Source: "{#OSG64PluginsDir}\osgdb_serializers_osganimation.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist -Source: "{#OSG64PluginsDir}\osgdb_serializers_osgfx.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist -Source: "{#OSG64PluginsDir}\osgdb_serializers_osgmanipulator.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist -Source: "{#OSG64PluginsDir}\osgdb_serializers_osgparticle.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist -Source: "{#OSG64PluginsDir}\osgdb_serializers_osgshadow.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist -Source: "{#OSG64PluginsDir}\osgdb_serializers_osgsim.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist -Source: "{#OSG64PluginsDir}\osgdb_serializers_osgterrain.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist -Source: "{#OSG64PluginsDir}\osgdb_serializers_osgtext.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist -Source: "{#OSG64PluginsDir}\osgdb_serializers_osgvolume.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist -Source: "{#OSG64PluginsDir}\osgdb_deprecated_osg.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist -Source: "{#OSG64PluginsDir}\osgdb_deprecated_osgparticle.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 @@ -156,22 +170,24 @@ 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"; @@ -183,7 +199,8 @@ Name: "{group}\Tools\Explore Documentation Folder"; Filename: "{app}\data\Docs" [Run] ; 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"; 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\Win64\terrasync.exe"" ""--fg-root={app}\data"" ""--fg-scenery={app}\data\Scenery;{app}\scenery;{code:TerrasyncDir}"" --ts-dir=3"; 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""" From 52e9019363920b306d574f9088c658f12c377d71 Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Sun, 29 Jan 2012 10:19:31 +0100 Subject: [PATCH 21/35] bump release head --- flightgear | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flightgear b/flightgear index c729a37..a713454 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit c729a3758d12e4c7ef7fa1a06ce3fa4397599806 +Subproject commit a7134542148fb4ca5e6be0e907a54652985ca1d4 From 324df28baa46a85a7b6cd07bb80b93b30a6e082a Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Sun, 29 Jan 2012 14:30:27 +0100 Subject: [PATCH 22/35] bump release head --- simgear | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simgear b/simgear index 73f9cd0..dd07ab0 160000 --- a/simgear +++ b/simgear @@ -1 +1 @@ -Subproject commit 73f9cd05cd2524740a11227cab4813255d649733 +Subproject commit dd07ab04366ca2729157aa51a32f5cbed1e1a912 From 5cd7c88bab7a9d2e10a509de586a50bd8caf808f Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Sun, 29 Jan 2012 14:41:00 +0100 Subject: [PATCH 23/35] bump release head --- simgear | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simgear b/simgear index dd07ab0..b753646 160000 --- a/simgear +++ b/simgear @@ -1 +1 @@ -Subproject commit dd07ab04366ca2729157aa51a32f5cbed1e1a912 +Subproject commit b753646aaf938e909ec3e49369f1439d7ec27250 From 3fbecf99978eaf0227a723f77708992e270e8456 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier Date: Mon, 30 Jan 2012 09:16:48 +0100 Subject: [PATCH 24/35] Call vcredist*.exe and oalinst.exe when available --- FlightGear.iss | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/FlightGear.iss b/FlightGear.iss index af28a33..5d06932 100755 --- a/FlightGear.iss +++ b/FlightGear.iss @@ -59,6 +59,7 @@ 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] @@ -87,8 +88,12 @@ Source: "X:\install\msvc100-64\FGRun\share\locale\*"; DestDir: "{app}\bin\Win64\ Source: "X:\3rdParty\bin\*.dll"; DestDir: "{app}\bin\Win32"; Check: not Is64BitInstallMode or 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"; Check: not Is64BitInstallMode or 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 @@ -197,6 +202,11 @@ 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"; Check: not Is64BitInstallMode or IsTaskSelected('force32') From f596081cb6df44f53a1c577d15576437bde0b79d Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Tue, 31 Jan 2012 23:21:02 +0100 Subject: [PATCH 25/35] Bump. --- flightgear | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flightgear b/flightgear index a713454..50c2ea4 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit a7134542148fb4ca5e6be0e907a54652985ca1d4 +Subproject commit 50c2ea4b377746ce54c387755bea0db23c10bfcf From bcebb30a3514ea8b16acc3f288f582c16507429d Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Mon, 6 Feb 2012 23:25:46 +0100 Subject: [PATCH 26/35] bump --- flightgear | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flightgear b/flightgear index 50c2ea4..b59a08b 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit 50c2ea4b377746ce54c387755bea0db23c10bfcf +Subproject commit b59a08b56ebde970ec06cc9892b82688d8dcd450 From 53b0de6b12483b47baedb033d4ac362d5ab42606 Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Fri, 10 Feb 2012 21:21:24 +0100 Subject: [PATCH 27/35] Bump. --- flightgear | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flightgear b/flightgear index b59a08b..47721b7 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit b59a08b56ebde970ec06cc9892b82688d8dcd450 +Subproject commit 47721b7c62049d85f1d313f69bdcd253827b5f96 From d7a3e9d74361dcd1984839ae99ec2ca64ceebfe5 Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Fri, 10 Feb 2012 22:46:47 +0100 Subject: [PATCH 28/35] bump --- simgear | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simgear b/simgear index b753646..c41d504 160000 --- a/simgear +++ b/simgear @@ -1 +1 @@ -Subproject commit b753646aaf938e909ec3e49369f1439d7ec27250 +Subproject commit c41d504a29fec5a0f223233ac1adc509ca3cf7f7 From 6f13418057c5d2c46c15cadc2448e3f972908357 Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Sat, 11 Feb 2012 01:32:52 +0100 Subject: [PATCH 29/35] bump --- flightgear | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flightgear b/flightgear index 47721b7..72c485a 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit 47721b7c62049d85f1d313f69bdcd253827b5f96 +Subproject commit 72c485ac5dbfd199b18e69afe1517cd5f30f6c42 From f350707547e030dda99d8d0c83387217b90ffc9c Mon Sep 17 00:00:00 2001 From: Frederic Bouvier Date: Sat, 11 Feb 2012 09:50:42 +0100 Subject: [PATCH 30/35] Add fgpanel to the release on Windows --- FlightGear.iss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/FlightGear.iss b/FlightGear.iss index 5d06932..b77396c 100755 --- a/FlightGear.iss +++ b/FlightGear.iss @@ -73,6 +73,7 @@ Source: "X:\install\msvc100\FlightGear\bin\fgadmin.exe"; DestDir: "{app}\bin\Win 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 @@ -195,6 +196,7 @@ Name: "{group}\Tools\UGsmooth"; Filename: "cmd"; Parameters: "/k ""{app}\bin\Win 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" From 5cd7da7e4c6788c90b6bacd2fd414083655eab24 Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Sat, 11 Feb 2012 10:07:05 +0100 Subject: [PATCH 31/35] bump --- simgear | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simgear b/simgear index c41d504..cfda390 160000 --- a/simgear +++ b/simgear @@ -1 +1 @@ -Subproject commit c41d504a29fec5a0f223233ac1adc509ca3cf7f7 +Subproject commit cfda390557f506c051bfae0cb36b206e59961481 From 4e737a93f18fd2eaf5b11b47f191d63b577b6f4c Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Sat, 11 Feb 2012 17:13:06 +0100 Subject: [PATCH 32/35] bump --- flightgear | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flightgear b/flightgear index 72c485a..4b05c59 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit 72c485ac5dbfd199b18e69afe1517cd5f30f6c42 +Subproject commit 4b05c592c54b625df8da9c9ab604e51342894126 From 856c1108a23ea6e82abee487f831bf191933923a Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Sun, 12 Feb 2012 20:06:43 +0100 Subject: [PATCH 33/35] bump --- flightgear | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flightgear b/flightgear index 4b05c59..1e65425 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit 4b05c592c54b625df8da9c9ab604e51342894126 +Subproject commit 1e65425b39ea71774cb62eb3b2baa53d60416c2f From e0c104c494600305c47965eda8d80f64f1d981b2 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier Date: Sun, 12 Feb 2012 23:55:01 +0100 Subject: [PATCH 34/35] bump --- flightgear | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flightgear b/flightgear index 1e65425..7e2aaf0 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit 1e65425b39ea71774cb62eb3b2baa53d60416c2f +Subproject commit 7e2aaf061ee53b3b9a5cd840555b2deeecd1bd45 From 0dc89062f261f679136abf717df253a9568d5a09 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier Date: Mon, 27 Feb 2012 23:19:49 +0100 Subject: [PATCH 35/35] Fix Win64 packaging (include win32 dlls for tools that are not available in 64bit) --- FlightGear.iss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FlightGear.iss b/FlightGear.iss index b77396c..09f3c55 100755 --- a/FlightGear.iss +++ b/FlightGear.iss @@ -79,6 +79,7 @@ Source: "X:\install\msvc100\FlightGear\bin\UGsmooth.exe"; DestDir: "{app}\bin\Wi 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:\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') @@ -86,7 +87,6 @@ Source: "X:\install\msvc100\FGRun\share\locale\*"; DestDir: "{app}\bin\Win32\loc 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\bin\*.dll"; DestDir: "{app}\bin\Win32"; Check: not Is64BitInstallMode or 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" @@ -212,7 +212,7 @@ filename: "{app}\bin\Win32\oalinst.exe"; WorkingDir: "{app}\bin\Win32"; Descript ; 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"; 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\Win64\terrasync.exe"" ""--fg-root={app}\data"" ""--fg-scenery={app}\data\Scenery;{app}\scenery;{code:TerrasyncDir}"" --ts-dir=3"; Check: Is64BitInstallMode and not 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"; 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"""