Reworked build scripts for all platforms; Removed platform prefix fro…

…m script names

scripts/android/build-android.sh → scripts/android/build.sh

@@ -1,18 +1,20 @@
 #!/usr/bin/env bash
-# This script is meant to be run from the root of the project.
 
-source scripts/variables-android.sh
+source variables.sh
 
 # Following variables must be present in the environment:
+#
 # ANDROID_NDK_HOME - Root of directory with unpacked Android NDK, i.e - /opt/android/android-ndk-r15c
 # ANDROID_DEPS_ARMEABI_V7A - Root of directory with armeabi-v7a dependency artifacts, i.e - /opt/android/deps-armeabi-v7a,
 #                            will be forwarded to CMake through CMAKE_PREFIX_PATH.
 # ANDROID_DEPS_ARM64_V8A - Root of directory with arm64-v8a dependency artifacts, i.e - /opt/android/deps-arm64-v8a,
-#                            will be forwarded to CMake through CMAKE_PREFIX_PATH.
+#                          will be forwarded to CMake through CMAKE_PREFIX_PATH.
 
-rm -rf $INSTALL_PATH
-mkdir -p $INSTALL_PATH
+echo ANDROID_NDK_HOME: $ANDROID_NDK_HOME
+echo ANDROID_DEPS_ARMEABI_V7A: $ANDROID_DEPS_ARMEABI_V7A
+echo ANDROID_DEPS_ARM64_V8A: $ANDROID_DEPS_ARM64_V8A
 
-cd $ROOT_PATH/platforms/android
+# FIXME: This should be building under TMP_PATH, just like every other artifact:
+cd $PLATFORMS_PATH/android
 ./gradlew assemble
 cp build/android-app/outputs/apk/debug/Spelunky_PSP-debug.apk $INSTALL_PATH/Spelunky_PSP.apk

scripts/android/clean.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
-# This script is meant to be run from the root of the project.
 
-rm -rf tmp
+source variables.sh
+
+yes | rm -r $TMP_PATH

scripts/android/variables.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+# Stop on error:
+set -e
+# Referencing unset variables are errors:
+set -u
+
+ROOT_PATH=$(realpath ../../)
+TMP_PATH=$ROOT_PATH/tmp
+INSTALL_PATH=$TMP_PATH/install-android
+BUILD_PATH=$TMP_PATH/build-android
+# TODO: Think about moving this directory somewhere else or more specific naming;
+#       "platform-specific/android", "platform-files/android", "extras/android"?
+PLATFORMS_PATH=$ROOT_PATH/platforms

scripts/darwin/build.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+source variables.sh
+
+cmake \
+    --build $BUILD_PATH \
+    --target install \
+    --config Release \
+    -j $NUM_THREADS

scripts/darwin/clean.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
-# This script is meant to be run from the root of the project.
 
-rm -rf tmp
+source variables.sh
+
+yes | rm -r $TMP_PATH

scripts/darwin/config.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+source variables.sh
+
+cmake \
+    -B $BUILD_PATH \
+    -S $ROOT_PATH \
+    -G "Unix Makefiles" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH

scripts/darwin/variables.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+# Stop on error:
+set -e
+# Referencing unset variables are errors:
+set -u
+
+ROOT_PATH=$(realpath ../../)
+TMP_PATH=$ROOT_PATH/tmp
+INSTALL_PATH=$TMP_PATH/install-darwin
+BUILD_PATH=$TMP_PATH/build-darwin
+NUM_THREADS=$(nproc)

scripts/linux/build.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+source variables.sh
+
+cmake \
+    --build $BUILD_PATH \
+    --target install \
+    --config Release \
+    -j $NUM_THREADS

scripts/linux/clean.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
-# This script is meant to be run from the root of the project.
 
-rm -rf tmp
+source variables.sh
+
+yes | rm -r $TMP_PATH

scripts/linux/config.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+source variables.sh
+
+cmake \
+    -S $ROOT_PATH \
+    -B $BUILD_PATH \
+    -G "Unix Makefiles" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH

scripts/linux/variables.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+# Stop on error:
+set -e
+# Referencing unset variables are errors:
+set -u
+
+ROOT_PATH=$(realpath ../../)
+TMP_PATH=$ROOT_PATH/tmp
+INSTALL_PATH=$TMP_PATH/install-linux
+BUILD_PATH=$TMP_PATH/build-linux
+NUM_THREADS=$(nproc)

scripts/psp/build.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+source variables.sh
+
+cmake \
+    --build $BUILD_PATH \
+    --target install \
+    --config Release \
+    -j $NUM_THREADS

scripts/psp/clean.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
-# This script is meant to be run from the root of the project.
 
-rm -rf tmp
+source variables.sh
+
+yes | rm -r $TMP_PATH

scripts/psp/config.sh

@@ -0,0 +1,13 @@
+#/usr/bin/env bash
+
+source variables.sh
+
+# "psp-cmake" is guaranteed to be in PATH after successful pspdev/psptoolchain installation AND in the official PSP SDK Docker image;
+# it's a shell script calling host's vanilla cmake with cmake toolchain file already passed:
+
+psp-cmake \
+    -S $ROOT_PATH \
+    -B $BUILD_PATH \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH \
+    -DCMAKE_VERBOSE_MAKEFILE=ON

scripts/psp/run.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+source variables.sh
+
+# Run filtering everything except Spelunky-PSP output:
+ppsspp $BUILD_PATH/EBOOT.PBP 2>&1 | grep -F SPELUNKY

scripts/psp/variables.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+# Stop on error:
+set -e
+# Referencing unset variables are errors:
+set -u
+
+ROOT_PATH=$(realpath ../../)
+TMP_PATH=$ROOT_PATH/tmp
+INSTALL_PATH=$TMP_PATH/install-psp
+BUILD_PATH=$TMP_PATH/build-psp
+NUM_THREADS=$(nproc)

scripts/windows/TODO.txt

@@ -0,0 +1 @@
+Rework these scripts to be structured in the same way as for other platforms.

scripts/windows/build.ps1

@@ -0,0 +1,3 @@
+$ErrorActionPreference = "Stop"
+
+cmake --build "../../tmp/build-windows" --target install --config Release -j $env:NUMBER_OF_PROCESSORS

scripts/windows/config-windows.ps1 → scripts/windows/config.ps1

@@ -1,8 +1,3 @@
-# This script is meant to be run from the root of the project.
-
-# Builds SpelunkyPSP natively on Windows, using following dependencies:
-# * SDL as a vendor of creating window, retrieving OpenGL context, controls and sounds.
-
 [CmdletBinding()]
 param (
     [Parameter()][String]
@@ -11,7 +6,7 @@ param (
 
 $ErrorActionPreference = "Stop"
 
-$ROOT = $(Get-Location)
+$ROOT = $(Get-Location)/../../
 $INSTALL_PATH = "$ROOT/tmp/install-windows"
 $DEPS_PATH = "$ROOT/$DepsDirectory/SDL"