videolan/vlc
1
Fork 0
mirror of https://code.videolan.org/videolan/vlc synced 2024-09-04 09:11:33 +02:00
Code Releases Activity

OSX packaging: fix http lua

Browse Source 
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
This commit is contained in:
Rafaël Carré 2012-01-21 09:47:00 -05:00
parent c16d79969f
commit 860a7e5c41
2 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
extras/package/macosx/package.mak
View File

@ -25,8 +25,9 @@ VLC.app: VLC-tmp
VLC-tmp: 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/
@ -46,7 +47,9 @@ VLC-tmp: 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 ; \

27
projects/macosx/framework/Pre-Compile.sh
View File

@ -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.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