From c30b7f534993198e6360282ae18684922fa630fd Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Tue, 19 Jul 2011 07:53:04 +0100 Subject: [PATCH 001/145] Switch submodule paths to use git: protocol - hoping this will help the Windows slave issues. --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index dbc0fce..29ede68 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "simgear"] path = simgear - url = http://git.gitorious.org/fg/simgear.git + url = git://gitorious.org/fg/simgear.git [submodule "flightgear"] path = flightgear - url = http://git.gitorious.org/fg/flightgear.git + url = git://gitorious.org/fg/flightgear.git From fdf2311152efc70594c30a9bb248526a6c2694e7 Mon Sep 17 00:00:00 2001 From: ThorstenB <brehmt@gmail.com> Date: Sun, 31 Jul 2011 14:40:03 +0200 Subject: [PATCH 002/145] Update download_and_compile script to use OSG3.0.1 with fg GIT --- download_and_compile.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/download_and_compile.sh b/download_and_compile.sh index dd1637b..aff1574 100755 --- a/download_and_compile.sh +++ b/download_and_compile.sh @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -VERSION="1.4" +VERSION="1.4.1" #COMPILE GIT FGFS @@ -129,8 +129,8 @@ FGRUN_STABLE_REVISION="554" FGCOM_STABLE_REVISION="234" 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 From ade63a8bc38caf4ee969777d5fb42f497fb9c5d1 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier <fredfgfs01@free.fr> Date: Mon, 1 Aug 2011 22:55:00 +0200 Subject: [PATCH 003/145] Add several OSG plugins required by some models --- FlightGear.iss | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/FlightGear.iss b/FlightGear.iss index 5ddd35d..d31962d 100755 --- a/FlightGear.iss +++ b/FlightGear.iss @@ -92,12 +92,26 @@ Source: "{#OSGInstallDir}\bin\ot12-OpenThreads.dll"; DestDir: "{app}\bin\Win32" 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_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: "{#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 @@ -113,12 +127,26 @@ Source: "{#OSG64InstallDir}\bin\ot12-OpenThreads.dll"; DestDir: "{app}\bin\Win64 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: "{#OSG64InstallDir}\osgdb_serializers_osg.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist +Source: "{#OSG64InstallDir}\osgdb_serializers_osganimation.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist +Source: "{#OSG64InstallDir}\osgdb_serializers_osgfx.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist +Source: "{#OSG64InstallDir}\osgdb_serializers_osgmanipulator.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist +Source: "{#OSG64InstallDir}\osgdb_serializers_osgparticle.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist +Source: "{#OSG64InstallDir}\osgdb_serializers_osgshadow.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist +Source: "{#OSG64InstallDir}\osgdb_serializers_osgsim.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist +Source: "{#OSG64InstallDir}\osgdb_serializers_osgterrain.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist +Source: "{#OSG64InstallDir}\osgdb_serializers_osgtext.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist +Source: "{#OSG64InstallDir}\osgdb_serializers_osgvolume.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist +Source: "{#OSG64InstallDir}\osgdb_deprecated_osg.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist +Source: "{#OSG64InstallDir}\osgdb_deprecated_osgparticle.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist [Dirs] ; Make the user installable scenery directory From 9f8fb2fc03266fc184357cb03c9e68d2b270bfd1 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier <fredfgfs01@free.fr> Date: Mon, 1 Aug 2011 23:38:19 +0200 Subject: [PATCH 004/145] Fix typo in 64-bit plugin deployment --- FlightGear.iss | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/FlightGear.iss b/FlightGear.iss index d31962d..b9e394f 100755 --- a/FlightGear.iss +++ b/FlightGear.iss @@ -135,18 +135,18 @@ 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: "{#OSG64InstallDir}\osgdb_serializers_osg.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist -Source: "{#OSG64InstallDir}\osgdb_serializers_osganimation.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist -Source: "{#OSG64InstallDir}\osgdb_serializers_osgfx.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist -Source: "{#OSG64InstallDir}\osgdb_serializers_osgmanipulator.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist -Source: "{#OSG64InstallDir}\osgdb_serializers_osgparticle.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist -Source: "{#OSG64InstallDir}\osgdb_serializers_osgshadow.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist -Source: "{#OSG64InstallDir}\osgdb_serializers_osgsim.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist -Source: "{#OSG64InstallDir}\osgdb_serializers_osgterrain.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist -Source: "{#OSG64InstallDir}\osgdb_serializers_osgtext.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist -Source: "{#OSG64InstallDir}\osgdb_serializers_osgvolume.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist -Source: "{#OSG64InstallDir}\osgdb_deprecated_osg.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist -Source: "{#OSG64InstallDir}\osgdb_deprecated_osgparticle.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 [Dirs] ; Make the user installable scenery directory From 379aa1887740288521782c4c205ccd5ecf1c0423 Mon Sep 17 00:00:00 2001 From: ThorstenB <brehmt@gmail.com> Date: Thu, 18 Aug 2011 21:17:54 +0200 Subject: [PATCH 005/145] Update download_and_compile script for FG2.4.0 Pick up 2.4.0 release tag for stable version (Note: specifying commit IDs alone doesn't work - since the same commits are on different branches => either use commitID+branch or preferably the release-tag). Update FGRUN stable version for FG2.4.0 Conflicts: download_and_compile.sh --- download_and_compile.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/download_and_compile.sh b/download_and_compile.sh index aff1574..341ca22 100755 --- a/download_and_compile.sh +++ b/download_and_compile.sh @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -VERSION="1.4.1" +VERSION="1.4.2" #COMPILE GIT FGFS @@ -119,13 +119,13 @@ 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" +OSG_STABLE_REVISION="http://www.openscenegraph.org/svn/osg/OpenSceneGraph/tags/OpenSceneGraph-3.0.1" +SIMGEAR_STABLE_REVISION="version/2.4.0-final" +FGFS_STABLE_REVISION="version/2.4.0-final" +FGFS_DATA_STABLE_REVISION="version/2.4.0-final" +FGRUN_STABLE_REVISION="625" FGCOM_STABLE_REVISION="234" FGCOMGUI_STABLE_REVISION="46" From bf9d84fb3a733a8ba4e1f235725bd24b010efab1 Mon Sep 17 00:00:00 2001 From: ThorstenB <brehmt@gmail.com> Date: Tue, 16 Aug 2011 21:42:51 +0200 Subject: [PATCH 006/145] Update download_and_compile script for FG2.4.0 More GIT magic: cleanly switch between stable and unstable branches. --- download_and_compile.sh | 90 +++++++++++++++++++++++++++++++---------- 1 file changed, 69 insertions(+), 21 deletions(-) diff --git a/download_and_compile.sh b/download_and_compile.sh index 341ca22..5354885 100755 --- a/download_and_compile.sh +++ b/download_and_compile.sh @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -VERSION="1.4.2" +VERSION="1.4.3" #COMPILE GIT FGFS @@ -122,9 +122,19 @@ fi # 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-3.0.1" + +# common stable branch for flightgear, simgear and fgdata +FGSG_STABLE_GIT_BRANCH="release/2.4.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.4.0-final" FGFS_STABLE_REVISION="version/2.4.0-final" FGFS_DATA_STABLE_REVISION="version/2.4.0-final" + FGRUN_STABLE_REVISION="625" FGCOM_STABLE_REVISION="234" FGCOMGUI_STABLE_REVISION="46" @@ -538,16 +548,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 + # 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 + # 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 .. @@ -623,14 +644,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 + # 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 + # 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 @@ -679,21 +712,36 @@ then #cvs -z5 -d :pserver:cvsguest@cvs.flightgear.org:/var/cvs/FlightGear-0.9 co data if [ -d "fgdata" ] - then - cd fgdata - - if [ "$STABLE" = "STABLE" ] - then - git pull origin - git reset --hard $FGFS_DATA_STABLE_REVISION - fi - - git pull - cd .. - else + then + echo "fgdata exists already." + else + # no repository yet - need to clone a fresh one git clone git://gitorious.org/fg/fgdata.git - fi + 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 + # 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 + # 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 .. echo " OK" >> $LOGFILE cd "$EXDIR" From 4c949dff4dbba4749bbb8f0d2510787c6918c2fc Mon Sep 17 00:00:00 2001 From: ThorstenB <brehmt@gmail.com> Date: Thu, 18 Aug 2011 20:33:01 +0200 Subject: [PATCH 007/145] download_and_compile.sh: ignore errors when creating branches Branches may already exist, errors must be properly since the "-e" flag is set to abort the script on any errors. Thanks to Francesco for testing. --- download_and_compile.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) mode change 100755 => 100644 download_and_compile.sh diff --git a/download_and_compile.sh b/download_and_compile.sh old mode 100755 new mode 100644 index 5354885..60635d2 --- a/download_and_compile.sh +++ b/download_and_compile.sh @@ -553,7 +553,7 @@ then 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 + 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 @@ -561,7 +561,7 @@ then 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 + 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 @@ -649,7 +649,7 @@ then 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 + 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 @@ -657,7 +657,7 @@ then 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 + 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 @@ -726,7 +726,7 @@ then 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 + 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 @@ -734,7 +734,7 @@ then 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 + 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 From bcd325c78d7589f6e5a673115efef2b67d2bfcd6 Mon Sep 17 00:00:00 2001 From: ThorstenB <brehmt@gmail.com> Date: Wed, 24 Aug 2011 20:34:30 +0200 Subject: [PATCH 008/145] Francesco Brisa: add FGO! to build script --- download_and_compile.sh | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/download_and_compile.sh b/download_and_compile.sh index 60635d2..653d15e 100644 --- a/download_and_compile.sh +++ b/download_and_compile.sh @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -VERSION="1.4.3" +VERSION="1.5" #COMPILE GIT FGFS @@ -256,7 +256,7 @@ 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="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 python-tk python-imaging-tk" @@ -786,6 +786,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 ####################################################### From db795fbca714e53098558d07bf0ae38ad02f8cd2 Mon Sep 17 00:00:00 2001 From: ThorstenB <brehmt@gmail.com> Date: Sun, 18 Sep 2011 11:25:48 +0200 Subject: [PATCH 009/145] Francesco Brisa: Ubuntu/Debian-specific package dependencies for down&compile script --- download_and_compile.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/download_and_compile.sh b/download_and_compile.sh index 653d15e..fef7d4e 100644 --- a/download_and_compile.sh +++ b/download_and_compile.sh @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -VERSION="1.5" +VERSION="1.5.1" #COMPILE GIT FGFS @@ -256,16 +256,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 python-tk python-imaging-tk" - +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 libtiff4-dev libboost-serialization-dev git-core libhal-dev libqt4-dev scons python-tk python-imaging-tk" +UBUNTU_PACKAGES="libglut3-dev libjpeg62-dev libjpeg62 boost-build" +DEBIAN_PACKAGES="freeglut3-dev libjpeg8-dev libjpeg8 libboost1.46-dev" # 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 From 85635d4f6853fce2e1bf345502b14cc4ad54b055 Mon Sep 17 00:00:00 2001 From: ThorstenB <brehmt@gmail.com> Date: Tue, 27 Sep 2011 21:00:02 +0200 Subject: [PATCH 010/145] Francesco Brisa: ubuntu + cmake update for downl_and_compile script - switch to CMake - support for Ubuntu 11.10 (beta 2) --- download_and_compile.sh | 47 +++++++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/download_and_compile.sh b/download_and_compile.sh index fef7d4e..b6a895c 100644 --- a/download_and_compile.sh +++ b/download_and_compile.sh @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -VERSION="1.5.1" +VERSION="1.6" #COMPILE GIT FGFS @@ -256,9 +256,9 @@ fi # default is hardy -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 libtiff4-dev libboost-serialization-dev git-core libhal-dev libqt4-dev scons python-tk python-imaging-tk" +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 libtiff4-dev libboost-serialization-dev git-core libhal-dev libqt4-dev scons python-tk python-imaging-tk libsvn-dev" -UBUNTU_PACKAGES="libglut3-dev libjpeg62-dev libjpeg62 boost-build" +UBUNTU_PACKAGES="freeglut3-dev libjpeg62-dev libjpeg62 libboost1.46-dev libapr1-dev" DEBIAN_PACKAGES="freeglut3-dev libjpeg8-dev libjpeg8 libboost1.46-dev" # checking linux distro and version to differ needed packages @@ -584,12 +584,21 @@ then then if [ "$RECONFIGURE" = "y" ] then - echo "AUTOGEN SIMGEAR" >> $LOGFILE - ./autogen.sh 2>&1 | tee -a $LOGFILE + #echo "AUTOGEN SIMGEAR" >> $LOGFILE + #./autogen.sh 2>&1 | tee -a $LOGFILE + #echo "CONFIGURE SIMGEAR" >> $LOGFILE + #./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 + + echo -n "RECONFIGURE SIMGEAR ... " >> $LOGFILE + rm -f 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 . 2>&1 | tee -a $LOGFILE + + echo " OK" >> $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 fi fi @@ -679,12 +688,24 @@ 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 + + echo -n "RECONFIGURE FGFS ... " >> $LOGFILE + rm -f CMakeCache.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" . 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 From eb5c64e656c537eaf599f9adef1da9971aafa1ee Mon Sep 17 00:00:00 2001 From: ThorstenB <brehmt@gmail.com> Date: Tue, 3 Jan 2012 22:04:42 +0100 Subject: [PATCH 011/145] Download_and_compile update 1.7 (Removed the Xinerama/Xft hacks, since the issue should be fixed in git/next). --- download_and_compile.sh | 54 ++++++++++++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 14 deletions(-) diff --git a/download_and_compile.sh b/download_and_compile.sh index b6a895c..e8415cd 100644 --- a/download_and_compile.sh +++ b/download_and_compile.sh @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -VERSION="1.6" +VERSION="1.7" #COMPILE GIT FGFS @@ -152,7 +152,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)" @@ -256,7 +256,7 @@ fi # default is hardy -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 libtiff4-dev libboost-serialization-dev git-core libhal-dev libqt4-dev scons python-tk python-imaging-tk libsvn-dev" +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 " UBUNTU_PACKAGES="freeglut3-dev libjpeg62-dev libjpeg62 libboost1.46-dev libapr1-dev" DEBIAN_PACKAGES="freeglut3-dev libjpeg8-dev libjpeg8 libboost1.46-dev" @@ -732,15 +732,13 @@ 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 echo "fgdata exists already." else # no repository yet - need to clone a fresh one - git clone git://gitorious.org/fg/fgdata.git + git clone git://gitorious.org/fg/fgdata.git fgdata fi cd fgdata @@ -767,12 +765,46 @@ then 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 + + + + + + + echo " OK" >> $LOGFILE cd "$EXDIR" fi fi fi + + # IF SEPARATED FOLDER FOR AIRCRAFTS + # --fg-aircraft=\$PWD/../aircrafts cat > run_fgfs.sh << ENDOFALL #!/bin/sh cd \$(dirname \$0) @@ -792,13 +824,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 @@ -921,7 +946,8 @@ then 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 From cf87d84cfe831068cfb0190da00d00ad2a582153 Mon Sep 17 00:00:00 2001 From: ThorstenB <brehmt@gmail.com> Date: Tue, 17 Jan 2012 22:27:31 +0100 Subject: [PATCH 012/145] 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 <brehmt@gmail.com> Date: Tue, 17 Jan 2012 22:36:46 +0100 Subject: [PATCH 013/145] 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 <brehmt@gmail.com> Date: Tue, 17 Jan 2012 23:43:12 +0100 Subject: [PATCH 014/145] 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 <brehmt@gmail.com> Date: Wed, 18 Jan 2012 00:32:16 +0100 Subject: [PATCH 015/145] 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 <brehmt@gmail.com> Date: Wed, 18 Jan 2012 01:08:33 +0100 Subject: [PATCH 016/145] 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 <brehmt@gmail.com> Date: Wed, 18 Jan 2012 20:45:21 +0100 Subject: [PATCH 017/145] 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 <brehmt@gmail.com> Date: Wed, 18 Jan 2012 21:43:34 +0100 Subject: [PATCH 018/145] 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 <brehmt@gmail.com> Date: Wed, 18 Jan 2012 22:40:04 +0100 Subject: [PATCH 019/145] 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 <brehmt@gmail.com> Date: Sun, 22 Jan 2012 12:49:01 +0100 Subject: [PATCH 020/145] 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 <brehmt@gmail.com> Date: Sun, 22 Jan 2012 19:17:52 +0100 Subject: [PATCH 021/145] 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 c90b114ac90ab4a2f1bf79480a5526518b701300 Mon Sep 17 00:00:00 2001 From: ThorstenB <brehmt@gmail.com> Date: Sun, 22 Jan 2012 19:19:02 +0100 Subject: [PATCH 022/145] Update downl_and_comp script to version of Francesco Brisa --- download_and_compile.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) mode change 100644 => 100755 download_and_compile.sh diff --git a/download_and_compile.sh b/download_and_compile.sh old mode 100644 new mode 100755 index e8415cd..a515342 --- a/download_and_compile.sh +++ b/download_and_compile.sh @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -VERSION="1.7" +VERSION="1.8" #COMPILE GIT FGFS @@ -696,6 +696,12 @@ then echo -n "RECONFIGURE FGFS ... " >> $LOGFILE rm -f 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" . 2>&1 | tee -a $LOGFILE From a3f33c5e9750867d070aee6c1e20802205a24e75 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier <fredfgfs01@free.fr> Date: Mon, 23 Jan 2012 09:04:47 +0100 Subject: [PATCH 023/145] 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 <fredfgfs01@free.fr> Date: Mon, 23 Jan 2012 23:29:26 +0100 Subject: [PATCH 024/145] 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 <fredfgfs01@free.fr> Date: Tue, 24 Jan 2012 08:06:20 +0100 Subject: [PATCH 025/145] 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 <brehmt@gmail.com> Date: Wed, 25 Jan 2012 18:01:18 +0100 Subject: [PATCH 026/145] 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 <zakalawe@mac.com> Date: Wed, 25 Jan 2012 19:04:25 +0000 Subject: [PATCH 027/145] 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 <fredfgfs01@free.fr> Date: Wed, 25 Jan 2012 21:11:50 +0100 Subject: [PATCH 028/145] 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 <fredfgfs01@free.fr> Date: Wed, 25 Jan 2012 21:58:41 +0100 Subject: [PATCH 029/145] 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 <fredfgfs01@free.fr> Date: Thu, 26 Jan 2012 08:59:53 +0100 Subject: [PATCH 030/145] 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 <fredfgfs01@free.fr> Date: Fri, 27 Jan 2012 01:09:51 +0100 Subject: [PATCH 031/145] 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 <fredfgfs01@free.fr> Date: Fri, 27 Jan 2012 09:05:36 +0100 Subject: [PATCH 032/145] 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 ad3595fdc6339ab90f3795f85eb8adf2e7c40ee0 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier <fredfgfs01@free.fr> Date: Mon, 23 Jan 2012 09:04:47 +0100 Subject: [PATCH 033/145] 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 4d3fffd8e42668a96ddeccfd9bfd1d1951bb3e09 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier <fredfgfs01@free.fr> Date: Mon, 23 Jan 2012 23:29:26 +0100 Subject: [PATCH 034/145] 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 1e00b6a679c395cbbd552f4d5e472f4a16200840 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier <fredfgfs01@free.fr> Date: Tue, 24 Jan 2012 08:06:20 +0100 Subject: [PATCH 035/145] 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 bea03a50115fb82fe40f18fc1866d726150f4fcd Mon Sep 17 00:00:00 2001 From: Frederic Bouvier <fredfgfs01@free.fr> Date: Wed, 25 Jan 2012 21:11:50 +0100 Subject: [PATCH 036/145] 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 3a9abdb09270a96a802ff17e0b286e2d0cd00e6f Mon Sep 17 00:00:00 2001 From: Frederic Bouvier <fredfgfs01@free.fr> Date: Wed, 25 Jan 2012 21:58:41 +0100 Subject: [PATCH 037/145] 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 a71117b58f41a5da6a6a8946379369961901b8e3 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier <fredfgfs01@free.fr> Date: Thu, 26 Jan 2012 08:59:53 +0100 Subject: [PATCH 038/145] 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 675002e298dae3c7bf6093a40d402ea9b397cb84 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier <fredfgfs01@free.fr> Date: Fri, 27 Jan 2012 01:09:51 +0100 Subject: [PATCH 039/145] 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 39924c29ee8eaaaf30fc118e7f5b5b811bd1c053 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier <fredfgfs01@free.fr> Date: Fri, 27 Jan 2012 09:05:36 +0100 Subject: [PATCH 040/145] 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 <brehmt@gmail.com> Date: Sun, 29 Jan 2012 10:19:31 +0100 Subject: [PATCH 041/145] 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 <brehmt@gmail.com> Date: Sun, 29 Jan 2012 14:30:27 +0100 Subject: [PATCH 042/145] 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 <brehmt@gmail.com> Date: Sun, 29 Jan 2012 14:41:00 +0100 Subject: [PATCH 043/145] 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 <fredfgfs01@free.fr> Date: Mon, 30 Jan 2012 09:16:48 +0100 Subject: [PATCH 044/145] 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 <brehmt@gmail.com> Date: Tue, 31 Jan 2012 23:21:02 +0100 Subject: [PATCH 045/145] 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 cd10243834a36794f0c505c71f8336160a91dad5 Mon Sep 17 00:00:00 2001 From: ThorstenB <brehmt@gmail.com> Date: Mon, 6 Feb 2012 21:22:00 +0100 Subject: [PATCH 046/145] Francesco Angelo Brisa: add required package for Atlas compilation --- download_and_compile.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) mode change 100755 => 100644 download_and_compile.sh diff --git a/download_and_compile.sh b/download_and_compile.sh old mode 100755 new mode 100644 index a515342..865c75a --- a/download_and_compile.sh +++ b/download_and_compile.sh @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -VERSION="1.8" +VERSION="1.9" #COMPILE GIT FGFS @@ -256,7 +256,7 @@ fi # default is hardy -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 " +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 libboost1.46-dev libapr1-dev" DEBIAN_PACKAGES="freeglut3-dev libjpeg8-dev libjpeg8 libboost1.46-dev" From bcebb30a3514ea8b16acc3f288f582c16507429d Mon Sep 17 00:00:00 2001 From: ThorstenB <brehmt@gmail.com> Date: Mon, 6 Feb 2012 23:25:46 +0100 Subject: [PATCH 047/145] 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 <brehmt@gmail.com> Date: Fri, 10 Feb 2012 21:21:24 +0100 Subject: [PATCH 048/145] 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 <brehmt@gmail.com> Date: Fri, 10 Feb 2012 22:46:47 +0100 Subject: [PATCH 049/145] 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 <brehmt@gmail.com> Date: Sat, 11 Feb 2012 01:32:52 +0100 Subject: [PATCH 050/145] 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 <fredfgfs01@free.fr> Date: Sat, 11 Feb 2012 09:50:42 +0100 Subject: [PATCH 051/145] 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 <brehmt@gmail.com> Date: Sat, 11 Feb 2012 10:07:05 +0100 Subject: [PATCH 052/145] 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 <brehmt@gmail.com> Date: Sat, 11 Feb 2012 17:13:06 +0100 Subject: [PATCH 053/145] 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 <brehmt@gmail.com> Date: Sun, 12 Feb 2012 20:06:43 +0100 Subject: [PATCH 054/145] 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 <fredfgfs01@free.fr> Date: Sun, 12 Feb 2012 23:55:01 +0100 Subject: [PATCH 055/145] 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 beb8dfebc82b054926bf295829a6f89e87b16115 Mon Sep 17 00:00:00 2001 From: ThorstenB <brehmt@gmail.com> Date: Tue, 21 Feb 2012 09:24:37 +0100 Subject: [PATCH 056/145] Francesco Angelo Brisa: d&c script update for FG2.6.0 updated all the 2.4.0-final tags to 2.6.0-final. compilation runs fine (2.7 version). compilation using -s switch (2.6 version) runs fine. --- download_and_compile.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/download_and_compile.sh b/download_and_compile.sh index 865c75a..b88da21 100644 --- a/download_and_compile.sh +++ b/download_and_compile.sh @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -VERSION="1.9" +VERSION="1.10" #COMPILE GIT FGFS @@ -124,19 +124,19 @@ PLIB_STABLE_REVISION="2163" 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.4.0" +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.4.0-final" -FGFS_STABLE_REVISION="version/2.4.0-final" -FGFS_DATA_STABLE_REVISION="version/2.4.0-final" +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="625" -FGCOM_STABLE_REVISION="234" +FGCOM_STABLE_REVISION="261" FGCOMGUI_STABLE_REVISION="46" # Current developer revision: latest FlightGear GIT (2.5.0) with OSG 3.0.1 From 0dc89062f261f679136abf717df253a9568d5a09 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier <fredfgfs01@free.fr> Date: Mon, 27 Feb 2012 23:19:49 +0100 Subject: [PATCH 057/145] 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""" From a22659269764739ae6275c4e652700765d92b08b Mon Sep 17 00:00:00 2001 From: Frederic Bouvier <fredfgfs01@free.fr> Date: Mon, 30 Jan 2012 09:16:48 +0100 Subject: [PATCH 058/145] 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 a0b8fdd86777d04aad3835ea95511d53fcef741b Mon Sep 17 00:00:00 2001 From: Frederic Bouvier <fredfgfs01@free.fr> Date: Sat, 11 Feb 2012 09:50:42 +0100 Subject: [PATCH 059/145] 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 7f31b781cd4406f1145a8b5c47533ea27cb74db0 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier <fredfgfs01@free.fr> Date: Mon, 27 Feb 2012 23:19:49 +0100 Subject: [PATCH 060/145] 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""" From eaed135885289f3d87ca00c1398ea1342365f0cf Mon Sep 17 00:00:00 2001 From: ThorstenB <brehmt@gmail.com> Date: Thu, 12 Apr 2012 19:58:37 +0200 Subject: [PATCH 061/145] Francesco Angelo Brisa: download_and_compile now using cmake for fgrun --- download_and_compile.sh | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/download_and_compile.sh b/download_and_compile.sh index b88da21..a02b570 100644 --- a/download_and_compile.sh +++ b/download_and_compile.sh @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -VERSION="1.10" +VERSION="1.21" #COMPILE GIT FGFS @@ -27,6 +27,7 @@ VERSION="1.10" ####################################################### # Special thanks to Alessandro Garosi for FGComGui and # other patches +# Thanks to "pac1" for patches for fgrun compilation @@ -135,7 +136,7 @@ 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="625" +FGRUN_STABLE_REVISION="655" FGCOM_STABLE_REVISION="261" FGCOMGUI_STABLE_REVISION="46" @@ -928,11 +929,19 @@ then then if [ "$RECONFIGURE" = "y" ] then - echo "AUTOGEN FGRUN" >> $LOGFILE - ./autogen.sh 2>&1 | tee -a $LOGFILE - echo "CONFIGURE FGRUN" >> $LOGFILE + echo -n "RECONFIGURE FGRUN ... " >> $LOGFILE + rm -f 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" . 2>&1 | tee -a $LOGFILE + + echo " OK" >> $LOGFILE + + + # echo "AUTOGEN FGRUN" >> $LOGFILE + # ./autogen.sh 2>&1 | tee -a $LOGFILE + # echo "CONFIGURE FGRUN" >> $LOGFILE + + # ./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 fi fi From 45a38fe12128f33a8eee90a20d32081ac9d69c82 Mon Sep 17 00:00:00 2001 From: ThorstenB <brehmt@gmail.com> Date: Wed, 18 Apr 2012 10:38:22 +0200 Subject: [PATCH 062/145] Francesco Angelo Brisa: d_and_compile now using out-of-directory builds Building binaries in a separate directory keeps the original source directory clean. --- download_and_compile.sh | 153 +++++++++++++++++++--------------------- 1 file changed, 71 insertions(+), 82 deletions(-) diff --git a/download_and_compile.sh b/download_and_compile.sh index a02b570..f798de9 100644 --- a/download_and_compile.sh +++ b/download_and_compile.sh @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -VERSION="1.21" +VERSION="1.30" #COMPILE GIT FGFS @@ -259,8 +259,8 @@ fi # default is hardy 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 libboost1.46-dev libapr1-dev" -DEBIAN_PACKAGES="freeglut3-dev libjpeg8-dev libjpeg8 libboost1.46-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" ] @@ -345,6 +345,10 @@ SUB_INSTALL_DIR=install INSTALL_DIR=$CBD/$SUB_INSTALL_DIR +cd "$CBD" +mkdir -p build + + ####################################################### # PLIB ####################################################### @@ -355,7 +359,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 @@ -369,27 +372,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" ] @@ -410,20 +398,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 @@ -436,12 +435,11 @@ then make install 2>&1 | tee -a $LOGFILE fi - cd - + cd "$CBD" fi fi - ####################################################### # OpenSceneGraph ####################################################### @@ -474,12 +472,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 @@ -489,6 +492,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 ] @@ -514,6 +518,8 @@ then cd - fi + + ####################################################### # SIMGEAR ####################################################### @@ -585,19 +591,15 @@ then then if [ "$RECONFIGURE" = "y" ] then - #echo "AUTOGEN SIMGEAR" >> $LOGFILE - #./autogen.sh 2>&1 | tee -a $LOGFILE - #echo "CONFIGURE SIMGEAR" >> $LOGFILE - #./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 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 . 2>&1 | tee -a $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 @@ -605,6 +607,9 @@ then 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 @@ -695,8 +700,14 @@ then #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 CMakeCache.txt + rm -f ../../fgfs/flightgear/CMakeCache.txt # REMOVING BAD LINES IN CMakeLists.txt #echo "REMOVING BAD LINES IN CMakeLists.txt" @@ -704,7 +715,7 @@ then #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" . 2>&1 | tee -a $LOGFILE + 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 @@ -718,6 +729,10 @@ then 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 @@ -841,7 +856,6 @@ ENDOFALL2 fi - ####################################################### # FGO! ####################################################### @@ -906,47 +920,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 + cd "$CBD" + mkdir -p build/fgrun + cd "$CBD"/build/fgrun + echo -n "RECONFIGURE FGRUN ... " >> $LOGFILE - rm -f CMakeCache.txt + rm -f ../../fgrun/fgrun/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_FGRUN" -D "CMAKE_PREFIX_PATH=$INSTALL_DIR_OSG;$INSTALL_DIR_PLIB;$INSTALL_DIR_SIMGEAR" . 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 - - - # echo "AUTOGEN FGRUN" >> $LOGFILE - # ./autogen.sh 2>&1 | tee -a $LOGFILE - # echo "CONFIGURE FGRUN" >> $LOGFILE - - # ./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 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 @@ -954,7 +951,8 @@ then echo "INSTALL FGRUN" >> $LOGFILE make install 2>&1 | tee -a $LOGFILE fi - cd - + + cd "$CBD" SCRIPT=run_fgrun.sh echo "#!/bin/sh" > $SCRIPT @@ -1013,9 +1011,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 @@ -1054,7 +1049,6 @@ then fi - mkdir -p "$INSTALL_DIR_FGCOM"/bin if [ "$COMPILE" = "y" ] @@ -1152,22 +1146,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 @@ -1175,16 +1157,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 @@ -1192,6 +1179,8 @@ 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 From ffa12d720ba6052fe08deed1e7c127ed916348e0 Mon Sep 17 00:00:00 2001 From: ThorstenB <brehmt@gmail.com> Date: Fri, 20 Apr 2012 19:28:06 +0200 Subject: [PATCH 063/145] Francesco Brisa & F-JJTH: d&c script bugfixes --- download_and_compile.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/download_and_compile.sh b/download_and_compile.sh index f798de9..b7d732b 100644 --- a/download_and_compile.sh +++ b/download_and_compile.sh @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -VERSION="1.30" +VERSION="1.31" #COMPILE GIT FGFS @@ -28,6 +28,7 @@ VERSION="1.30" # 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 @@ -824,6 +825,7 @@ then fi fi + cd "$CBD" # IF SEPARATED FOLDER FOR AIRCRAFTS # --fg-aircraft=\$PWD/../aircrafts @@ -1060,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 @@ -1116,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 @@ -1186,7 +1188,7 @@ then 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 From 4eb511c33d78d8ff1b8d1084f64f86fe60c5fdc2 Mon Sep 17 00:00:00 2001 From: ThorstenB <brehmt@gmail.com> Date: Sat, 23 Jun 2012 14:28:42 +0200 Subject: [PATCH 064/145] Prepare 2.8.0 branch. fg/sg submodules still tracking "next" (until sg/fg are branched, too). --- flightgear | 2 +- hudson_win_build32.bat | 2 +- hudson_win_build64.bat | 2 +- simgear | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flightgear b/flightgear index 7e2aaf0..1c83a15 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit 7e2aaf061ee53b3b9a5cd840555b2deeecd1bd45 +Subproject commit 1c83a151100931405f9bb923718396d82cdd9cfb diff --git a/hudson_win_build32.bat b/hudson_win_build32.bat index 57e50fe..8b67722 100644 --- a/hudson_win_build32.bat +++ b/hudson_win_build32.bat @@ -1,7 +1,7 @@ IF NOT DEFINED WORKSPACE SET WORKSPACE=%~dp0 -ECHO #define SIMGEAR_VERSION "2.6.0" > %WORKSPACE%\simgear\simgear\version.h +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 diff --git a/hudson_win_build64.bat b/hudson_win_build64.bat index ba12920..4f66644 100644 --- a/hudson_win_build64.bat +++ b/hudson_win_build64.bat @@ -1,7 +1,7 @@ IF NOT DEFINED WORKSPACE SET WORKSPACE=%~dp0 -ECHO #define SIMGEAR_VERSION "2.6.0" > %WORKSPACE%\simgear\simgear\version.h +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 diff --git a/simgear b/simgear index cfda390..ad4a9ee 160000 --- a/simgear +++ b/simgear @@ -1 +1 @@ -Subproject commit cfda390557f506c051bfae0cb36b206e59961481 +Subproject commit ad4a9eeaa5c6a33b4f192bd0fab043bef930152f From 1ff0264a57109237a97a11d6b9691fd65cc035cd Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Mon, 25 Jun 2012 14:14:58 +0100 Subject: [PATCH 065/145] Updated Mac release build script. Capture most of the build logic in a script (ie. visible to Git, and outside Jenkins). use XCodebuild to run the actual compiles, so we get Clang. Use the Xcode 4.3 SDK paths. --- hudson_mac_build_launcher.sh | 15 -------- hudson_mac_build_release.sh | 66 ++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 15 deletions(-) delete mode 100755 hudson_mac_build_launcher.sh create mode 100755 hudson_mac_build_release.sh diff --git a/hudson_mac_build_launcher.sh b/hudson_mac_build_launcher.sh deleted file mode 100755 index dc3bd24..0000000 --- a/hudson_mac_build_launcher.sh +++ /dev/null @@ -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 - diff --git a/hudson_mac_build_release.sh b/hudson_mac_build_release.sh new file mode 100755 index 0000000..f2ed207 --- /dev/null +++ b/hudson_mac_build_release.sh @@ -0,0 +1,66 @@ +#!/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 -DSIMGEAR_SHARED:BOOL="ON" ../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 -DSIMGEAR_SHARED:BOOL="ON" ../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" + +SDK_PATH="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/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 + +echo "Running package script" +./hudson_mac_package_release.rb From 4c54c5feb6927ca280d64b7b721a9d47b523ae13 Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Tue, 26 Jun 2012 09:17:42 +0100 Subject: [PATCH 066/145] Skip missing OSG plugins silently in Mac packaging --- hudson_mac_package_release.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/hudson_mac_package_release.rb b/hudson_mac_package_release.rb index d1cfb24..b572327 100755 --- a/hudson_mac_package_release.rb +++ b/hudson_mac_package_release.rb @@ -1,6 +1,8 @@ #!/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'] @@ -84,8 +86,11 @@ libFile = "libOpenThreads.#{$openThreadsSoVersion}.dylib" $osgPlugins.each do |p| pluginFile = "osgdb_#{p}.so" - `cp #{prefixDir}/lib/osgPlugins-#{osgVersion}/#{pluginFile} #{osgPluginsDir}` - fix_install_names("#{osgPluginsDir}/#{pluginFile}") + sourcePath = "#{prefixDir}/lib/osgPlugins-#{osgVersion}/#{pluginFile}" + if File.exists?(sourcePath) + `cp #{sourcePath} #{osgPluginsDir}` + fix_install_names("#{osgPluginsDir}/#{pluginFile}") + end end # custom ALUT From 561b22144876559282f12ff21c780b3d12c73753 Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Tue, 26 Jun 2012 10:22:32 +0100 Subject: [PATCH 067/145] Mac release builds should use static SimGear --- hudson_mac_build_release.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hudson_mac_build_release.sh b/hudson_mac_build_release.sh index f2ed207..4808344 100755 --- a/hudson_mac_build_release.sh +++ b/hudson_mac_build_release.sh @@ -18,7 +18,7 @@ rm -rf $WORKSPACE/dist/include/simgear $WORKSPACE/dist/libSim* $WORKSPACE/dist/l ############################################################################### echo "Starting on SimGear" pushd sgBuild -cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -G Xcode -DSIMGEAR_SHARED:BOOL="ON" ../simgear +cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -G Xcode ../simgear # compile xcodebuild -configuration Release -target install build @@ -33,7 +33,7 @@ popd ################################################################################ echo "Starting on FlightGear" pushd fgBuild -cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -G Xcode -DSIMGEAR_SHARED:BOOL="ON" ../flightgear +cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -G Xcode ../flightgear xcodebuild -configuration Release -target install build From 57cafd62e15438ce981161b666375ce2d13808fe Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Tue, 26 Jun 2012 10:22:46 +0100 Subject: [PATCH 068/145] Fix DMG output path, oops. --- hudson_mac_package_release.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hudson_mac_package_release.rb b/hudson_mac_package_release.rb index b572327..3f41408 100755 --- a/hudson_mac_package_release.rb +++ b/hudson_mac_package_release.rb @@ -58,7 +58,7 @@ osgPluginsDir=contents+"/PlugIns/osgPlugins-#{osgVersion}" 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}` From 35bc589a0423c0c50847e05c6f7e2b3d044af444 Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Tue, 26 Jun 2012 10:23:40 +0100 Subject: [PATCH 069/145] Git-ignore updates for Mac build --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 930f8e0..e5f3491 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ Output output fgBuild sgBuild +image +macflightgear From 9c0ccec847fe2944927e05cb939a019aa507a9ed Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Tue, 26 Jun 2012 15:21:51 +0100 Subject: [PATCH 070/145] Bump 2.8 fg+sg commits (still on next) Checking that Mac release build increments ok. --- flightgear | 2 +- simgear | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flightgear b/flightgear index 1c83a15..20071b6 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit 1c83a151100931405f9bb923718396d82cdd9cfb +Subproject commit 20071b66afd467bc87acea2e2c42cff90757f743 diff --git a/simgear b/simgear index ad4a9ee..2c54237 160000 --- a/simgear +++ b/simgear @@ -1 +1 @@ -Subproject commit ad4a9eeaa5c6a33b4f192bd0fab043bef930152f +Subproject commit 2c54237fe5071d3f2e8a3bf22d0000c7bc485591 From 7ef17cc4b29e4b587dd54801018642eb0f05a00e Mon Sep 17 00:00:00 2001 From: ThorstenB <brehmt@gmail.com> Date: Tue, 26 Jun 2012 23:24:51 +0200 Subject: [PATCH 071/145] Bump to 2.8.0 head --- flightgear | 2 +- simgear | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flightgear b/flightgear index 20071b6..af53a2e 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit 20071b66afd467bc87acea2e2c42cff90757f743 +Subproject commit af53a2eaf8038f6e1e530bf8183fa15a072d0b50 diff --git a/simgear b/simgear index 2c54237..3fa835d 160000 --- a/simgear +++ b/simgear @@ -1 +1 @@ -Subproject commit 2c54237fe5071d3f2e8a3bf22d0000c7bc485591 +Subproject commit 3fa835d74cbce1ba1ef862ac1fc9397c59709a20 From 72d2bb90444ca91019283a1e29c0b18aa61c7760 Mon Sep 17 00:00:00 2001 From: ThorstenB <brehmt@gmail.com> Date: Wed, 4 Jul 2012 22:26:39 +0200 Subject: [PATCH 072/145] Bump 2.8.0 release head. --- flightgear | 2 +- simgear | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flightgear b/flightgear index af53a2e..0934ba8 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit af53a2eaf8038f6e1e530bf8183fa15a072d0b50 +Subproject commit 0934ba859f981ba2426bf2bf76f83ed9108ef779 diff --git a/simgear b/simgear index 3fa835d..4838a96 160000 --- a/simgear +++ b/simgear @@ -1 +1 @@ -Subproject commit 3fa835d74cbce1ba1ef862ac1fc9397c59709a20 +Subproject commit 4838a9690e1a9492db6741f4950976b63868200d From 26e6b859a5e133c09a5e054e889770e8a7d3f84e Mon Sep 17 00:00:00 2001 From: Frederic Bouvier <fredfgfs01@free.fr> Date: Fri, 13 Jul 2012 16:11:47 +0200 Subject: [PATCH 073/145] Bump to latest next --- flightgear | 2 +- simgear | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flightgear b/flightgear index 0934ba8..26aeb84 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit 0934ba859f981ba2426bf2bf76f83ed9108ef779 +Subproject commit 26aeb8439926403972e0d24995ba36d09f821f07 diff --git a/simgear b/simgear index 4838a96..00e21af 160000 --- a/simgear +++ b/simgear @@ -1 +1 @@ -Subproject commit 4838a9690e1a9492db6741f4950976b63868200d +Subproject commit 00e21af5bb9f38eccb6e421b3afc00df58924942 From 868f7df661448942bc4cf3ab22bf51b82da74979 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier <fredfgfs01@free.fr> Date: Fri, 13 Jul 2012 18:59:26 +0200 Subject: [PATCH 074/145] Bump --- simgear | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simgear b/simgear index 00e21af..ddfdbd7 160000 --- a/simgear +++ b/simgear @@ -1 +1 @@ -Subproject commit 00e21af5bb9f38eccb6e421b3afc00df58924942 +Subproject commit ddfdbd75b87b62b831e899821795c2f735c0dbda From eebf4dbcafc89c8709ffae52dc23ed46cb270b28 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier <fredfgfs01@free.fr> Date: Sat, 14 Jul 2012 14:24:25 +0200 Subject: [PATCH 075/145] Bump --- flightgear | 2 +- simgear | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flightgear b/flightgear index 26aeb84..c1137f3 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit 26aeb8439926403972e0d24995ba36d09f821f07 +Subproject commit c1137f371d1bc7c36ca6ba77420e63a96b443bb8 diff --git a/simgear b/simgear index ddfdbd7..e6ab3dd 160000 --- a/simgear +++ b/simgear @@ -1 +1 @@ -Subproject commit ddfdbd75b87b62b831e899821795c2f735c0dbda +Subproject commit e6ab3ddb7d263d340c03a826feb2de1a1c75e47a From a3c2a9424a9125c411f0cfa3febeed1d7f301469 Mon Sep 17 00:00:00 2001 From: ThorstenB <brehmt@gmail.com> Date: Tue, 17 Jul 2012 19:01:58 +0200 Subject: [PATCH 076/145] Switch fgmeta's existing 2.8.0 branch to now track new sg/fg 2.8.0 branches --- flightgear | 2 +- simgear | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flightgear b/flightgear index c1137f3..9db625a 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit c1137f371d1bc7c36ca6ba77420e63a96b443bb8 +Subproject commit 9db625af7977a91483a6fb35bd7cc1c034b8bda3 diff --git a/simgear b/simgear index e6ab3dd..3ba3121 160000 --- a/simgear +++ b/simgear @@ -1 +1 @@ -Subproject commit e6ab3ddb7d263d340c03a826feb2de1a1c75e47a +Subproject commit 3ba312116b0c602733e5f62b52870e9d3e2677cf From 3d99ef3ea24c9567077295611d581a5978688e54 Mon Sep 17 00:00:00 2001 From: ThorstenB <brehmt@gmail.com> Date: Fri, 20 Jul 2012 00:25:52 +0200 Subject: [PATCH 077/145] knock knock: 2.8.0 fg head --- flightgear | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flightgear b/flightgear index 9db625a..8f5d858 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit 9db625af7977a91483a6fb35bd7cc1c034b8bda3 +Subproject commit 8f5d8580b69d71313271a9fbac46e2cd8e830a99 From 5a31e3133f5432935f73aba1cea0d103c8e62594 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier <fredfgfs01@free.fr> Date: Fri, 20 Jul 2012 00:39:31 +0200 Subject: [PATCH 078/145] Give FG version to fgrun to control what path should be set and overwrite a previous installation in the preference file --- FlightGear.iss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/FlightGear.iss b/FlightGear.iss index 09f3c55..962d68c 100755 --- a/FlightGear.iss +++ b/FlightGear.iss @@ -46,7 +46,7 @@ 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 @@ -211,8 +211,8 @@ filename: "{app}\bin\Win64\vcredist_x64.exe"; WorkingDir: "{app}\bin\Win64"; Par 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') -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') +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""" From 3e0eefa8f5839c2e54886bd871e4f7f4fa3422c3 Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Fri, 27 Jul 2012 17:52:34 +0100 Subject: [PATCH 079/145] Bump release head for metar.exe fix on Windows. --- flightgear | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flightgear b/flightgear index 8f5d858..f892b4c 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit 8f5d8580b69d71313271a9fbac46e2cd8e830a99 +Subproject commit f892b4cf8934ecd42628b0433a928733073b2667 From 06800a6c56aa0769f6297296fc9154f2615ed2f0 Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Mon, 30 Jul 2012 18:09:12 +0100 Subject: [PATCH 080/145] Bump FG release for Mac fixes. --- flightgear | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flightgear b/flightgear index f892b4c..c889339 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit f892b4cf8934ecd42628b0433a928733073b2667 +Subproject commit c889339ec3effc58bd7325bea80bef9da68a229f From 7190575775900468f0a644624c6225db41a7b4da Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Tue, 31 Jul 2012 09:02:46 +0100 Subject: [PATCH 081/145] Bump Simgear head for Clang templates fix. --- simgear | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simgear b/simgear index 3ba3121..a7519c9 160000 --- a/simgear +++ b/simgear @@ -1 +1 @@ -Subproject commit 3ba312116b0c602733e5f62b52870e9d3e2677cf +Subproject commit a7519c9e95d6c2c1bf7132d76c2a79d8a20e7e37 From 8b782ce69b8dc3c6197802f8572631a984e1e70f Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Tue, 31 Jul 2012 11:02:38 +0100 Subject: [PATCH 082/145] Add the Mac launcher as an external. Folks on other platforms, it's tiny - and this is the simplest way to manage things for the release builds. If you strongly object please let me know and we can figure out an alternate approach. --- .gitmodules | 3 +++ maclauncher | 1 + 2 files changed, 4 insertions(+) create mode 160000 maclauncher diff --git a/.gitmodules b/.gitmodules index 29ede68..7671951 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/maclauncher b/maclauncher new file mode 160000 index 0000000..ed55fa6 --- /dev/null +++ b/maclauncher @@ -0,0 +1 @@ +Subproject commit ed55fa6f7d72c766d623763865ce2cfaa3806044 From e7011cab66009e2189eb55b9fd6773730989786b Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Tue, 31 Jul 2012 19:02:26 +0100 Subject: [PATCH 083/145] Updates for Mac packaging. Note this is currently hard-coding a source path for rsync which only works on my machine - which is the Mac jenkins slave. This will be updated shortly. --- base-package.rules | 38 +++++++++++++++++++++++++++++++++++ hudson_mac_build_release.sh | 8 +++----- hudson_mac_package_release.rb | 11 +++++----- 3 files changed, 47 insertions(+), 10 deletions(-) create mode 100644 base-package.rules diff --git a/base-package.rules b/base-package.rules new file mode 100644 index 0000000..488a83e --- /dev/null +++ b/base-package.rules @@ -0,0 +1,38 @@ +- .git +- *.xcf +- *.tex + ++ /data/Aircraft/Generic ++ /data/Aircraft/Instruments ++ /data/Aircraft/Instruments-3d + ++ /data/Aircraft/UIUC ++ /data/Aircraft/c172p ++ /data/Aircraft/777 ++ /data/Aircraft/777-200 ++ /data/Aircraft/b1900d ++ /data/Aircraft/ufo ++ /data/Aircraft/CitationX ++ /data/Aircraft/ZLT-NT ++ /data/Aircraft/dhc2 ++ /data/Aircraft/Cub ++ /data/Aircraft/sopwithCamel ++ /data/Aircraft/f-14b ++ /data/Aircraft/ASK13 ++ /data/Aircraft/bo105 ++ /data/Aircraft/Dragonfly ++ /data/Aircraft/SenecaII ++ /data/Aircraft/A6M2 + +- /data/Aircraft/* + +- /data/Textures.high/*.new +- /data/Textures.high/*.orig +- /data/Textures.high/*.save +- /data/Textures/Unused +- /data/Textures/*.orig +- /data/Docs/source +- /data/Models/Airspace +- /data/Models/MNUAV + + diff --git a/hudson_mac_build_release.sh b/hudson_mac_build_release.sh index 4808344..d900525 100755 --- a/hudson_mac_build_release.sh +++ b/hudson_mac_build_release.sh @@ -49,12 +49,10 @@ chmod +x $WORKSPACE/dist/bin/osgversion ################################################################################ echo "Building Macflightgear launcher" -SDK_PATH="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk" -OSX_TARGET="10.6" +SDK_PATH="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk" +OSX_TARGET="10.7" -svn co https://macflightgear.svn.sourceforge.net/svnroot/macflightgear/trunk/FlightGearOSX macflightgear - -pushd macflightgear +pushd maclauncher/FlightGearOSX # compile the stub executable gcc -o FlightGear -mmacosx-version-min=$OSX_TARGET -isysroot $SDK_PATH -arch i386 main.m \ diff --git a/hudson_mac_package_release.rb b/hudson_mac_package_release.rb index 3f41408..7b9945b 100755 --- a/hudson_mac_package_release.rb +++ b/hudson_mac_package_release.rb @@ -67,10 +67,10 @@ puts "Creating directory structure" `mkdir -p #{osgPluginsDir}` puts "Copying binaries" -bins = ['fgfs', 'terrasync'] +bins = ['fgfs', 'fgjs'] bins.each do |b| - `cp #{prefixDir}/bin/#{b} #{resourcesDir}/#{b}` - fix_install_names("#{resourcesDir}/#{b}") + `cp #{prefixDir}/bin/#{b} #{macosDir}/#{b}` + fix_install_names("#{macosDir}/#{b}") end puts "copying libraries" @@ -100,9 +100,9 @@ end # 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 # Info.plist @@ -115,6 +115,7 @@ File.open("#{contents}/Info.plist", 'w') { |f| `cp #{srcDir}/package/mac/FlightGear.icns #{resourcesDir}/FlightGear.icns` `cp #{srcDir}/COPYING #{dmgDir}` +`rsync -a --verbose --filter 'merge #{Dir.pwd}/base-package.rules' /Users/Shared/FGFS/data #{resourcesDir}` puts "Creating DMG" From 05f4f85b27b80f727f74fed44e147af4edead7b0 Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Tue, 31 Jul 2012 19:04:45 +0100 Subject: [PATCH 084/145] Bump for updated Mac launcher --- maclauncher | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maclauncher b/maclauncher index ed55fa6..960f11d 160000 --- a/maclauncher +++ b/maclauncher @@ -1 +1 @@ -Subproject commit ed55fa6f7d72c766d623763865ce2cfaa3806044 +Subproject commit 960f11dc6928d1c74d1abf54e42f601e077a89c4 From 022f1791d9a666675037de91936127f7038cbae9 Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Thu, 2 Aug 2012 10:34:00 +0100 Subject: [PATCH 085/145] Update Mac release build to sync from Telascience --- .gitignore | 1 + base-package.rules | 58 +++++++++++++++++------------------ hudson_mac_build_release.sh | 5 +++ hudson_mac_package_release.rb | 4 ++- 4 files changed, 38 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index e5f3491..a4cb745 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ fgBuild sgBuild image macflightgear +fgdata diff --git a/base-package.rules b/base-package.rules index 488a83e..8e210bf 100644 --- a/base-package.rules +++ b/base-package.rules @@ -2,37 +2,37 @@ - *.xcf - *.tex -+ /data/Aircraft/Generic -+ /data/Aircraft/Instruments -+ /data/Aircraft/Instruments-3d ++ /fgdata/Aircraft/Generic ++ /fgdata/Aircraft/Instruments ++ /fgdata/Aircraft/Instruments-3d -+ /data/Aircraft/UIUC -+ /data/Aircraft/c172p -+ /data/Aircraft/777 -+ /data/Aircraft/777-200 -+ /data/Aircraft/b1900d -+ /data/Aircraft/ufo -+ /data/Aircraft/CitationX -+ /data/Aircraft/ZLT-NT -+ /data/Aircraft/dhc2 -+ /data/Aircraft/Cub -+ /data/Aircraft/sopwithCamel -+ /data/Aircraft/f-14b -+ /data/Aircraft/ASK13 -+ /data/Aircraft/bo105 -+ /data/Aircraft/Dragonfly -+ /data/Aircraft/SenecaII -+ /data/Aircraft/A6M2 ++ /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 -- /data/Aircraft/* +- /fgdata/Aircraft/* -- /data/Textures.high/*.new -- /data/Textures.high/*.orig -- /data/Textures.high/*.save -- /data/Textures/Unused -- /data/Textures/*.orig -- /data/Docs/source -- /data/Models/Airspace -- /data/Models/MNUAV +- /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 diff --git a/hudson_mac_build_release.sh b/hudson_mac_build_release.sh index d900525..8b29689 100755 --- a/hudson_mac_build_release.sh +++ b/hudson_mac_build_release.sh @@ -60,5 +60,10 @@ gcc -o FlightGear -mmacosx-version-min=$OSX_TARGET -isysroot $SDK_PATH -arch i38 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 . + echo "Running package script" ./hudson_mac_package_release.rb diff --git a/hudson_mac_package_release.rb b/hudson_mac_package_release.rb index 7b9945b..def85c1 100755 --- a/hudson_mac_package_release.rb +++ b/hudson_mac_package_release.rb @@ -115,7 +115,9 @@ File.open("#{contents}/Info.plist", 'w') { |f| `cp #{srcDir}/package/mac/FlightGear.icns #{resourcesDir}/FlightGear.icns` `cp #{srcDir}/COPYING #{dmgDir}` -`rsync -a --verbose --filter 'merge #{Dir.pwd}/base-package.rules' /Users/Shared/FGFS/data #{resourcesDir}` + +puts "Copying base package files into the image" +`rsync -a fgdata/ #{resourcesDir}/data` puts "Creating DMG" From e528468bd45f5881e6053438f3ec9486b67fd5ec Mon Sep 17 00:00:00 2001 From: Frederic Bouvier <fredfgfs01@free.fr> Date: Thu, 2 Aug 2012 23:04:23 +0200 Subject: [PATCH 086/145] Bump for Rembrandt fix --- flightgear | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flightgear b/flightgear index c889339..a50f1ad 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit c889339ec3effc58bd7325bea80bef9da68a229f +Subproject commit a50f1adda5cce437685f467cdc90b5f268ef66b3 From e25d5289e2894411c0bc9e61e26ed62fef45eca0 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier <fredfgfs01@free.fr> Date: Thu, 2 Aug 2012 23:24:06 +0200 Subject: [PATCH 087/145] Bump for another Rembrandt fix --- flightgear | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flightgear b/flightgear index a50f1ad..6f35a46 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit a50f1adda5cce437685f467cdc90b5f268ef66b3 +Subproject commit 6f35a46bdb6f14a6d093a8563d748bf89872ff09 From f15b661076d489766d8ae8fc564b96460febcd8a Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Sun, 5 Aug 2012 21:38:08 +0100 Subject: [PATCH 088/145] Bump release head for PUI menubar crash fix. --- flightgear | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flightgear b/flightgear index 6f35a46..96b3888 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit 6f35a46bdb6f14a6d093a8563d748bf89872ff09 +Subproject commit 96b38887574d894ef2c1d31c02170e8acb62c630 From 86d0cef390a860b825d3a6e4b8f2cd30e042ea4f Mon Sep 17 00:00:00 2001 From: Frederic Bouvier <fredfgfs01@free.fr> Date: Sun, 5 Aug 2012 22:47:38 +0200 Subject: [PATCH 089/145] Add fgrun git repository as git module for future release (not 2.8) --- fgrun | 1 + 1 file changed, 1 insertion(+) create mode 160000 fgrun diff --git a/fgrun b/fgrun new file mode 160000 index 0000000..6e97b38 --- /dev/null +++ b/fgrun @@ -0,0 +1 @@ +Subproject commit 6e97b387f6925634e941f774d7cd3b561ece3f96 From dd0bbe0a0566850b8df6f86fd3d6592f808b5744 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier <fredfgfs01@free.fr> Date: Sun, 5 Aug 2012 23:24:00 +0200 Subject: [PATCH 090/145] Add fgrun git repository as git module for future release (not 2.8). Hand edited .gitmodules as msysgit doesn't modify that file --- .gitmodules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitmodules b/.gitmodules index 29ede68..79d8fb5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "flightgear"] path = flightgear url = git://gitorious.org/fg/flightgear.git +[submodule "fgrun"] + path = fgrun + url = git://gitorious.org/fg/fgrun.git From d8897780d2eb58b7bdadb03e385d414b7d419b82 Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Wed, 8 Aug 2012 14:43:45 +0100 Subject: [PATCH 091/145] Mac packaging tweaks Pieces for libsvn deployment, code-signing and FGCom --- hudson_mac_package_release.rb | 69 +++++++++++++++++++++++++++-------- 1 file changed, 53 insertions(+), 16 deletions(-) diff --git a/hudson_mac_package_release.rb b/hudson_mac_package_release.rb index def85c1..213fc1a 100755 --- a/hudson_mac_package_release.rb +++ b/hudson_mac_package_release.rb @@ -5,7 +5,7 @@ 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" @@ -21,6 +21,10 @@ 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'] + def fix_install_names(object) #puts "fixing install names for #{object}" @@ -39,10 +43,35 @@ def fix_install_names(object) `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" + oldName = "#{$prefixDir}/lib/#{fileName}" + newName = "@executable_path/../Frameworks/#{fileName}" + `install_name_tool -change #{oldName} #{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 "Mac Developer: James Turner (3JTY4GZGL8)" #{path}` +end + puts "Erasing previous image dir" `rm -rf #{dmgDir}` @@ -50,7 +79,7 @@ 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}" @@ -62,40 +91,47 @@ 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', 'fgjs'] +bins = ['fgfs', 'fgjs', 'fgcom'] bins.each do |b| - `cp #{prefixDir}/bin/#{b} #{macosDir}/#{b}` - fix_install_names("#{macosDir}/#{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) + code_sign(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" - sourcePath = "#{prefixDir}/lib/osgPlugins-#{osgVersion}/#{pluginFile}" - if File.exists?(sourcePath) - `cp #{sourcePath} #{osgPluginsDir}` - fix_install_names("#{osgPluginsDir}/#{pluginFile}") - end + `cp #{$prefixDir}/lib/osgPlugins-#{osgVersion}/#{pluginFile} #{osgPluginsDir}` + fix_install_names("#{osgPluginsDir}/#{pluginFile}") end +# svn lib copying disabled for the moment +# 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" @@ -104,6 +140,7 @@ Dir.chdir "maclauncher/FlightGearOSX" do `cp FlightGear #{macosDir}` `rsync -a *.rb *.lproj *.sh *.tiff #{resourcesDir}` end +code_sign("#{macosDir}/FlightGear") # Info.plist template = File.read("Info.plist.in") From 69c46231d723229c9de1d7b66d088b804a35b9d9 Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Wed, 8 Aug 2012 16:27:04 +0100 Subject: [PATCH 092/145] FGCom data copying for release package --- hudson_mac_package_release.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hudson_mac_package_release.rb b/hudson_mac_package_release.rb index 213fc1a..f20f69f 100755 --- a/hudson_mac_package_release.rb +++ b/hudson_mac_package_release.rb @@ -140,6 +140,12 @@ Dir.chdir "maclauncher/FlightGearOSX" do `cp FlightGear #{macosDir}` `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 + code_sign("#{macosDir}/FlightGear") # Info.plist From 3b202ff6077a5add61de3727511d42a5a102d83c Mon Sep 17 00:00:00 2001 From: Frederic Bouvier <fredfgfs01@free.fr> Date: Sat, 11 Aug 2012 12:30:38 +0200 Subject: [PATCH 093/145] Bump for missing rembrandt uniforms --- flightgear | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flightgear b/flightgear index 96b3888..0dd860e 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit 96b38887574d894ef2c1d31c02170e8acb62c630 +Subproject commit 0dd860e25c582f730f06f008686b16ef432fb56d From b400a2adc1e58893f26f39ccff66ea792a0c08f3 Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Sun, 12 Aug 2012 17:03:10 +0100 Subject: [PATCH 094/145] Bump release heads, enable SVN packaging. --- Info.plist.in | 6 ++++-- flightgear | 2 +- hudson_mac_package_release.rb | 3 +-- simgear | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Info.plist.in b/Info.plist.in index 5fdd5d4..1dded92 100644 --- a/Info.plist.in +++ b/Info.plist.in @@ -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</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleExecutable</key> @@ -19,7 +21,7 @@ <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> diff --git a/flightgear b/flightgear index 0dd860e..0a822fb 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit 0dd860e25c582f730f06f008686b16ef432fb56d +Subproject commit 0a822fb412e2fcc44028bf5412710e2fb32dc96b diff --git a/hudson_mac_package_release.rb b/hudson_mac_package_release.rb index f20f69f..5ccbe9d 100755 --- a/hudson_mac_package_release.rb +++ b/hudson_mac_package_release.rb @@ -126,8 +126,7 @@ $osgPlugins.each do |p| fix_install_names("#{osgPluginsDir}/#{pluginFile}") end -# svn lib copying disabled for the moment -# copy_svn_libs() +copy_svn_libs() # custom ALUT # must copy frameworks using ditto diff --git a/simgear b/simgear index a7519c9..2e60af7 160000 --- a/simgear +++ b/simgear @@ -1 +1 @@ -Subproject commit a7519c9e95d6c2c1bf7132d76c2a79d8a20e7e37 +Subproject commit 2e60af7cc032a5b4a7df8b1cdf92cf4a2553a76b From 0a40a360413c556b8bdf22130d6a46bce808f76e Mon Sep 17 00:00:00 2001 From: Frederic Bouvier <fredfgfs01@free.fr> Date: Sun, 12 Aug 2012 19:10:53 +0200 Subject: [PATCH 095/145] Bump for rembrandt fix --- flightgear | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flightgear b/flightgear index 0a822fb..2f8bb5e 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit 0a822fb412e2fcc44028bf5412710e2fb32dc96b +Subproject commit 2f8bb5eab298d79055c387570e613fab7277735d From 41356c1ababf007d2a9fd13a79d51ba2783f2ffc Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Mon, 13 Aug 2012 14:26:33 +0100 Subject: [PATCH 096/145] Code-sign using the identity from the environment. --- hudson_mac_package_release.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hudson_mac_package_release.rb b/hudson_mac_package_release.rb index 5ccbe9d..07ad53d 100755 --- a/hudson_mac_package_release.rb +++ b/hudson_mac_package_release.rb @@ -17,6 +17,9 @@ 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' @@ -69,7 +72,7 @@ end def code_sign(path) puts "Signing #{path}" - `codesign -s "Mac Developer: James Turner (3JTY4GZGL8)" #{path}` + `codesign -s "#{$codeSignIdentity}" #{path}` end From 2382a0600af84853f12b1f8106ec1f98a963e711 Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Mon, 13 Aug 2012 14:26:47 +0100 Subject: [PATCH 097/145] Bump to latest Mac launcher. --- maclauncher | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maclauncher b/maclauncher index 960f11d..57e971a 160000 --- a/maclauncher +++ b/maclauncher @@ -1 +1 @@ -Subproject commit 960f11dc6928d1c74d1abf54e42f601e077a89c4 +Subproject commit 57e971a159ef8d17c20f9dfed31d27a870ead26b From 0d7f99e261d22ab7bffa09de19ddcb2dd4516abc Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Tue, 14 Aug 2012 10:46:00 +0100 Subject: [PATCH 098/145] Tweak Mac code-signing for 2.8 release. --- hudson_mac_package_release.rb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/hudson_mac_package_release.rb b/hudson_mac_package_release.rb index 07ad53d..23a0713 100755 --- a/hudson_mac_package_release.rb +++ b/hudson_mac_package_release.rb @@ -26,7 +26,7 @@ $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_svn', 'svn_subr', 'svn_ra_neon'] def fix_install_names(object) #puts "fixing install names for #{object}" @@ -109,7 +109,6 @@ bins.each do |b| `cp #{$prefixDir}/bin/#{b} #{outPath}` fix_install_names(outPath) fix_svn_install_names(outPath) - code_sign(outPath) end puts "copying libraries" @@ -148,8 +147,6 @@ if File.exist?("#{$prefixDir}/bin/fgcom-data") `ditto #{$prefixDir}/bin/fgcom-data #{resourcesDir}/fgcom-data` end -code_sign("#{macosDir}/FlightGear") - # Info.plist template = File.read("Info.plist.in") output = ERB.new(template).result(binding) @@ -164,6 +161,15 @@ File.open("#{contents}/Info.plist", 'w') { |f| 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}" From 3ea2728b69176f7e264b7360d534741dcaab2e16 Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Tue, 14 Aug 2012 12:11:48 +0100 Subject: [PATCH 099/145] Mac: Keychain unlock needs to happen later. Apparently the keychain re-locks fairly rapidly, so run the unlock script right before running the packaging script. This is non-portable to another Mac slave, but will do for now. --- hudson_mac_build_release.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hudson_mac_build_release.sh b/hudson_mac_build_release.sh index 8b29689..55e7608 100755 --- a/hudson_mac_build_release.sh +++ b/hudson_mac_build_release.sh @@ -65,5 +65,9 @@ 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 +/Users/Shared/Hudson/unlock-keychain.sh + echo "Running package script" ./hudson_mac_package_release.rb From 2cb313c6f1cdbb3174149a22ecf6477c1c1c5c0c Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Tue, 14 Aug 2012 19:51:50 +0100 Subject: [PATCH 100/145] Bump for new Mac launcher head. --- maclauncher | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maclauncher b/maclauncher index 57e971a..524e514 160000 --- a/maclauncher +++ b/maclauncher @@ -1 +1 @@ -Subproject commit 57e971a159ef8d17c20f9dfed31d27a870ead26b +Subproject commit 524e5147a7ee0b7d822e46fafd47a76c704f4aff From 9fc39e957561e13384f913a8a087db2b5254a2b1 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier <fredfgfs01@free.fr> Date: Wed, 15 Aug 2012 23:55:23 +0200 Subject: [PATCH 101/145] Bump master for test purposes --- flightgear | 2 +- simgear | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flightgear b/flightgear index 7e2aaf0..c864b39 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit 7e2aaf061ee53b3b9a5cd840555b2deeecd1bd45 +Subproject commit c864b396c65d5ddf36b639e4bfd6f1794ea0b9b9 diff --git a/simgear b/simgear index cfda390..4f3e158 160000 --- a/simgear +++ b/simgear @@ -1 +1 @@ -Subproject commit cfda390557f506c051bfae0cb36b206e59961481 +Subproject commit 4f3e1587b1c21d19d52b3f652f9b361347e6b862 From 78dfd3112840e00e1914d7460689384bf1ddf72b Mon Sep 17 00:00:00 2001 From: Frederic Bouvier <fredfgfs01@free.fr> Date: Fri, 17 Aug 2012 21:07:05 +0200 Subject: [PATCH 102/145] Build embedded fgrun --- hudson_win_build32.bat | 7 ++++++- hudson_win_build64.bat | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/hudson_win_build32.bat b/hudson_win_build32.bat index 57e50fe..16b8bac 100644 --- a/hudson_win_build32.bat +++ b/hudson_win_build32.bat @@ -1,11 +1,12 @@ IF NOT DEFINED WORKSPACE SET WORKSPACE=%~dp0 -ECHO #define SIMGEAR_VERSION "2.6.0" > %WORKSPACE%\simgear\simgear\version.h +ECHO #define SIMGEAR_VERSION "2.9.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 +md build-fgrun 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 @@ -13,3 +14,7 @@ cmake --build . --config Release --target INSTALL 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 + +cd ..\build-fgrun +cmake ..\fgrun -G "Visual Studio 10" -DMSVC_3RDPARTY_ROOT:PATH=%WORKSPACE% -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc100/FGRun -DFLTK_FLUID_EXECUTABLE:FILEPATH=%WORKSPACE%/3rdParty/bin/fluid.exe -DGETTEXT_MSGFMT_EXECUTABLE:FILEPATH=%WORKSPACE%/3rdParty/bin/msgfmt.exe -DGETTEXT_MSGMERGE_EXECUTABLE:FILEPATH=%WORKSPACE%/3rdParty/bin/msgmerge.exe +cmake --build . --config Release --target INSTALL diff --git a/hudson_win_build64.bat b/hudson_win_build64.bat index ba12920..fe2f20e 100644 --- a/hudson_win_build64.bat +++ b/hudson_win_build64.bat @@ -1,11 +1,12 @@ IF NOT DEFINED WORKSPACE SET WORKSPACE=%~dp0 -ECHO #define SIMGEAR_VERSION "2.6.0" > %WORKSPACE%\simgear\simgear\version.h +ECHO #define SIMGEAR_VERSION "2.9.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 +md build-fgrun64 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 @@ -13,3 +14,7 @@ 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 + +cd ..\build-fgrun64 +cmake ..\fgrun -G "Visual Studio 10 Win64" -DMSVC_3RDPARTY_ROOT:PATH=%WORKSPACE% -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc100-64/FGRun -DFLTK_FLUID_EXECUTABLE:FILEPATH=%WORKSPACE%/3rdParty/bin/fluid.exe -DGETTEXT_MSGFMT_EXECUTABLE:FILEPATH=%WORKSPACE%/3rdParty/bin/msgfmt.exe -DGETTEXT_MSGMERGE_EXECUTABLE:FILEPATH=%WORKSPACE%/3rdParty/bin/msgmerge.exe +cmake --build . --config Release --target INSTALL From c7ef5567d364d13fac00f541e71ebacef72dc2e9 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier <fredfgfs01@free.fr> Date: Fri, 17 Aug 2012 21:12:25 +0200 Subject: [PATCH 103/145] Bump for fgrun --- fgrun | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fgrun b/fgrun index 6e97b38..e568c73 160000 --- a/fgrun +++ b/fgrun @@ -1 +1 @@ -Subproject commit 6e97b387f6925634e941f774d7cd3b561ece3f96 +Subproject commit e568c73fcd85cf82ccca2a4aadccc0dc9ab4184d From 9ca5e065786fc45f00c2b4a744bd176c4b23d962 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier <fredfgfs01@free.fr> Date: Fri, 20 Jul 2012 00:39:31 +0200 Subject: [PATCH 104/145] Give FG version to fgrun to control what path should be set and overwrite a previous installation in the preference file --- FlightGear.iss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/FlightGear.iss b/FlightGear.iss index 09f3c55..962d68c 100755 --- a/FlightGear.iss +++ b/FlightGear.iss @@ -46,7 +46,7 @@ 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 @@ -211,8 +211,8 @@ filename: "{app}\bin\Win64\vcredist_x64.exe"; WorkingDir: "{app}\bin\Win64"; Par 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') -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') +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""" From 302b1ff5b7bc9b9c11d0d6183667602472189d6e Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Sun, 19 Aug 2012 20:25:34 +0100 Subject: [PATCH 105/145] Bump for Mac launcher tweak. --- maclauncher | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maclauncher b/maclauncher index 524e514..9e20536 160000 --- a/maclauncher +++ b/maclauncher @@ -1 +1 @@ -Subproject commit 524e5147a7ee0b7d822e46fafd47a76c704f4aff +Subproject commit 9e205366d1ad5f0d2484533ec9effef98c7c8e97 From 154afebc4517daff7328195a63b7aa726fa3de6f Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Wed, 22 Aug 2012 18:35:52 +0100 Subject: [PATCH 106/145] Tweaks for building on different Jenkins slave. --- hudson_mac_build_release.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hudson_mac_build_release.sh b/hudson_mac_build_release.sh index 55e7608..a9d1566 100755 --- a/hudson_mac_build_release.sh +++ b/hudson_mac_build_release.sh @@ -49,8 +49,7 @@ chmod +x $WORKSPACE/dist/bin/osgversion ################################################################################ echo "Building Macflightgear launcher" -SDK_PATH="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk" -OSX_TARGET="10.7" +OSX_TARGET="10.6" pushd maclauncher/FlightGearOSX @@ -67,7 +66,7 @@ rsync -avz --filter 'merge base-package.rules' \ # 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 -/Users/Shared/Hudson/unlock-keychain.sh +unlock-keychain.sh echo "Running package script" ./hudson_mac_package_release.rb From e13daffc46af89ad5c161207e63768a245e3224c Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Wed, 22 Aug 2012 22:34:27 +0100 Subject: [PATCH 107/145] Fix SV renaming for Mac release. --- hudson_mac_package_release.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hudson_mac_package_release.rb b/hudson_mac_package_release.rb index 23a0713..de6e854 100755 --- a/hudson_mac_package_release.rb +++ b/hudson_mac_package_release.rb @@ -53,9 +53,8 @@ srcDir=Dir.pwd + "/flightgear" def fix_svn_install_names(object) $svnLibs.each do |l| fileName = "lib#{l}-1.0.dylib" - oldName = "#{$prefixDir}/lib/#{fileName}" newName = "@executable_path/../Frameworks/#{fileName}" - `install_name_tool -change #{oldName} #{newName} #{object}` + `install_name_tool -change #{fileName} #{newName} #{object}` end end @@ -66,7 +65,7 @@ def copy_svn_libs() path = "#{$frameworksDir}/#{libFile}" `cp #{$prefixDir}/lib/#{libFile} #{$frameworksDir}` fix_svn_install_names(path) - `install_name_tool -id #{libFile} #{path}` + # `install_name_tool -id #{libFile} #{path}` end end From 23b0f4eea48a14b58760fd3f621bd8fdd2df1df7 Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Thu, 23 Aug 2012 08:15:24 +0100 Subject: [PATCH 108/145] Bump flightgear head to 2.8.1 to get ATC crash fix. --- flightgear | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flightgear b/flightgear index 2f8bb5e..1bade10 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit 2f8bb5eab298d79055c387570e613fab7277735d +Subproject commit 1bade1069f066ea5e2941cdfa145ca37de06dbe1 From 9a80c0103e0d8f5b5723d78c148d72e0334e693f Mon Sep 17 00:00:00 2001 From: ThorstenB <brehmt@gmail.com> Date: Thu, 23 Aug 2012 20:49:07 +0200 Subject: [PATCH 109/145] Francesco Angelo Brisa: Updated d_and_c script for FG2.8.0 --- download_and_compile.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/download_and_compile.sh b/download_and_compile.sh index b7d732b..c4f92a7 100644 --- a/download_and_compile.sh +++ b/download_and_compile.sh @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -VERSION="1.31" +VERSION="1.4" #COMPILE GIT FGFS @@ -126,16 +126,16 @@ PLIB_STABLE_REVISION="2163" 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" +FGSG_STABLE_GIT_BRANCH="release/2.8.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" +SIMGEAR_STABLE_REVISION="version/2.8.0-final" +FGFS_STABLE_REVISION="version/2.8.0-final" +FGFS_DATA_STABLE_REVISION="version/2.8.0-final" FGRUN_STABLE_REVISION="655" FGCOM_STABLE_REVISION="261" @@ -183,7 +183,7 @@ fi echo "**************************************" echo "* *" echo "* Warning, the compilation process *" -echo "* is going to use 9 or more Gbytes *" +echo "* is going to use 12 or more Gbytes *" echo "* of space and at least a couple of *" echo "* hours to download and build FG. *" echo "* *" @@ -374,7 +374,8 @@ then PLIB_STABLE_REVISION_="" - if [ "$STABLE" = "STABLE" ] + #if [ "$STABLE" = "STABLE" ] + if [ "STABLE" = "STABLE" ] then PLIB_STABLE_REVISION_=" -r $PLIB_STABLE_REVISION" fi From 083269de807871b1c041539c2ebdeea1b4cf6c6b Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Sat, 25 Aug 2012 14:55:20 +0100 Subject: [PATCH 110/145] Fix ALUT naming, ooops. --- hudson_mac_package_release.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hudson_mac_package_release.rb b/hudson_mac_package_release.rb index de6e854..ffd6a07 100755 --- a/hudson_mac_package_release.rb +++ b/hudson_mac_package_release.rb @@ -41,7 +41,7 @@ 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 From f1f4fcb0d84249e5c99e918a310a1ea78f6a90ce Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Sat, 25 Aug 2012 14:55:34 +0100 Subject: [PATCH 111/145] Bump FG version. --- flightgear | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flightgear b/flightgear index 1bade10..bffb558 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit 1bade1069f066ea5e2941cdfa145ca37de06dbe1 +Subproject commit bffb5589215182cb21ab2b2697ae7bf000db1412 From 81f5a48973aa5797ed6b3b809c630056788aee0a Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Tue, 28 Aug 2012 13:47:37 +0100 Subject: [PATCH 112/145] Changes to Info.plist creation, fix copyright. Info.plist now generates correct copyright strings based on the current year. --- Info.plist.in | 4 +++- flightgear | 2 +- hudson_mac_package_release.rb | 3 +++ maclauncher | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Info.plist.in b/Info.plist.in index 1dded92..b6dd5d4 100644 --- a/Info.plist.in +++ b/Info.plist.in @@ -9,7 +9,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleGetInfoString</key> - <string>FlightGear, the open-source flight simulator</string> + <string>FlightGear, the open-source flight simulator, <%= fgVersion %>. ©1996-<%= fgCurrentYear%>, The FlightGear Project</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleExecutable</key> @@ -26,6 +26,8 @@ <string>MainMenu</string> <key>NSPrincipalClass</key> <string>NSApplication</string> + <key>NSHumanReadableCopyright</key> + <string>©1996-<%= fgCurrentYear%>, The FlightGear Project</string> </dict> </plist> diff --git a/flightgear b/flightgear index bffb558..ddc2a74 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit bffb5589215182cb21ab2b2697ae7bf000db1412 +Subproject commit ddc2a745c67d138b34e3d95948d341341c85965d diff --git a/hudson_mac_package_release.rb b/hudson_mac_package_release.rb index ffd6a07..563f587 100755 --- a/hudson_mac_package_release.rb +++ b/hudson_mac_package_release.rb @@ -85,6 +85,9 @@ $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}\"" diff --git a/maclauncher b/maclauncher index 9e20536..f9d2f97 160000 --- a/maclauncher +++ b/maclauncher @@ -1 +1 @@ -Subproject commit 9e205366d1ad5f0d2484533ec9effef98c7c8e97 +Subproject commit f9d2f97206bbbeebc4b5690c1d03cda5ce8e97ae From 7cbc6a0439983e292ef02f23ff366117a455eafb Mon Sep 17 00:00:00 2001 From: Frederic Bouvier <fredfgfs01@free.fr> Date: Mon, 3 Sep 2012 10:51:33 +0200 Subject: [PATCH 113/145] Update fgmeta master to latest sources --- fgrun | 2 +- flightgear | 2 +- simgear | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fgrun b/fgrun index e568c73..611cdd1 160000 --- a/fgrun +++ b/fgrun @@ -1 +1 @@ -Subproject commit e568c73fcd85cf82ccca2a4aadccc0dc9ab4184d +Subproject commit 611cdd1661a7cfc1b76e0393eec831fa951c2753 diff --git a/flightgear b/flightgear index c864b39..0608367 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit c864b396c65d5ddf36b639e4bfd6f1794ea0b9b9 +Subproject commit 06083672573b525793300fd14e63df242c99248c diff --git a/simgear b/simgear index 4f3e158..b4c8b00 160000 --- a/simgear +++ b/simgear @@ -1 +1 @@ -Subproject commit 4f3e1587b1c21d19d52b3f652f9b361347e6b862 +Subproject commit b4c8b00c0e5b31db95f1e54ad5d62685386acd9e From 48ad2d326fad7225b7d8991f9130b64684f67cd3 Mon Sep 17 00:00:00 2001 From: ThorstenB <brehmt@gmail.com> Date: Tue, 4 Sep 2012 00:00:42 +0200 Subject: [PATCH 114/145] Bump sg+fg. --- flightgear | 2 +- simgear | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flightgear b/flightgear index ddc2a74..8039b6c 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit ddc2a745c67d138b34e3d95948d341341c85965d +Subproject commit 8039b6cb8f68a9db157adf11d8ecd90b120c4881 diff --git a/simgear b/simgear index 2e60af7..b1baddd 160000 --- a/simgear +++ b/simgear @@ -1 +1 @@ -Subproject commit 2e60af7cc032a5b4a7df8b1cdf92cf4a2553a76b +Subproject commit b1baddd6dce9ceea0857790c46154e3c2087e62b From a717c77ee9446bd87a42a81ac219aa6c6359600a Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Mon, 17 Sep 2012 23:02:55 +0100 Subject: [PATCH 115/145] Mac launcher fixes. --- hudson_mac_package_release.rb | 2 +- maclauncher | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hudson_mac_package_release.rb b/hudson_mac_package_release.rb index 563f587..1180f15 100755 --- a/hudson_mac_package_release.rb +++ b/hudson_mac_package_release.rb @@ -101,7 +101,7 @@ puts "Creating directory structure" `mkdir -p #{osgPluginsDir}` puts "Copying binaries" -bins = ['fgfs', 'fgjs', 'fgcom'] +bins = ['fgfs', 'fgjs', 'fgcom', 'fgviewer'] bins.each do |b| if !File.exist?("#{$prefixDir}/bin/#{b}") next diff --git a/maclauncher b/maclauncher index f9d2f97..7ffef2c 160000 --- a/maclauncher +++ b/maclauncher @@ -1 +1 @@ -Subproject commit f9d2f97206bbbeebc4b5690c1d03cda5ce8e97ae +Subproject commit 7ffef2cb26442578f3c4b1e22158feb1ad812367 From babafbb198b7f0ee85595243eb55a302766b147e Mon Sep 17 00:00:00 2001 From: ThorstenB <brehmt@gmail.com> Date: Thu, 1 Nov 2012 13:28:51 +0100 Subject: [PATCH 116/145] Francesco Angelo Brisa: FGRun update for d&c script. Also pulls FGrun from git repository now, thanks to Pac. --- download_and_compile.sh | 69 ++++++++++++++++++++++++++++++----------- 1 file changed, 51 insertions(+), 18 deletions(-) diff --git a/download_and_compile.sh b/download_and_compile.sh index c4f92a7..7bcc51d 100644 --- a/download_and_compile.sh +++ b/download_and_compile.sh @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -VERSION="1.4" +VERSION="1.5" #COMPILE GIT FGFS @@ -27,7 +27,7 @@ VERSION="1.4" ####################################################### # Special thanks to Alessandro Garosi for FGComGui and # other patches -# Thanks to "pac1" for patches for fgrun compilation +# Thanks to "Pat Callahan" for patches for fgrun compilation # Thanks to "F-JJTH" for bug fixes and suggestions @@ -127,17 +127,18 @@ OSG_STABLE_REVISION="http://www.openscenegraph.org/svn/osg/OpenSceneGraph/tags/O # common stable branch for flightgear, simgear and fgdata FGSG_STABLE_GIT_BRANCH="release/2.8.0" +FGRUN_STABLE_GIT_BRANCH="master" # unstable branch: next for sg/fg, master for fgdata FGSG_UNSTABLE_GIT_BRANCH="next" FGDATA_UNSTABLE_GIT_BRANCH="master" +FGRUN_UNSTABLE_GIT_BRANCH="master" # stable GIT revision: release tag SIMGEAR_STABLE_REVISION="version/2.8.0-final" FGFS_STABLE_REVISION="version/2.8.0-final" FGFS_DATA_STABLE_REVISION="version/2.8.0-final" -FGRUN_STABLE_REVISION="655" FGCOM_STABLE_REVISION="261" FGCOMGUI_STABLE_REVISION="46" @@ -258,7 +259,7 @@ fi # default is hardy -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 " +DISTRO_PACKAGES="libopenal-dev libalut-dev libalut0 libfltk1.3-dev libfltk1.3 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 libxft2 libxft-dev libxinerama1 libxinerama-dev" UBUNTU_PACKAGES="freeglut3-dev libjpeg62-dev libjpeg62 libapr1-dev " DEBIAN_PACKAGES="freeglut3-dev libjpeg8-dev libjpeg8 " @@ -909,23 +910,55 @@ then echo "**************** FGRUN *****************" | tee -a $LOGFILE echo "****************************************" | tee -a $LOGFILE - if [ "$DOWNLOAD" = "y" ] - then - FGRUN_STABLE_REVISION_="" - if [ "$STABLE" = "STABLE" ] + if [ "$DOWNLOAD" = "y" ] then - FGRUN_STABLE_REVISION_=" -r $FGRUN_STABLE_REVISION" + #echo -n "CVS FROM cvs.flightgear.org:/var/cvs/FlightGear-0.9 ... " >> $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 source + + echo -n "GIT FROM git://gitorious.org/fg/fgrun.git ... " >> $LOGFILE + + + if [ -d "fgrun" ] + then + echo "fgrun exists already." + else + git clone git://gitorious.org/fg/fgrun.git fgrun + fi + + cd fgrun + + git fetch origin + if [ "$STABLE" = "STABLE" ] + then + # switch to stable branch + # create local stable branch, ignore errors if it exists + ls + git branch -f $FGRUN_STABLE_GIT_BRANCH origin/$FGRUN_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 $FGRUN_STABLE_GIT_BRANCH + # get indicated stable version + git reset --hard $FGRUN_STABLE_GIT_BRANCH + else + # switch to unstable branch + # create local unstable branch, ignore errors if it exists + git branch -f $FGRUN_UNSTABLE_GIT_BRANCH origin/$FGRUN_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 $FGRUN_UNSTABLE_GIT_BRANCH + # pull latest version from the unstable branch + git pull + fi + + cd .. + + echo " OK" >> $LOGFILE + fi + + cd fgrun - echo -n "SVN FROM http://fgrun.svn.sourceforge.net/svnroot/fgrun ... " >> $LOGFILE - svn $FGRUN_STABLE_REVISION_ co http://fgrun.svn.sourceforge.net/svnroot/fgrun/trunk fgrun - echo " OK" >> $LOGFILE - - fi - cd fgrun/fgrun/ - if [ ! "$UPDATE" = "UPDATE" ] then if [ "$RECONFIGURE" = "y" ] @@ -935,9 +968,9 @@ then cd "$CBD"/build/fgrun echo -n "RECONFIGURE FGRUN ... " >> $LOGFILE - rm -f ../../fgrun/fgrun/CMakeCache.txt + rm -f ../../fgrun/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_FGRUN" -D "CMAKE_PREFIX_PATH=$INSTALL_DIR_OSG;$INSTALL_DIR_PLIB;$INSTALL_DIR_SIMGEAR" ../../fgrun/fgrun/ 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/ 2>&1 | tee -a $LOGFILE echo " OK" >> $LOGFILE fi From 1b1be1678eb65324e899be9d68d20e636226fa3b Mon Sep 17 00:00:00 2001 From: ThorstenB <brehmt@gmail.com> Date: Tue, 20 Nov 2012 19:40:35 +0100 Subject: [PATCH 117/145] Francesco Angelo Brisa: plib update for d&c script. --- download_and_compile.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/download_and_compile.sh b/download_and_compile.sh index 7bcc51d..190aa1c 100644 --- a/download_and_compile.sh +++ b/download_and_compile.sh @@ -122,7 +122,7 @@ fi ####################################################### # Last stable revision: currently FlightGear 2.4.0 with 3.0.1 -PLIB_STABLE_REVISION="2163" +PLIB_STABLE_REVISION="2172" OSG_STABLE_REVISION="http://www.openscenegraph.org/svn/osg/OpenSceneGraph/tags/OpenSceneGraph-3.0.1" # common stable branch for flightgear, simgear and fgdata @@ -375,8 +375,8 @@ then PLIB_STABLE_REVISION_="" - #if [ "$STABLE" = "STABLE" ] - if [ "STABLE" = "STABLE" ] + if [ "$STABLE" = "STABLE" ] + #if [ "STABLE" = "STABLE" ] then PLIB_STABLE_REVISION_=" -r $PLIB_STABLE_REVISION" fi @@ -392,8 +392,8 @@ then else echo -n "DOWNLOADING FROM http://plib.svn.sourceforge.net ..." >> $LOGFILE svn $PLIB_STABLE_REVISION_ co http://plib.svn.sourceforge.net/svnroot/plib/trunk plib - cat plib/src/util/ul.h | sed s/"PLIB_TINY_VERSION 5"/"PLIB_TINY_VERSION 6"/g > ul.h-v1.8.6 - mv ul.h-v1.8.6 plib/src/util/ul.h + #cat plib/src/util/ul.h | sed s/"PLIB_TINY_VERSION 5"/"PLIB_TINY_VERSION 6"/g > ul.h-v1.8.6 + #mv ul.h-v1.8.6 plib/src/util/ul.h echo " OK" >> $LOGFILE fi fi From 6941d72b9fc02486a250fe24eb0b9178720804a1 Mon Sep 17 00:00:00 2001 From: ThorstenB <brehmt@gmail.com> Date: Thu, 22 Nov 2012 20:38:51 +0100 Subject: [PATCH 118/145] Francesco Brisa: d&c script, F-JJTH has done some big improvements Added OpenRTI to compilation list Added FGX to compilation list Simgear now can be compiled with openrti option. Minor minor fixes for plib --- download_and_compile.sh | 281 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 263 insertions(+), 18 deletions(-) diff --git a/download_and_compile.sh b/download_and_compile.sh index 190aa1c..28220b2 100644 --- a/download_and_compile.sh +++ b/download_and_compile.sh @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -VERSION="1.5" +VERSION="1.8" #COMPILE GIT FGFS @@ -29,6 +29,7 @@ VERSION="1.5" # other patches # Thanks to "Pat Callahan" for patches for fgrun compilation # Thanks to "F-JJTH" for bug fixes and suggestions +# Thanks again to "F-JJTH" for OpenRTI and FGX @@ -51,8 +52,9 @@ JOPTION="" OOPTION="" DEBUG="" WITH_EVENT_INPUT="" +WITH_OPENRTI="" -while getopts "suhc:p:a:d:r:j:O:ge" OPTION +while getopts "suhc:p:a:d:r:j:O:gei" OPTION do case $OPTION in s) @@ -91,6 +93,9 @@ do e) WITH_EVENT_INPUT="--with-eventinput" ;; + i) + WITH_OPENRTI="-D ENABLE_RTI=ON" + ;; ?) @@ -128,18 +133,22 @@ OSG_STABLE_REVISION="http://www.openscenegraph.org/svn/osg/OpenSceneGraph/tags/O # common stable branch for flightgear, simgear and fgdata FGSG_STABLE_GIT_BRANCH="release/2.8.0" FGRUN_STABLE_GIT_BRANCH="master" +OPENRTI_STABLE_GIT_BRANCH="release-0.3" # unstable branch: next for sg/fg, master for fgdata FGSG_UNSTABLE_GIT_BRANCH="next" FGDATA_UNSTABLE_GIT_BRANCH="master" FGRUN_UNSTABLE_GIT_BRANCH="master" +OPENRTI_UNSTABLE_GIT_BRANCH="master" # stable GIT revision: release tag SIMGEAR_STABLE_REVISION="version/2.8.0-final" FGFS_STABLE_REVISION="version/2.8.0-final" FGFS_DATA_STABLE_REVISION="version/2.8.0-final" +OPENRTI_STABLE_REVISION="OpenRTI-0.3.0" -FGCOM_STABLE_REVISION="261" +# FGCOM +FGCOM_UNSTABLE_GIT_BRANCH="master" FGCOMGUI_STABLE_REVISION="46" # Current developer revision: latest FlightGear GIT (2.5.0) with OSG 3.0.1 @@ -155,14 +164,15 @@ 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|FGO|FGRUN|FGCOM|FGCOMGUI|ATLAS] [UPDATE]" - echo "* without options it recompiles: PLIB,OSG,SIMGEAR,FGFS,FGRUN" + echo "./$0 [-u] [-h] [-s] [-e] [-i] [-g] [-a y|n] [-c y|n] [-p y|n] [-d y|n] [-r y|n] [ALL|PLIB|OSG|OPENRTI|SIMGEAR|FGFS|FGO|FGX|FGRUN|FGCOM|FGCOMGUI|ATLAS] [UPDATE]" + echo "* without options it recompiles: PLIB,OSG,OPENRTI,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)" echo "Switches:" echo "* -u such as using UPDATE" echo "* -h show this help" echo "* -e compile FlightGear with --with-eventinput option (experimental)" + echo "* -i compile SimGear and FlightGear with -D ENABLE_RTI=ON option (experimental)" echo "* -g compile with debug info for gcc" echo "* -a y|n y=do an apt-get update n=skip apt-get update default=y" echo "* -p y|n y=download packages n=skip download packages default=y" @@ -412,7 +422,7 @@ then ./autogen.sh 2>&1 | tee -a $LOGFILE echo "CONFIGURING plib" >> $LOGFILE cd "$CBD"/build/plib - ../../plib/configure --prefix="$INSTALL_DIR_PLIB" --exec-prefix="$INSTALL_DIR_PLIB" 2>&1 | tee -a $LOGFILE + ../../plib/configure --disable-pw --disable-sl --disable-psl --disable-ssg --disable-ssgaux --prefix="$INSTALL_DIR_PLIB" --exec-prefix="$INSTALL_DIR_PLIB" 2>&1 | tee -a $LOGFILE else echo "NO RECONFIGURE FOR plib" >> $LOGFILE fi @@ -523,6 +533,104 @@ fi +####################################################### +# OPENRTI +####################################################### +OPENRTI_INSTALL_DIR=openrti +INSTALL_DIR_OPENRTI=$INSTALL_DIR/$OPENRTI_INSTALL_DIR +cd "$CBD" + +if [ ! -d "openrti" ] +then + mkdir "openrti" +fi + +if [ "$WHATTOBUILD" = "" -o "$WHATTOBUILD" = "OPENRTI" -o "$WHATTOBUILD" = "ALL" ] +then + echo "****************************************" | tee -a $LOGFILE + echo "**************** OPENRTI ***************" | tee -a $LOGFILE + echo "****************************************" | tee -a $LOGFILE + + + if [ "$DOWNLOAD" = "y" ] + then + cd openrti + + echo -n "git FROM git://gitorious.org/openrti/openrti.git ... " >> $LOGFILE + + if [ -d "openrti" ] + then + echo "openrti exists already." + else + git clone git://gitorious.org/openrti/openrti.git + fi + + cd openrti + + git fetch origin + if [ "$STABLE" = "STABLE" ] + then + # switch to stable branch + # create local stable branch, ignore errors if it exists + git branch -f $OPENRTI_STABLE_GIT_BRANCH origin/$OPENRTI_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 $OPENRTI_STABLE_GIT_BRANCH + # get indicated stable version + git reset --hard $OPENRTI_STABLE_REVISION + else + # switch to unstable branch + # create local unstable branch, ignore errors if it exists + git branch -f $OPENRTI_UNSTABLE_GIT_BRANCH origin/$OPENRTI_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 $OPENRTI_UNSTABLE_GIT_BRANCH + # pull latest version from the unstable branch + git pull + fi + + cd .. + + echo " OK" >> $LOGFILE + cd .. + + fi + + cd "openrti/openrti" + + if [ ! "$UPDATE" = "UPDATE" ] + then + if [ "$RECONFIGURE" = "y" ] + then + + cd "$CBD" + mkdir -p build/openrti + cd "$CBD"/build/openrti + echo -n "RECONFIGURE OPENRTI ... " >> $LOGFILE + rm -f ../../openrti/openrti/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_OPENRTI" ../../openrti/openrti/ 2>&1 | tee -a $LOGFILE + echo " OK" >> $LOGFILE + + + + fi + fi + + if [ "$COMPILE" = "y" ] + then + + + cd "$CBD"/build/openrti + echo "MAKE OPENRTI" >> $LOGFILE + echo "make $JOPTION $OOPTION " >> $LOGFILE + make $JOPTION $OOPTION 2>&1 | tee -a $LOGFILE + + echo "INSTALL OPENRTI" >> $LOGFILE + make install 2>&1 | tee -a $LOGFILE + fi + cd - +fi + + + ####################################################### # SIMGEAR ####################################################### @@ -600,7 +708,7 @@ then 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 + cmake -D CMAKE_BUILD_TYPE="Release" $WITH_OPENRTI -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 @@ -718,7 +826,7 @@ then #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 + cmake -D CMAKE_BUILD_TYPE="Release" $WITH_OPENRTI -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 @@ -835,7 +943,7 @@ then #!/bin/sh cd \$(dirname \$0) cd $SUB_INSTALL_DIR/$FGFS_INSTALL_DIR/bin -export LD_LIBRARY_PATH=../../$PLIB_INSTALL_DIR/lib:../../$OSG_INSTALL_DIR/lib:../../$SIMGEAR_INSTALL_DIR/lib +export LD_LIBRARY_PATH=../../$PLIB_INSTALL_DIR/lib:../../$OSG_INSTALL_DIR/lib:../../$SIMGEAR_INSTALL_DIR/lib:../../$OPENRTI_INSTALL_DIR/lib ./fgfs --fg-root=\$PWD/../fgdata/ \$@ ENDOFALL chmod 755 run_fgfs.sh @@ -845,7 +953,7 @@ ENDOFALL cd \$(dirname \$0) P1=\$PWD cd $SUB_INSTALL_DIR/$FGFS_INSTALL_DIR/bin -export LD_LIBRARY_PATH=../../$PLIB_INSTALL_DIR/lib:../../$OSG_INSTALL_DIR/lib:../../$SIMGEAR_INSTALL_DIR/lib +export LD_LIBRARY_PATH=../../$PLIB_INSTALL_DIR/lib:../../$OSG_INSTALL_DIR/lib:../../$SIMGEAR_INSTALL_DIR/lib:../../$OPENRTI_INSTALL_DIR/lib gdb --directory="\$P1"/fgfs/source/src/ --args fgfs --fg-root=\$PWD/../fgdata/ \$@ ENDOFALL2 chmod 755 run_fgfs_debug.sh @@ -897,6 +1005,102 @@ then fi +####################################################### +# FGx +####################################################### +FGX_INSTALL_DIR=fgx +INSTALL_DIR_FGX=$INSTALL_DIR/$FGX_INSTALL_DIR +cd "$CBD" +if [ "$WHATTOBUILD" = "" -o "$WHATTOBUILD" = "FGX" ] +then + echo "****************************************" | tee -a $LOGFILE + echo "***************** FGX ******************" | tee -a $LOGFILE + echo "****************************************" | tee -a $LOGFILE + + if [ "$DOWNLOAD" = "y" ] + then + + echo -n "git clone git://gitorious.org/fgx/fgx.git ... " >> $LOGFILE + + if [ -d "fgx" ] + then + echo "fgx exists already." + else + git clone git://gitorious.org/fgx/fgx.git fgx + fi + + echo " OK" >> $LOGFILE + + fi + + cd fgx/ + + git branch -f $FGX_STABLE_GIT_BRANCH origin/$FGX_STABLE_GIT_BRANCH 2> /dev/null || true + git checkout -f $FGX_STABLE_GIT_BRANCH + git pull + + cd .. + + + cd fgx/src/ + + #Patch in order to pre-setting paths + cd resources/default/ + cp x_default.ini x_default.ini.orig + cat x_default.ini | sed s/\\/usr\\/bin\\/fgfs/INSTALL_DIR_FGXMY_SLASH_HERE..MY_SLASH_HEREfgfsMY_SLASH_HEREbinMY_SLASH_HEREfgfs/g > tmp1 + cat tmp1 | sed s/\\/usr\\/share\\/flightgear/INSTALL_DIR_FGXMY_SLASH_HERE..MY_SLASH_HEREfgfsMY_SLASH_HEREfgdata/g > tmp2 + cat tmp2 | sed s/\\/usr\\/bin\\/terrasync/INSTALL_DIR_FGXMY_SLASH_HERE..MY_SLASH_HEREfgfsMY_SLASH_HEREbinMY_SLASH_HEREterrasync/g > tmp3 + cat tmp3 | sed s/\\/usr\\/bin\\/fgcom/INSTALL_DIR_FGXMY_SLASH_HERE..MY_SLASH_HEREfgcomMY_SLASH_HEREbinMY_SLASH_HEREfgcom/g > tmp4 + cat tmp4 | sed s/\\/usr\\/bin\\/js_demo/INSTALL_DIR_FGXMY_SLASH_HERE..MY_SLASH_HEREfgfsMY_SLASH_HEREbinMY_SLASH_HEREjs_demo/g > tmp5 + + INSTALL_DIR_FGX_NO_SLASHS=$(echo "$INSTALL_DIR_FGX" | sed -e 's/\//MY_SLASH_HERE/g') + cat tmp5 | sed s/INSTALL_DIR_FGX/"$INSTALL_DIR_FGX_NO_SLASHS"/g > tmp + cat tmp | sed s/MY_SLASH_HERE/\\//g > x_default.ini + rm tmp* + + cd .. + + + if [ ! "$UPDATE" = "UPDATE" ] + then + if [ "$RECONFIGURE" = "y" ] + then + + echo -n "RECONFIGURE FGX ... " >> $LOGFILE + + mkdir -p $INSTALL_DIR_FGX + cd $INSTALL_DIR_FGX + + qmake ../../fgx/src + + echo " OK" >> $LOGFILE + fi + fi + + if [ "$COMPILE" = "y" ] + then + cd $INSTALL_DIR_FGX + echo "MAKE AND INSTALL FGX" >> $LOGFILE + echo "make $JOPTION $OOPTION " >> $LOGFILE + make $JOPTION $OOPTION | tee -a $LOGFILE + cd .. + fi + + cd "$CBD" + + SCRIPT=run_fgx.sh + echo "#!/bin/sh" > $SCRIPT + echo "cd \$(dirname \$0)" >> $SCRIPT + echo "cd $SUB_INSTALL_DIR" >> $SCRIPT + echo "p=\$(pwd)" >> $SCRIPT + echo "cd $FGX_INSTALL_DIR" >> $SCRIPT + echo "export LD_LIBRARY_PATH=\$p/plib/lib:\$p/OpenSceneGraph/lib:\$p/simgear/lib" >> $SCRIPT + echo "./fgx" >> $SCRIPT + chmod 755 $SCRIPT + +fi + + ####################################################### # FGRUN ####################################################### @@ -1028,10 +1232,39 @@ then FGCOM_STABLE_REVISION_=" -r $FGCOM_STABLE_REVISION" fi + echo -n "git://gitorious.org/fg/fgcom.git ... " >> $LOGFILE - echo -n "SVN FROM https://appfgcom.svn.sourceforge.net/svnroot/fgcom/trunk ... " >> $LOGFILE - svn $FGCOM_STABLE_REVISION_ co https://appfgcom.svn.sourceforge.net/svnroot/fgcom/trunk fgcom + if [ -d "fgcom" ] + then + echo "fgcom exists already." + else + git clone git://gitorious.org/fg/fgcom.git + fi + + cd fgcom + git fetch origin + if [ "$STABLE" = "STABLE" ] + then + # switch to stable branch + # create local stable branch, ignore errors if it exists + git branch -f $FGCOM_STABLE_FGOM_BRANCH origin/$FGCOM_STABLE_FGCOM_BRANCH 2> /dev/null || true + # switch to stable branch. No error is reported if we're already on the branch. + git checkout -f $FGCOM_STABLE_FGCOM_BRANCH + # get indicated stable version + git reset --hard $FGCOM_STABLE_REVISION + else + # switch to unstable branch + # create local unstable branch, ignore errors if it exists + git branch -f $FGCOM_UNSTABLE_GIT_BRANCH origin/$FGCOM_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 $FGCOM_UNSTABLE_GIT_BRANCH + # pull latest version from the unstable branch + git pull + fi + echo " OK" >> $LOGFILE + cd .. + @@ -1040,11 +1273,22 @@ then mv fgcom/iaxclient/lib/libiax2/src/iax_ok.c fgcom/iaxclient/lib/libiax2/src/iax.c fi - cd fgcom/src/ if [ "$RECONFIGURE" = "y" ] then - cp Makefile Makefile.original + cd "$CBD" + mkdir -p build/fgcom + + cd "$CBD"/build/fgcom + echo -n "RECONFIGURE FGCOM ... " >> $LOGFILE + rm -f CMakeCache.txt + cmake -D CMAKE_BUILD_TYPE="Release" -D "CMAKE_PREFIX_PATH=$INSTALL_DIR_PLIB;$INSTALL_DIR_SIMGEAR" -D "CMAKE_INSTALL_PREFIX:PATH=$INSTALL_DIR_FGCOM" "$CBD"/fgcom 2>&1 | tee -a $LOGFILE + + echo " OK" >> $LOGFILE + + cd "$CBD"/fgcom/src/ + + cp Makefile Makefile.original cat Makefile | sed s/\\//MY_SLASH_HERE/g > Makefile_NOSLASHES # 1 @@ -1084,17 +1328,18 @@ then fi + cd "$CBD"/build/fgcom mkdir -p "$INSTALL_DIR_FGCOM"/bin if [ "$COMPILE" = "y" ] then echo "MAKE FGCOM" >> $LOGFILE - echo "make $JOPTION $OOPTION" >> $LOGFILE - make $JOPTION $OOPTION 2>&1 | tee -a $LOGFILE - + echo "cmake --build . --config Release" >> $LOGFILE + cmake --build . --config Release 2>&1 | tee -a $LOGFILE + echo "INSTALL FGCOM" >> $LOGFILE - make install 2>&1 | tee -a $LOGFILE + cmake -DBUILD_TYPE=Release -P cmake_install.cmake 2>&1 | tee -a $LOGFILE fi cd "$CBD" From 73fac5dd6a741c88d4285dbb5566c2c542708faf Mon Sep 17 00:00:00 2001 From: ThorstenB <brehmt@gmail.com> Date: Tue, 27 Nov 2012 22:09:03 +0100 Subject: [PATCH 119/145] Francesco Brisa: d&c script update * fix OpenRTI support for simgear. * fix package management on debian 6.0 --- download_and_compile.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/download_and_compile.sh b/download_and_compile.sh index 28220b2..8b9f40c 100644 --- a/download_and_compile.sh +++ b/download_and_compile.sh @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -VERSION="1.8" +VERSION="1.9-4" #COMPILE GIT FGFS @@ -271,11 +271,11 @@ fi # default is hardy DISTRO_PACKAGES="libopenal-dev libalut-dev libalut0 libfltk1.3-dev libfltk1.3 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 libxft2 libxft-dev libxinerama1 libxinerama-dev" -UBUNTU_PACKAGES="freeglut3-dev libjpeg62-dev libjpeg62 libapr1-dev " -DEBIAN_PACKAGES="freeglut3-dev libjpeg8-dev libjpeg8 " +UBUNTU_PACKAGES="freeglut3-dev libjpeg62-dev libjpeg62 libapr1-dev libfltk1.3-dev libfltk1.3" +DEBIAN_PACKAGES="freeglut3-dev libjpeg8-dev libjpeg8 libfltk-dev libfltk1.1" # checking linux distro and version to differ needed packages -if [ "$DISTRIB_ID" = "Ubuntu" ] +if [ "$DISTRIB_ID" = "Ubuntu" -o "$DISTRIB_ID" = "LinuxMint" ] then echo "$DISTRIB_ID $DISTRIB_RELEASE" >> $LOGFILE DISTRO_PACKAGES="$DISTRO_PACKAGES $UBUNTU_PACKAGES" @@ -606,7 +606,7 @@ then cd "$CBD"/build/openrti echo -n "RECONFIGURE OPENRTI ... " >> $LOGFILE rm -f ../../openrti/openrti/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_OPENRTI" ../../openrti/openrti/ 2>&1 | tee -a $LOGFILE + cmake -D CMAKE_BUILD_TYPE="Release" -D CMAKE_CXX_FLAGS="-O3 -D__STDC_CONSTANT_MACROS" -D CMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_OPENRTI" ../../openrti/openrti/ 2>&1 | tee -a $LOGFILE echo " OK" >> $LOGFILE @@ -708,7 +708,7 @@ then cd "$CBD"/build/simgear echo -n "RECONFIGURE SIMGEAR ... " >> $LOGFILE rm -f ../../simgear/simgear/CMakeCache.txt - cmake -D CMAKE_BUILD_TYPE="Release" $WITH_OPENRTI -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 + cmake -D CMAKE_BUILD_TYPE="Release" $WITH_OPENRTI -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;$INSTALL_DIR_OPENRTI" ../../simgear/simgear/ 2>&1 | tee -a $LOGFILE echo " OK" >> $LOGFILE @@ -826,7 +826,7 @@ then #cp -f utils/fgadmin/src/CMakeLists_without_err.txt utils/fgadmin/src/CMakeLists.txt - cmake -D CMAKE_BUILD_TYPE="Release" $WITH_OPENRTI -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 + cmake -D CMAKE_BUILD_TYPE="Release" $WITH_OPENRTI -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;$INSTALL_DIR_OPENRTI" ../../fgfs/flightgear 2>&1 | tee -a $LOGFILE echo " OK" >> $LOGFILE From b60191638b87462aa58bf86af93a366c2c017fc8 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier <fredfgfs01@free.fr> Date: Fri, 30 Nov 2012 16:30:35 +0100 Subject: [PATCH 120/145] Bump fgmeta to latest next --- fgrun | 2 +- flightgear | 2 +- simgear | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fgrun b/fgrun index 611cdd1..36b766b 160000 --- a/fgrun +++ b/fgrun @@ -1 +1 @@ -Subproject commit 611cdd1661a7cfc1b76e0393eec831fa951c2753 +Subproject commit 36b766baa142ec11d85168fff36d50efdab40d0b diff --git a/flightgear b/flightgear index 0608367..f754474 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit 06083672573b525793300fd14e63df242c99248c +Subproject commit f7544744bbcd72bbebdfa922ca9b6307c9774e59 diff --git a/simgear b/simgear index b4c8b00..8816d0a 160000 --- a/simgear +++ b/simgear @@ -1 +1 @@ -Subproject commit b4c8b00c0e5b31db95f1e54ad5d62685386acd9e +Subproject commit 8816d0a9ac5c33c7c911714978c91f732dc0bb42 From 76abd56d61f612e8be0bb1baee32ee86e94db13b Mon Sep 17 00:00:00 2001 From: Frederic Bouvier <fredfgfs01@free.fr> Date: Fri, 30 Nov 2012 19:52:22 +0100 Subject: [PATCH 121/145] Build release with last Boost --- hudson_win_build32.bat | 6 +++--- hudson_win_build64.bat | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hudson_win_build32.bat b/hudson_win_build32.bat index 16b8bac..0b6b9a0 100644 --- a/hudson_win_build32.bat +++ b/hudson_win_build32.bat @@ -8,13 +8,13 @@ md build-sg md build-fg md build-fgrun cd build-sg -cmake ..\simgear -G "Visual Studio 10" -DMSVC_3RDPARTY_ROOT=%WORKSPACE% -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc100/SimGear +cmake ..\simgear -G "Visual Studio 10" -DMSVC_3RDPARTY_ROOT=%WORKSPACE% -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc100/SimGear -DBOOST_ROOT=%WORKSPACE%/Boost cmake --build . --config Release --target INSTALL 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 ..\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 -DBOOST_ROOT=%WORKSPACE%/Boost cmake --build . --config Release --target INSTALL cd ..\build-fgrun -cmake ..\fgrun -G "Visual Studio 10" -DMSVC_3RDPARTY_ROOT:PATH=%WORKSPACE% -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc100/FGRun -DFLTK_FLUID_EXECUTABLE:FILEPATH=%WORKSPACE%/3rdParty/bin/fluid.exe -DGETTEXT_MSGFMT_EXECUTABLE:FILEPATH=%WORKSPACE%/3rdParty/bin/msgfmt.exe -DGETTEXT_MSGMERGE_EXECUTABLE:FILEPATH=%WORKSPACE%/3rdParty/bin/msgmerge.exe +cmake ..\fgrun -G "Visual Studio 10" -DMSVC_3RDPARTY_ROOT:PATH=%WORKSPACE% -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc100/FGRun -DFLTK_FLUID_EXECUTABLE:FILEPATH=%WORKSPACE%/3rdParty/bin/fluid.exe -DGETTEXT_MSGFMT_EXECUTABLE:FILEPATH=%WORKSPACE%/3rdParty/bin/msgfmt.exe -DGETTEXT_MSGMERGE_EXECUTABLE:FILEPATH=%WORKSPACE%/3rdParty/bin/msgmerge.exe -DBOOST_ROOT=%WORKSPACE%/Boost cmake --build . --config Release --target INSTALL diff --git a/hudson_win_build64.bat b/hudson_win_build64.bat index fe2f20e..31cea0f 100644 --- a/hudson_win_build64.bat +++ b/hudson_win_build64.bat @@ -8,13 +8,13 @@ md build-sg64 md build-fg64 md build-fgrun64 cd build-sg64 -cmake ..\SimGear -G "Visual Studio 10 Win64" -DMSVC_3RDPARTY_ROOT=%WORKSPACE% -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc100-64/SimGear +cmake ..\SimGear -G "Visual Studio 10 Win64" -DMSVC_3RDPARTY_ROOT=%WORKSPACE% -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc100-64/SimGear -DBOOST_ROOT=%WORKSPACE%/Boost 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 ..\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 -DBOOST_ROOT=%WORKSPACE%/Boost cmake --build . --config Release --target INSTALL cd ..\build-fgrun64 -cmake ..\fgrun -G "Visual Studio 10 Win64" -DMSVC_3RDPARTY_ROOT:PATH=%WORKSPACE% -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc100-64/FGRun -DFLTK_FLUID_EXECUTABLE:FILEPATH=%WORKSPACE%/3rdParty/bin/fluid.exe -DGETTEXT_MSGFMT_EXECUTABLE:FILEPATH=%WORKSPACE%/3rdParty/bin/msgfmt.exe -DGETTEXT_MSGMERGE_EXECUTABLE:FILEPATH=%WORKSPACE%/3rdParty/bin/msgmerge.exe +cmake ..\fgrun -G "Visual Studio 10 Win64" -DMSVC_3RDPARTY_ROOT:PATH=%WORKSPACE% -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc100-64/FGRun -DFLTK_FLUID_EXECUTABLE:FILEPATH=%WORKSPACE%/3rdParty/bin/fluid.exe -DGETTEXT_MSGFMT_EXECUTABLE:FILEPATH=%WORKSPACE%/3rdParty/bin/msgfmt.exe -DGETTEXT_MSGMERGE_EXECUTABLE:FILEPATH=%WORKSPACE%/3rdParty/bin/msgmerge.exe -DBOOST_ROOT=%WORKSPACE%/Boost cmake --build . --config Release --target INSTALL From 24b0e27feef16bd8a26515335bc5792144abc604 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier <fredfgfs01@free.fr> Date: Tue, 4 Dec 2012 09:18:22 +0100 Subject: [PATCH 122/145] Fix the windows 64 release build --- hudson_win_build64.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hudson_win_build64.bat b/hudson_win_build64.bat index 31cea0f..b3f604a 100644 --- a/hudson_win_build64.bat +++ b/hudson_win_build64.bat @@ -12,7 +12,7 @@ cmake ..\SimGear -G "Visual Studio 10 Win64" -DMSVC_3RDPARTY_ROOT=%WORKSPACE% -D 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 -DBOOST_ROOT=%WORKSPACE%/Boost +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 -DBOOST_ROOT=%WORKSPACE%/Boost -DWITH_FGPANEL=OFF -DENABLE_PROFILE=OFF cmake --build . --config Release --target INSTALL cd ..\build-fgrun64 From 675d32f13743b2e261ecde3e43bf55a07b500578 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier <fredfgfs01@free.fr> Date: Tue, 4 Dec 2012 09:18:56 +0100 Subject: [PATCH 123/145] Update to latest sources --- flightgear | 2 +- simgear | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flightgear b/flightgear index f754474..fee2844 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit f7544744bbcd72bbebdfa922ca9b6307c9774e59 +Subproject commit fee2844ec30b4e4cc0190655ef8441b4aa072d96 diff --git a/simgear b/simgear index 8816d0a..e6e3e68 160000 --- a/simgear +++ b/simgear @@ -1 +1 @@ -Subproject commit 8816d0a9ac5c33c7c911714978c91f732dc0bb42 +Subproject commit e6e3e686c613d2072a9312905914633760634d7c From 2ffc2e2161d4d1ab42fe180b241717c6e255e8ee Mon Sep 17 00:00:00 2001 From: Frederic Bouvier <fredfgfs01@free.fr> Date: Thu, 20 Dec 2012 08:46:41 +0100 Subject: [PATCH 124/145] Bump fgmeta to latest sources --- fgrun | 2 +- flightgear | 2 +- simgear | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fgrun b/fgrun index 36b766b..ae0b0fe 160000 --- a/fgrun +++ b/fgrun @@ -1 +1 @@ -Subproject commit 36b766baa142ec11d85168fff36d50efdab40d0b +Subproject commit ae0b0fef3615a9a2d243da5b566ea3b221f7a6c2 diff --git a/flightgear b/flightgear index fee2844..3c6fbff 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit fee2844ec30b4e4cc0190655ef8441b4aa072d96 +Subproject commit 3c6fbffdf24a387d13a026891fe9f1edb940d6d4 diff --git a/simgear b/simgear index e6e3e68..c53fd5f 160000 --- a/simgear +++ b/simgear @@ -1 +1 @@ -Subproject commit e6e3e686c613d2072a9312905914633760634d7c +Subproject commit c53fd5fc9ac586b43dc037d10ef3bf3ebd80337e From e27bfc00cfd0ee2dbf2835d1cffcea1816ee7a88 Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Fri, 4 Jan 2013 10:40:43 +0000 Subject: [PATCH 125/145] Remove any references to ALUT from Mac build. --- hudson_mac_package_release.rb | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/hudson_mac_package_release.rb b/hudson_mac_package_release.rb index 1180f15..f57efe1 100755 --- a/hudson_mac_package_release.rb +++ b/hudson_mac_package_release.rb @@ -22,8 +22,6 @@ 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'] @@ -40,10 +38,6 @@ def fix_install_names(object) oldName = "libOpenThreads.#{$openThreadsSoVersion}.dylib" newName= "@executable_path/../Frameworks/#{oldName}" `install_name_tool -change #{oldName} #{newName} #{object}` - - alutBundlePath = "@executable_path/../Frameworks/ALUT.framework" - alutLib = "Versions/A/ALUT" - `install_name_tool -change #{$alutSourcePath}/#{alutLib} #{alutBundlePath}/#{alutLib} #{object}` end $prefixDir=Dir.pwd + "/dist" @@ -132,10 +126,6 @@ end copy_svn_libs() -# custom ALUT -# must copy frameworks using ditto -`ditto #{$alutSourcePath} #{$frameworksDir}/ALUT.framework` - # Macflightgear launcher puts "Copying Macflightgear launcher files" From 6380e284c2c2a9a709265f66053550277db910a9 Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Fri, 4 Jan 2013 10:43:24 +0000 Subject: [PATCH 126/145] Bump FG & SG to latest, testing release build. --- flightgear | 2 +- simgear | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flightgear b/flightgear index 3c6fbff..4873a28 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit 3c6fbffdf24a387d13a026891fe9f1edb940d6d4 +Subproject commit 4873a28e9721f637870f28b70e19d2c4b4647da3 diff --git a/simgear b/simgear index c53fd5f..724fba4 160000 --- a/simgear +++ b/simgear @@ -1 +1 @@ -Subproject commit c53fd5fc9ac586b43dc037d10ef3bf3ebd80337e +Subproject commit 724fba4af9ebdc6a684d6c4a47d4f6af2f31f386 From 4e9ab5aa80527469086d5fe8807c7baad21ff9aa Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Fri, 4 Jan 2013 12:06:26 +0000 Subject: [PATCH 127/145] Maclauncher: No 32-bit anymore! --- hudson_mac_build_release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hudson_mac_build_release.sh b/hudson_mac_build_release.sh index a9d1566..8b7592e 100755 --- a/hudson_mac_build_release.sh +++ b/hudson_mac_build_release.sh @@ -54,7 +54,7 @@ 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 \ +gcc -o FlightGear -mmacosx-version-min=$OSX_TARGET -isysroot $SDK_PATH main.m \ -framework Cocoa -framework RubyCocoa -framework Foundation -framework AppKit popd From bac9b55f06041a63ea16c02ae5b8de31e3549d60 Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Fri, 4 Jan 2013 14:37:55 +0000 Subject: [PATCH 128/145] Disable explicit SDK setting for Mac launcher. Setting an SDK is breaking, but since the build slave is running our lowest supported OS version anyway, we can live with the default setting. --- hudson_mac_build_release.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/hudson_mac_build_release.sh b/hudson_mac_build_release.sh index 8b7592e..ae2afac 100755 --- a/hudson_mac_build_release.sh +++ b/hudson_mac_build_release.sh @@ -49,12 +49,17 @@ chmod +x $WORKSPACE/dist/bin/osgversion ################################################################################ echo "Building Macflightgear launcher" -OSX_TARGET="10.6" +#OSX_TARGET="10.6" +# JMT - disabling setting the sysroot since it's breaking things on +# current build slave. Sinc ethe slave runs 10.6 natively, we don't +# actually need to set these. Real solution would be to use a proper +# build system for the Mac-launcher of course. +# -mmacosx-version-min=$OSX_TARGET -isysroot $SDK_PATH pushd maclauncher/FlightGearOSX # compile the stub executable -gcc -o FlightGear -mmacosx-version-min=$OSX_TARGET -isysroot $SDK_PATH main.m \ +gcc -o FlightGear main.m \ -framework Cocoa -framework RubyCocoa -framework Foundation -framework AppKit popd From 2c2c819a448191fb6e85af410afd1be9813587e4 Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Fri, 18 Jan 2013 13:17:41 +0000 Subject: [PATCH 129/145] Initial release-branch heads. --- fgrun | 2 +- flightgear | 2 +- maclauncher | 2 +- simgear | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fgrun b/fgrun index ae0b0fe..90e936c 160000 --- a/fgrun +++ b/fgrun @@ -1 +1 @@ -Subproject commit ae0b0fef3615a9a2d243da5b566ea3b221f7a6c2 +Subproject commit 90e936c01e28feac4a9c3e28d5227980fb8f1e1d diff --git a/flightgear b/flightgear index 4873a28..ea81903 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit 4873a28e9721f637870f28b70e19d2c4b4647da3 +Subproject commit ea81903f6707bb50a362bca64e005bf47f443a8c diff --git a/maclauncher b/maclauncher index 7ffef2c..3692e79 160000 --- a/maclauncher +++ b/maclauncher @@ -1 +1 @@ -Subproject commit 7ffef2cb26442578f3c4b1e22158feb1ad812367 +Subproject commit 3692e79f7dbc2c0d8a98a04da6ac55684185eb67 diff --git a/simgear b/simgear index 724fba4..ea8023e 160000 --- a/simgear +++ b/simgear @@ -1 +1 @@ -Subproject commit 724fba4af9ebdc6a684d6c4a47d4f6af2f31f386 +Subproject commit ea8023e51f17d2213d4f61548a91eb403e322656 From ecbee417b800f4a8dcde4506906789803df62aa4 Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Sat, 19 Jan 2013 16:28:58 +0000 Subject: [PATCH 130/145] Use 2.10.0 branch for maclauncher too. --- maclauncher | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maclauncher b/maclauncher index 3692e79..7ffef2c 160000 --- a/maclauncher +++ b/maclauncher @@ -1 +1 @@ -Subproject commit 3692e79f7dbc2c0d8a98a04da6ac55684185eb67 +Subproject commit 7ffef2cb26442578f3c4b1e22158feb1ad812367 From 24fd57edd3e77930b6cb81609bb2320876e63415 Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Sat, 19 Jan 2013 16:29:52 +0000 Subject: [PATCH 131/145] Bump to flightgear branch head. --- flightgear | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flightgear b/flightgear index ea81903..252b6cb 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit ea81903f6707bb50a362bca64e005bf47f443a8c +Subproject commit 252b6cbba16ebdcecf5d583318c1e0c9f8dd95ff From 60c95026ecff6f5da911c3c2d1cf9a5f55b4f822 Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Thu, 24 Jan 2013 11:38:12 +0100 Subject: [PATCH 132/145] Bump FlightGear version for release branch. --- flightgear | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flightgear b/flightgear index 252b6cb..1b7f4e0 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit 252b6cbba16ebdcecf5d583318c1e0c9f8dd95ff +Subproject commit 1b7f4e075377aa6a58ccffbb480da7c07b0e03f8 From df6ee9a21102685997801ec9b75058e322f934da Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Fri, 25 Jan 2013 13:18:11 +0100 Subject: [PATCH 133/145] One more bump of the fg release branch. --- flightgear | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flightgear b/flightgear index 1b7f4e0..c606177 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit 1b7f4e075377aa6a58ccffbb480da7c07b0e03f8 +Subproject commit c60617730957573e18f6e58e96b28709ddc3828f From 94ea65ec2e6c230c136c1f78731c7ce745becbd2 Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Mon, 28 Jan 2013 16:09:56 +0000 Subject: [PATCH 134/145] Build Mac release build with debugInfo. (Experimental, let's see if this helps testing) --- hudson_mac_build_release.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hudson_mac_build_release.sh b/hudson_mac_build_release.sh index ae2afac..8375ee5 100755 --- a/hudson_mac_build_release.sh +++ b/hudson_mac_build_release.sh @@ -21,7 +21,7 @@ pushd sgBuild cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -G Xcode ../simgear # compile -xcodebuild -configuration Release -target install build +xcodebuild -configuration RelWithDebInfo -target install build if [ $? -ne '0' ]; then echo "make simgear failed" @@ -35,7 +35,7 @@ echo "Starting on FlightGear" pushd fgBuild cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -G Xcode ../flightgear -xcodebuild -configuration Release -target install build +xcodebuild -configuration RelWithDebInfo -target install build if [ $? -ne '0' ]; then echo "make flightgear failed" From c2edd66b51b96afb7951b097593a2d5f7aef3d8a Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Mon, 28 Jan 2013 16:10:14 +0000 Subject: [PATCH 135/145] Updated Maclauncher version. --- maclauncher | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maclauncher b/maclauncher index 7ffef2c..05f4229 160000 --- a/maclauncher +++ b/maclauncher @@ -1 +1 @@ -Subproject commit 7ffef2cb26442578f3c4b1e22158feb1ad812367 +Subproject commit 05f42297d69911df04a95b9b72a74c674013843d From 91fdda387d869a25c5700a76ed857aa7687098af Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Mon, 28 Jan 2013 23:42:06 +0000 Subject: [PATCH 136/145] Bump to include Ati viewport hack. --- flightgear | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flightgear b/flightgear index c606177..4b7a17b 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit c60617730957573e18f6e58e96b28709ddc3828f +Subproject commit 4b7a17b16fa58e123ba3cf2704388f4f98506cdf From 55933a76217b13152f848109c89f9f7ff1ffa2b7 Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Wed, 30 Jan 2013 15:46:15 +0000 Subject: [PATCH 137/145] Include GetStart and Short-Ref PDFs in the DMG. Rather than hiding these inside the bundle, lift them up to a visible place. --- hudson_mac_package_release.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hudson_mac_package_release.rb b/hudson_mac_package_release.rb index f57efe1..2822250 100755 --- a/hudson_mac_package_release.rb +++ b/hudson_mac_package_release.rb @@ -150,6 +150,10 @@ File.open("#{contents}/Info.plist", 'w') { |f| `cp #{srcDir}/package/mac/FlightGear.icns #{resourcesDir}/FlightGear.icns` `cp #{srcDir}/COPYING #{dmgDir}` +# move documentation to a public place +`mv fgdata/Docs/FGShortRef.pdf #{dmgDir}` +`mv fgdata/Docs/getstart.pdf #{dmgDir}` + puts "Copying base package files into the image" `rsync -a fgdata/ #{resourcesDir}/data` From 33693907c33d76047246fc007dc57babab612479 Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Thu, 31 Jan 2013 09:26:45 +0000 Subject: [PATCH 138/145] Include the Options html file in the Mac DMG. --- hudson_mac_package_release.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hudson_mac_package_release.rb b/hudson_mac_package_release.rb index 2822250..324521b 100755 --- a/hudson_mac_package_release.rb +++ b/hudson_mac_package_release.rb @@ -131,7 +131,7 @@ puts "Copying Macflightgear launcher files" Dir.chdir "maclauncher/FlightGearOSX" do `cp FlightGear #{macosDir}` - `rsync -a *.rb *.lproj *.sh *.tiff #{resourcesDir}` + `rsync -a *.rb *.lproj *.sh *.tiff *.html #{resourcesDir}` end if File.exist?("#{$prefixDir}/bin/fgcom-data") From e72e6c5621540c06f9378520e1108959aae58919 Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Thu, 31 Jan 2013 14:02:02 +0000 Subject: [PATCH 139/145] Mac launcher tweaks. --- maclauncher | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maclauncher b/maclauncher index 05f4229..a2c9d0b 160000 --- a/maclauncher +++ b/maclauncher @@ -1 +1 @@ -Subproject commit 05f42297d69911df04a95b9b72a74c674013843d +Subproject commit a2c9d0b8d604afe63e416f5514ffdb29139e2259 From abe9cb809adffe29c009434e6fdfefa0863ee128 Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Thu, 31 Jan 2013 18:49:09 +0000 Subject: [PATCH 140/145] Bump to include Mac keypad fix. --- flightgear | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flightgear b/flightgear index 4b7a17b..a6aa279 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit 4b7a17b16fa58e123ba3cf2704388f4f98506cdf +Subproject commit a6aa2796012967e71c8cdcc0e0a1cff406ebaee1 From ace2336cdeafdc7d3aa7932860df83c000d108cf Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Fri, 1 Feb 2013 10:00:59 +0000 Subject: [PATCH 141/145] Fixed MSAA option in Mac launcher --- maclauncher | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maclauncher b/maclauncher index a2c9d0b..ad8c49d 160000 --- a/maclauncher +++ b/maclauncher @@ -1 +1 @@ -Subproject commit a2c9d0b8d604afe63e416f5514ffdb29139e2259 +Subproject commit ad8c49da2661ceb573652b8c5dc749a938b8e2ee From cf425684a6348820b49227cc185bf0ee1e5c966e Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Fri, 1 Feb 2013 14:45:30 +0000 Subject: [PATCH 142/145] DMG file naming tweaks. --- hudson_mac_package_release.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hudson_mac_package_release.rb b/hudson_mac_package_release.rb index 324521b..5a378b1 100755 --- a/hudson_mac_package_release.rb +++ b/hudson_mac_package_release.rb @@ -86,7 +86,7 @@ fgCurrentYear = t.year fgVersion = File.read("#{srcDir}/version").strip volName="\"FlightGear #{fgVersion}\"" -dmgPath = Dir.pwd + "/output/fg_mac_#{fgVersion}.dmg" +dmgPath = Dir.pwd + "/output/FlightGear-#{fgVersion}.dmg" puts "Creating directory structure" `mkdir -p #{macosDir}` @@ -151,8 +151,8 @@ File.open("#{contents}/Info.plist", 'w') { |f| `cp #{srcDir}/COPYING #{dmgDir}` # move documentation to a public place -`mv fgdata/Docs/FGShortRef.pdf #{dmgDir}` -`mv fgdata/Docs/getstart.pdf #{dmgDir}` +`mv fgdata/Docs/FGShortRef.pdf "#{dmgDir}/Quick Reference.pdf"` +`mv fgdata/Docs/getstart.pdf "#{dmgDir}/Getting Started.pdf"` puts "Copying base package files into the image" `rsync -a fgdata/ #{resourcesDir}/data` From bd19b4a2bd8fcce1685330446b75ee6de745983d Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Mon, 4 Feb 2013 08:40:44 +0000 Subject: [PATCH 143/145] Update for revised nav-cache rebuild. --- flightgear | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flightgear b/flightgear index a6aa279..b12f127 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit a6aa2796012967e71c8cdcc0e0a1cff406ebaee1 +Subproject commit b12f127c460e9b6515e015e06b3da7358bcb24c7 From 20fffd5b2eb0e93c215f1d226c0a3129cee503be Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Sat, 9 Feb 2013 10:34:26 +0000 Subject: [PATCH 144/145] Extend Linux release script: create base package. This uses the same tactic as Mac-release; a filtered rsync from the map server's git checkout. --- hudson_build_release.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/hudson_build_release.sh b/hudson_build_release.sh index 76c75bd..97ef1f6 100755 --- a/hudson_build_release.sh +++ b/hudson_build_release.sh @@ -5,6 +5,8 @@ if [ "$WORKSPACE" == "" ]; then exit 1 fi +VERSION=`cat flightgear/version` + ##################################################################################### # remove old and create fresh build directories rm -rf sgBuild @@ -53,3 +55,14 @@ make install make package_source cp flightgear-*.tar.bz2 ../output/. +##################################################################################### + +echo "Assembling base package" +cd $WORKSPACE + +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 . + +tar cjf output/FlightGear-$VERSION-data.tar.bz fgdata/ + From 9a02d6ecb7aeb7ec7d85b81ce9f514c3b1371240 Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Sat, 9 Feb 2013 11:04:50 +0000 Subject: [PATCH 145/145] Mac launcher tweaks for release. --- maclauncher | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maclauncher b/maclauncher index ad8c49d..7e6406f 160000 --- a/maclauncher +++ b/maclauncher @@ -1 +1 @@ -Subproject commit ad8c49da2661ceb573652b8c5dc749a938b8e2ee +Subproject commit 7e6406f35cebeb7bb7d060bc0adf9d07c7ca6525