20,741
edits
TerraGear compilation - Ubuntu 14.04: Difference between revisions
Jump to navigation
Jump to search
→How to proceed
(https://forum.flightgear.org/viewtopic.php?f=45&t=32458) |
|||
| Line 20: | Line 20: | ||
1. get into our terragear repository | 1. get into our terragear repository | ||
<syntaxhighlight lang="bash"> | |||
cd ~/flightgear-dev/next/terragear | cd ~/flightgear-dev/next/terragear | ||
</syntaxhighlight> | |||
2. make sure we're on the terragear scenery/ws2.0 branch | 2. make sure we're on the terragear scenery/ws2.0 branch | ||
<syntaxhighlight lang="bash"> | |||
git checkout scenery/ws2.0 | git checkout scenery/ws2.0 | ||
</syntaxhighlight> | |||
3. make sure we've done the reset | 3. make sure we've done the reset | ||
<syntaxhighlight lang="bash"> | |||
git reset --hard 082ee9b82f15c8067183925a2ce48da817fa3748 | git reset --hard 082ee9b82f15c8067183925a2ce48da817fa3748 | ||
</syntaxhighlight> | |||
4. create and checkout a new branch for us to use | 4. create and checkout a new branch for us to use | ||
<syntaxhighlight lang="bash"> | |||
git checkout -b oldgdal scenery/ws2.0 | git checkout -b oldgdal scenery/ws2.0 | ||
</syntaxhighlight> | |||
5. now it is time to go cherry-picking | 5. now it is time to go cherry-picking | ||
<syntaxhighlight lang="bash"> | |||
git cherry-pick 0bb5df8d4d9e67a99b2afe27f53d90592ac97674 | git cherry-pick 0bb5df8d4d9e67a99b2afe27f53d90592ac97674 | ||
git cherry-pick ac460f92259629d222aee2411319327c736fe967 | git cherry-pick ac460f92259629d222aee2411319327c736fe967 | ||
| Line 40: | Line 50: | ||
git cherry-pick cf5fcfc6c05d5e76918bb5c9e2d371a1e1d0fe3a | git cherry-pick cf5fcfc6c05d5e76918bb5c9e2d371a1e1d0fe3a | ||
git cherry-pick 95a34ae32abe60af89c2aace6bb28a65279d7e1c | git cherry-pick 95a34ae32abe60af89c2aace6bb28a65279d7e1c | ||
</syntaxhighlight> | |||
'''NOTE: if you've modified your download_and_compile.sh script to force the above mentioned reset we'll be commenting that out in the next step... if you mess up or otherwise reset in this branch, you have to cherry-pick again so don't do that!''' ;) | '''NOTE: if you've modified your download_and_compile.sh script to force the above mentioned reset we'll be commenting that out in the next step... if you mess up or otherwise reset in this branch, you have to cherry-pick again so don't do that!''' ;) | ||
| Line 123: | Line 134: | ||
that should do it... when download_and_compile.sh finishes, you should have a nice shiny set of terragear tools that you can play with building scenery... remember, this uses your old GDAL v1.17 so none of the newer code specific to GDAL stuff will be able to be used... future updates to this terragear will also have to be cherry-picked or hand-written... | that should do it... when download_and_compile.sh finishes, you should have a nice shiny set of terragear tools that you can play with building scenery... remember, this uses your old GDAL v1.17 so none of the newer code specific to GDAL stuff will be able to be used... future updates to this terragear will also have to be cherry-picked or hand-written... | ||
== References == | == References == | ||
{{Appendix}} | {{Appendix}} | ||