#4794 go back to shell scripts, easier

Author: totaam

packaging/MacOS/Helpers/Python

@@ -7,12 +7,15 @@
 # which is used on OSX as the default application name
 # as shown in the global menu.
 
-APPNAME=$(echo "$1" | sed 's+_+ +g')
+BINNAME="$1"
+APPNAME=$(echo "${BINNAME}" | sed 's+_+ +g')
 if [ -z "$APPNAME" ]; then
 	echo "usage $0 APPNAME [args ..]"
 	exit 1
 fi
 shift
+MODULE="$1"
+shift
 
 
 full_path=$(cd "$(dirname "$0")"; pwd)
@@ -108,4 +111,5 @@ if test "$LANG" == "C"; then
 	fi
 fi
 
-exec "$PYTHON" "${APPNAME}" "$@"
+
+exec "$PYTHON" "-c" "import sys;sys.argv[0]='${full_path}/${BINNAME}';from ${MODULE} import main;sys.exit(main(sys.argv))" "$@"

packaging/MacOS/Helpers/PythonExecWrapper

@@ -126,10 +126,6 @@ git checkout "./Info.plist" "./Xpra_NoDock.app/Contents/Info.plist" >& /dev/null
 echo "*******************************************************************************"
 PYVERSIONSTR="${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_VERSION}"
 echo "Building Xpra for Python ${PYVERSIONSTR} using $NPROC logical CPUs"
-echo "- building C launcher shim"
-rm -f "${MACOS_SCRIPT_DIR}/launcher"
-gcc -o "${MACOS_SCRIPT_DIR}/launcher" "${MACOS_SCRIPT_DIR}/launcher.c" -I"${JHBUILD_PREFIX}/include/python${PYVERSIONSTR}" -L"${JHBUILD_PREFIX}/lib" "-lpython${PYVERSIONSTR}" -Wl,-rpath,"@executable_path/.."
-
 cd "${XPRA_SRC_DIR}" || exit 1
 echo "- regenerate source and build info"
 rm -f "xpra/src_info.py" "xpra/build_info.py"
@@ -294,17 +290,14 @@ cp "${SITELIB}/uvloop/_noop.py" "${PYDIR}/uvloop/"
 
 echo "- add xpra/server/python helper scripts"
 rsync -plt "${MACOS_SCRIPT_DIR}/Helpers/"* "${HELPERS_DIR}/"
-#we dont need the wrappers that may have been installed by distutils:
+# we dont need the wrappers that may have been installed by distutils:
 rm -f "${MACOS_DIR}/*bin"
-#add our own one:
-mv "${MACOS_SCRIPT_DIR}/launcher" "${FRAMEWORKS_DIR}/bin/Xpra"
-#ensure they all have a symlink to the helper name:
+# ensure they all have a symlink to the Python interpreter for each helper
+# (using the "pretty" name, converting underscores to spaces)
 for helper in "${HELPERS_DIR}/"*; do
   filename=$(basename "${helper}")
   name=${filename//_/ }
-  if [ "${name}" != "Xpra" ]; then
-    ln -sf "./Xpra" "${FRAMEWORKS_DIR}/bin/${name}"
-  fi
+  ln -sf "./Python" "${FRAMEWORKS_DIR}/bin/${name}"
 done
 
 # overwrite the "Xpra" script generated by py2app with our custom one:

packaging/MacOS/launcher.c

@@ -59,7 +59,10 @@ if [ -d "${X11_DIR}/bin" ]; then
     sign_runtime "${X11_DIR}/lib/dri/"*
 fi
 echo "  Frameworks/bin"
-sign_runtime "${CONTENTS_DIR}/Frameworks/bin/"*
+# only sign the actual binaries / unique scripts, not the symlinks:
+for bin in Python daemonizer gst-inspect-1.0 gst-launch-1.0 gst-plugin-scanner sshpass xpra_signal_listener; do
+  sign_runtime "${CONTENTS_DIR}/Frameworks/bin/${bin}"
+done
 echo "  Helpers"
 sign_runtime "${CONTENTS_DIR}/Helpers/"*
 echo "  MacOS/Xpra"