From 3551edce2cca831be0c90b3fe38a368aea70a710 Mon Sep 17 00:00:00 2001 From: Egor00f Date: Thu, 7 Nov 2024 12:38:42 +0000 Subject: [PATCH 01/10] create windows installer script --- .github/workflows/test.yml | 21 +++++++++++++++++++-- install.bat | 34 ++++++++++++++++++++++++++++++++++ install => install.sh | 0 3 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 install.bat rename install => install.sh (100%) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bed08f3..99b103d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,7 @@ on: # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: # This workflow contains a single job called "build" - build: + linux-install: # The type of runner that the job will run on runs-on: ubuntu-latest @@ -27,7 +27,7 @@ jobs: # Runs a single command using the runners shell - name: Run script - run: ${{ github.workspace }}/./install + run: ${{ github.workspace }}/./install.sh - name: add to path run: echo "/home/autobuild/tools/win32/bin" >> $GITHUB_PATH @@ -36,5 +36,22 @@ jobs: run: | kos32-gcc -v kos32-g++ -v + windows-install: + runs-on: windows-latest + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v4 + + # Runs a single command using the runners shell + - name: Run script + run: ${{ github.workspace }}/install.bat + + - name: add to path + run: echo "C:\MinGW\msys\1.0\home\autobuild\tools\win32\bin" >> $GITHUB_PATH + + - name: Test + run: | + kos32-gcc -v + kos32-g++ -v diff --git a/install.bat b/install.bat new file mode 100644 index 0000000..3c5f702 --- /dev/null +++ b/install.bat @@ -0,0 +1,34 @@ + +@echo off + +7z -v + +set TOOLCHAIN_DIR=C:\MinGW\msys\1.0\home\autobuild\tools + + +cd %TOOLCHAIN_DIR% + +wget http://ftp.kolibrios.org/users/Serge/new/Toolchain/msys-kos32-5.4.0.7z -q -O %TOOLCHAIN_DIR%\kos32-toolchain.7z + +7z x -y kos32-toolchain.7z + + +cd %TOOLCHAIN_DIR%\win32\mingw32 + +wget http://ftp.kolibrios.org/users/Serge/new/Toolchain/sdk-28-10-16.7z -q -O %TOOLCHAIN_DIR%\sdk-28-10-16.7z + +7z x -y sdk-28-10-16.7z + +cd lib + +wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libdll.a -q -O libdll.a +wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libfreetype.a -q -O libfreetype.a +wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libc.dll.a -q -O libc.dll.a +wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libSDLn.a -q -O libSDLn.a +wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libcurses.a -q -O libcurses.a +wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libz.dll.a -q -O libz.dll.a +wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libogg.a -q -O libogg.a +wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libvorbis.a -q -O libvorbis.a +wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libopenjpeg.a -q -O libopenjpeg.a + +set PATH=%PATH%;%TOOLCHAIN_DIR%%\win32\bin diff --git a/install b/install.sh similarity index 100% rename from install rename to install.sh From a54d0f3f2c74209ebdef347d339503d9e49d645a Mon Sep 17 00:00:00 2001 From: Egor00f Date: Thu, 7 Nov 2024 19:34:03 +0500 Subject: [PATCH 02/10] update --- README.md | 19 +++++++++++++++++-- install.bat | 33 ++++++++++++++++++++++++++++++--- update-libs | 25 ------------------------- 3 files changed, 47 insertions(+), 30 deletions(-) delete mode 100755 update-libs diff --git a/README.md b/README.md index 6cb1232..5331dd4 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,21 @@ Просто устанавливает тулчейн -оригинальный скрипт взят из http://board.kolibrios.org/viewtopic.php?p=76227&hilit=%D1%82%D1%83%D0%BB%D1%87%D0%B5%D0%B9%D0%BD#p76227 - +оригинальный скрипт для linux взят из http://board.kolibrios.org/viewtopic.php?p=76227&hilit=%D1%82%D1%83%D0%BB%D1%87%D0%B5%D0%B9%D0%BD#p76227 (скрипт подправлен) + +## установка + +Для установки требуются установленные 7z и wget + +## Linux + +Просто запустите install.sh. + +Некоторые команды требуют sudo + +## Windows + +Просто запустите install.bat. Рекомендуется запускать с повышенными правами + +wget для windows можно поискать в GnuWin32, 7z Нужно добавить в PATH. diff --git a/install.bat b/install.bat index 3c5f702..4e2a712 100644 --- a/install.bat +++ b/install.bat @@ -1,17 +1,24 @@ - @echo off +for /f %%a in ('echo prompt $E^| cmd') do set "ESC=%%a" -7z -v set TOOLCHAIN_DIR=C:\MinGW\msys\1.0\home\autobuild\tools +mkdir %TOOLCHAIN_DIR% cd %TOOLCHAIN_DIR% -wget http://ftp.kolibrios.org/users/Serge/new/Toolchain/msys-kos32-5.4.0.7z -q -O %TOOLCHAIN_DIR%\kos32-toolchain.7z + +call :print_msg Download the kos32-gcc toolchain... + +wget http://ftp.kolibrios.org/users/Serge/new/Toolchain/msys-kos32-5.4.0.7z -O %TOOLCHAIN_DIR%\kos32-toolchain.7z 7z x -y kos32-toolchain.7z +Call :print_ok Successfully! + + +Call :print_msg Downloading libraries... cd %TOOLCHAIN_DIR%\win32\mingw32 @@ -19,6 +26,12 @@ wget http://ftp.kolibrios.org/users/Serge/new/Toolchain/sdk-28-10-16.7z -q -O %T 7z x -y sdk-28-10-16.7z +Call :print_ok "Successfully!" + + + +Call :print_msg Updating libraries + cd lib wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libdll.a -q -O libdll.a @@ -31,4 +44,18 @@ wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libogg.a -q -O libog wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libvorbis.a -q -O libvorbis.a wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libopenjpeg.a -q -O libopenjpeg.a +Call :print_ok Successfully! + +Call :print_msg Adding C:/MinGW/msys/1.0/home/autobuild/tools/win32/bin to PATH + set PATH=%PATH%;%TOOLCHAIN_DIR%%\win32\bin + + + +:print_msg + echo %ESC%[92m%* %ESC%[%m +exit /b + +:print_ok + echo %ESC%[36m%*%ESC%[%m +exit /b \ No newline at end of file diff --git a/update-libs b/update-libs deleted file mode 100755 index 7f4170f..0000000 --- a/update-libs +++ /dev/null @@ -1,25 +0,0 @@ -print_msg(){ - echo -e "\e[34m$1\e[0m" -} - -print_ok(){ - echo -e "\e[32m$1\e[0m" -} - -print_msg "Updating libraries..." - - -cd ~/autobuild/tools/win32/mingw32/lib - -wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libdll.a -O libdll.a -wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libfreetype.a -O libfreetype.a -wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libc.dll.a -O libc.dll.a -wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libSDLn.a -O libSDLn.a -wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libcurses.a -O libcurses.a -wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libz.dll.a -O libz.dll.a -wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libogg.a -O libogg.a -wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libvorbis.a -O libvorbis.a -wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libopenjpeg.a -O libopenjpeg.a - - -print_ok "Successfully!" From 132fbf248c3bdc2ff4f9f03fc5f726f27e1aa007 Mon Sep 17 00:00:00 2001 From: Egor00f Date: Thu, 7 Nov 2024 19:37:30 +0500 Subject: [PATCH 03/10] update test.yml --- .github/workflows/test.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 99b103d..5d80c29 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,10 +5,7 @@ name: test # Controls when the workflow will run on: # Triggers the workflow on push or pull request events but only for the "main" branch - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] + ["push", "pull_request"] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -36,6 +33,7 @@ jobs: run: | kos32-gcc -v kos32-g++ -v + windows-install: runs-on: windows-latest steps: From 4b4407f3856722c9aecbb27c805fff6c15500d97 Mon Sep 17 00:00:00 2001 From: Egor00f Date: Thu, 7 Nov 2024 19:45:03 +0500 Subject: [PATCH 04/10] Revert "update test.yml" This reverts commit 132fbf248c3bdc2ff4f9f03fc5f726f27e1aa007. --- .github/workflows/test.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5d80c29..99b103d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,7 +5,10 @@ name: test # Controls when the workflow will run on: # Triggers the workflow on push or pull request events but only for the "main" branch - ["push", "pull_request"] + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -33,7 +36,6 @@ jobs: run: | kos32-gcc -v kos32-g++ -v - windows-install: runs-on: windows-latest steps: From 4436251fb08ba1ebb2286d1c00e34e689e864ab9 Mon Sep 17 00:00:00 2001 From: Egor00f Date: Thu, 7 Nov 2024 20:19:35 +0500 Subject: [PATCH 05/10] add more info to Readme and install.bat && fix test.yml --- .github/workflows/test.yml | 6 ++++++ README.md | 12 ++++++++---- install.bat | 13 +++++++++++++ 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 99b103d..cdfc454 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -36,11 +36,17 @@ jobs: run: | kos32-gcc -v kos32-g++ -v + windows-install: runs-on: windows-latest steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v4 + + - name: Install depends + run: | + choco install wget + choco install 7zip # Runs a single command using the runners shell - name: Run script diff --git a/README.md b/README.md index 5331dd4..3435b1e 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ # Установщик gcc тулчейна для KolibriOS -Просто устанавливает тулчейн +Просто устанавливает тулчейн. оригинальный скрипт для linux взят из http://board.kolibrios.org/viewtopic.php?p=76227&hilit=%D1%82%D1%83%D0%BB%D1%87%D0%B5%D0%B9%D0%BD#p76227 (скрипт подправлен) -## установка +## Установка -Для установки требуются установленные 7z и wget +Для установки требуются 7z и wget ## Linux @@ -15,8 +15,12 @@ Некоторые команды требуют sudo +Тулчейн устанавливается в папку `/home/autobuild/tools/win32` + ## Windows Просто запустите install.bat. Рекомендуется запускать с повышенными правами -wget для windows можно поискать в GnuWin32, 7z Нужно добавить в PATH. +wget для windows можно поискать в GnuWin32 например, 7z Нужно добавить в PATH. + +Тулчейн устанавливается в папку `C:/MinGW/msys/1.0/home/autobuild/tools/win32` diff --git a/install.bat b/install.bat index 4e2a712..eba7046 100644 --- a/install.bat +++ b/install.bat @@ -4,8 +4,13 @@ for /f %%a in ('echo prompt $E^| cmd') do set "ESC=%%a" set TOOLCHAIN_DIR=C:\MinGW\msys\1.0\home\autobuild\tools +Call :print_msg Create the C:/MinGW/msys/1.0/home/autobuild folder... + mkdir %TOOLCHAIN_DIR% +Call :print_ok Successfully! + + cd %TOOLCHAIN_DIR% @@ -18,10 +23,12 @@ wget http://ftp.kolibrios.org/users/Serge/new/Toolchain/msys-kos32-5.4.0.7z -O % Call :print_ok Successfully! + Call :print_msg Downloading libraries... cd %TOOLCHAIN_DIR%\win32\mingw32 + wget http://ftp.kolibrios.org/users/Serge/new/Toolchain/sdk-28-10-16.7z -q -O %TOOLCHAIN_DIR%\sdk-28-10-16.7z 7z x -y sdk-28-10-16.7z @@ -46,12 +53,18 @@ wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libopenjpeg.a -q -O Call :print_ok Successfully! + + Call :print_msg Adding C:/MinGW/msys/1.0/home/autobuild/tools/win32/bin to PATH set PATH=%PATH%;%TOOLCHAIN_DIR%%\win32\bin +Call :print_ok Installation was successful! + + + :print_msg echo %ESC%[92m%* %ESC%[%m exit /b From 56e593853d6b22eb8cbd4a40a9b450920d2b2ead Mon Sep 17 00:00:00 2001 From: Egor00f Date: Thu, 7 Nov 2024 20:29:01 +0500 Subject: [PATCH 06/10] try fix test.yml & add newline in install.bat --- .github/workflows/test.yml | 26 ++++++-------------------- install.bat | 2 +- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cdfc454..3c2d81b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,46 +1,33 @@ -# This is a basic workflow to help you get started with Actions - name: test -# Controls when the workflow will run on: - # Triggers the workflow on push or pull request events but only for the "main" branch push: branches: [ "main" ] pull_request: branches: [ "main" ] - - # Allows you to run this workflow manually from the Actions tab workflow_dispatch: -# A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: - # This workflow contains a single job called "build" linux-install: - # The type of runner that the job will run on runs-on: ubuntu-latest - # Steps represent a sequence of tasks that will be executed as part of the job steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v4 - # Runs a single command using the runners shell - name: Run script run: ${{ github.workspace }}/./install.sh - - name: add to path + - name: Add toolchain to path run: echo "/home/autobuild/tools/win32/bin" >> $GITHUB_PATH - - name: Test + - name: Test run run: | kos32-gcc -v kos32-g++ -v - + windows-install: runs-on: windows-latest steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v4 - name: Install depends @@ -48,14 +35,13 @@ jobs: choco install wget choco install 7zip - # Runs a single command using the runners shell - name: Run script run: ${{ github.workspace }}/install.bat - - name: add to path - run: echo "C:\MinGW\msys\1.0\home\autobuild\tools\win32\bin" >> $GITHUB_PATH + - name: Add toolchain to path + run: echo "C:/MinGW/msys/1.0/home/autobuild/tools/win32\bin" >> $GITHUB_PATH - - name: Test + - name: Test run run: | kos32-gcc -v kos32-g++ -v diff --git a/install.bat b/install.bat index eba7046..aab3d78 100644 --- a/install.bat +++ b/install.bat @@ -71,4 +71,4 @@ exit /b :print_ok echo %ESC%[36m%*%ESC%[%m -exit /b \ No newline at end of file +exit /b From 6eef73e3454d93dbfb5397b878c5e8f960d6b98b Mon Sep 17 00:00:00 2001 From: Egor00f Date: Thu, 7 Nov 2024 20:38:27 +0500 Subject: [PATCH 07/10] try fix test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3c2d81b..20d657d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -39,7 +39,7 @@ jobs: run: ${{ github.workspace }}/install.bat - name: Add toolchain to path - run: echo "C:/MinGW/msys/1.0/home/autobuild/tools/win32\bin" >> $GITHUB_PATH + run: echo "C:\MinGW\msys\1.0\home\autobuild\tools\win32\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - name: Test run run: | From c46fd1403947db730d72a5ff7cb8b93e4f3df7b2 Mon Sep 17 00:00:00 2001 From: Egor00f Date: Thu, 7 Nov 2024 20:53:33 +0500 Subject: [PATCH 08/10] fix install.bat --- install.bat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install.bat b/install.bat index aab3d78..2182cca 100644 --- a/install.bat +++ b/install.bat @@ -18,7 +18,7 @@ call :print_msg Download the kos32-gcc toolchain... wget http://ftp.kolibrios.org/users/Serge/new/Toolchain/msys-kos32-5.4.0.7z -O %TOOLCHAIN_DIR%\kos32-toolchain.7z -7z x -y kos32-toolchain.7z +7z x -y %TOOLCHAIN_DIR%\kos32-toolchain.7z Call :print_ok Successfully! @@ -29,9 +29,9 @@ Call :print_msg Downloading libraries... cd %TOOLCHAIN_DIR%\win32\mingw32 -wget http://ftp.kolibrios.org/users/Serge/new/Toolchain/sdk-28-10-16.7z -q -O %TOOLCHAIN_DIR%\sdk-28-10-16.7z +wget http://ftp.kolibrios.org/users/Serge/new/Toolchain/sdk-28-10-16.7z -q -O %TOOLCHAIN_DIR%\win32\mingw32\sdk-28-10-16.7z -7z x -y sdk-28-10-16.7z +7z x -y %TOOLCHAIN_DIR%\win32\mingw32\sdk-28-10-16.7z Call :print_ok "Successfully!" From bc2b3616c2114126a96c15bc634753b016b7f716 Mon Sep 17 00:00:00 2001 From: Egor00f Date: Thu, 7 Nov 2024 21:04:55 +0500 Subject: [PATCH 09/10] idk --- install.bat | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/install.bat b/install.bat index 2182cca..c7631eb 100644 --- a/install.bat +++ b/install.bat @@ -4,6 +4,8 @@ for /f %%a in ('echo prompt $E^| cmd') do set "ESC=%%a" set TOOLCHAIN_DIR=C:\MinGW\msys\1.0\home\autobuild\tools + + Call :print_msg Create the C:/MinGW/msys/1.0/home/autobuild folder... mkdir %TOOLCHAIN_DIR% @@ -11,11 +13,11 @@ mkdir %TOOLCHAIN_DIR% Call :print_ok Successfully! -cd %TOOLCHAIN_DIR% - call :print_msg Download the kos32-gcc toolchain... +cd %TOOLCHAIN_DIR% + wget http://ftp.kolibrios.org/users/Serge/new/Toolchain/msys-kos32-5.4.0.7z -O %TOOLCHAIN_DIR%\kos32-toolchain.7z 7z x -y %TOOLCHAIN_DIR%\kos32-toolchain.7z @@ -28,28 +30,27 @@ Call :print_msg Downloading libraries... cd %TOOLCHAIN_DIR%\win32\mingw32 - wget http://ftp.kolibrios.org/users/Serge/new/Toolchain/sdk-28-10-16.7z -q -O %TOOLCHAIN_DIR%\win32\mingw32\sdk-28-10-16.7z 7z x -y %TOOLCHAIN_DIR%\win32\mingw32\sdk-28-10-16.7z -Call :print_ok "Successfully!" +Call :print_ok Successfully! Call :print_msg Updating libraries -cd lib +cd %TOOLCHAIN_DIR%\win32\mingw32\lib -wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libdll.a -q -O libdll.a -wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libfreetype.a -q -O libfreetype.a -wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libc.dll.a -q -O libc.dll.a -wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libSDLn.a -q -O libSDLn.a -wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libcurses.a -q -O libcurses.a -wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libz.dll.a -q -O libz.dll.a -wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libogg.a -q -O libogg.a -wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libvorbis.a -q -O libvorbis.a -wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libopenjpeg.a -q -O libopenjpeg.a +wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libdll.a -q -O %TOOLCHAIN_DIR%\win32\mingw32\lib\libdll.a +wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libfreetype.a -q -O %TOOLCHAIN_DIR%\win32\mingw32\lib\libfreetype.a +wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libc.dll.a -q -O %TOOLCHAIN_DIR%\win32\mingw32\lib\libc.dll.a +wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libSDLn.a -q -O %TOOLCHAIN_DIR%\win32\mingw32\lib\libSDLn.a +wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libcurses.a -q -O %TOOLCHAIN_DIR%\win32\mingw32\lib\libcurses.a +wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libz.dll.a -q -O %TOOLCHAIN_DIR%\win32\mingw32\lib\libz.dll.a +wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libogg.a -q -O %TOOLCHAIN_DIR%\win32\mingw32\lib\libogg.a +wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libvorbis.a -q -O %TOOLCHAIN_DIR%\win32\mingw32\lib\libvorbis.a +wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libopenjpeg.a -q -O %TOOLCHAIN_DIR%\win32\mingw32\lib\libopenjpeg.a Call :print_ok Successfully! @@ -66,7 +67,7 @@ Call :print_ok Installation was successful! :print_msg - echo %ESC%[92m%* %ESC%[%m + echo %ESC%[92m%*%ESC%[%m exit /b :print_ok From 48339c46a7ed2cc091ef4adb235b2f6c856d200e Mon Sep 17 00:00:00 2001 From: Egor00f Date: Thu, 7 Nov 2024 21:09:03 +0500 Subject: [PATCH 10/10] hmmm... wget with -q flag fall... --- install.bat | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/install.bat b/install.bat index c7631eb..b16a867 100644 --- a/install.bat +++ b/install.bat @@ -30,7 +30,7 @@ Call :print_msg Downloading libraries... cd %TOOLCHAIN_DIR%\win32\mingw32 -wget http://ftp.kolibrios.org/users/Serge/new/Toolchain/sdk-28-10-16.7z -q -O %TOOLCHAIN_DIR%\win32\mingw32\sdk-28-10-16.7z +wget http://ftp.kolibrios.org/users/Serge/new/Toolchain/sdk-28-10-16.7z -O %TOOLCHAIN_DIR%\win32\mingw32\sdk-28-10-16.7z 7z x -y %TOOLCHAIN_DIR%\win32\mingw32\sdk-28-10-16.7z @@ -42,15 +42,15 @@ Call :print_msg Updating libraries cd %TOOLCHAIN_DIR%\win32\mingw32\lib -wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libdll.a -q -O %TOOLCHAIN_DIR%\win32\mingw32\lib\libdll.a -wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libfreetype.a -q -O %TOOLCHAIN_DIR%\win32\mingw32\lib\libfreetype.a -wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libc.dll.a -q -O %TOOLCHAIN_DIR%\win32\mingw32\lib\libc.dll.a -wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libSDLn.a -q -O %TOOLCHAIN_DIR%\win32\mingw32\lib\libSDLn.a -wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libcurses.a -q -O %TOOLCHAIN_DIR%\win32\mingw32\lib\libcurses.a -wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libz.dll.a -q -O %TOOLCHAIN_DIR%\win32\mingw32\lib\libz.dll.a -wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libogg.a -q -O %TOOLCHAIN_DIR%\win32\mingw32\lib\libogg.a -wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libvorbis.a -q -O %TOOLCHAIN_DIR%\win32\mingw32\lib\libvorbis.a -wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libopenjpeg.a -q -O %TOOLCHAIN_DIR%\win32\mingw32\lib\libopenjpeg.a +wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libdll.a -O %TOOLCHAIN_DIR%\win32\mingw32\lib\libdll.a +wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libfreetype.a -O %TOOLCHAIN_DIR%\win32\mingw32\lib\libfreetype.a +wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libc.dll.a -O %TOOLCHAIN_DIR%\win32\mingw32\lib\libc.dll.a +wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libSDLn.a -O %TOOLCHAIN_DIR%\win32\mingw32\lib\libSDLn.a +wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libcurses.a -O %TOOLCHAIN_DIR%\win32\mingw32\lib\libcurses.a +wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libz.dll.a -O %TOOLCHAIN_DIR%\win32\mingw32\lib\libz.dll.a +wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libogg.a -O %TOOLCHAIN_DIR%\win32\mingw32\lib\libogg.a +wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libvorbis.a -O %TOOLCHAIN_DIR%\win32\mingw32\lib\libvorbis.a +wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libopenjpeg.a -O %TOOLCHAIN_DIR%\win32\mingw32\lib\libopenjpeg.a Call :print_ok Successfully!