Public_Skunkworks/joeylib
Public_Skunkworks/joeylib
1
0
Fork 0
Code Issues 10 Pull requests Projects Releases Packages Wiki Activity Actions

Installer fixes.

Browse source
This commit is contained in:
Scott Duensing 2021-09-09 17:09:38 -05:00
parent 13dd1200c9
commit 10c06187c1
2 changed files with 51 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/build-PC.helper.sh
View file

@ -93,7 +93,7 @@ function buildLinux64() {
function buildWindows32() { function buildWindows32() {
CC="i686-w64-mingw32-gcc" CC="i686-w64-mingw32-gcc"
CFLAGS="" CFLAGS="-Dmain=SDL_main"
LDFLAGS="-lgdi32 -lwinmm -limm32 -lversion -lole32 -loleaut32 -lsetupapi -static -lstdc++" LDFLAGS="-lgdi32 -lwinmm -limm32 -lversion -lole32 -loleaut32 -lsetupapi -static -lstdc++"
doPCBuild windows i386 '.exe' doPCBuild windows i386 '.exe'
} }
@ -101,7 +101,7 @@ function buildWindows32() {
function buildWindows64() { function buildWindows64() {
CC="x86_64-w64-mingw32-gcc" CC="x86_64-w64-mingw32-gcc"
CFLAGS="" CFLAGS="-Dmain=SDL_main"
LDFLAGS="-lgdi32 -lwinmm -limm32 -lversion -lole32 -loleaut32 -lsetupapi -static -lstdc++" LDFLAGS="-lgdi32 -lwinmm -limm32 -lversion -lole32 -loleaut32 -lsetupapi -static -lstdc++"
doPCBuild windows x64 '.exe' doPCBuild windows x64 '.exe'
} }

70
scripts/installer.sh
View file

@ -160,14 +160,18 @@ function buildMacOSXSDK() {
purple "Building macOS SDK" purple "Building macOS SDK"
if [[ ! -d osxcross ]]; then if [[ ! -d osxcross ]]; then
git clone https://github.com/tpoechtrager/osxcross.git git clone https://github.com/tpoechtrager/osxcross.git
pushd osxcross &> /dev/null
git checkout 26ebac26899650b12b99de86ebbde785de6ca173
popd &> /dev/null
fi fi
pushd osxcross &> /dev/null pushd osxcross &> /dev/null
./tools/gen_sdk_package_pbzx.sh "${XCODE}" ./tools/gen_sdk_package_pbzx.sh "${XCODE}"
mv -f MacOSX.* tarballs/. mv -f MacOSX* tarballs/.
# SDK_VERSION= # SDK_VERSION=
# OSX_VERSION_MIN=${G_MAC_INTEL_MIN} # OSX_VERSION_MIN=${G_MAC_INTEL_MIN}
UNATTENDED=1 ./build.sh UNATTENDED=1 ./build.sh
mv -f target "${OSX}" mkdir -p "${OSX}"
mv -f target/* "${OSX}"
./cleanup.sh ./cleanup.sh
popd &> /dev/null popd &> /dev/null
@ -176,14 +180,29 @@ function buildMacOSXSDK() {
function buildPCDepsM1Hack() { function buildPCDepsM1Hack() {
mkdir -p build-scripts local TARGET=$1
pushd build-scripts &> /dev/null
rm -f config.guess config.sub if [[ "${TARGET}" == "macosa64" ]]; then
wget https://git.savannah.gnu.org/cgit/config.git/plain/config.guess [[ -f config.guess ]] && mv -f config.guess config.guess.joey
wget https://git.savannah.gnu.org/cgit/config.git/plain/config.sub [[ -f config.sub ]] && mv -f config.sub config.sub.joey
popd &> /dev/null mkdir -p build-scripts
cp -f build-scripts/config.guess . pushd build-scripts &> /dev/null
cp -f build-scripts/config.sub . [[ -f config.guess ]] && mv -f config.guess config.guess.joey
[[ -f config.sub ]] && mv -f config.sub config.sub.joey
wget https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
wget https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
popd &> /dev/null
cp -f build-scripts/config.guess .
cp -f build-scripts/config.sub .
else
[[ -f config.guess.joey ]] && mv -f config.guess.joey config.guess
[[ -f config.sub.joey ]] && mv -f config.sub.joey config.sub
mkdir -p build-scripts
pushd build-scripts &> /dev/null
[[ -f config.guess.joey ]] && mv -f config.guess.joey config.guess
[[ -f config.sub.joey ]] && mv -f config.sub.joey config.sub
popd &> /dev/null
fi
} }
@ -220,10 +239,10 @@ function buildPCDeps() {
# SDL2 # SDL2
purple "Building SDL2 ${TARGET}" purple "Building SDL2 ${TARGET}"
if [[ ! -d SDL ]]; then if [[ ! -d SDL ]]; then
hg clone http://hg.libsdl.org/SDL git clone https://github.com/libsdl-org/SDL.git
pushd SDL &> /dev/null pushd SDL &> /dev/null
hg up release-2.0.14 git checkout 25f9ed87ff6947d9576fc9d79dee0784e638ac58
buildPCDepsM1Hack buildPCDepsM1Hack ${TARGET}
popd &> /dev/null popd &> /dev/null
fi fi
if [[ ! -e "${PREFIX}/lib/libSDL2.a" ]]; then if [[ ! -e "${PREFIX}/lib/libSDL2.a" ]]; then
@ -235,6 +254,7 @@ function buildPCDeps() {
--build=x86_64-linux \ --build=x86_64-linux \
--enable-static \ --enable-static \
--disable-shared \ --disable-shared \
--disable-video-wayland \
--disable-render-metal \ --disable-render-metal \
--disable-video-metal \ --disable-video-metal \
--prefix=${PREFIX} --prefix=${PREFIX}
@ -254,7 +274,7 @@ function buildPCDeps() {
autoheader autoheader
automake --force-missing --add-missing automake --force-missing --add-missing
autoconf autoconf
buildPCDepsM1Hack buildPCDepsM1Hack ${TARGET}
popd &> /dev/null popd &> /dev/null
fi fi
if [[ ! -e "${PREFIX}/lib/libmodplug.a" ]]; then if [[ ! -e "${PREFIX}/lib/libmodplug.a" ]]; then
@ -275,10 +295,10 @@ function buildPCDeps() {
# SDL_mixer # SDL_mixer
purple "Building SDL_mixer ${TARGET}" purple "Building SDL_mixer ${TARGET}"
if [[ ! -d SDL_mixer ]]; then if [[ ! -d SDL_mixer ]]; then
hg clone http://hg.libsdl.org/SDL_mixer git clone https://github.com/libsdl-org/SDL_mixer.git
pushd SDL_mixer &> /dev/null pushd SDL_mixer &> /dev/null
hg up release-2.0.4 git checkout da75a58c19de9fedea62724a5f7770cbbe39adf9
buildPCDepsM1Hack buildPCDepsM1Hack ${TARGET}
popd &> /dev/null popd &> /dev/null
fi fi
if [[ ! -e "${PREFIX}/lib/libSDL2_mixer.a" ]]; then if [[ ! -e "${PREFIX}/lib/libSDL2_mixer.a" ]]; then
@ -294,6 +314,7 @@ function buildPCDeps() {
--disable-shared \ --disable-shared \
--prefix=${PREFIX} \ --prefix=${PREFIX} \
--with-sdl-prefix=${PREFIX} \ --with-sdl-prefix=${PREFIX} \
--disable-sdltest \
--disable-music-cmd \ --disable-music-cmd \
--disable-music-wave \ --disable-music-wave \
--enable-music-mod-modplug \ --enable-music-mod-modplug \
@ -335,6 +356,7 @@ function buildSDL12() {
purple "Building SDL" purple "Building SDL"
if [[ ! -d SDL-1.2 ]]; then if [[ ! -d SDL-1.2 ]]; then
# ***TODO*** Change to git repo & checkout specific version.
hg clone http://hg.libsdl.org/SDL SDL-1.2 -r SDL-1.2 hg clone http://hg.libsdl.org/SDL SDL-1.2 -r SDL-1.2
fi fi
if [[ ! -e "${PREFIX}/lib/libSDL.a" ]]; then if [[ ! -e "${PREFIX}/lib/libSDL.a" ]]; then
@ -357,6 +379,7 @@ function buildSDL12() {
purple "Building SDL_mixer and libMikMod" purple "Building SDL_mixer and libMikMod"
if [[ ! -d SDL_mixer-1.2 ]]; then if [[ ! -d SDL_mixer-1.2 ]]; then
# ***TODO*** Change to git repo & checkout specific version.
hg clone http://hg.libsdl.org/SDL_mixer SDL_mixer-1.2 -r SDL-1.2 hg clone http://hg.libsdl.org/SDL_mixer SDL_mixer-1.2 -r SDL-1.2
fi fi
if [[ ! -e "${PREFIX}/lib/libmikmod.a" ]]; then if [[ ! -e "${PREFIX}/lib/libmikmod.a" ]]; then
@ -539,7 +562,9 @@ function doSudoAskPass() {
function download() { function download() {
local URL=$1 local URL=$1
local FILE=$2 local FILE=
tTrim FILE "$2"
if [[ -z ${FILE} ]]; then if [[ -z ${FILE} ]]; then
FILE=${URL##*/} FILE=${URL##*/}
@ -575,6 +600,7 @@ function installAmiga() {
purple "Installing Amiga GCC" purple "Installing Amiga GCC"
if [[ ! -d amiga-gcc ]]; then if [[ ! -d amiga-gcc ]]; then
# ***TODO*** Checkout specific version.
git clone https://github.com/bebbo/amiga-gcc.git git clone https://github.com/bebbo/amiga-gcc.git
fi fi
pushd amiga-gcc &> /dev/null pushd amiga-gcc &> /dev/null
@ -711,6 +737,7 @@ function installIIgs() {
ssh-keygen -F gitlab.com || ssh-keyscan gitlab.com > ~/.ssh/known_hosts 2> /dev/null ssh-keygen -F gitlab.com || ssh-keyscan gitlab.com > ~/.ssh/known_hosts 2> /dev/null
git config --global credential.helper cache git config --global credential.helper cache
git clone https://${G_GOLDEN_GATE_USER}:${G_GOLDEN_GATE_PASS}@gitlab.com/GoldenGate/GoldenGate.git git clone https://${G_GOLDEN_GATE_USER}:${G_GOLDEN_GATE_PASS}@gitlab.com/GoldenGate/GoldenGate.git
# ***TODO*** Checkout specific version.
if [ ! -d GoldenGate ]; then if [ ! -d GoldenGate ]; then
tBoldBox tRED "Unable to clone the GoldenGate repository!" tBoldBox tRED "Unable to clone the GoldenGate repository!"
echo "Must be a paying member of the GoldenGate project!" echo "Must be a paying member of the GoldenGate project!"
@ -779,6 +806,7 @@ function installIIgs() {
if [[ ! -d gsplus ]]; then if [[ ! -d gsplus ]]; then
purple "Building GSplus" purple "Building GSplus"
git clone https://github.com/digarok/gsplus.git git clone https://github.com/digarok/gsplus.git
# ***TODO*** Checkout specific version.
mkdir gsplus/build mkdir gsplus/build
pushd gsplus/build &> /dev/null pushd gsplus/build &> /dev/null
cmake .. cmake ..
@ -812,6 +840,7 @@ function installIIgs() {
if [[ ! -d cadius ]]; then if [[ ! -d cadius ]]; then
purple "Building Cadius" purple "Building Cadius"
git clone https://github.com/mach-kernel/cadius.git git clone https://github.com/mach-kernel/cadius.git
# ***TODO*** Checkout specific version.
pushd cadius &> /dev/null pushd cadius &> /dev/null
make make
if [[ ! -e bin/release/cadius ]]; then if [[ ! -e bin/release/cadius ]]; then
@ -1059,9 +1088,8 @@ function mainMenu() {
local WHAT= local WHAT=
local CHOICE="x" local CHOICE="x"
checkInstalled
if [[ ! -z ${G_AUTOMATED} ]]; then if [[ ! -z ${G_AUTOMATED} ]]; then
checkInstalled
for (( X=0; X<=$(( ${TOTAL}-1 )); X++ )); do for (( X=0; X<=$(( ${TOTAL}-1 )); X++ )); do
CHOICE="install${G_ITEMS[$X]}" CHOICE="install${G_ITEMS[$X]}"
echo "" echo ""
@ -1070,6 +1098,7 @@ function mainMenu() {
done done
else else
while [[ "${CHOICE}" != "" ]]; do while [[ "${CHOICE}" != "" ]]; do
checkInstalled
MENU=() MENU=()
for (( X=0; X<=$(( ${TOTAL}-1 )); X++ )); do for (( X=0; X<=$(( ${TOTAL}-1 )); X++ )); do
MENU+=( "${G_ITEMS[$X]}" ) MENU+=( "${G_ITEMS[$X]}" )
@ -1180,7 +1209,6 @@ function start() {
libssl-dev \ libssl-dev \
libtool \ libtool \
libxml2-dev \ libxml2-dev \
linux-modules-extra-$(uname -r) \
llvm-dev \ llvm-dev \
make \ make \
mercurial \ mercurial \