Add PACKGEN to build_packages.sh and add better parameter parsing #159
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dgaliffiAMD
requested changes
Sep 4, 2024
Scripts/Packaging/build_packages.sh
Outdated
| echo " --rpm-dir <path> Set the RPM directory" | ||
| echo " --deb-release <release> Set the DEB package release" | ||
| echo " --rpm-release <release> Set the RPM package release" | ||
| echo " --cpackgen <tool> Specify the CPack tool" |
There was a problem hiding this comment.
Suggested change
| echo " --cpackgen <tool> Specify the CPack tool" | |
| echo " --packgen <format> Specify the package format. Options 'DEB' or 'RPM'. Default: '', which generates both." |
Scripts/Packaging/build_packages.sh
Outdated
| -h | --help) | ||
| echo "Usage: build_rocm_examples.sh [options]" | ||
| echo "Options:" | ||
| echo " --root <path> Set the root of the ROCm examples" |
There was a problem hiding this comment.
Suggested change
| echo " --root <path> Set the root of the ROCm examples" | |
| echo " --src-dir<path> Set the source directory" |
Changing to src-dir to match other path related options. Maybe we should move it lower to also group them all together.
Comment on lines
+59
to
+60
| echo " --pkgname <name> Set the package name" | ||
| echo " --version <version> Set the package version" |
There was a problem hiding this comment.
Let's group pkgname, version, deb-release, and rpm-release together. Logically, they are all related and make up the full package name.
Scripts/Packaging/build_packages.sh
Outdated
| RPM_DIR="$BUILD_DIR/rpm" | ||
| DEB_PACKAGE_RELEASE="local.9999" | ||
| RPM_PACKAGE_RELEASE="local.9999" | ||
| CPACKGEN="" |
There was a problem hiding this comment.
Suggested change
| CPACKGEN="" | |
| PACKGEN="" # Default is both DEB and RPM |
Changing name to "PACKGEN", since you're not actually using CPack to build your packages. NOTE: I haven't changed subsequent references.
Scripts/Packaging/build_packages.sh
Outdated
Comment on lines
66
to
67
| echo " --deb-release <release> Set the DEB package release" | ||
| echo " --rpm-release <release> Set the RPM package release" |
There was a problem hiding this comment.
Suggested change
| echo " --deb-release <release> Set the DEB package release" | |
| echo " --rpm-release <release> Set the RPM package release" | |
| echo " --deb-release <release> Set the DEB package release info (used to generate filename)" | |
| echo " --rpm-release <release> Set the RPM package release info (used to generate filename)" |
Scripts/Packaging/build_packages.sh
Outdated
| GIT_TOP_LEVEL=$(git rev-parse --show-toplevel) | ||
| ROCM_EXAMPLES_ROOT="$GIT_TOP_LEVEL" |
There was a problem hiding this comment.
Suggested change
| ROCM_EXAMPLES_ROOT="$GIT_TOP_LEVEL" | |
| SRC_DIR="$GIT_TOP_LEVEL" |
Changing to SRC_DIR to match other path related options. Maybe we should move it lower to also group them all together. NOTE: I haven't changed subsequent references.
Scripts/Packaging/build_packages.sh
Outdated
| PACKAGE_HOMEPAGE_URL="https://github.com/ROCm/ROCm-examples" | ||
|
|
||
| # Getopt argument parsing | ||
| VALID_ARGS=$(getopt -o hcr --long help,clean,release,root:,pkgname:,version:,install-prefix:,test-install-prefix:,build-dir:,deb-dir:,rpm-dir:,deb-release:,rpm-release:,cpackgen: -- "$@") |
There was a problem hiding this comment.
Suggested change
| VALID_ARGS=$(getopt -o hcr --long help,clean,release,root:,pkgname:,version:,install-prefix:,test-install-prefix:,build-dir:,deb-dir:,rpm-dir:,deb-release:,rpm-release:,cpackgen: -- "$@") | |
| VALID_ARGS=$(getopt -o h --long help,root:,pkgname:,version:,install-prefix:,test-install-prefix:,build-dir:,deb-dir:,rpm-dir:,deb-release:,rpm-release:,cpackgen: -- "$@") |
I didn't see "clean" or "release" in your switch-case statement. If I'm missing something, you can ignore this suggestion.
dgaliffiAMD
approved these changes
Sep 5, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Passes PACKGEN as a parameter to
build_packages.shto determine which distribution the script is generating a package for(DEB/RPM). Default is both RPM and DEB packages are generated. Additionally adds better parameter parsing.