final tunnings before 2.12 release

Author: ilg-ul

CHANGELOG.txt

@@ -12,6 +12,10 @@ There are currently no changes from the official BusyBox distribution.
 Build
 =====
 
+[2019-04-22]
+
+- v2.12 released
+
 [2019-04-06]
 
 - prepare v2.12

README.md

@@ -60,10 +60,10 @@ Before starting a multi-platform build, check if Docker is started:
 $ docker info
 ```
 
-To build both the 32/64-bits Windows use `--all`; to build selectively, use `--win64` or `--win32`.
+To build both the 32/64-bits Windows use `--all`.
 
 ```console
-$ bash ~/Downloads/windows-build-tools.git/scripts/build.sh 
+$ bash ~/Downloads/windows-build-tools.git/scripts/build.sh --all
 ```
 
 Several minutes later, the output of the build script is a set of 2 files and their SHA signatures, created in the `deploy` folder:

scripts/build.sh

@@ -119,6 +119,8 @@ host_show_sha
 
 host_stop_timer
 
+host_notify_completed
+
 echo
 echo "Use --date ${DISTRIBUTION_FILE_DATE} if needed to resume a build."
 

scripts/container-app-functions-source.sh …ripts/container-apps-functions-source.shscripts/container-app-functions-source.sh renamed to scripts/container-apps-functions-source.sh scripts/container-app-functions-source.sh renamed to scripts/container-apps-functions-source.sh

@@ -42,7 +42,7 @@ function do_make()
   MAKE_FOLDER_NAME="make-${MAKE_VERSION}"
   local make_archive="${MAKE_FOLDER_NAME}.tar.bz2"
 
-  local make_stamp_file_path="${INSTALL_FOLDER_PATH}/stamp-make-installed"
+  local make_stamp_file_path="${INSTALL_FOLDER_PATH}/stamp-make-${MSYS2_MAKE_VERSION_RELEASE}-installed"
   if [ ! -f "${make_stamp_file_path}" -o ! -d "${BUILD_FOLDER_PATH}/${MAKE_FOLDER_NAME}" ]
   then
 
@@ -154,7 +154,7 @@ function do_busybox()
 
   download_and_extract "${BUSYBOX_URL}" "${BUSYBOX_ARCHIVE}" "${BUSYBOX_SRC_FOLDER}"
 
-  local busybox_stamp_file_path="${INSTALL_FOLDER_PATH}/stamp-busybox-installed"
+  local busybox_stamp_file_path="${INSTALL_FOLDER_PATH}/stamp-busybox-${BUSYBOX_COMMIT}-installed"
   if [ ! -f "${busybox_stamp_file_path}" ]
   then
     (
@@ -273,28 +273,31 @@ function check_binaries()
   done
 }
 
-function copy_gme_files()
+function copy_distro_files()
 {
-  rm -rf "${APP_PREFIX}/${DISTRO_LC_NAME}"
-  mkdir -p "${APP_PREFIX}/${DISTRO_LC_NAME}"
+  (
+    xbb_activate
 
-  echo
-  echo "Copying license files..."
+    rm -rf "${APP_PREFIX}/${DISTRO_LC_NAME}"
+    mkdir -p "${APP_PREFIX}/${DISTRO_LC_NAME}"
+
+    echo
+    echo "Copying license files..."
 
-  copy_license \
-    "${SOURCES_FOLDER_PATH}/${MAKE_FOLDER_NAME}" \
-    "${MAKE_FOLDER_NAME}"
+    copy_license \
+      "${SOURCES_FOLDER_PATH}/${MAKE_FOLDER_NAME}" \
+      "${MAKE_FOLDER_NAME}"
 
-  copy_license \
-    "${BUILD_FOLDER_PATH}/${BUSYBOX_SRC_FOLDER}" \
-    "busybox-w32"
+    copy_license \
+      "${BUILD_FOLDER_PATH}/${BUSYBOX_SRC_FOLDER}" \
+      "busybox-w32"
 
-  copy_build_files
+    copy_build_files
 
-  echo
-  echo "Copying GME files..."
+    echo
+    echo "Copying distro files..."
 
-  cd "${WORK_FOLDER_PATH}/build.git"
-  /usr/bin/install -v -c -m 644 "README-out.md" \
-    "${APP_PREFIX}/README.md"
+    cd "${WORK_FOLDER_PATH}/build.git"
+    install -v -c -m 644 "README-out.md" "${APP_PREFIX}/README.md"
+  )
 }

scripts/container-build.sh

@@ -64,7 +64,7 @@ container_libs_functions_script_path="${script_folder_path}/${CONTAINER_LIBS_FUN
 echo "Container lib 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}"
 
@@ -178,8 +178,12 @@ do_busybox
 # -----------------------------------------------------------------------------
 
 copy_binaries
+
+# -----------------------------------------------------------------------------
+
 check_binaries
-copy_gme_files
+
+copy_distro_files
 
 create_archive
 

scripts/container-lib-functions-source.sh …ripts/container-libs-functions-source.shscripts/container-lib-functions-source.sh renamed to scripts/container-libs-functions-source.sh scripts/container-lib-functions-source.sh renamed to scripts/container-libs-functions-source.sh

@@ -25,8 +25,11 @@ APP_LC_NAME=${APP_LC_NAME:-"windows-build-tools"}
 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}"}
+
 CONTAINER_SCRIPT_NAME=${CONTAINER_SCRIPT_NAME:-"container-build.sh"}
-CONTAINER_LIBS_FUNCTIONS_SCRIPT_NAME=${CONTAINER_LIBS_FUNCTIONS_SCRIPT_NAME:-"container-lib-functions-source.sh"}
-CONTAINER_APP_FUNCTIONS_SCRIPT_NAME=${CONTAINER_APP_FUNCTIONS_SCRIPT_NAME:-"container-app-functions-source.sh"}
+CONTAINER_LIBS_FUNCTIONS_SCRIPT_NAME=${CONTAINER_LIBS_FUNCTIONS_SCRIPT_NAME:-"container-libs-functions-source.sh"}
+CONTAINER_APPS_FUNCTIONS_SCRIPT_NAME=${CONTAINER_APPS_FUNCTIONS_SCRIPT_NAME:-"container-apps-functions-source.sh"}
 
 # -----------------------------------------------------------------------------