From 06c1b20ec726faaf303dadffeca8450f945cc567 Mon Sep 17 00:00:00 2001
From: Toni Uhlig <matzeton@googlemail.com>
Date: Sun, 4 Sep 2022 15:15:18 +0200
Subject: Added activate.sh script and run CI test.

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
---
 mingw-w64-build | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'mingw-w64-build')

diff --git a/mingw-w64-build b/mingw-w64-build
index af833a8..c4879dc 100755
--- a/mingw-w64-build
+++ b/mingw-w64-build
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (C) 2022 Kyle Schwarz <zeranoe@gmail.com>, Toni Uhlig <matzeton@googlemail.com>
 #
@@ -517,29 +517,28 @@ export CFLAGS="-g0"
 export CXXFLAGS="-g0"
 export LDFLAGS="-s"
 
-COMPLETE_MSG="complete, to use MinGW-w64 everywhere add"
-
 if [ "$BUILD_I686" ]; then
     build i686 "$I686_PREFIX"
-    COMPLETE_MSG="$COMPLETE_MSG '$I686_PREFIX/bin'"
 fi
 
 if [ "$BUILD_X86_64" ]; then
     build x86_64 "$X86_64_PREFIX"
-    if [ "$BUILD_I686" ]; then
-        COMPLETE_MSG="$COMPLETE_MSG and "
-    fi
-    COMPLETE_MSG="$COMPLETE_MSG '$X86_64_PREFIX/bin'"
 fi
 
-COMPLETE_MSG="$COMPLETE_MSG to PATH."
-
 if [ ! "$KEEP_ARTIFACTS" ]; then
     remove_path "$SRC_PATH"
     remove_path "$BLD_PATH"
     remove_path "$LOG_FILE"
 fi
 
+cat >${ROOT_PATH}/activate.sh <<EOF
+#!/usr/bin/env bash
+
+MYDIR="\$(realpath \$(dirname \${BASH_SOURCE[0]}))"
+export PATH="\${MYDIR}/i686/bin:\${MYDIR}/x86_64/bin:\${PATH}"
+EOF
+chmod +x ${ROOT_PATH}/activate.sh
+
 if [ ! -z ${TARBALL} ]; then
     if [ "$BUILD_I686" ]; then
         TAR_DIRS="i686"
@@ -548,9 +547,9 @@ if [ ! -z ${TARBALL} ]; then
         TAR_DIRS="${TAR_DIRS} x86_64"
     fi
     execute "generating tarball ${TARBALL}" "" \
-        cd ${ROOT_PATH} && tar --transform "s,^,mingw-w64-sysroot/," -cjf ${TARBALL} ${TAR_DIRS}
+        cd ${ROOT_PATH} && tar --transform "s,^,mingw-w64-sysroot/," -cjf ${TARBALL} ${TAR_DIRS} activate.sh
 fi
 
-printf "(%d/%d): %s\n" "$CURRENT_STEP" "$TOTAL_STEPS" "$COMPLETE_MSG"
+printf "(%d/%d): %s\n" "$CURRENT_STEP" "$TOTAL_STEPS" "complete, to use MinGW-w64 everywhere run: source ${ROOT_PATH}/activate.sh"
 
 exit 0
-- 
cgit v1.2.3