Don’t wipe dist when building, since we need it

OpenSceneGraph is copied into dist, don’t blank it.
set correct release-branch for submodules
2017-11-17 14:27:14 +00:00 · 2017-09-17 12:14:09 +02:00
2 changed files with 4 additions and 5 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,11 +1,11 @@
 [submodule "simgear"]
 	path = simgear
 	url = https://git.code.sf.net/p/flightgear/simgear
-	branch = next
+	branch = release/2017.3
 [submodule "flightgear"]
 	path = flightgear
 	url = https://git.code.sf.net/p/flightgear/flightgear
-	branch = next
+	branch = release/2017.3
 [submodule "fgrun"]
 	path = fgrun
 	url = https://git.code.sf.net/p/flightgear/fgrun
@ -13,7 +13,7 @@
 [submodule "fgdata"]
 	path = fgdata
 	url = git://git.code.sf.net/p/flightgear/fgdata
-	branch = next
+	branch = release/2017.3
 [submodule "windows-3rd-party"]
 	path = windows-3rd-party
 	url = https://git.code.sf.net/p/flightgear/windows-3rd-party
@ -21,4 +21,4 @@
 [submodule "getstart"]
 	path = getstart
 	url = https://git.code.sf.net/p/flightgear/getstart
-	branch = next
+	branch = release/2017.3
--- a/build_release_linux.sh
+++ b/build_release_linux.sh
@ -14,7 +14,6 @@ mkdir -p sgBuild
 mkdir -p fgBuild
 mkdir -p output
 rm -rf output/*
-rm -rf dist/*

 #####################################################################################
 echo "Starting on SimGear"
Author	SHA1	Message	Date
James Turner	089bcff15f	Don’t wipe dist when building, since we need it OpenSceneGraph is copied into dist, don’t blank it.	2017-11-17 14:27:14 +00:00
Torsten Dreyer	01913242b0	set correct release-branch for submodules	2017-09-17 12:14:09 +02:00