Преглед изворни кода

Fixed typo and grammar errors inside of the build scripts

Signed-off-by: lumberyard-employee-dm <[email protected]>
lumberyard-employee-dm пре 2 година
родитељ
комит
1a4f8eba2b

+ 3 - 3
package-system/sdformat/Dockerfile

@@ -36,7 +36,7 @@ ARG INPUT_DEP_TINYXML2_GIT_TAG=9.0.0
 # Pinning to the gz-math7 release which libsdformat has a dependency on
 ARG INPUT_DEP_GZ_MATH_GIT_TAG=gz-math7_7.2.0
 # Pinning to the gz-utils2 to the last release in September 2022
-# The libsdformat has an explicit dependencyt on gz-utils2
+# The libsdformat has an explicit dependency on gz-utils2
 ARG INPUT_DEP_GZ_UTILS_GIT_TAG=gz-utils2_2.0.0
 
 
@@ -48,7 +48,7 @@ ARG GROUP_ID
 ARG INPUT_BUILD_FOLDER=build
 
 # The install subfolder where binary artifacts are copied to
-# It is being copied to /data/workspace/temp/instaall
+# It is being copied to /data/workspace/temp/install
 # which is a local filesystem mounted on the user machine
 ARG INPUT_INSTALL_FOLDER=install
 
@@ -74,7 +74,7 @@ RUN apt-get install -y build-essential \
                        ruby
 
 
-# Add a user called "user" that will inside the docker
+# Add a user called "user" that will be used inside the docker
 # It will have the same UID and GID as the outside user
 RUN addgroup --gid $GROUP_ID user && \
     adduser --disabled-password --gecos '' --uid $USER_ID --gid $GROUP_ID user

+ 3 - 0
package-system/sdformat/docker_build_sdformat.sh

@@ -182,6 +182,9 @@ if [ -d ${BUILD_FOLDER} ]; then
     rm -rf ${BUILD_FOLDER}
 fi
 
+# When building sdformat, set it to use its internal copy of urdfdom for parsing urdf files
+# instead of relying on an externally-installed package.
+# This keeps the dependencies self-contained.
 echo "Configuring ${LIB_NAME}"
 CMD="cmake -B ${BUILD_FOLDER} -S. -DUSE_INTERNAL_URDF=ON -DBUILD_TESTING=OFF -DCMAKE_INSTALL_PREFIX=${INSTALL_FOLDER} -DCMAKE_PREFIX_PATH=\"${CMAKE_PREFIX_PATH}\""
 echo $CMD

+ 1 - 3
package-system/sdformat/install-linux.sh

@@ -58,8 +58,6 @@ fi
 # Copy the sdformat include folder
 copy_folder_to_target include
 
-# Copy the bin folder
-# copy_folder_to_target bin
 
 # Copy the sdformat lib folder
 copy_folder_to_target lib
@@ -67,7 +65,7 @@ copy_folder_to_target lib
 # Copy the dependent libraries include files for sdformat (tinyxml2, gz-utils, gz-math)
 # exclude the gz-cmake folder, since it is not needed to use the library.
 
-# Change directory to the dependency install path so that `find`` can use relative paths
+# Change directory to the dependency install path so that `find` can use relative paths
 pushd ${DEP_INSTALL_PATH}/include > /dev/null
 # Use cp --parents to preserve the directory structure
 # Skip copying directories via the `find -not -type d` command