Bugfix: Out of place build settings files in stand alone builds.

The regular files are being included in the stand alone builds.
This is confusing and can lead to build failures due to selecting invalid build settings files.

Remove the build settings files that must not exist in stand alone builds.

diff --git a/build/scripts/package.sh b/build/scripts/package.sh
index 205313d9d073881cce0db7e8620188159a957fc6..5e855b83d948fd2432006f7a915b261eff8af04d 100644 (file)
--- a/build/scripts/package.sh
+++ b/build/scripts/package.sh
@@ -2191,6 +2191,20 @@ package_operation_stand_alone() {
       break
     fi
 
+    # Clear out any build settings to ensure non-stand_alone build settings do not exist.
+
+    rm ${verbose_common} -f ${package}data/build/settings*
+
+    if [[ ${?} -ne 0 ]] ; then
+      if [[ ${verbosity} != "quiet" ]] ; then
+        echo -e "${c_error}ERROR: Failed to remove existing build settings ${c_notice}${package}data/build/settings*${c_error}.${c_reset}"
+      fi
+
+      let failure=1
+
+      break
+    fi
+
     cp ${verbose_common} -R ${path_build}stand_alone/${name}.settings ${package}data/build/settings
 
     if [[ ${?} -ne 0 ]] ; then