mirror of
https://github.com/Gator96100/ProxSpace.git
synced 2025-08-19 21:03:25 -07:00
Removed unused 32-bit functions
This commit is contained in:
parent
8b7ee8df4d
commit
0a6cf98a60
6 changed files with 3 additions and 36 deletions
|
@ -1,5 +1,4 @@
|
||||||
@echo off
|
@echo off
|
||||||
call msys2\ps\setup.cmd
|
call msys2\ps\setup.cmd
|
||||||
echo %cd%\builds /builds ntfs noacl 0 0 >>msys2/etc/fstab
|
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
|
call msys2\msys2_shell.cmd -mingw64 -defterm -no-start -c /ps/autobuild.sh
|
|
@ -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
|
export PATH=/gcc-arm-none-eabi/bin:/ps/bin:$PATH
|
||||||
alias ls='ls -hF --color=auto'
|
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
|
if [ "$MAYBE_FIRST_START" = "true" ]; then
|
||||||
yes | pacman -Syuu
|
yes | pacman -Syuu
|
||||||
else
|
else
|
||||||
|
|
|
@ -2,22 +2,14 @@
|
||||||
pm3Dir=/pm3
|
pm3Dir=/pm3
|
||||||
copyDir=/builds
|
copyDir=/builds
|
||||||
buildDir=/tmp
|
buildDir=/tmp
|
||||||
|
mingwDir=/mingw64
|
||||||
|
arch=64
|
||||||
|
|
||||||
pacman -Q p7zip 1> /dev/null
|
pacman -Q p7zip 1> /dev/null
|
||||||
if [[ $? != 0 ]]; then
|
if [[ $? != 0 ]]; then
|
||||||
pacman --noconfirm -S p7zip
|
pacman --noconfirm -S p7zip
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$MSYSTEM" == "MINGW32" ]; then
|
|
||||||
mingwDir=/mingw32
|
|
||||||
arch=32
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$MSYSTEM" == "MINGW64" ]; then
|
|
||||||
mingwDir=/mingw64
|
|
||||||
arch=64
|
|
||||||
fi
|
|
||||||
|
|
||||||
cd $pm3Dir
|
cd $pm3Dir
|
||||||
for i in $( ls -d */ ); do
|
for i in $( ls -d */ ); do
|
||||||
echo Processing: ${i%%/}-$arch
|
echo Processing: ${i%%/}-$arch
|
||||||
|
|
|
@ -9,7 +9,6 @@ ps_print "Arch: $MSYSTEM_CARCH"
|
||||||
ps_print "OS: $(wmic OS get Caption,CSDVersion,OSArchitecture,Version | awk 'NR==2')"
|
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 "CPU: $(wmic CPU get Name | awk 'NR==2')"
|
||||||
ps_print "Ram: $(wmic COMPUTERSYSTEM get TotalPhysicalMemory | 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 "Installed64: $(cat /ps/installed64.txt)"
|
||||||
ps_print "OLDPWD: $OLDPWD"
|
ps_print "OLDPWD: $OLDPWD"
|
||||||
ps_print "Path: $PATH"
|
ps_print "Path: $PATH"
|
||||||
|
|
|
@ -5,11 +5,6 @@ check_install () {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
clean_86 () {
|
|
||||||
rm -rf /mingw32/share/qt5/examples
|
|
||||||
pacman --noconfirm --overwrite='*' -Scc
|
|
||||||
}
|
|
||||||
|
|
||||||
clean_64 () {
|
clean_64 () {
|
||||||
rm -rf /mingw64/share/qt5/examples
|
rm -rf /mingw64/share/qt5/examples
|
||||||
pacman --noconfirm --overwrite='*' -Scc
|
pacman --noconfirm --overwrite='*' -Scc
|
||||||
|
@ -33,22 +28,5 @@ setup_proxspace ()
|
||||||
clean_64
|
clean_64
|
||||||
echo $(date '+%Y-%m-%d %H:%M:%S') > /ps/installed64.txt
|
echo $(date '+%Y-%m-%d %H:%M:%S') > /ps/installed64.txt
|
||||||
fi
|
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
|
setup_proxspace
|
|
@ -1,3 +1,2 @@
|
||||||
rm /ps/installed64.txt &> /dev/null
|
rm /ps/installed64.txt &> /dev/null
|
||||||
rm /ps/installed32.txt &> /dev/null
|
|
||||||
yes | pacman -Syuu
|
yes | pacman -Syuu
|
Loading…
Add table
Add a link
Reference in a new issue