X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f04cfcce18c6e4bd1faf3140ccbc835328580024..2c094e28cc4f19df4f6d0bc81355e7fc19e8c493:/build/run-library.sh diff --git a/build/run-library.sh b/build/run-library.sh index 8d97adab81..a13470bc43 100755 --- a/build/run-library.sh +++ b/build/run-library.sh @@ -35,13 +35,19 @@ format_last_commit_here() { version_from_git() { # Generates a version number from the git log for the current working # directory, and writes it to stdout. - local git_ts git_hash + local git_ts git_hash prefix + if [[ -n "$1" ]] ; then + prefix="$1" + else + prefix="0.1" + fi + declare $(format_last_commit_here "git_ts=%ct git_hash=%h") - echo "0.1.$(date -ud "@$git_ts" +%Y%m%d%H%M%S).$git_hash" + echo "${prefix}.$(date -ud "@$git_ts" +%Y%m%d%H%M%S).$git_hash" } nohash_version_from_git() { - version_from_git | cut -d. -f1-3 + version_from_git $1 | cut -d. -f1-3 } timestamp_from_git() { @@ -63,6 +69,10 @@ handle_ruby_gem() { local gem_version="$(nohash_version_from_git)" local gem_src_dir="$(pwd)" + if [[ -n "$ONLY_BUILD" ]] && [[ "$gem_name" != "$ONLY_BUILD" ]] ; then + return 0 + fi + if ! [[ -e "${gem_name}-${gem_version}.gem" ]]; then find -maxdepth 1 -name "${gem_name}-*.gem" -delete @@ -78,6 +88,10 @@ package_go_binary() { local description="$1"; shift local license_file="${1:-agpl-3.0.txt}"; shift + if [[ -n "$ONLY_BUILD" ]] && [[ "$prog" != "$ONLY_BUILD" ]] ; then + return 0 + fi + debug_echo "package_go_binary $src_path as $prog" local basename="${src_path##*/}" @@ -99,18 +113,40 @@ package_go_binary() { fi cd $WORKSPACE/packages/$TARGET + test_package_presence $prog $version go + + if [[ "$?" != "0" ]]; then + return 1 + fi + go get "git.curoverse.com/arvados.git/$src_path" - fpm_build "$GOPATH/bin/$basename=/usr/bin/$prog" "$prog" 'Curoverse, Inc.' dir "$version" "--url=https://arvados.org" "--license=GNU Affero General Public License, version 3.0" "--description=$description" "$WORKSPACE/$license_file=/usr/share/doc/$prog/$license_file" + + declare -a switches=() + systemd_unit="$WORKSPACE/${src_path}/${prog}.service" + if [[ -e "${systemd_unit}" ]]; then + switches+=( + --after-install "${WORKSPACE}/build/go-python-package-scripts/postinst" + --before-remove "${WORKSPACE}/build/go-python-package-scripts/prerm" + "${systemd_unit}=/lib/systemd/system/${prog}.service") + fi + switches+=("$WORKSPACE/${license_file}=/usr/share/doc/$prog/${license_file}") + + fpm_build "$GOPATH/bin/${basename}=/usr/bin/${prog}" "${prog}" 'Curoverse, Inc.' dir "${version}" "--url=https://arvados.org" "--license=GNU Affero General Public License, version 3.0" "--description=${description}" "${switches[@]}" } default_iteration() { local package_name="$1"; shift local package_version="$1"; shift + local package_type="$1"; shift local iteration=1 if [[ $package_version =~ ^0\.1\.([0-9]{14})(\.|$) ]] && \ [[ ${BASH_REMATCH[1]} -le $LICENSE_PACKAGE_TS ]]; then iteration=2 fi + if [[ $package_type =~ ^python ]]; then + # Fix --iteration for #9242. + iteration=2 + fi echo $iteration } @@ -124,8 +160,85 @@ _build_rails_package_scripts() { done } +test_rails_package_presence() { + local pkgname="$1"; shift + local srcdir="$1"; shift + + if [[ -n "$ONLY_BUILD" ]] && [[ "$pkgname" != "$ONLY_BUILD" ]] ; then + return 1 + fi + + tmppwd=`pwd` + + cd $srcdir + + local version="$(version_from_git)" + + cd $tmppwd + + test_package_presence $pkgname $version rails $RAILS_PACKAGE_ITERATION +} + +test_package_presence() { + local pkgname="$1"; shift + local version="$1"; shift + local pkgtype="$1"; shift + local iteration="$1"; shift + local arch="$1"; shift + + if [[ -n "$ONLY_BUILD" ]] && [[ "$pkgname" != "$ONLY_BUILD" ]] ; then + return 1 + fi + + if [[ "$iteration" == "" ]]; then + iteration="$(default_iteration "$pkgname" "$version" "$pkgtype")" + fi + + if [[ "$arch" == "" ]]; then + rpm_architecture="x86_64" + deb_architecture="amd64" + + if [[ "$pkgtype" =~ ^(python|python3)$ ]]; then + rpm_architecture="noarch" + deb_architecture="all" + fi + + if [[ "$pkgtype" =~ ^(src)$ ]]; then + rpm_architecture="noarch" + deb_architecture="all" + fi + + # These python packages have binary components + if [[ "$pkgname" =~ (ruamel|ciso|pycrypto|pyyaml) ]]; then + rpm_architecture="x86_64" + deb_architecture="amd64" + fi + else + rpm_architecture=$arch + deb_architecture=$arch + fi + + if [[ "$FORMAT" == "deb" ]]; then + local complete_pkgname=$pkgname"_"$version"-"$iteration"_"$deb_architecture".deb" + else + local complete_pkgname="$pkgname-$version-$iteration.$rpm_architecture.rpm" + fi + + if [[ -e "$complete_pkgname" ]]; then + echo "Package $complete_pkgname exists, not rebuilding!" + return 1 + else + echo "Package $complete_pkgname not found, building" + return 0 + fi +} + handle_rails_package() { local pkgname="$1"; shift + + if [[ -n "$ONLY_BUILD" ]] && [[ "$pkgname" != "$ONLY_BUILD" ]] ; then + return 0 + fi local srcdir="$1"; shift local license_path="$1"; shift local scripts_dir="$(mktemp --tmpdir -d "$pkgname-XXXXXXXX.scripts")" && \ @@ -148,8 +261,7 @@ handle_rails_package() { local -a pos_args=("$srcdir/=$railsdir" "$pkgname" "Curoverse, Inc." dir "$(cat "$version_file")") local license_arg="$license_path=$railsdir/$(basename "$license_path")" - # --iteration=5 accommodates the package script bugfixes #8371 and #8413. - local -a switches=(--iteration=5 + local -a switches=(--iteration=$RAILS_PACKAGE_ITERATION --after-install "$scripts_dir/postinst" --before-remove "$scripts_dir/prerm" --after-remove "$scripts_dir/postrm") @@ -178,8 +290,8 @@ fpm_build () { # pip). PACKAGE=$1 shift - # The name of the package to build. Defaults to $PACKAGE. - PACKAGE_NAME=${1:-$PACKAGE} + # The name of the package to build. + PACKAGE_NAME=$1 shift # Optional: the vendor of the package. Should be "Curoverse, Inc." for # packages of our own software. Passed to fpm --vendor. @@ -192,6 +304,12 @@ fpm_build () { VERSION=$1 shift + if [[ -n "$ONLY_BUILD" ]] && [[ "$PACKAGE_NAME" != "$ONLY_BUILD" ]] && [[ "$PACKAGE" != "$ONLY_BUILD" ]] ; then + return 0 + fi + + local default_iteration_value="$(default_iteration "$PACKAGE" "$VERSION" "$PACKAGE_TYPE")" + case "$PACKAGE_TYPE" in python) # All Arvados Python2 packages depend on Python 2.7. @@ -199,6 +317,10 @@ fpm_build () { set -- "$@" --python-bin python2.7 \ --python-easyinstall "$EASY_INSTALL2" \ --python-package-name-prefix "$PYTHON2_PKG_PREFIX" \ + --prefix "$PYTHON2_PREFIX" \ + --python-install-lib "$PYTHON2_INSTALL_LIB" \ + --python-install-data . \ + --exclude "${PYTHON2_INSTALL_LIB#/}/tests" \ --depends "$PYTHON2_PACKAGE" ;; python3) @@ -210,26 +332,27 @@ fpm_build () { set -- "$@" --python-bin python3 \ --python-easyinstall "$EASY_INSTALL3" \ --python-package-name-prefix "$PYTHON3_PKG_PREFIX" \ + --prefix "$PYTHON3_PREFIX" \ + --python-install-lib "$PYTHON3_INSTALL_LIB" \ + --python-install-data . \ + --exclude "${PYTHON3_INSTALL_LIB#/}/tests" \ --depends "$PYTHON3_PACKAGE" ;; esac declare -a COMMAND_ARR=("fpm" "--maintainer=Ward Vandewege " "-s" "$PACKAGE_TYPE" "-t" "$FORMAT") - if [ python = "$PACKAGE_TYPE" ]; then - COMMAND_ARR+=(--exclude=\*/{dist,site}-packages/tests/\*) - if [ deb = "$FORMAT" ]; then - # Dependencies are built from setup.py. Since setup.py will never - # refer to Debian package iterations, it doesn't make sense to - # enforce those in the .deb dependencies. - COMMAND_ARR+=(--deb-ignore-iteration-in-dependencies) - fi + if [ python = "$PACKAGE_TYPE" ] && [ deb = "$FORMAT" ]; then + # Dependencies are built from setup.py. Since setup.py will never + # refer to Debian package iterations, it doesn't make sense to + # enforce those in the .deb dependencies. + COMMAND_ARR+=(--deb-ignore-iteration-in-dependencies) fi if [[ "${DEBUG:-0}" != "0" ]]; then COMMAND_ARR+=('--verbose' '--log' 'info') fi - if [[ "$PACKAGE_NAME" != "$PACKAGE" ]]; then + if [[ -n "$PACKAGE_NAME" ]]; then COMMAND_ARR+=('-n' "$PACKAGE_NAME") fi @@ -242,7 +365,15 @@ fpm_build () { fi # We can always add an --iteration here. If another one is specified in $@, # that will take precedence, as desired. - COMMAND_ARR+=(--iteration "$(default_iteration "$PACKAGE" "$VERSION")") + COMMAND_ARR+=(--iteration "$default_iteration_value") + + if [[ python = "$PACKAGE_TYPE" ]] && [[ -e "${PACKAGE}/${PACKAGE_NAME}.service" ]] + then + COMMAND_ARR+=( + --after-install "${WORKSPACE}/build/go-python-package-scripts/postinst" + --before-remove "${WORKSPACE}/build/go-python-package-scripts/prerm" + ) + fi # Append --depends X and other arguments specified by fpm-info.sh in # the package source dir. These are added last so they can override @@ -254,8 +385,11 @@ fpm_build () { declare -a fpm_dirs=( # source dir part of 'dir' package ("/source=/dest" => "/source"): "${PACKAGE%%=/*}" - # backports ("llfuse==0.41.1" => "backports/python-llfuse") + # backports ("llfuse>=1.0" => "backports/python-llfuse") "${WORKSPACE}/backports/${PACKAGE_TYPE}-${PACKAGE%%[<=>]*}") + if [[ -n "$PACKAGE_NAME" ]]; then + fpm_dirs+=("${WORKSPACE}/backports/${PACKAGE_NAME}") + fi for pkgdir in "${fpm_dirs[@]}"; do fpminfo="$pkgdir/fpm-info.sh" if [[ -e "$fpminfo" ]]; then @@ -308,6 +442,11 @@ fpm_build () { FPM_EXIT_CODE=$? fpm_verify $FPM_EXIT_CODE $FPM_RESULTS + + # if something went wrong and debug is off, print out the fpm command that errored + if [[ 0 -ne $? ]] && [[ "$STDOUT_IF_DEBUG" == "/dev/null" ]]; then + echo -e "\n${COMMAND_ARR[@]}\n" + fi } # verify build results @@ -323,14 +462,19 @@ fpm_verify () { if [[ "$FPM_PACKAGE_NAME" == "" ]]; then EXITCODE=1 + echo echo "Error: $PACKAGE: Unable to figure out package name from fpm results:" echo echo $FPM_RESULTS echo + return 1 elif [[ "$FPM_RESULTS" =~ "File already exists" ]]; then echo "Package $FPM_PACKAGE_NAME exists, not rebuilding" + return 0 elif [[ 0 -ne "$FPM_EXIT_CODE" ]]; then + EXITCODE=1 echo "Error building package for $1:\n $FPM_RESULTS" + return 1 fi } @@ -382,4 +526,3 @@ report_outcomes() { done fi } -