274 Commits

Author SHA1 Message Date
James Turner
3b41a1f8dc SuperBuild file 2013-10-24 08:40:07 +01:00
James Turner
32c5b8819a Work-in-progress on Python script to create catalog.xml
Script to generate tarballs and serve directory from an Aircraft folder. Includes
thumbnail extraction, MD5 creation, tarball creation and -set.xml parsing, but
still some further work to be done.
2013-10-24 08:40:07 +01:00
James Turner
091c466b9e Mac launcher tweaks for release. 2013-10-24 08:40:07 +01:00
James Turner
286253fda4 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.
2013-10-24 08:40:07 +01:00
James Turner
c97c439db7 DMG file naming tweaks. 2013-10-24 08:40:03 +01:00
James Turner
822926bcaa Fixed MSAA option in Mac launcher 2013-10-24 08:40:03 +01:00
James Turner
037176fb72 Mac launcher tweaks. 2013-10-24 08:39:59 +01:00
James Turner
c8afb19ce6 Include the Options html file in the Mac DMG. 2013-10-24 08:39:59 +01:00
James Turner
66b389f011 Include GetStart and Short-Ref PDFs in the DMG.
Rather than hiding these inside the bundle, lift them up to a visible place.
2013-10-24 08:39:59 +01:00
James Turner
b04de947a8 Bump to include Ati viewport hack. 2013-10-24 08:39:59 +01:00
James Turner
5014a47ead Updated Maclauncher version. 2013-10-24 08:39:59 +01:00
James Turner
00bbc6cea7 Build Mac release build with debugInfo.
(Experimental, let's see if this helps testing)
2013-10-24 08:39:58 +01:00
James Turner
e1ff3e5f69 Use 2.10.0 branch for maclauncher too. 2013-10-24 08:39:52 +01:00
James Turner
3ebf7b6286 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.
2013-10-24 08:39:45 +01:00
James Turner
f8046e65ec Maclauncher: No 32-bit anymore! 2013-10-24 08:31:00 +01:00
Pat
36e9b1d4f3 Version 1.9.12
1. Added the output of a rebuild command to facilitate
   rerunning with The same parameters.

   usage: chmod +x rebuild
          ./rebuild

2. Removed FGCOMGUI from the all build due to its failure to build
   at least on Ubuntu 13.04

3. Added options

   -B branch
   -R revision

   usage:  -B master -R HEAD
           -B next   -R HEAD
	   -B 2.10.0 -R HEAD
	   -B 2.12.0 -R HEAD

   other entries are possibl -R defaults to HEAD, but can also be a commit #
   or a tag name

4. OSG Version option -G

   usage:

	-G 3.0.1 (default)
	-G 3.1.9
        -G 3.1.9d (debug build for osg - untested)

5. Stop after building one module

   This was added to facilitate testing.

   usage: -z

6. Enable Flightgear 2.10.0 as stable

   usage: -s

7. Add optional build for OPENRADAR

   usage:

   ./download_and_compile.sh OPENRADAR

   untested

8. Echo compile bash variable values to terminal and logfile

9. add patches for fltk libraries on Ubuntu 13.04

10. Sets the window title at each step

11. Initial support for keeping multiple versions of fgdata

    To do this, create directories in the parent of where you are building:

    fgdata_2.10.0
    fgdata_2.12.0
    fgdata_2.99.9

    move a copy of ANY fgdata git clone into all three

    the next initial build of a given version will set the corresponding
    fgdata to the right version.

    to use these, set up a symbolic link to fgdata_x from install/fgfs/fgdata

12. Added output to an additonal log: download_and_compile.log

    The log contains only a record of starting each component build
    and the end of the build.

    Fun fact:  OSG builds in about 4 minutes using -j 9
               on an i7 4770k with 16gb memory

    ../download_and_compile.sh -xvp n -j 9 -B 2.12.0 ALL
    cat download_and_compile.log
../download_and_compile.sh -xvp n -j 9 -B 2.12.0 ALL
		started building in /home/pac1/work/fg/test-gits/team-master/2.12.0
		        at Tue Aug 27 22:43:17 EDT 2013
		finished at Tue Aug 27 22:56:04 EDT 2013

Version 1.9.12-pre5  5th pre-release version of 1.9.12
function write_log() added.
	write_log writes summary information to sysout and a summary log file
	the function is added as a preview of changes to the logging for the script
function SET_WINDOW_TITLE()
	changes the window title to indicate what is being built.
function check_build()
	writes to the summary log a list of what was found as executables after a build.
outputs a rebuild command
	the rebuild command can be used to re-execute the same build without entry of options or parameters.

removes fgcomgui from the list of modules built when ALL is specified

STOP_AFTER_ONE_MODULE
Adds options z, B, R and G

option z will set this so that only one module will be built, and then the script
will immediately stop.  This is useful during testing of the script.

Option B allows the build of a specific branch. Without the R option it will build the head of the branch.
option R allows the build of a specific revision or commit.
Option G allows selection of a specific version of OpenSceneGraph.

This version introduces the use of a bash associative array to select branch and version for building.

patches allow building with fltk under Ubuntu 13.04

Open radar has been added
2013-10-24 08:20:27 +01:00
James Turner
8fe9281692 Update superbuild
- remove libSvn
- compile Boost ourselves on Windows
- tweak OSG detection
2013-10-21 22:19:45 +01:00
James Turner
5610f352af Use OSG 3.2 for superbuild.
Bump to current FG+SG head revisions on next
2013-09-15 22:04:58 +01:00
James Turner
19e9e62ba6 Add data package extraction to Windows script 2013-08-28 13:12:14 +01:00
Pat
75f1a35520 Version 1.9.12 see release notes on
http://wiki.flightgear.org/Scripted_Compilation_on_Linux_Debian/Ubuntu
2013-08-01 13:32:32 +01:00
Pat
06df73928f Version 1.9.11 approved by Francesco Brisa 2013-08-01 13:31:43 +01:00
Pat
1e183ed9de Cumulative Changes from versions 1.9.5 through 1.9.10
Changes 1.9.5 through 1.9.10
Multiple changes restructuring parts of the script
FGRUN added to ALL list
Regular expression used to determine if a component is to be built
OPENRTI added

Fixes and changes in 1.9.10
url for plib has / at the end to prevent problems with svn
url for osg has been updated to http://svn.openscenegraph.org/osg/OpenSceneGraph/tags/OpenSceneGraph-3.0.1/
x and v options added to aid in script debugging
w option added to aid in cmake debugging
2013-06-15 12:38:49 +01:00
James Turner
8f53e02e26 Bump to latest 'next' heads. 2013-03-28 11:11:24 +00:00
James Turner
19705077f5 Bump to latest fg+sg 2013-03-10 15:10:15 +00:00
James Turner
5e82468203 Use Boost from Jenkins, on Windows. 2013-03-06 12:38:22 +00:00
James Turner
40b0daec9f Bump SG+FG versions. 2013-03-03 16:09:41 +00:00
James Turner
9019d3c49c More Super-build tweaks.
Download and extract libsvn files on Mac, and enable RTI on non-Windows builds. Factor dependencies so they work for all platforms.
2013-03-01 17:55:55 +00:00
James Turner
530e41f1b0 Catalog XML creation basically works.
Still need to write <aircraft> entries.
2013-03-01 16:34:50 +00:00
James Turner
c20802b84f XML write-out improving.
Use existing catalog for static data, revision counting.
2013-03-01 16:34:49 +00:00
James Turner
b4b5f665c1 Metabuild starting to work on Windows 2013-03-01 16:26:38 +00:00
James Turner
e5f6218be9 SuperBuild tweaks 2013-02-24 21:14:08 +00:00
James Turner
3c32c48955 RTI support 2013-02-21 14:21:26 +00:00
James Turner
8fc045b409 Latest SG+FG 2013-02-21 11:08:06 +00:00
James Turner
ecd1537a61 SuperBuild file 2013-02-21 11:06:29 +00:00
James Turner
82fedc7362 Work-in-progress on Python script to create catalog.xml
Script to generate tarballs and serve directory from an Aircraft folder. Includes
thumbnail extraction, MD5 creation, tarball creation and -set.xml parsing, but
still some further work to be done.
2013-02-17 17:19:57 +00:00
James Turner
958a9ac2ba Merge branch 'refs/heads/release/2.10.0' into next 2013-02-17 12:02:25 +00:00
James Turner
9a02d6ecb7 Mac launcher tweaks for release. 2013-02-09 11:04:50 +00:00
James Turner
20fffd5b2e 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.
2013-02-09 10:34:26 +00:00
James Turner
bd19b4a2bd Update for revised nav-cache rebuild. 2013-02-04 08:40:44 +00:00
James Turner
cf425684a6 DMG file naming tweaks. 2013-02-01 14:45:30 +00:00
James Turner
ace2336cde Fixed MSAA option in Mac launcher 2013-02-01 10:00:59 +00:00
James Turner
abe9cb809a Bump to include Mac keypad fix. 2013-01-31 18:49:09 +00:00
James Turner
e72e6c5621 Mac launcher tweaks. 2013-01-31 14:02:02 +00:00
James Turner
33693907c3 Include the Options html file in the Mac DMG. 2013-01-31 09:26:45 +00:00
James Turner
55933a7621 Include GetStart and Short-Ref PDFs in the DMG.
Rather than hiding these inside the bundle, lift them up to a visible place.
2013-01-30 15:46:15 +00:00
James Turner
91fdda387d Bump to include Ati viewport hack. 2013-01-28 23:42:06 +00:00
James Turner
c2edd66b51 Updated Maclauncher version. 2013-01-28 16:14:16 +00:00
James Turner
94ea65ec2e Build Mac release build with debugInfo.
(Experimental, let's see if this helps testing)
2013-01-28 16:14:16 +00:00
James Turner
df6ee9a211 One more bump of the fg release branch. 2013-01-25 13:18:11 +01:00
James Turner
60c95026ec Bump FlightGear version for release branch. 2013-01-24 11:38:12 +01:00