Changeset 9afe60081bbad75e6bd907226759a182d6150ee1

Timestamp:

01/02/08 02:32:05 (9 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1201829525 +0000

git-parent:

[3e75c8bc8fb5246b6bcc496c240e47dc9a9e156b]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1201829525 +0000

Message:

MacOSX/Framework/Pre-Compile.sh: Support the VLC-release.app target.

Files:

• extras/MacOSX/Framework/Pre-Compile.sh (modified) (5 diffs)

extras/MacOSX/Framework/Pre-Compile.sh

@@ -9 +9 @@
-    rm -fr ${FULL_PRODUCT_NAME}
-    # Debug --
+fi
+
+# Hack to use that script with the current VLC-release.app
+if test "${ACTION}" = "VLC-release.app"; then
+    TARGET_BUILD_DIR="${build_dir}"
+    FULL_PRODUCT_NAME="VLC-release.app"
+    CONTENTS_FOLDER_PATH="${FULL_PRODUCT_NAME}/Contents/MacOS"
+    VLC_BUILD_DIR="${build_dir}"
+    VLC_SRC_DIR="${src_dir}"
+    ACTION="build"
-fi
-
@@ -23 +33 @@
-    
-    ##########################
-
+, type, lib_install_prefix, destination_name
-    # @description Installs the specified library into the destination folder, automatically changes the references to dependencies
-    # @param src_lib     source library to copy to the destination directory
@@ -30 +40 @@
-        if [ ${3} = "library" ]; then
-            install_name="@loader_path/lib"
-se
+if [ ${3} = "module" ]; then
-            install_name="@loader_path/modules"
-        fi
-        
-4
-4
+5
+5
-        else
-            lib_dest="${2}/`basename ${1}`"
-        fi
+
+        if [ "${4}" != "" ]; then
+            lib_install_prefix="${4}"
+        else
+            lib_install_prefix="@loader_path/../lib"
+        fi
-        
-        if test -e ${1} && ((! test -e ${lib_dest}) || test ${1} -nt ${lib_dest} ); then
+            
-            mkdir -p ${2}
-
+
-            # Lets copy the library from the source folder to our new destination folder
-cp
+install -m 644
-
-            # Update the dynamic library so it will know where to look for the other libraries
-            echo "Installing ${3} `basename ${lib_dest}`"
-
-# Change the reference of libvlc.1 stored in the usr directory to libvlc.dylib in the framework's library directory
-install_name_tool -change /usr/local/lib/libvlc.1.dylib @loader_path/../lib/libvlc.dylib ${lib_dest}
-install_name_tool -change @executable_path/lib/vlc_libintl.dylib @loader_path/../lib/vlc_libintl.dylib ${lib_dest}
-install_name_tool -id "${install_name}/`basename ${lib_dest}`" ${lib_dest}
-
+if [ "${3}" != "bin" ]; then
+    # Change the reference of libvlc.1 stored in the usr directory to libvlc.dylib in the framework's library directory
+    install_name_tool -id "${install_name}/`basename ${lib_dest}`" ${lib_dest} > /dev/null
+fi
+
-            # Iterate through each installed library and modify the references to other dynamic libraries to match the framework's library directory
-            for linked_lib in `otool -L ${lib_dest}  | grep '(' | sed 's/\((.*)\)//'`; do
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-            done
-
+ 
-    }
-    # @function install_library
@@ -104 +126 @@
-    for linked_lib in ${linked_libs} ; do
-        case "${linked_lib}" in
-
-
-
-
-
-
+
+
+
-                fi
-
+
+
+
+
+
-                ;;
-        esac
@@ -118 +141 @@
-    install_library "${VLC_BUILD_DIR}/src/.libs/libvlc-control.dylib" ${target_lib} "library"
-    install_library "${VLC_BUILD_DIR}/src/.libs/libvlc.dylib" ${target_lib} "library"
+
+    ##########################
+    # Hack for VLC-release.app
+    if [ "$FULL_PRODUCT_NAME" = "VLC-release.app" ] ; then
+        install_library "${VLC_BUILD_DIR}/.libs/vlc" "${target}" "bin" "@loader_path/lib"
+    fi
-
-    ##########################