Remove *_VERSION variables (#179)

Windows-on-ARM-Experiments · Aug 13, 2024 · a2ef14a · a2ef14a
1 parent d686b76
commit a2ef14a
Show file tree

Hide file tree

Showing 30 changed files with 50 additions and 79 deletions.
diff --git a/.github/scripts/binutils/build.sh b/.github/scripts/binutils/build.sh
@@ -42,7 +42,7 @@ if [[ "$RUN_CONFIG" = 1 ]] || [[ ! -f "$BINUTILS_BUILD_PATH/Makefile" ]]; then
                 ;;
         esac
 
-        $SOURCE_PATH/$BINUTILS_VERSION/configure \
+        $SOURCE_PATH/binutils/configure \
             --prefix=$TOOLCHAIN_PATH \
             --build=$BUILD \
             --host=$HOST \

diff --git a/.github/scripts/binutils/patch-cygwin.sh b/.github/scripts/binutils/patch-cygwin.sh
@@ -10,7 +10,7 @@ if [[ "$STAGE" = 2 && "$PLATFORM" =~ cygwin ]]; then
 fi
 
 echo "::group::Patch Cygwin binutils"
-    cd $SOURCE_PATH/$BINUTILS_VERSION
+    cd $SOURCE_PATH/binutils
 
     if [[ "$RESET_SOURCES" = 1 ]]; then
         git reset --hard HEAD

diff --git a/.github/scripts/config.ps1 b/.github/scripts/config.ps1
@@ -1,9 +1,5 @@
 Set-PSDebug -Trace 2 # echo on
 
-if ( -not $env:OPENBLAS_VERSION ) { $env:OPENBLAS_VERSION = "openblas-develop" }
-if ( -not $env:OPENSSL_VERSION ) { $env:OPENSSL_VERSION = "openssl-master" }
-if ( -not $env:LIBJPEG_TURBO_VERSION) { $env:LIBJPEG_TURBO_VERSION="libjpeg-turbo-main" }
-
 if ( -not $env:ARCH ) { $env:ARCH = "aarch64" }
 if ( -not $env:PLATFORM ) { $env:PLATFORM = "w64-mingw32" }
 if ( -not $env:CRT ) { $env:CRT = "msvcrt" }

diff --git a/.github/scripts/config.sh b/.github/scripts/config.sh
@@ -4,18 +4,6 @@ set -e # exit on error
 set -x # echo on
 set -o pipefail # fail of any command in pipeline is an error
 
-GCC_VERSION=${GCC_VERSION:-gcc-master}
-BINUTILS_VERSION=${BINUTILS_VERSION:-binutils-master}
-MINGW_VERSION=${MINGW_VERSION:-mingw-w64-master}
-CYGWIN_VERSION=${CYGWIN_VERSION:-cygwin-master}
-COCOM_VERSION=${COCOM_VERSION:-cocom-master}
-OPENBLAS_VERSION=${OPENBLAS_VERSION:-openblas-develop}
-ZLIB_VERSION=${ZLIB_VERSION:-zlib-develop}
-LIBXML2_VERSION=${LIBXML2_VERSION:-libxml2-master}
-OPENSSL_VERSION=${OPENSSL_VERSION:-openssl-master}
-LIBJPEG_TURBO_VERSION=${LIBJPEG_TURBO_VERSION:-libjpeg-turbo-main}
-FFMPEG_VERSION=${FFMPEG_VERSION:-ffmpeg-master}
-
 ARCH=${ARCH:-aarch64}
 PLATFORM=${PLATFORM:-w64-mingw32}
 if [[ "$PLATFORM" =~ (mingw|cygwin) ]]; then

diff --git a/.github/scripts/ffmpeg/build.sh b/.github/scripts/ffmpeg/build.sh
@@ -3,7 +3,7 @@
 source `dirname ${BASH_SOURCE[0]}`/../config.sh
 
 FFMPEG_BUILD_PATH=$BUILD_PATH/ffmpeg
-FFMPEG_SOURCE_PATH=$SOURCE_PATH/$FFMPEG_VERSION
+FFMPEG_SOURCE_PATH=$SOURCE_PATH/ffmpeg
 
 mkdir -p $FFMPEG_BUILD_PATH
 cd $FFMPEG_BUILD_PATH

diff --git a/.github/scripts/ffmpeg/execute-tests.sh b/.github/scripts/ffmpeg/execute-tests.sh
@@ -3,7 +3,7 @@
 source `dirname ${BASH_SOURCE[0]}`/../config.sh
 
 SOURCE_PATH=`cygpath $SOURCE_PATH`
-FFMPEG_SOURCE_PATH=$SOURCE_PATH/$FFMPEG_VERSION
+FFMPEG_SOURCE_PATH=$SOURCE_PATH/ffmpeg
 
 # Path to the file with test names which should be skipped.
 SKIP_TESTS_PATH=$(realpath `dirname ${BASH_SOURCE[0]}`/skip-tests.txt)

diff --git a/.github/scripts/ffmpeg/patch.sh b/.github/scripts/ffmpeg/patch.sh
@@ -2,7 +2,7 @@
 
 source `dirname ${BASH_SOURCE[0]}`/../config.sh
 
-cd $SOURCE_PATH/$FFMPEG_VERSION
+cd $SOURCE_PATH/ffmpeg
 
 echo "::group::Patch FFmpeg"
     git apply --3way --ignore-whitespace $PATCHES_PATH/ffmpeg/fate.patch

diff --git a/.github/scripts/install-libraries.sh b/.github/scripts/install-libraries.sh
@@ -5,13 +5,13 @@ source `dirname ${BASH_SOURCE[0]}`/config.sh
 echo "::group::Install libraries"
 
     # Download and install packages
-    cd $SOURCE_PATH/$GCC_VERSION
+    cd $SOURCE_PATH/gcc
     ./contrib/download_prerequisites
 
     # Symbolic links for binutils dependencies
-    cd $SOURCE_PATH/$BINUTILS_VERSION
-    ln -sf $SOURCE_PATH/$GCC_VERSION/gmp gmp
-    ln -sf $SOURCE_PATH/$GCC_VERSION/mpfr mpfr
+    cd $SOURCE_PATH/binutils
+    ln -sf $SOURCE_PATH/gcc/gmp gmp
+    ln -sf $SOURCE_PATH/gcc/mpfr mpfr
 
 echo "::endgroup::"
 

diff --git a/.github/scripts/libjpeg-turbo/build.sh b/.github/scripts/libjpeg-turbo/build.sh
@@ -4,7 +4,7 @@ source `dirname ${BASH_SOURCE[0]}`/../config.sh
 
 LIBJPEG_TURBO_BUILD_PATH=$BUILD_PATH/libjpeg-turbo
 
-cd $SOURCE_PATH/$LIBJPEG_TURBO_VERSION
+cd $SOURCE_PATH/libjpeg-turbo
 
 if [[ "$RUN_CONFIG" = 1 ]] || [[ ! -f $LIBJPEG_TURBO_BUILD_PATH/CMakeCache.txt ]]; then
     echo "::group::Configure libjpeg-turbo"

diff --git a/.github/scripts/libjpeg-turbo/patch.sh b/.github/scripts/libjpeg-turbo/patch.sh
@@ -2,7 +2,7 @@
 
 source `dirname ${BASH_SOURCE[0]}`/../config.sh
 
-cd $SOURCE_PATH/$LIBJPEG_TURBO_VERSION
+cd $SOURCE_PATH/libjpeg-turbo
 
 echo "::group::Patch libjpeg-turbo"
     git apply $PATCHES_PATH/libjpeg-turbo/testimages.patch

diff --git a/.github/scripts/libxml2/build.sh b/.github/scripts/libxml2/build.sh
@@ -4,7 +4,7 @@ source `dirname ${BASH_SOURCE[0]}`/../config.sh
 
 LIBXML2_BUILD_PATH=$BUILD_PATH/libxml2
 
-cd $SOURCE_PATH/$LIBXML2_VERSION
+cd $SOURCE_PATH/libxml2
 
 if [[ "$RUN_CONFIG" = 1 ]] || [[ ! -f $LIBXML2_BUILD_PATH/CMakeCache.txt ]]; then
     echo "::group::Configure libxml2"

diff --git a/.github/scripts/openblas/build.sh b/.github/scripts/openblas/build.sh
@@ -4,13 +4,13 @@ source `dirname ${BASH_SOURCE[0]}`/../config.sh
 
 if [[ "$RUN_CONFIG" = 1 ]]; then
     echo "::group::Configure OpenBLAS"
-        cd $SOURCE_PATH/$OPENBLAS_VERSION
+        cd $SOURCE_PATH/openblas
         make clean
     echo "::endgroup::"
 fi
 
 echo "::group::Build OpenBLAS"
-    cd $SOURCE_PATH/$OPENBLAS_VERSION
+    cd $SOURCE_PATH/openblas
     make BINARY=64 CC=aarch64-w64-mingw32-gcc CFLAGS=-Wno-incompatible-pointer-types HOSTCC=gcc NOFORTRAN=1 TARGET=ARMV8 $BUILD_MAKE_OPTIONS
     for i in ctest/x*; do 
         mv $i $i.exe

diff --git a/.github/scripts/openblas/pack-tests.sh b/.github/scripts/openblas/pack-tests.sh
@@ -2,7 +2,7 @@
 
 source `dirname ${BASH_SOURCE[0]}`/../config.sh
 
-OPENBLAS_BUILD_PATH=$SOURCE_PATH/$OPENBLAS_VERSION
+OPENBLAS_BUILD_PATH=$SOURCE_PATH/openblas
 
 echo "::group::Pack OpenBLAS tests"
     mkdir -p $ARTIFACT_PATH

diff --git a/.github/scripts/openssl/build.sh b/.github/scripts/openssl/build.sh
@@ -10,7 +10,7 @@ cd $OPENSSL_BUILD_PATH
 if [[ "$RUN_CONFIG" = 1 ]] || [[ ! -f "$OPENSSL_BUILD_PATH/Makefile" ]]; then
     echo "::group::Configure OpenSSL"
         rm -rf $OPENSSL_BUILD_PATH/*
-        $SOURCE_PATH/$OPENSSL_VERSION/Configure \
+        $SOURCE_PATH/openssl/Configure \
             --prefix=$OPENSSL_PATH \
             --cross-compile-prefix=$TOOLCHAIN_PATH/bin/$TARGET- \
             --with-zlib-include=$ZLIB_PATH/include \

diff --git a/.github/scripts/openssl/execute-tests.ps1 b/.github/scripts/openssl/execute-tests.ps1
@@ -5,7 +5,7 @@ Write-Output '::group::Test OpenSSL'
        '-test_ssl_new' # something about handshake failure
     )
 
-    $env:SRCTOP = "$env:SOURCE_PATH\$env:OPENSSL_VERSION"
+    $env:SRCTOP = "$env:SOURCE_PATH\openssl"
     $env:BLDTOP = "$env:OPENSSL_TESTS_PATH"
     $env:LC_ALL = "C"
 

diff --git a/.github/scripts/toolchain/build-cocom.sh b/.github/scripts/toolchain/build-cocom.sh
@@ -2,7 +2,7 @@
 
 source `dirname ${BASH_SOURCE[0]}`/../config.sh
 
-COCOM_SOURCE_PATH=$SOURCE_PATH/$COCOM_VERSION
+COCOM_SOURCE_PATH=$SOURCE_PATH/cocom
 COCOM_BUILD_PATH=$BUILD_PATH/cocom
 
 mkdir -p $COCOM_BUILD_PATH

diff --git a/.github/scripts/toolchain/build-cygwin.sh b/.github/scripts/toolchain/build-cygwin.sh
@@ -3,7 +3,7 @@
 source `dirname ${BASH_SOURCE[0]}`/../config.sh
 
 STAGE=$1
-CYGWIN_SOURCE_PATH=$SOURCE_PATH/$CYGWIN_VERSION
+CYGWIN_SOURCE_PATH=$SOURCE_PATH/cygwin
 CYGWIN_BUILD_PATH=$BUILD_PATH/cygwin
 
 mkdir -p $CYGWIN_BUILD_PATH

diff --git a/.github/scripts/toolchain/build-gcc-stage1.sh b/.github/scripts/toolchain/build-gcc-stage1.sh
@@ -55,7 +55,7 @@ if [[ "$RUN_CONFIG" = 1 ]] || [[ ! -f "$GCC_BUILD_PATH/Makefile" ]]; then
                 ;;
         esac
 
-    $SOURCE_PATH/$GCC_VERSION/configure \
+    $SOURCE_PATH/gcc/configure \
         --prefix=$TOOLCHAIN_PATH \
         --build=$BUILD \
         --host=$HOST \

diff --git a/.github/scripts/toolchain/build-gcc.sh b/.github/scripts/toolchain/build-gcc.sh
@@ -96,7 +96,7 @@ if [[ "$RUN_CONFIG" = 1 ]] || [[ ! -f "$GCC_BUILD_PATH/Makefile" ]]; then
                 ;;
         esac
 
-        $SOURCE_PATH/$GCC_VERSION/configure \
+        $SOURCE_PATH/gcc/configure \
             --prefix=$TOOLCHAIN_PATH \
             --build=$BUILD \
             --host=$HOST \

diff --git a/.github/scripts/toolchain/build-mingw-crt.sh b/.github/scripts/toolchain/build-mingw-crt.sh
@@ -58,7 +58,7 @@ if [[ "$RUN_CONFIG" = 1 ]] || [[ ! -f "$MINGW_BUILD_PATH/Makefile" ]]; then
             ;;
         esac
 
-        $SOURCE_PATH/$MINGW_VERSION/mingw-w64-crt/configure \
+        $SOURCE_PATH/mingw/mingw-w64-crt/configure \
             --prefix=$TOOLCHAIN_PATH/$TARGET \
             --build=$BUILD \
             --host=$TARGET \

diff --git a/.github/scripts/toolchain/build-mingw-headers.sh b/.github/scripts/toolchain/build-mingw-headers.sh
@@ -40,7 +40,7 @@ if [[ "$RUN_CONFIG" = 1 ]] || [[ ! -f "$MINGW_HEADERS_BUILD_PATH/Makefile" ]]; t
             ;;
         esac
 
-        $SOURCE_PATH/$MINGW_VERSION/mingw-w64-headers/configure \
+        $SOURCE_PATH/mingw/mingw-w64-headers/configure \
             --prefix=$TOOLCHAIN_PATH/$TARGET \
             --build=$BUILD \
             --host=$TARGET \

diff --git a/.github/scripts/toolchain/build-mingw-winpthreads.sh b/.github/scripts/toolchain/build-mingw-winpthreads.sh
@@ -23,7 +23,7 @@ if [[ "$RUN_CONFIG" = 1 ]] || [[ ! -f "$MINGW_BUILD_PATH/Makefile" ]]; then
             ;;
         esac
 
-        $SOURCE_PATH/$MINGW_VERSION/mingw-w64-libraries/winpthreads/configure \
+        $SOURCE_PATH/mingw/mingw-w64-libraries/winpthreads/configure \
             --prefix=$TOOLCHAIN_PATH/$TARGET \
             --build=$BUILD \
             --host=$TARGET \

diff --git a/.github/scripts/toolchain/build-mingw.sh b/.github/scripts/toolchain/build-mingw.sh
@@ -58,7 +58,7 @@ if [[ "$RUN_CONFIG" = 1 ]] || [[ ! -f "$MINGW_BUILD_PATH/Makefile" ]]; then
             ;;
         esac
 
-        $SOURCE_PATH/$MINGW_VERSION/configure \
+        $SOURCE_PATH/mingw/configure \
             --prefix=$TOOLCHAIN_PATH/$TARGET \
             --build=$BUILD \
             --host=$TARGET \

diff --git a/.github/scripts/toolchain/compare-gcc-results.sh b/.github/scripts/toolchain/compare-gcc-results.sh
@@ -13,7 +13,7 @@ mkdir -p $RESULTS_PATH
 echo "::group::Compare GCC tests results"
     for TEST_FILE in $TEST_PATH/*.sum; do
         BASELINE_FIILE=$BASELINE_PATH/`basename $TEST_FILE`
-        $SOURCE_PATH/$GCC_VERSION/contrib/compare_tests $BASELINE_FIILE $TEST_FILE > \
+        $SOURCE_PATH/gcc/contrib/compare_tests $BASELINE_FIILE $TEST_FILE > \
           $RESULTS_PATH/`basename $TEST_FILE .sum`.diff && true
     done
 echo "::endgroup::"

diff --git a/.github/scripts/toolchain/install-cygwin-headers.sh b/.github/scripts/toolchain/install-cygwin-headers.sh
@@ -2,7 +2,7 @@
 
 source `dirname ${BASH_SOURCE[0]}`/../config.sh
 
-CYGWIN_SOURCE_PATH=$SOURCE_PATH/$CYGWIN_VERSION
+CYGWIN_SOURCE_PATH=$SOURCE_PATH/cygwin
 
 echo "::group::Install Cygwin headers"
     mkdir -p $TOOLCHAIN_PATH/include

diff --git a/.github/scripts/toolchain/patch-cygwin.sh b/.github/scripts/toolchain/patch-cygwin.sh
@@ -10,7 +10,7 @@ if [[ "$STAGE" = 2 && "$PLATFORM" =~ cygwin ]]; then
 fi
 
 echo "::group::Patch Cygwin GCC"
-    cd $SOURCE_PATH/$GCC_VERSION
+    cd $SOURCE_PATH/gcc
 
     if [[ "$RESET_SOURCES" = 1 ]]; then
         git reset --hard HEAD
@@ -33,7 +33,7 @@ echo "::group::Patch Cygwin GCC"
 echo "::endgroup::"
 
 echo "::group::Patch Cygwin"
-    cd $SOURCE_PATH/$CYGWIN_VERSION
+    cd $SOURCE_PATH/cygwin
 
     if [[ "$RESET_SOURCES" = 1 ]]; then
         git reset --hard HEAD

diff --git a/.github/scripts/update-sources.sh b/.github/scripts/update-sources.sh
@@ -30,13 +30,13 @@ echo "::group::Update source code repositories"
     mkdir -p "$SOURCE_PATH"
 
     cd "$SOURCE_PATH"
-    update_repository "$BINUTILS_VERSION" https://github.com/Windows-on-ARM-Experiments/binutils-woarm64.git woarm64
-    update_repository "$GCC_VERSION" https://github.com/Windows-on-ARM-Experiments/gcc-woarm64.git woarm64
-    update_repository "$MINGW_VERSION" https://github.com/Windows-on-ARM-Experiments/mingw-woarm64.git woarm64
+    update_repository binutils https://github.com/Windows-on-ARM-Experiments/binutils-woarm64.git woarm64
+    update_repository gcc https://github.com/Windows-on-ARM-Experiments/gcc-woarm64.git woarm64
+    update_repository mingw https://github.com/Windows-on-ARM-Experiments/mingw-woarm64.git woarm64
     if [[ "$PLATFORM" =~ cygwin ]]; then 
-        update_repository "$CYGWIN_VERSION" https://github.com/Windows-on-ARM-Experiments/newlib-cygwin.git main
+        update_repository cygwin https://github.com/Windows-on-ARM-Experiments/newlib-cygwin.git main
         update_repository cygwin-packages https://github.com/Windows-on-ARM-Experiments/cygwin-packages.git main
-        update_repository "$COCOM_VERSION" https://git.code.sf.net/p/cocom/git master
+        update_repository cocom https://git.code.sf.net/p/cocom/git master
     fi
 echo "::endgroup::"
 

diff --git a/.github/scripts/zlib/build.sh b/.github/scripts/zlib/build.sh
@@ -4,7 +4,7 @@ source `dirname ${BASH_SOURCE[0]}`/../config.sh
 
 ZLIB_BUILD_PATH=$BUILD_PATH/zlib
 
-cd $SOURCE_PATH/$ZLIB_VERSION
+cd $SOURCE_PATH/zlib
 
 if [[ "$RUN_CONFIG" = 1 ]] || [[ ! -f $ZLIB_BUILD_PATH/CMakeCache.txt ]]; then
     echo "::group::Configure zblib"