fgmeta

Author	SHA1	Message	Date
James Turner	b6bcaaa36d	Update from Pat: First time users of the script on ubuntu will find an error when the script attempts to install packages using su instead of sudo.	2014-03-04 09:09:52 +00:00
James Turner	1026e75f7c	Download_and_compile 1.9.14 1. Version bump for 2.99.9 now 3.0.0 2. changed logging to log entire output of a sub-process rather than write individual lines of output to a logfile. 3. logs are versioned. 4. fix to support a change in fgdata version when fgdata is a symlink 5. Automatic j option # of cores + 1 6. fixed stable fgrun build 7. stable is now 2.12.0 for fgfs & simgear, 2.12.1 for fgdata 8. fixed broken stable build for 2.12.0 9. Added section on setup 10. once built, unless specifically requested by parameter OSG or PLIB: Don't rebuild OSG or plib Don't update OSG or plib sources 12. self testing with ./download_and_compile.sh test. this will build 2.12.0, stable, master, next, 3.0.0 in sub-directories under the one containing ./download_and_compile.sh if doing this test it is highly recommended that you create a directory "othersrc" in the same directory as download_and_compile.sh. You may also want to place a recent copy of fgdata in both ../fgdata_3.0.0 and fgdata_2.12.1 usage: ./download_and_compile.sh test reset You had better have lots of disk space free. and plenty of time as it will download a copy of fgdata for each version if you don't provide one.	2014-01-29 14:23:24 +00:00
James Turner	d3955a4e2c	Merge branch 'refs/heads/next'	2014-01-04 16:26:56 +00:00
Clément de l'Hamaide	636548111e	FG-Win-installer: add FGCom installation	2013-10-31 22:52:42 +01:00
Clément de l'Hamaide	6a0c88934f	build-mac-release: use new FGCom	2013-10-25 15:42:41 +02:00
James Turner	811d421382	Tweak data file name (.tar.bz to .tar.bz2) This simplifies life for the upload step which only needs to deal with one file suffix, not two.	2013-10-24 08:40:07 +01:00
James Turner	871236a9de	Use different InnoSetup compiler. (Hopefully this one reports errors to stdout instead of a GUI)	2013-10-24 08:40:07 +01:00
James Turner	51b9e61667	Make OpenThreads SO number dynamic.	2013-10-24 08:40:07 +01:00
James Turner	f4fc5a3a58	Add data package extraction to Windows script	2013-10-24 08:40:07 +01:00
James Turner	3d0dce4a11	Bump FGRun version to master.	2013-10-24 08:40:07 +01:00
James Turner	b493681787	Use Boost from Jenkins, on Windows.	2013-10-24 08:40:07 +01:00
James Turner	75815ca5bc	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-10-24 08:40:07 +01:00
James Turner	fecaccdb8e	Catalog XML creation basically works. Still need to write <aircraft> entries.	2013-10-24 08:40:07 +01:00
James Turner	b59449aa63	XML write-out improving. Use existing catalog for static data, revision counting.	2013-10-24 08:40:07 +01:00
James Turner	ac4189b12b	Metabuild starting to work on Windows	2013-10-24 08:40:07 +01:00
James Turner	6d8aadb35f	SuperBuild tweaks	2013-10-24 08:40:07 +01:00
James Turner	5405da6e3f	RTI support	2013-10-24 08:40:07 +01:00
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
Pat	06df73928f	Version 1.9.11 approved by Francesco Brisa	2013-08-01 13:31:43 +01:00

7 changed files with 648 additions and 414 deletions

4

.gitmodules vendored

View File

 [submodule "simgear"]
 	path = simgear
 	url = git://gitorious.org/fg/simgear.git
-	branch = next
 [submodule "flightgear"]
 	path = flightgear
 	url = git://gitorious.org/fg/flightgear.git
-	branch = next
 [submodule "fgrun"]
 	path = fgrun
 	url = git://gitorious.org/fg/fgrun.git
-	branch = next
 [submodule "maclauncher"]
 	path = maclauncher
 	url = git://gitorious.org/fg/maclauncher.git
-	branch = master

1046

download_and_compile.sh

View File

File diff suppressed because it is too large Load Diff

2

fgrun

Submodule fgrun updated: 89385a013d...b82da6b7d7

2

flightgear

Submodule flightgear updated: 9e773e85f8...b12f127c46

									
										4

hudson_mac_package_release.rb
									
												View File
												
					@@ -134,9 +134,9 @@ Dir.chdir "maclauncher/FlightGearOSX" do

					  `rsync -a *.rb *.lproj *.sh *.tiff *.html #{resourcesDir}`

					  `rsync -a *.rb *.lproj *.sh *.tiff *.html #{resourcesDir}`

					end

					end

					if File.exist?("#{$prefixDir}/bin/fgcom-data")

					if File.exist?("#{$prefixDir}/share/flightgear")

					  puts "Copying FGCom data files"

					  puts "Copying FGCom data files"

					  `ditto #{$prefixDir}/bin/fgcom-data #{resourcesDir}/fgcom-data`

					  `ditto #{$prefixDir}/share/flightgear #{resourcesDir}`

					end

					end

					# Info.plist

					# Info.plist

2

maclauncher

Submodule maclauncher updated: bc7f928dc9...7e6406f35c

2

simgear

Submodule simgear updated: c6330b64f6...ea8023e51f

Compare commits

34 Commits

release/20 ... master

4

.gitmodules vendored

View File

1046

download_and_compile.sh

View File

2

fgrun

2

flightgear

4

hudson_mac_package_release.rb

View File

2

maclauncher

2

simgear

Compare commits

34 Commits release/20 ... master

4 .gitmodules vendored Unescape Escape View File

1046 download_and_compile.sh View File

2 fgrun

2 flightgear

4 hudson_mac_package_release.rb Unescape Escape View File

2 maclauncher

2 simgear

34 Commits

release/20 ... master

4

.gitmodules vendored

View File

1046

download_and_compile.sh

View File

2

fgrun

2

flightgear

4

hudson_mac_package_release.rb

View File

2

maclauncher

2

simgear