Skip to content

Commit

Permalink
common-versions: add 0.11.0 case
Browse files Browse the repository at this point in the history
  • Loading branch information
ilg-ul committed Mar 15, 2021
1 parent 458df66 commit 7cd8b11
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 1 deletion.
37 changes: 36 additions & 1 deletion scripts/common-versions-source.sh
Expand Up @@ -38,7 +38,42 @@ function build_versions()
# and running the tests after packing the archive.

# Keep them in sync with combo archive content.
if [[ "${RELEASE_VERSION}" =~ 0\.10\.0-15 ]]
if [[ "${RELEASE_VERSION}" =~ 0\.11\.0-1 ]]
then

# -------------------------------------------------------------------------

# Used in the licenses folder.
OPENOCD_FOLDER_NAME="openocd-${OPENOCD_VERSION}"

# OPENOCD_GIT_BRANCH=${OPENOCD_GIT_BRANCH:-"xpack"}
OPENOCD_GIT_BRANCH=${OPENOCD_GIT_BRANCH:-"xpack-develop"}
OPENOCD_GIT_COMMIT=${OPENOCD_GIT_COMMIT:-"e392e485e40036543e6a3cce04570e7525c48ca2"}

# -------------------------------------------------------------------------

do_libusb1 "1.0.22"
if [ "${TARGET_PLATFORM}" == "win32" ]
then
do_libusb_w32 "1.2.6.0"
else
do_libusb0 "0.1.5"
fi

do_libftdi "1.4"

build_libiconv "1.15"

do_hidapi "0.9.0"

# -------------------------------------------------------------------------

do_openocd

run_openocd

# -------------------------------------------------------------------------
elif [[ "${RELEASE_VERSION}" =~ 0\.10\.0-1[56] ]]
then

# -------------------------------------------------------------------------
Expand Down
12 changes: 12 additions & 0 deletions scripts/container-build.sh
Expand Up @@ -97,6 +97,8 @@ WITH_PDF="y"
WITH_HTML="n"
IS_DEVELOP=""
IS_DEBUG=""
WITH_TESTS="y"
LINUX_INSTALL_RELATIVE_PATH=""

if [ "$(uname)" == "Linux" ]
then
Expand All @@ -118,6 +120,11 @@ do
shift
;;

--disable-tests)
WITH_TESTS="n"
shift
;;

--without-pdf)
WITH_PDF="n"
shift
Expand Down Expand Up @@ -153,6 +160,11 @@ do
shift
;;

--linux-install-relative-path)
LINUX_INSTALL_RELATIVE_PATH="$2"
shift 2
;;

*)
echo "Unknown action/option $1"
exit 1
Expand Down

0 comments on commit 7cd8b11

Please sign in to comment.