Skip to content

Commit

Permalink
Regenerate artifacts.
Browse files Browse the repository at this point in the history
  • Loading branch information
pmienk committed Jul 14, 2022
1 parent 582afd0 commit d79f594
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 8 deletions.
24 changes: 20 additions & 4 deletions install-cmake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
# --prefix=<absolute-path> Library install location (defaults to /usr/local).
# --disable-shared Disables shared library builds.
# --disable-static Disables static library builds.
# --verbose Display verbose output (defaults to quiet on called tooling).
# --help Display usage, overriding script execution.
#
# Verified on Ubuntu 14.04, requires gcc-4.8 or newer.
Expand Down Expand Up @@ -170,12 +171,17 @@ make_jobs()
local JOBS=$1
shift 1

VERBOSITY=""
if [[ DISPLAY_VERBOSE ]]; then
VERBOSITY="VERBOSE=1"
fi

SEQUENTIAL=1
# Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]).
if [[ $JOBS > $SEQUENTIAL ]]; then
make -j"$JOBS" "$@"
make -j"$JOBS" "$@" $VERBOSITY
else
make "$@"
make "$@" $VERBOSITY
fi
}

Expand Down Expand Up @@ -263,6 +269,7 @@ parse_command_line_options()
case $OPTION in
# Standard script options.
(--help) DISPLAY_HELP="yes";;
(--verbose) DISPLAY_VERBOSE="yes";;

# Standard build options.
(--prefix=*) PREFIX="${OPTION#*=}";;
Expand Down Expand Up @@ -537,9 +544,18 @@ extract_from_tarball()
push_directory "$TARGET_DIR"

# Extract the source locally.
wget --output-document "$ARCHIVE" "$URL"
tar --extract --file "$ARCHIVE" "--$COMPRESSION" --strip-components=1
WGET="wget --quiet"
TAR="tar"

if [[ $DISPLAY_VERBOSE ]]; then
WGET="wget --verbose"
TAR="tar --verbose"
fi

$WGET --output-document "$ARCHIVE" "$URL"
$TAR --extract --file "$ARCHIVE" "--$COMPRESSION" --strip-components=1

display_message "Completed download and extraction successfully."
pop_directory
}

Expand Down
24 changes: 20 additions & 4 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
# --prefix=<absolute-path> Library install location (defaults to /usr/local).
# --disable-shared Disables shared library builds.
# --disable-static Disables static library builds.
# --verbose Display verbose output (defaults to quiet on called tooling).
# --help Display usage, overriding script execution.
#
# Verified on Ubuntu 14.04, requires gcc-4.8 or newer.
Expand Down Expand Up @@ -170,12 +171,17 @@ make_jobs()
local JOBS=$1
shift 1

VERBOSITY=""
if [[ DISPLAY_VERBOSE ]]; then
VERBOSITY="VERBOSE=1"
fi

SEQUENTIAL=1
# Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]).
if [[ $JOBS > $SEQUENTIAL ]]; then
make -j"$JOBS" "$@"
make -j"$JOBS" "$@" $VERBOSITY
else
make "$@"
make "$@" $VERBOSITY
fi
}

Expand Down Expand Up @@ -263,6 +269,7 @@ parse_command_line_options()
case $OPTION in
# Standard script options.
(--help) DISPLAY_HELP="yes";;
(--verbose) DISPLAY_VERBOSE="yes";;

# Standard build options.
(--prefix=*) PREFIX="${OPTION#*=}";;
Expand Down Expand Up @@ -468,9 +475,18 @@ extract_from_tarball()
push_directory "$TARGET_DIR"

# Extract the source locally.
wget --output-document "$ARCHIVE" "$URL"
tar --extract --file "$ARCHIVE" "--$COMPRESSION" --strip-components=1
WGET="wget --quiet"
TAR="tar"

if [[ $DISPLAY_VERBOSE ]]; then
WGET="wget --verbose"
TAR="tar --verbose"
fi

$WGET --output-document "$ARCHIVE" "$URL"
$TAR --extract --file "$ARCHIVE" "--$COMPRESSION" --strip-components=1

display_message "Completed download and extraction successfully."
pop_directory
}

Expand Down

0 comments on commit d79f594

Please sign in to comment.