radiant/vfs: rework vfs loading, attempt to load wads and paks, ref #139

[xonotic/netradiant.git] / library-bundler

diff --git a/library-bundler b/library-bundler
index ea276cea7230f955dc50d3a2ff3d5252329cd77b..d5a439716aa88b950d24cd85b165a7a5e196faf2 100755 (executable)
--- a/library-bundler
+++ b/library-bundler
@@ -1,7 +1,9 @@
 #! /usr/bin/env bash
 
+set -e
+
 Common::noOp () {
-       printf ''
+       true
 }
 
 Common::getPath () {
@@ -24,7 +26,8 @@ Common::getPath () {
                else
                        printf '%s\n' "${file_path}"
                fi
-       fi
+       fi \
+       | sed -e 's|/*$||'
 }
 
 Common::grepLdd () {
@@ -46,8 +49,8 @@ Multi::excludeLdd () {
                        #   which is likely to pull gtk itself, x11 and gl dependencies
                        # - old fontconfig does not work correctly if newer fontconfig configuration is installed
                        # - if gtk and fontconfig is installed, pango and freetype are
-                       egrep -v '/libc\.|/libstdc\+\+\.|/libdl\.|/libm\.|/libX|/libxcb|/libGL|/libICE\.|/libSM\.' \
-                       | egrep -v '/libatk|/libgdk|/libgtk|/libgio|/libglib|/libgmodule|/libgobject|/libpango|/libfontconfig|/libfreetype'
+                       egrep -v '/libc\.|/libstdc\+\+\.|/libdl\.|/libm\.|/libX|/libxcb|/libGL|/libICE\.|/libSM\.|/libpthread\.' \
+                       | egrep -v '/libatk|/libgdk|/libgtk|/libgio|/libglib|/libgmodule|/libgobject|/libcairo|/libpango|/libfontconfig|/libfreetype'
                        ;;
                'windows')
                        egrep -i '\.dll => [A-Z]:\\msys64\\' \
@@ -107,7 +110,7 @@ Multi::getRootPrefix () {
                        ;;
                'windows')
                        basename "${lib_file}" \
-                       | xargs -n1 -P 1 which \
+                       | xargs -n1 -P1 which \
                        | cut -f2 -d'/'
                        ;;
        esac
@@ -186,7 +189,7 @@ Multi::bundleLibFromFile () {
        do
                lib_basename="$(basename "${lib_file}")"
 
-               if [ -f "${bundle_dir}/${lib_basename}" ]
+               if [ -f "${lib_dir}/${lib_basename}" ]
                then
                        continue
                fi
@@ -211,24 +214,61 @@ Multi::cleanUp () {
                -exec rm {} \;
 
        find "${bundle_dir}/lib" \
-               -type d \
                -depth \
+               -type d \
                -exec rmdir --ignore-fail-on-non-empty {} \;
 }
 
+Linux::getRpath () {
+       local exe_file="${1}"
+
+       local exe_dir="$(dirname "${exe_file}")"
+       local path_start="$(printf '%s' "${bundle_dir}" | wc -c)"
+       path_start="$((${path_start} + 1))"
+
+       local exe_subdir="$(echo "${exe_dir}" | cut -c "${path_start}-" | sed -e 's|//*|/|;s|^/||')"
+
+       local rpath_origin='$ORIGIN'
+
+       if [ "${exe_subdir}" = '' ]
+       then
+               printf '%s/lib\n' "${rpath_origin}"
+       else
+               if [ "${exe_subdir}" = 'lib' ]
+               then
+                       printf '%s\n' "${rpath_origin}"
+               else
+                       local num_parent_dir="$(echo "${exe_subdir}" | tr '/' '\n' | wc -l)"
+                       local rpath_subdir
+                       local i=0
+                       while [ "${i}" -lt "${num_parent_dir}" ]
+                       do
+                               rpath_subdir="${rpath_subdir}/.."
+                               i="$((${i} + 1))"
+                       done
+                       printf '%s%s/lib\n' "${rpath_origin}" "${rpath_subdir}"
+               fi
+       fi
+}
+
 Linux::patchExe () {
        local exe_file="${1}"
 
-       patchelf --set-rpath "${rpath_string}" "${exe_file}"
+       local linux_rpath_string=$"$(Linux::getRpath "${exe_file}")"
+       patchelf --set-rpath "${linux_rpath_string}" "${exe_file}"
 }
 
 Linux::patchLib () {
        local lib_dir="${1}"
+       local exe_file
 
        find "${lib_dir}" \
                -type f \
                -name '*.so*' \
-               -exec patchelf --set-rpath "${rpath_string}" {} \;
+       | while read exe_file
+       do
+               Linux::patchExe "${exe_file}"
+       done
 }
 
 Windows::listLibForManifest () {
@@ -257,7 +297,11 @@ Windows::writeManifest () {
 
 system_name="${1}"; shift
 bundle_dir="${1}"; shift
-exe_file="${1}"; shift
+
+if ! [ -z "${1}" ]
+then
+       exe_file="${1}"; shift
+fi
 
 bundle_dir="$(Common::getPath "${bundle_dir}")"
 registry_dir="${bundle_dir}/registry"
@@ -265,8 +309,6 @@ lib_dir="${bundle_dir}/lib"
 
 manifest_file="${lib_dir}/lib.manifest"
 
-rpath_string='@executable_path:lib'
-
 exe_action='Common::noOp'
 lib_action='Common::noOp'