Removed unused 32-bit functions

This commit is contained in:
Gator96100 2020-09-07 18:37:33 +02:00
commit 0a6cf98a60
6 changed files with 3 additions and 36 deletions

View file

@ -1,5 +1,4 @@
@echo off
call msys2\ps\setup.cmd
echo %cd%\builds /builds ntfs noacl 0 0 >>msys2/etc/fstab
call msys2\msys2_shell.cmd -mingw32 -defterm -no-start -c /ps/autobuild.sh
call msys2\msys2_shell.cmd -mingw64 -defterm -no-start -c /ps/autobuild.sh

View file

@ -4,7 +4,7 @@ export PS1='\[\033]0;ProxSpace v$PSVERSION - $MSYSTEM:\w\007\033[32m\]pm3 \[\033
export PATH=/gcc-arm-none-eabi/bin:/ps/bin:$PATH
alias ls='ls -hF --color=auto'
if [ \( ! -f /ps/installed32.txt -a "$MSYSTEM" == "MINGW32" \) -o \( ! -f /ps/installed64.txt -a "$MSYSTEM" == "MINGW64" \) ]; then
if [ \( ! -f /ps/installed64.txt -a "$MSYSTEM" == "MINGW64" \) ]; then
if [ "$MAYBE_FIRST_START" = "true" ]; then
yes | pacman -Syuu
else

View file

@ -2,22 +2,14 @@
pm3Dir=/pm3
copyDir=/builds
buildDir=/tmp
mingwDir=/mingw64
arch=64
pacman -Q p7zip 1> /dev/null
if [[ $? != 0 ]]; then
pacman --noconfirm -S p7zip
fi
if [ "$MSYSTEM" == "MINGW32" ]; then
mingwDir=/mingw32
arch=32
fi
if [ "$MSYSTEM" == "MINGW64" ]; then
mingwDir=/mingw64
arch=64
fi
cd $pm3Dir
for i in $( ls -d */ ); do
echo Processing: ${i%%/}-$arch

View file

@ -9,7 +9,6 @@ ps_print "Arch: $MSYSTEM_CARCH"
ps_print "OS: $(wmic OS get Caption,CSDVersion,OSArchitecture,Version | awk 'NR==2')"
ps_print "CPU: $(wmic CPU get Name | awk 'NR==2')"
ps_print "Ram: $(wmic COMPUTERSYSTEM get TotalPhysicalMemory | awk 'NR==2')"
ps_print "Installed32: $(cat /ps/installed32.txt)"
ps_print "Installed64: $(cat /ps/installed64.txt)"
ps_print "OLDPWD: $OLDPWD"
ps_print "Path: $PATH"

View file

@ -5,11 +5,6 @@ check_install () {
fi
}
clean_86 () {
rm -rf /mingw32/share/qt5/examples
pacman --noconfirm --overwrite='*' -Scc
}
clean_64 () {
rm -rf /mingw64/share/qt5/examples
pacman --noconfirm --overwrite='*' -Scc
@ -33,22 +28,5 @@ setup_proxspace ()
clean_64
echo $(date '+%Y-%m-%d %H:%M:%S') > /ps/installed64.txt
fi
if [ "$MSYSTEM" == "MINGW32" ]; then
check_install mingw-w64-i686-readline
check_install mingw-w64-i686-gcc
check_install mingw-w64-i686-libsndfile
check_install mingw-w64-i686-cmake
check_install mingw-w64-i686-lua
check_install mingw-w64-i686-bzip2
check_install mingw-w64-i686-python
check_install mingw-w64-i686-jansson
check_install git
check_install make
check_install pkg-config
check_install mingw-w64-i686-qt5
clean_86
echo $(date '+%Y-%m-%d %H:%M:%S') > /ps/installed32.txt
fi
}
setup_proxspace

View file

@ -1,3 +1,2 @@
rm /ps/installed64.txt &> /dev/null
rm /ps/installed32.txt &> /dev/null
yes | pacman -Syuu