vlc/vlc-2.0 | branch: master | Rafaël Carré <[email protected]> | Thu Jan 5
23:39:48 2012 -0500| [f9adddf1ebdd4b15bbc676eaa2f42d4b8c37fd1d] | committer:
Rafaël Carré
OSX: build relocatable VLC.app by default
Use VLC-dev.app when developing and rebuilding frequently
(cherry picked from commit a80cde4daa41fee1fef3acd6d26d0c15f503a318)
Conflicts:
extras/package/macosx/package.mak
projects/macosx/framework/Pre-Compile.sh
Signed-off-by: Rafaël Carré <[email protected]>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=f9adddf1ebdd4b15bbc676eaa2f42d4b8c37fd1d
---
extras/package/macosx/package.mak | 16 ++++++++--------
extras/package/macosx/ub.sh | 6 +++---
projects/macosx/framework/Pre-Compile.sh | 8 ++++----
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/extras/package/macosx/package.mak
b/extras/package/macosx/package.mak
index 07294a5..621c232 100644
--- a/extras/package/macosx/package.mak
+++ b/extras/package/macosx/package.mak
@@ -6,17 +6,17 @@ endif
endif
# This is just for development purposes.
-# The resulting VLC.app will only run in this tree.
-VLC.app: VLC-tmp
+# The resulting VLC-dev.app will only run in this tree.
+VLC-dev.app: VLC-tmp
rm -Rf $@
cp -R VLC-tmp $@
$(INSTALL) -m 0755 $(top_builddir)/bin/.libs/vlc $@/Contents/MacOS/VLC
$(LN_S) -f ../../../modules $@/Contents/MacOS/plugins
rm -Rf VLC-tmp
-# VLC-release.app for packaging and giving it to your friends
+# VLC.app for packaging and giving it to your friends
# use package-macosx to get a nice dmg
-VLC-release.app: VLC-tmp
+VLC.app: VLC-tmp
rm -Rf $@
cp -R VLC-tmp $@
PRODUCT="$@" ACTION="release-makefile" src_dir=$(srcdir)
build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh
@@ -62,9 +62,9 @@ VLC-tmp: vlc
done
printf "APPLVLC#" >| $@/Contents/PkgInfo
-package-macosx: VLC-release.app ChangeLog
+package-macosx: VLC.app ChangeLog
mkdir -p "$(top_builddir)/vlc-$(VERSION)/Goodies/"
- cp -R "$(top_builddir)/VLC-release.app"
"$(top_builddir)/vlc-$(VERSION)/VLC.app"
+ cp -R "$(top_builddir)/VLC.app" "$(top_builddir)/vlc-$(VERSION)/VLC.app"
cd $(srcdir); cp AUTHORS COPYING README THANKS NEWS
$(abs_top_builddir)/vlc-$(VERSION)/Goodies/
cp $(top_builddir)/ChangeLog $(top_builddir)/vlc-$(VERSION)/Goodies/
cp -R $(srcdir)/extras/package/macosx/Delete_Preferences.app
$(top_builddir)/vlc-$(VERSION)/Goodies/Delete\ VLC\ Preferences.app
@@ -86,9 +86,9 @@ package-macosx: VLC-release.app ChangeLog
rm -f "$(top_builddir)/vlc-$(VERSION)-rw.dmg"
rm -rf "$(top_builddir)/vlc-$(VERSION)"
-package-macosx-zip: VLC-release.app ChangeLog
+package-macosx-zip: VLC.app ChangeLog
mkdir -p $(top_builddir)/vlc-$(VERSION)/Goodies/
- cp -R $(top_builddir)/VLC-release.app
$(top_builddir)/vlc-$(VERSION)/VLC.app
+ cp -R $(top_builddir)/VLC.app $(top_builddir)/vlc-$(VERSION)/VLC.app
cp $(top_builddir)/ChangeLog $(top_builddir)/vlc-$(VERSION)/Goodies/
cd $(srcdir); cp -R AUTHORS COPYING README THANKS NEWS
extras/package/macosx/Delete_Preferences.app/ \
$(abs_top_builddir)/vlc-$(VERSION)/Goodies/
diff --git a/extras/package/macosx/ub.sh b/extras/package/macosx/ub.sh
index 2d58f26..d4ffbd5 100644
--- a/extras/package/macosx/ub.sh
+++ b/extras/package/macosx/ub.sh
@@ -25,8 +25,8 @@ cd $WD
#############################################
# Config
-INTELROOT=$SRCROOT/build32/VLC-release.app
-INTEL64ROOT=$SRCROOT/build64/VLC-release.app
+INTELROOT=$SRCROOT/build32/VLC.app
+INTEL64ROOT=$SRCROOT/build64/VLC.app
# PPCROOT
UBROOT=$SRCROOT/build-fat/VLC.app
@@ -121,5 +121,5 @@ fi
# Now, you need to copy the resulting UBROOT bundle into VLC's build directory
-# and make sure it is named "VLC-release.app".
+# and make sure it is named "VLC.app".
# Afterwards, run 'make package-macosx' and follow release_howto.txt in /doc
diff --git a/projects/macosx/framework/Pre-Compile.sh
b/projects/macosx/framework/Pre-Compile.sh
index cb92a18..751b1e6 100644
--- a/projects/macosx/framework/Pre-Compile.sh
+++ b/projects/macosx/framework/Pre-Compile.sh
@@ -4,12 +4,12 @@
#
# Script that install libvlc and its modules inside VLCKit.
#
-# This is for some creepy reasons also used by legacy VLC-release.app or
+# This is for some creepy reasons also used by legacy VLC.app or
# the moz plugin.
#
-# We are building VLC-release.app or the moz plugin
+# We are building VLC.app or the moz plugin
#
if test "${ACTION}" = "release-makefile"; then
echo "running Pre-Compile.sh in release-makefile mode"
@@ -210,8 +210,8 @@ if [ "$RELEASE_MAKEFILE" != "yes" ] ; then
fi
##########################
-# Hack for VLC-release.app
-if [ "$FULL_PRODUCT_NAME" = "VLC-release.app" ] ; then
+# Hack for VLC.app
+if [ "$FULL_PRODUCT_NAME" = "VLC.app" ] ; then
vlc_install "bin/${prefix}" "vlc" "${target}" "bin" "@loader_path/lib"
mv ${target}/vlc ${target}/VLC
chmod +x ${target}/VLC
_______________________________________________
vlc-commits mailing list
[email protected]
http://mailman.videolan.org/listinfo/vlc-commits
