Commit Graph
100 Commits
Author SHA1 Message Date
James Turner e50b26e537 Use libCurl for night / release builds. 2016-04-15 16:12:51 +01:00
James Turner 92b7ab1b09 Remove the old catalog-creation logic
- avoid confusing people by having both the old and new logic
  in the same place.
2016-01-14 10:32:57 -06:00
James Turner 99026272a1 Catalog-creation tweaks. 2016-01-14 10:30:34 -06:00
James Turner d930779381 Packaging updates 2016-01-13 19:47:13 -06:00
James Turner 141be1410a Fix adding of variants to catalog property-list 2016-01-03 19:49:54 -06:00
James Turner 5b1b01bb0f Don’t need MAKEOPTIONS
- we already set official MAKEFLAGs on the Jenkins slave.
2015-12-08 18:55:37 +00:00
James Turner 0c36cc3eef Use make instead of xcodebuild to compile Mac.
Xcode seems to be overriding the setting of min-macos-version,
which is causing 10.7 and 10.8 support to fail. See if using
make resolves this.
2015-12-08 18:40:02 +00:00
James Turner 3aacabdfd0 Catalog tag changes
- fix spelling of ‘Embraer’
- add airship feature type
2015-12-08 18:28:49 +00:00
James Turner 9d00aec7dd Tweak Qt-path setting for Mac nightly. 2015-11-15 00:11:25 +00:00
James Turner 6f54db6d76 Fix zip-name specification in packages 2015-09-27 23:15:44 -05:00
James Turner b11fae7f37 Fix paths inside created zips 2015-09-24 20:39:03 -05:00
James Turner 8823d89f42 Add ‘force’ option to update every package 2015-09-24 20:38:54 -05:00
James Turner c19096b0af Fixes to package generation tooling 2015-09-24 19:45:42 -05:00
James Turner d943076183 Adjust package IDs, use primary -set.xml
- previously directory name was used, but this caused problems
for aircraft with certain combinations of dir/-set.xml name
2015-09-20 09:20:43 -05:00
James Turner 955fa86000 Archive windows PDB files. 2015-09-04 08:34:05 +01:00
James Turner c67f750862 Archive PDB files inside the build script. 2015-09-02 11:41:49 +01:00
James Turner 5d112a90d4 Whoops, don’t block on user input.
/Q to rmdir avoids an ‘are you sure’ prompt
2015-09-02 11:38:50 +01:00
James Turner b75295f647 Fix nightly build uploads. 2015-09-02 11:35:06 +01:00
James Turner 4ac12095a6 Fix data destination on Windows
- ensures default path logic works.
2015-09-02 11:27:50 +01:00
James Turner deeeddbfbb Additional debug output from post_upload.py 2015-09-02 11:26:39 +01:00
James Turner e0504be7cf Mac release builds tweaks 2015-08-31 23:29:35 +01:00
James Turner 3c0683185f Post-upload tweaks to support RC builds. 2015-08-31 23:29:20 +01:00
James Turner 2d119001c6 Fix creation of nodes with existing index. 2015-08-03 17:59:41 -05:00
James Turner 479a175587 Support a global exclude file for zip creation. 2015-07-30 12:04:17 -05:00
James Turner f61ceb1293 Support a per-aircraft exclude file.
- needed to make the P51D not be crazy large.
2015-07-29 15:09:01 -05:00
James Turner d2cb130135 Fix existing catalog 2015-07-29 11:54:45 -07:00
James Turner bd453e4a3e Drive scan from SCM repos.
- reduces repetition in the config XML.
2015-07-28 15:26:00 -05:00
James Turner 80f7a7f2d3 Mirror URLs written correctly. 2015-07-27 22:39:32 -05:00
James Turner 78de3e4243 More control over updating SCM repos. 2015-07-27 21:45:55 -05:00
James Turner 565feadfa6 Support for multiple upload targets
- also option to update the SCM repo
2015-07-27 21:40:00 -05:00
James Turner 242c0f9172 Move PackageData to its own file. 2015-07-25 22:45:01 -05:00
James Turner 651482a0df Maintain catalog: argument parsing 2015-07-22 23:35:57 -04:00
James Turner f0fff6d16e Catalog creation work
- XML scanning works
- thumbnail extraction progressing
2015-07-18 15:30:20 -05:00
James Turner 8d1e9abcc9 Catalogs: Thumbnail extraction works. 2015-07-14 21:37:39 -05:00
James Turner 5944ad64d9 Improved bool parsing 2015-07-11 22:23:14 +01:00
James Turner cf1afee705 maintain catalog: Mirror URLs generated 2015-07-11 22:23:05 +01:00
James Turner 548de8bd2d OS-X: Adapt package script for @rpath
Since the Mac build sets @rpath correctly now, no longer
need to fix install names during package creation.
2015-07-11 21:48:24 +01:00
James Turner f390d16625 Ignore .pyc files 2015-07-11 21:47:38 +01:00
James Turner fbda7475f0 Maintain catalog script starting to work. 2015-07-11 21:47:13 +01:00
James Turner 287380d98d Work on catalog creation. 2015-06-04 22:09:46 +01:00
James Turner 0c3bf73b01 Refresh superbuild
- remove FGRun
- remove Windows-3rd-party-dep download
- disable OpenRTI for now
- Pull OSG from Git
- Don't build Boost on Mac
2015-05-06 21:38:07 +01:00
James Turner d4890af978 Missed add of submodule dir
- thanks to Alessandro Menti for catching
2015-04-06 09:32:39 +01:00
James Turner c2ef0ba2dc Add windows 3rd party repo as a submodule 2015-04-03 10:52:29 +01:00
James Turner fae026da99 Post-upload script for Mac & Win
Runs on download.flightgear.org, as part of the SFTP upload step of
the Jenkins jobs, to deal with changing version, creation of symlinks
and mirroring to SourceForge.
2015-03-23 11:36:39 -05:00
James Turner e80520c9ac Initial hacking on a post-upload script.
- this will live on download.flightgear.org, but adding
here so it can be maintained visibly.
2015-03-11 17:48:33 +00:00
James Turner 1758cee3f3 Remove old data rsync code. 2015-03-09 16:35:18 +00:00
James Turner 444d6be8ad Mac nightly creates full and lite DMGs. 2015-03-08 01:01:03 +00:00
James Turner e3d55cf136 Fix nightly build rsync source.
Rsync can’t rename the root folder, so moved things on Sphere into
a subdirectory.
2015-02-28 11:42:36 +00:00
James Turner e57f5f761c Use correct FGData branch for nightlies. 2015-02-24 12:56:22 +00:00
James Turner c68585096d Setup submodule branch tracking.
(Maybe already done by Clement but making sure)
2015-02-24 11:53:36 +00:00
James Turner 0856c9827f Remove maclauncher submodule 2015-02-24 11:50:53 +00:00
James Turner a54e3c43cb Tweaks for nightly build packaging 2015-02-24 11:47:15 +00:00
James Turner 7c6278a7ff Fix Info.plist template 2015-02-24 11:44:05 +00:00
James Turner cb1819693d Code-signing v2 2015-02-24 11:43:51 +00:00
James Turner c09266504a Revised Mac package script 2015-02-24 11:41:58 +00:00
James Turner 3f2d05e183 Remove old Mac launcher. 2015-02-24 11:39:55 +00:00
James Turner cc7bc8fdbf Fixes for tag extraction in catalog building. 2014-10-18 11:37:43 +01:00
James Turner 8e52a6a247 Catalog creation tweaks:
- add file-size-bytes
- cache zips locally for MD5 generation
- audit tags against known list
2014-06-12 10:34:31 +01:00
James Turner 6109e8717d catalog: filename / md5 fixes.
- script downloads every zip now, so run with care.
2014-06-01 22:44:35 +01:00
James Turner 4abdf82598 Closer to working catalog creation. 2014-06-01 20:45:41 +01:00
James Turner 1ab162d4d6 Hacking on catalog-creation script.
Only appropriate for official FlightGear aircraft right now, needs
additional work to be useful for other hangars.
2014-06-01 15:44:52 +01:00
James Turner 9d1862e591 Bug 1344 - remove old files from base package
- pass '--delete' to rsync so files removed from the source
tree are also removed on the destination side.
2014-03-28 08:06:21 +00:00
James Turner 70ee8107b1 Update to v1.9.14 of the script
(same version as on master now)
2014-03-04 09:10:52 +00:00
James Turner f98529dbce Bump submodule revisions. 2014-01-04 16:19:21 +00:00
James Turner 2e4f0171eb Updated download_and_compile script.
From Pat Callahan.
2014-01-04 16:16:57 +00:00
James Turner fe39e97c2e Bump for FGRun windows fixes 2013-12-02 22:03:40 +00:00
James Turner 5f94a6d623 Superbuild tweaks
- fix download/configure of Boost on Windows
- attempt to use custom build steps to fix re-builds.
2013-12-02 22:02:24 +00:00
James Turner 0a81018df9 Sync download&compile
Copy from master -> next since next is the new default branch.
2013-11-24 21:57:21 +00:00
James Turner 784a595e82 Updated maclauncher SHA 2013-11-24 21:55:06 +00:00
James Turner 95d0692b0e Keep Windows script in sync with new data name. 2013-11-22 22:48:56 +01:00
James Turner af9a7e9bd2 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-11-22 22:48:41 +01:00
James Turner 3378b289aa Bump to latest SG+FG 2013-10-30 14:52:36 +00: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
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