From efec2c96a1621ee1f9800d76fd8b865cfa94fc89 Mon Sep 17 00:00:00 2001 From: Neil McGill Date: Wed, 8 Jan 2025 19:39:05 +0000 Subject: [PATCH] try to fix msys error again --- .github/workflows/msys2.yml | 6 +- build/build.sh | 6 +- build/todo/RUNME.mingw64 | 197 ------------------------------------ 3 files changed, 6 insertions(+), 203 deletions(-) delete mode 100755 build/todo/RUNME.mingw64 diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml index c0ef62987..3164998f6 100644 --- a/.github/workflows/msys2.yml +++ b/.github/workflows/msys2.yml @@ -66,9 +66,9 @@ jobs: mingw-w64-ucrt-x86_64-ncurses mingw-w64-ucrt-x86_64-openssl mingw-w64-ucrt-x86_64-portaudio - mingw-w64-ucrt-x86_64-python3 - mingw-w64-ucrt-x86_64-python3-pip - mingw-w64-ucrt-x86_64-python3-py + mingw-w64-ucrt-x86_64-python + mingw-w64-ucrt-x86_64-python-pip + mingw-w64-ucrt-x86_64-python-py mingw-w64-ucrt-x86_64-readline mingw-w64-ucrt-x86_64-smpeg2 mingw-w64-ucrt-x86_64-speex diff --git a/build/build.sh b/build/build.sh index c8a435299..afedf29a3 100755 --- a/build/build.sh +++ b/build/build.sh @@ -151,9 +151,9 @@ help_full() ${MINGW_PKG_TYPE}-x86_64-ncurses \ ${MINGW_PKG_TYPE}-x86_64-openssl \ ${MINGW_PKG_TYPE}-x86_64-portaudio \ - ${MINGW_PKG_TYPE}-x86_64-python3 \ - ${MINGW_PKG_TYPE}-x86_64-python3-pip \ - ${MINGW_PKG_TYPE}-x86_64-python3-py \ + ${MINGW_PKG_TYPE}-x86_64-python \ + ${MINGW_PKG_TYPE}-x86_64-python-pip \ + ${MINGW_PKG_TYPE}-x86_64-python-py \ ${MINGW_PKG_TYPE}-x86_64-readline \ ${MINGW_PKG_TYPE}-x86_64-smpeg2 \ ${MINGW_PKG_TYPE}-x86_64-speex \ diff --git a/build/todo/RUNME.mingw64 b/build/todo/RUNME.mingw64 deleted file mode 100755 index b59044cfb..000000000 --- a/build/todo/RUNME.mingw64 +++ /dev/null @@ -1,197 +0,0 @@ -#!/bin/sh -# -# This script will try and build the game for mingw64, installing files -# it needs. There is some manual prep needed first: -# -# 1. Goto https://www.msys2.org/ and install the msys2...exe -# -# 2. Once installed, in the terminal msys creates, do: -# pacman -Syu -# -# 3. This may close the terminal. If it does, reopen and then do: -# pacman -Su -# -# 4. Now install basic stuff: -# pacman -S git -# pacman -S unzip -# pacman -S vim -# -# Copyright (C) 2014 Neil McGill -# -# This game is free software; you can redistribute it and/or -# modify it under the terms of the GNU Library General Public -# License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. -# -# This game is distributed in the hope that it will be fun, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Library General Public License for more details. -# -# You should have received a copy of the GNU Library General Public -# License along with this game; if not, write to the Free -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# - -. ./VERSION -. ./build/common.sh - -cat <<%% -${RED} - @@@@@@@@ @@@@@@ @@@@@@@ @@@@@@@ @@@@@@ @@@@@@ @@@ @@@ - @@@@@@@@ @@@@@@@@ @@@@@@@@ @@@@@@@@ @@@@@@@@ @@@@@@@ @@@ @@@ - @@! @@! @@@ @@! @@@ @@! @@@ @@! @@@ !@@ @@! @@@ - !@! !@! @!@ !@! @!@ !@ @!@ !@! @!@ !@! !@! @!@ - @!! @!@ !@! @!@!!@! @!@!@!@ @!@!@!@! !!@@!! @!@!@!@! - !!! !@! !!! !!@!@! !!!@!!!! !!!@!!!! !!@!!! !!!@!!!! - !!: !!: !!! !!: :!! !!: !!! !!: !!! !:! !!: !!! - :!: :!: !:! :!: !:! :!: !:! :!: !:! !:! :!: !:! - ::: :::: ::::: :: :: ::: :: :::: :: ::: :::: :: :: ::: - : :: : : : : : : : : : : :: : : : :: : : : : : - : : : : : : : : : : :: : : : : : : : : : - . . . : : . : . : . : . :: : : . .. : : . : : -${RESET} -%% - -LOG=./build.log -MAINTAINER=goblinhack@gmail.com - -TOP_DIR=`pwd` - -. ./build/common.sh - -for i in /mingw64 -do - if [ -d "$i" ] - then - MINGW64_DIR=$i - break - fi -done - -if [ "$MINGW64_DIR" = "" ] -then -cat << %% - I could not find msys/mingw installed. Here are some steps to get you going: - - 1. Goto https://www.msys2.org/ and install the msys2.exe - - 2. Once installed, in the terminal msys creates, do: - pacman -Syu - - 3. This may close the terminal. If it does, reopen and then do: - pacman -Su - - 4. Now install basic stuff: - pacman -S git - pacman -S unzip - pacman -S vim - - 5. Now run this script again. -%% - log_err "Could not find MINGW64 dir (/mingw64)" - exit 1 -fi - -log_info "MING64 install dir $MINGW64_DIR." - -pacman -S tar \ - make \ - mingw-w64-ucrt-x86_64-SDL \ - mingw-w64-ucrt-x86_64-SDL2 \ - mingw-w64-ucrt-x86_64-SDL2_gfx \ - mingw-w64-ucrt-x86_64-SDL2_image \ - mingw-w64-ucrt-x86_64-SDL2_mixer \ - mingw-w64-ucrt-x86_64-SDL2_net \ - mingw-w64-ucrt-x86_64-SDL2_ttf \ - mingw-w64-ucrt-x86_64-binutils \ - mingw-w64-ucrt-x86_64-bzip2 \ - mingw-w64-ucrt-x86_64-clang \ - mingw-w64-ucrt-x86_64-clang-tools-extra \ - mingw-w64-ucrt-x86_64-crt-git \ - mingw-w64-ucrt-x86_64-expat \ - mingw-w64-ucrt-x86_64-flac \ - mingw-w64-ucrt-x86_64-fluidsynth \ - mingw-w64-ucrt-x86_64-gcc \ - mingw-w64-ucrt-x86_64-gcc-libs \ - mingw-w64-ucrt-x86_64-gdb \ - mingw-w64-ucrt-x86_64-gdbm \ - mingw-w64-ucrt-x86_64-gettext \ - mingw-w64-ucrt-x86_64-giflib \ - mingw-w64-ucrt-x86_64-glib2 \ - mingw-w64-ucrt-x86_64-gmp \ - mingw-w64-ucrt-x86_64-headers-git \ - mingw-w64-ucrt-x86_64-isl \ - mingw-w64-ucrt-x86_64-libffi \ - mingw-w64-ucrt-x86_64-libiconv \ - mingw-w64-ucrt-x86_64-libjpeg-turbo \ - mingw-w64-ucrt-x86_64-libmad \ - mingw-w64-ucrt-x86_64-libmodplug \ - mingw-w64-ucrt-x86_64-libogg \ - mingw-w64-ucrt-x86_64-libpng \ - mingw-w64-ucrt-x86_64-libsndfile \ - mingw-w64-ucrt-x86_64-libsystre \ - mingw-w64-ucrt-x86_64-libtiff \ - mingw-w64-ucrt-x86_64-libtre-git \ - mingw-w64-ucrt-x86_64-libvorbis \ - mingw-w64-ucrt-x86_64-libwebp \ - mingw-w64-ucrt-x86_64-libwinpthread-git \ - mingw-w64-ucrt-x86_64-mpc \ - mingw-w64-ucrt-x86_64-mpfr \ - mingw-w64-ucrt-x86_64-ncurses \ - mingw-w64-ucrt-x86_64-openssl \ - mingw-w64-ucrt-x86_64-portaudio \ - mingw-w64-ucrt-x86_64-python \ - mingw-w64-ucrt-x86_64-python-pip \ - mingw-w64-ucrt-x86_64-python-py \ - mingw-w64-ucrt-x86_64-readline \ - mingw-w64-ucrt-x86_64-smpeg2 \ - mingw-w64-ucrt-x86_64-speex \ - mingw-w64-ucrt-x86_64-speexdsp \ - mingw-w64-ucrt-x86_64-termcap \ - mingw-w64-ucrt-x86_64-windows-default-manifest \ - mingw-w64-ucrt-x86_64-winpthreads-git \ - mingw-w64-ucrt-x86_64-xz \ - mingw-w64-ucrt-x86_64-zlib - -if [[ $? -ne 0 ]]; -then - log_err "Install failed. I'll try and continue." -fi - -for i in colored hexdump flake8 -do - /mingw64-ucrt-ucrt/bin/pip3 install $i - if [[ $? -ne 0 ]]; - then - log_err "Install failed for pip3 hexdump I'll try and continue." - fi -done - -mycp() -{ - local a=$1 - local b=$2 - - for i in $a - do - run cp -rpvf $i $b - - if [ $? -ne 0 ] - then - log_err "Failed to copy $i to $MINGW64_DIR" - exit 1 - fi - done -} - -cd $TOP_DIR - -./RUNME - -if [ $? -eq 0 ] -then - /bin/rm -rf data/gfx # For licensing issues with oryx - cd build/windows - ./windows.sh -fi