[vlc-commits] src: darwin/dirs: Package share data in Resources subdirectory

[David Fuhrmann]

vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Mon Mar 18 19:36:16 2019 +0100| [a62cf6abea1a7309ecb27d1879e352aa32c167a9] | committer: David Fuhrmann

src: darwin/dirs: Package share data in Resources subdirectory

share data (including translations), are now moved from the MacOS
directory to Resources, where they belong.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a62cf6abea1a7309ecb27d1879e352aa32c167a9
---

 extras/package/macosx/package.mak |  9 +++++----
 src/darwin/dirs.m                 | 11 +++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/extras/package/macosx/package.mak b/extras/package/macosx/package.mak
index feeeb10942..4f92487198 100644
--- a/extras/package/macosx/package.mak
+++ b/extras/package/macosx/package.mak
@@ -29,19 +29,20 @@ endif
 if HAVE_BREAKPAD
 	cp -R $(CONTRIB_DIR)/Frameworks/Breakpad.framework $@/Contents/Frameworks
 endif
-	mkdir -p $@/Contents/MacOS/share/
+	mkdir -p $@/Contents/Resources/share/
+	mkdir -p $@/Contents/MacOS/
 if BUILD_LUA
 	## Copy lua scripts
-	cp -r "$(pkgdatadir)/lua" $@/Contents/MacOS/share/
+	cp -r "$(pkgdatadir)/lua" $@/Contents/Resources/share/
 	cp -r "$(pkglibexecdir)/lua" $@/Contents/MacOS/
 endif
 	## HRTFs
-	cp -r $(srcdir)/share/hrtfs $@/Contents/MacOS/share/
+	cp -r $(srcdir)/share/hrtfs $@/Contents/Resources/share/
 	## Copy some other stuff (?)
 	mkdir -p $@/Contents/MacOS/include/
 	(cd "$(prefix)/include" && $(AMTAR) -c --exclude "plugins" vlc) | $(AMTAR) -x -C $@/Contents/MacOS/include/
 	## Copy translations
-	test -d "$(prefix)/share/locale" && cp -r "$(prefix)/share/locale" $@/Contents/MacOS/share/ || true
+	test -d "$(prefix)/share/locale" && cp -r "$(prefix)/share/locale" $@/Contents/Resources/share/ || true
 	printf "APPLVLC#" >| $@/Contents/PkgInfo
 	## Copy libs
 	mkdir -p $@/Contents/MacOS/lib
diff --git a/src/darwin/dirs.m b/src/darwin/dirs.m
index 32b39c4b6a..6db871981e 100644
--- a/src/darwin/dirs.m
+++ b/src/darwin/dirs.m
@@ -76,6 +76,17 @@ static char *config_GetDataDir(void)
     if (path)
         return strdup (path);
 
+    if (isBundle()) {
+        NSBundle *bundle = [NSBundle mainBundle];
+        NSString *path = bundle.resourcePath;
+        if (!path)
+            return NULL;
+
+        path = [path stringByAppendingPathComponent:@"share"];
+        return strdup(path.UTF8String);
+    }
+
+    // Fallback
     char *vlcpath = config_GetLibDir ();
     char *datadir;