فهرست منبع

Addressed feedback for sdformat build scripts

Fixed the build-ubuntu.sh script to call the `build-linux.sh`.
The script had an underscore in it previously.
Removed no-lonnger relevant output messages.

Signed-off-by: lumberyard-employee-dm <[email protected]>
lumberyard-employee-dm 2 سال پیش
والد
کامیت
002a52f92c
3فایلهای تغییر یافته به همراه3 افزوده شده و 11 حذف شده
  1. 1 1
      package-system/sdformat/Dockerfile
  2. 0 8
      package-system/sdformat/build-linux.sh
  3. 2 2
      package-system/sdformat/build-ubuntu.sh

+ 1 - 1
package-system/sdformat/Dockerfile

@@ -25,7 +25,7 @@ FROM ${INPUT_ARCHITECTURE}/${INPUT_IMAGE}
 # of the image
 
 # The name of the build script to copy to the docker image to execute
-ARG INPUT_DOCKER_BUILD_SCRIPT=build.sh
+ARG INPUT_DOCKER_BUILD_SCRIPT=docker_build_sdformat.sh
 
 # The optional environment variable for list of folders in the mapped temp folders that represent additional 3P dependent packages
 ARG INPUT_DEPENDENT_PACKAGE_FOLDERS

+ 0 - 8
package-system/sdformat/build-linux.sh

@@ -128,9 +128,6 @@ then
     exit 1
 fi
 
-# Prepare the target build folder to copy from the docker container on successful run of the docker script
-INSTALL_PACKAGE_PATH=${TEMP_FOLDER}/${TARGET_INSTALL_FOLDER}/
-
 # Run the build script in the docker image
 echo "Running build script in the docker image ${DOCKER_IMAGE_NAME}:latest"
 echo ""
@@ -154,9 +151,4 @@ fi
 
 echo "Build Complete"
 
-# Copy the build artifacts from the docker image
-
-
-echo "Built ${DOCKER_IMAGE_NAME_BASE} into ${INSTALL_PACKAGE_PATH} successfully"
-
 exit 0

+ 2 - 2
package-system/sdformat/build-ubuntu.sh

@@ -8,7 +8,7 @@
 #
 
 # The function below is used to check if the docker application
-# is installed via checking the ArchLinux package manager
+# is installed via checking the Ubuntu package manager
 function check_docker_requirements()
 {
     echo "Checking cross compiling requirements."
@@ -48,4 +48,4 @@ function check_docker_requirements()
     fi
 }
 
-source ./build_linux.sh "$@" "check_docker_requirements"
+source ./build-linux.sh "$@" "check_docker_requirements"