IT LAUNCHES ON OS X

application/basilisk/installer/Makefile.in

@@ -108,13 +108,31 @@ endif
 
 INSTALL_SDK = 1
 
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-MOZ_FS_LAYOUT = bundle
-endif
-
 include $(topsrcdir)/toolkit/mozapps/installer/signing.mk
 include $(topsrcdir)/toolkit/mozapps/installer/packager-uxp.mk
 
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+APP_BUNDLE_INPUT = $(DIST)/$(MOZ_MACBUNDLE_NAME)
+
+prepare-bundle-input:
+	@mkdir -p '$(APP_BUNDLE_INPUT)/Contents/MacOS' '$(APP_BUNDLE_INPUT)/Contents/Resources'
+	@cp -RLf '$(DIST)/bin/.' '$(APP_BUNDLE_INPUT)/Contents/Resources/'
+	@cp -f '$(APP_BUNDLE_INPUT)/Contents/Resources/$(MOZ_APP_NAME)' '$(APP_BUNDLE_INPUT)/Contents/MacOS/' 2>/dev/null || true
+	@cp -f '$(APP_BUNDLE_INPUT)/Contents/Resources/XUL' '$(APP_BUNDLE_INPUT)/Contents/MacOS/' 2>/dev/null || true
+	@cp -f '$(APP_BUNDLE_INPUT)/Contents/Resources/'*.dylib '$(APP_BUNDLE_INPUT)/Contents/MacOS/' 2>/dev/null || true
+	@cp -Rf '$(APP_BUNDLE_INPUT)/Contents/Resources/plugin-container.app' '$(APP_BUNDLE_INPUT)/Contents/MacOS/' 2>/dev/null || true
+	@cp -f '$(srcdir)/macbuild/Contents/PkgInfo' '$(APP_BUNDLE_INPUT)/Contents/PkgInfo'
+	@sed \
+		-e 's/%MOZ_MACBUNDLE_ID%/$(MOZ_MACBUNDLE_ID)/' \
+		-e 's/%APP_VERSION%/$(MOZ_APP_VERSION)/g' \
+		-e 's/%MAC_BUNDLE_VERSION%/$(MOZ_APP_VERSION)/g' \
+		-e 's/%MAC_APP_NAME%/$(MOZ_APP_DISPLAYNAME)/g' \
+		-e 's#<string>basilisk</string>#<string>$(MOZ_APP_NAME)</string>#' \
+		'$(srcdir)/macbuild/Contents/Info.plist.in' > '$(APP_BUNDLE_INPUT)/Contents/Info.plist'
+
+stage-package: prepare-bundle-input
+endif
+
 # Local macOS workaround: precompile_cache.js hangs in xpcshell during package.
 # Skip precomplete/startupcache generation so packaging can complete.
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
@@ -131,7 +149,7 @@ BINPATH = bin
 endif
 DEFINES += -DBINPATH='$(BINPATH)'
 
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+ifeq (bundle, $(MOZ_FS_LAYOUT))
 RESPATH = $(_APPNAME)/Contents/Resources
 else
 RESPATH = $(BINPATH)

application/basilisk/locales/Makefile.in

@@ -92,7 +92,7 @@ $(STAGEDIST): $(DIST)/branding
 $(DIST)/branding:
 	$(NSINSTALL) -D $@
 
-DEFINES += -DBOOKMARKS_INCLUDE_DIR=$(dir $(call MERGE_FILE,profile/bookmarks.inc))
+DEFINES += -DBOOKMARKS_INCLUDE_DIR=/application/basilisk/locales/$(AB_CD)/profile
 
 libs-%:
 	$(NSINSTALL) -D $(DIST)/install

application/basilisk/locales/generic/profile/bookmarks.html.in

@@ -3,7 +3,7 @@
 #define eclipse_icon data:image/png;base64,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
 
 #define github_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAHdSURBVHgBvVeLbYNADDVdoHSDG4ENwgjpBMkG6QbtBkknIBtEnaDdADoBbEA6gWuXQ3GR7wOc8qSnSPhvkzuTQSQQMaefLXFDLIiGmFvxldgRG+IX8SPLsiukAAU2xDOxx3mo2BaWgismHnE9jrZ7s6tuMR1ajO0GKRaYNrhMorh35VoSBjwzbxWDCy5Lil/ailgrPnMtAe2F2wn5Hm+J9Nbxp2AvZNKuVPwetdZrKJQuGfCPMI/0baTSOai0EJ4EKlmVC3tYCdRHwOBR5Q8wHK8aOhiO1bVorK8phqPd0/4dJIKnCxULa4dw3vEZTkK7S2oegVH0u2S3mfCpPDOcQNJKPdAK+nsJ7wW10Ixn4xA+pRwDD1x5fOUOdA6bDaQLXjpEHSfw7RC+QDrsHc+b8ZJxYXUS5OPg8b8bj2LfvvcKCxEIzshHRXkavhG3+H8HaK2zMiJoYXXrQPBKGplJsK3tjObk4gl+wXiYqfFJCHublLailZ4EysjgJ814upKdRHc4uYp4gPAIQmjRdc8oFRcwExHBjdTPFAcclOc8Kp5huNN/iI90Or5DIAGHqCM+k30DEVU41/MI26jKo4DDX3JtAidcs1vg7eM0NoEeb98EBlIBAyu50DNzKv4F8Mg9kvfoSM0AAAAASUVORK5CYII=
-#include @BOOKMARKS_INCLUDE_DIR@/bookmarks.inc
+#include ../../@AB_CD@/profile/bookmarks.inc
 #define ja_jp_mac ja-JP-mac
 #if AB_CD == ja_jp_mac
 #define AB_CD ja