Make sdl-config/sdl2-config into simple shell scripts (#24907)

This removes the python dependency and the need to .bat and shell
launchers.

These script have always be shell scripts upstream and there should be
no expectation that they can be run on windows.

See libsdl-org/SDL#3516

In addition fix `sdl-config.py` so that it explicitly includes
`-sUSE_SDL`. This has been required since #18443.

Author: sbc100

ChangeLog.md

@@ -20,6 +20,8 @@ See docs/process.md for more on how version tagging works.
 
 4.0.13 (in development)
 -----------------------
+- `sdl-config` and `sdl2-config` scripts were simplified to avoid using python
+  and the `.bat` file versions were removed, matching upstream SDL. (#24907)
 - The `addRunDependency`/`removeRunDependency` now assert in debug builds if
   they are not passed an `id` parameter.  We have been issuing warnings in
   this case since 2012 (f67ad60), so it seems highly unlikely anyone is not

system/bin/sdl-config

@@ -1,35 +1,15 @@
 #!/bin/sh
-# Copyright 2020 The Emscripten Authors.  All rights reserved.
-# Emscripten is available under two separate licenses, the MIT license and the
-# University of Illinois/NCSA Open Source License.  Both these licenses can be
-# found in the LICENSE file.
-#
-# Entry point for running python scripts on UNIX systems.
-#
-# Automatically generated by `create_entry_points.py`; DO NOT EDIT.
-#
-# To make modifications to this file, edit `tools/run_python.sh` and then run
-# `tools/maint/create_entry_points.py`
 
-# $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal
-# of cpython used in cross compilation via setup.py.
-unset _PYTHON_SYSCONFIGDATA_NAME
+echo "emscripten sdl-config called with $*" >&2
 
-if [ -z "$PYTHON" ]; then
-  PYTHON=$EMSDK_PYTHON
-fi
+for arg in "$@"; do
+  case "$arg" in
+    --cflags|--libs)
+      echo "-sUSE_SDL"
+      ;;
+    --version)
+      echo "1.3.0"
+      ;;
+  esac
+done
 
-if [ -z "$PYTHON" ]; then
-  PYTHON=$(command -v python3 2> /dev/null)
-fi
-
-if [ -z "$PYTHON" ]; then
-  PYTHON=$(command -v python 2> /dev/null)
-fi
-
-if [ -z "$PYTHON" ]; then
-  echo 'unable to find python in $PATH'
-  exit 1
-fi
-
-exec "$PYTHON" -E "$0.py" "$@"

system/bin/sdl-config.bat

@@ -1,35 +1,15 @@
 #!/bin/sh
-# Copyright 2020 The Emscripten Authors.  All rights reserved.
-# Emscripten is available under two separate licenses, the MIT license and the
-# University of Illinois/NCSA Open Source License.  Both these licenses can be
-# found in the LICENSE file.
-#
-# Entry point for running python scripts on UNIX systems.
-#
-# Automatically generated by `create_entry_points.py`; DO NOT EDIT.
-#
-# To make modifications to this file, edit `tools/run_python.sh` and then run
-# `tools/maint/create_entry_points.py`
 
-# $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal
-# of cpython used in cross compilation via setup.py.
-unset _PYTHON_SYSCONFIGDATA_NAME
+echo "emscripten sdl2-config called with $*" >&2
 
-if [ -z "$PYTHON" ]; then
-  PYTHON=$EMSDK_PYTHON
-fi
+for arg in "$@"; do
+  case "$arg" in
+    --cflags|--libs)
+      echo "-sUSE_SDL=2"
+      ;;
+    --version)
+      echo "2.0.10"
+      ;;
+  esac
+done
 
-if [ -z "$PYTHON" ]; then
-  PYTHON=$(command -v python3 2> /dev/null)
-fi
-
-if [ -z "$PYTHON" ]; then
-  PYTHON=$(command -v python 2> /dev/null)
-fi
-
-if [ -z "$PYTHON" ]; then
-  echo 'unable to find python in $PATH'
-  exit 1
-fi
-
-exec "$PYTHON" -E "$0.py" "$@"

system/bin/sdl-config.py

@@ -7355,6 +7355,7 @@ def test_emmake_python(self):
     self.run_process([emmake, PYTHON, test_file('emmake/make.py')])
 
   @crossplatform
+  @no_windows('sdl2-config is a shell script and cannot run on windows')
   def test_sdl2_config(self):
     for args, expected in [
       [['--version'], '2.0.10'],

system/bin/sdl2-config

@@ -43,8 +43,6 @@
 emstrip
 emsymbolizer
 emscan-deps
-system/bin/sdl-config
-system/bin/sdl2-config
 tools/file_packager
 tools/webidl_binder
 test/runner