prepare v0.10.0-12

ilg-deprecated · Apr 22, 2019 · 0b616e6 · 0b616e6
1 parent ef142b7
commit 0b616e6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,9 +1,9 @@
 
 The changes applied to the OpenOCD master branch, and the releases, are:
 
-[2019-04-09]
+[2019-04-23]
 
-- v0.10.0-12-20190422 released
+- v0.10.0-12-20190423 released
 
 [2019-04-09]
 

diff --git a/scripts/container-app-functions-source.sh → scripts/container-apps-functions-source.sh b/scripts/container-app-functions-source.sh → scripts/container-apps-functions-source.sh
@@ -350,7 +350,7 @@ function strip_binaries()
 
 # -----------------------------------------------------------------------------
 
-function copy_gme_files()
+function copy_distro_files()
 {
   (
     xbb_activate

diff --git a/scripts/container-build.sh b/scripts/container-build.sh
@@ -73,7 +73,7 @@ container_libs_functions_script_path="${script_folder_path}/${CONTAINER_LIBS_FUN
 echo "Container libs functions source script: \"${container_libs_functions_script_path}\"."
 source "${container_libs_functions_script_path}"
 
-container_app_functions_script_path="${script_folder_path}/${CONTAINER_APP_FUNCTIONS_SCRIPT_NAME}"
+container_app_functions_script_path="${script_folder_path}/${CONTAINER_APPS_FUNCTIONS_SCRIPT_NAME}"
 echo "Container app functions source script: \"${container_app_functions_script_path}\"."
 source "${container_app_functions_script_path}"
 
@@ -360,7 +360,9 @@ run_openocd
 
 # -----------------------------------------------------------------------------
 
-copy_gme_files
+check_binaries
+
+copy_distro_files
 
 create_archive
 

diff --git a/scripts/defs-source.sh b/scripts/defs-source.sh
@@ -27,10 +27,13 @@ APP_EXECUTABLE_NAME=${APP_EXECUTABLE_NAME:-"openocd"}
 DISTRO_UC_NAME=${DISTRO_UC_NAME:-"GNU MCU Eclipse"}
 DISTRO_LC_NAME=${DISTRO_LC_NAME:-"gnu-mcu-eclipse"}
 
+# TODO: remove it.
+DISTRO_INFO_NAME=${DISTRO_INFO_NAME:-"${DISTRO_LC_NAME}"}
+
 BRANDING=${BRANDING:-"${DISTRO_UC_NAME} OpenOCD"}
 
 CONTAINER_SCRIPT_NAME=${CONTAINER_SCRIPT_NAME:-"container-build.sh"}
 CONTAINER_LIBS_FUNCTIONS_SCRIPT_NAME=${CONTAINER_LIBS_FUNCTIONS_SCRIPT_NAME:-"container-libs-functions-source.sh"}
-CONTAINER_APP_FUNCTIONS_SCRIPT_NAME=${CONTAINER_APP_FUNCTIONS_SCRIPT_NAME:-"container-app-functions-source.sh"}
+CONTAINER_APPS_FUNCTIONS_SCRIPT_NAME=${CONTAINER_APPS_FUNCTIONS_SCRIPT_NAME:-"container-apps-functions-source.sh"}
 
 # -----------------------------------------------------------------------------