diff options
Diffstat (limited to 'mk')
| -rwxr-xr-x | mk | 28 |
1 files changed, 12 insertions, 16 deletions
@@ -12,33 +12,29 @@ if [ "./${0##*/}" != "${0}" ] || [ ! -f "mk" ] || [ -L "mk" ]; then exit 1 fi +. "include/init.sh" . "include/lib.sh" -. "include/vendor.sh" +. "include/inject.sh" . "include/mrc.sh" -eval "`setvars "" vdir src_dirname srcdir mode xp ser`" +eval "`setvars "" vdir src_dirname srcdir mode`" main() { - [ $# -lt 1 ] && $err "bad command" - rval=0 + cmd="" && [ $# -gt 0 ] && cmd="$1" && shift 1 for g in "command -v git" "git config --global user.name" \ "git config --global user.email" "git_init"; do eval "$g 1>/dev/null 2>/dev/null || $err \"Unconfigured: $g\"" done - case "$1" in + case "$cmd" in version) printf "%s\nWebsite: %s\n" "$relname" "$projectsite" ;; - release|download|inject) - cmd="vendor_$1" && [ "$1" = "release" ] && cmd="mkrelease" - shift 1 - $cmd "$@" ;; - -*) rval=1 ;; + release|download|inject) $cmd "$@" ;; + -*) return 1 ;; *) $err "bad command" ;; esac set -u -e # some commands disable them. turn them on! - return $rval } git_init() @@ -54,7 +50,7 @@ git_init() git tag -a "$version" -m "$projectname $version" || return 1 } -mkrelease() +release() { export XBMK_RELEASE="y" @@ -121,9 +117,9 @@ main "$@" && exit 0 eval "`setvars "" xarch srcdir premake gnatdir xlang mode makeargs elfdir cmd \ project target target_dir targets xtree _f release bootstrapargs mkhelper \ - autoconfargs listfile autogenargs btype tree rev tree_depend build_depend \ + autoconfargs listfile autogenargs btype rev build_depend gccdir cmakedir \ defconfig postmake mkhelpercfg dry dest_dir mdir cleanargs gccver gccfull \ - gnatver gnatfull gccdir cmakedir do_make badhash`" + gnatver gnatfull do_make badhash tree`" trees() { @@ -246,8 +242,8 @@ handle_defconfig() configure_project() { eval "`setvars "" cleanargs build_depend autoconfargs xtree postmake \ - tree_depend makeargs btype mkhelper bootstrapargs premake release \ - xarch xlang badhash`" + makeargs btype mkhelper bootstrapargs premake release xlang xarch \ + badhash`" _tcfg="$1/target.cfg" [ -f "$_tcfg" ] || btype="auto" e "$datadir/mkhelper.cfg" f && eval "`setcfg "$datadir/mkhelper.cfg"`" |