vlc/vlc-1.2 | branch: master | Rafaël Carré <[email protected]> | Sat Jan 21
09:47:00 2012 -0500| [0c5fdbfe66cbad51ba2af881097312f1895efd0b] | committer:
Jean-Baptiste Kempf
OSX packaging: fix http lua
Use make install instead of broken rule in a custom script
Close #5891
Also move headers installation from said script to package.mak
We should use make install in the main directory but for some reason
the rule recurses and never ends
(cherry picked from commit 860a7e5c4193e4990f171cea93bddf43dba009b5)
Conflicts:
extras/package/macosx/package.mak
projects/macosx/framework/Pre-Compile.sh
> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=0c5fdbfe66cbad51ba2af881097312f1895efd0b
---
extras/package/macosx/package.mak | 9 ++++++---
projects/macosx/framework/Pre-Compile.sh | 27 +++++++++------------------
2 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/extras/package/macosx/package.mak
b/extras/package/macosx/package.mak
index 6831f47..f5699c5 100644
--- a/extras/package/macosx/package.mak
+++ b/extras/package/macosx/package.mak
@@ -27,8 +27,9 @@ VLC-release.app: VLC-tmp.app
# common target to a VLC bundle used by both the dev and the release build
VLC-tmp.app: vlc
- $(AM_V_GEN)(cd src && $(MAKE) $(AM_MAKEFLAGS) install $(silentstd))
- (cd lib && $(MAKE) $(AM_MAKEFLAGS) install $(silentstd))
+ $(AM_V_GEN)for i in src lib share; do \
+ (cd $$i && $(MAKE) $(AM_MAKEFLAGS) install $(silentstd)); \
+ done
rm -Rf "$(top_builddir)/tmp" "$@"
mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
cd $(srcdir)/extras/package/macosx; cp -R Resources README.MacOSX.rtf
$(abs_top_builddir)/tmp/extras/package/macosx/
@@ -48,7 +49,9 @@ VLC-tmp.app: vlc
cp -R -L $(top_builddir)/tmp/build/Default/VLC.bundle $@
mkdir -p $@/Contents/Frameworks && cp -R -L
$(CONTRIB_DIR)/Growl.framework $@/Contents/Frameworks/
mkdir -p $@/Contents/MacOS/share/locale/
- cp -r $(srcdir)/share/lua $@/Contents/MacOS/share/
+ cp -r "$(prefix)/lib/vlc/lua" "$(prefix)/share/vlc/lua"
$@/Contents/MacOS/share/
+ mkdir -p $@Contents/MacOS/include/
+ cp -r "$(srcdir)/include/vlc" $@/Contents/MacOS/include/
$(INSTALL) -m 644 $(srcdir)/share/vlc512x512.png
$@/Contents/MacOS/share/vlc512x512.png
cat $(top_srcdir)/po/LINGUAS | while read i; do \
$(INSTALL) -d $@/Contents/MacOS/share/locale/$${i}/LC_MESSAGES ; \
diff --git a/projects/macosx/framework/Pre-Compile.sh
b/projects/macosx/framework/Pre-Compile.sh
index b98eca4..cb92a18 100644
--- a/projects/macosx/framework/Pre-Compile.sh
+++ b/projects/macosx/framework/Pre-Compile.sh
@@ -52,7 +52,6 @@ target_bin="${target}/bin"
target_lib="${target}/${lib}" # Should we consider using a
different well-known folder like shared resources?
target_plugins="${target}/${plugins}" # Should we consider using a
different well-known folder like shared resources?
target_share="${target}/${share}" # Should we consider using a different
well-known folder like shared resources?
-target_include="${target}/${include}" # Should we consider using a
different well-known folder like shared resources?
linked_libs=""
prefix=".libs/"
suffix="dylib"
@@ -250,21 +249,13 @@ popd > /dev/null
##########################
# Build the share folder
-echo "Building share folder..."
-pbxcp="/Developer/Library/PrivateFrameworks/DevToolsCore.framework/Resources/pbxcp
-exclude .DS_Store -resolve-src-symlinks"
-mkdir -p ${target_share}
-if test "$use_archs" = "no"; then
- $pbxcp ${VLC_BUILD_DIR}/share/lua ${target_share}
-else
- $pbxcp ${main_build_dir}/share/lua ${target_share}
-fi
-
-##########################
-# Exporting headers
-if [ "$FULL_PRODUCT_NAME" = "VLC-release.app" ] ; then
- echo "Exporting headers..."
- mkdir -p ${target_include}/vlc
- $pbxcp ${VLC_SRC_DIR}/include/vlc/*.h ${target_include}/vlc
-else
- echo "Headers not needed for this product"
+if [ $PRODUCT != "VLC.app" ]; then
+ echo "Building share folder..."
+
pbxcp="/Developer/Library/PrivateFrameworks/DevToolsCore.framework/Resources/pbxcp
-exclude .DS_Store -resolve-src-symlinks -v -V"
+ mkdir -p ${target_share}
+ if test "$use_archs" = "no"; then
+ $pbxcp ${VLC_BUILD_DIR}/share/lua ${target_share}
+ else
+ $pbxcp ${main_build_dir}/share/lua ${target_share}
+ fi
fi
_______________________________________________
vlc-commits mailing list
[email protected]
http://mailman.videolan.org/listinfo/vlc-commits
