Merge remote-tracking branch 'andkrau/master'

6 files changed, 62 insertions, 17 deletions

diff --git a/.gitmodules b/.gitmodules
index bf72273..d0de927 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "platform"]

-	path = platform

-url=https://repo.palemoon.org/MoonchildProductions/UXP.git

+[submodule "platform"]
+	path = platform
+	url = https://repo.palemoon.org/MoonchildProductions/UXP.git
diff --git a/basilisk/app/Makefile.in b/basilisk/app/Makefile.in
index 19bc329..edb52e4 100644
--- a/basilisk/app/Makefile.in
+++ b/basilisk/app/Makefile.in
@@ -50,3 +50,50 @@ endif
 libs:: $(srcdir)/profile/channel-prefs.js
 	$(NSINSTALL) -D $(DIST)/bin/defaults/pref
 	$(call py_action,preprocessor,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js)
+
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+
+MAC_APP_NAME = $(MOZ_APP_DISPLAYNAME)
+
+ifdef MOZ_DEBUG
+MAC_APP_NAME := $(MAC_APP_NAME)Debug
+endif
+
+AB_CD = $(MOZ_UI_LOCALE)
+
+ifeq (zh-TW,$(AB_CD))
+LPROJ_ROOT := $(subst -,_,$(AB_CD))
+else
+LPROJ_ROOT := $(firstword $(subst -, ,$(AB_CD)))
+endif
+LPROJ := Contents/Resources/$(LPROJ_ROOT).lproj
+
+clean clobber repackage::
+	$(RM) -r $(dist_dest)
+
+MAC_BUNDLE_VERSION = $(shell $(PYTHON) $(srcdir)/macversion.py --version=$(MOZ_APP_VERSION) --buildid=$(DEPTH)/buildid.h)
+
+.PHONY: repackage
+tools repackage:: $(DIST)/bin/$(MOZ_APP_NAME)
+	$(MKDIR) -p '$(dist_dest)/Contents/MacOS'
+	$(MKDIR) -p '$(dist_dest)/$(LPROJ)'
+	rsync -a --exclude '*.in' $(srcdir)/macbuild/Contents '$(dist_dest)' --exclude English.lproj
+	rsync -a --exclude '*.in' $(srcdir)/macbuild/Contents/Resources/English.lproj/ '$(dist_dest)/$(LPROJ)'
+	sed -e 's/%APP_VERSION%/$(MOZ_APP_VERSION)/' -e 's/%MAC_APP_NAME%/$(MAC_APP_NAME)/' -e 's/%MOZ_MACBUNDLE_ID%/$(MOZ_MACBUNDLE_ID)/' -e 's/%MAC_BUNDLE_VERSION%/$(MAC_BUNDLE_VERSION)/' $(srcdir)/macbuild/Contents/Info.plist.in > '$(dist_dest)/Contents/Info.plist'
+	sed -e 's/%MAC_APP_NAME%/$(MAC_APP_NAME)/' $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | iconv -f UTF-8 -t UTF-16 > '$(dist_dest)/$(LPROJ)/InfoPlist.strings'
+	rsync -a --exclude-from='$(srcdir)/macbuild/Contents/MacOS-files.in' $(DIST)/bin/ '$(dist_dest)/Contents/Resources'
+	rsync -a --include-from='$(srcdir)/macbuild/Contents/MacOS-files.in' --exclude '*' $(DIST)/bin/ '$(dist_dest)/Contents/MacOS'
+	# MacOS-files-copy.in is a list of files that should be copies rather
+	# than symlinks and placed in .app/Contents/MacOS.
+	rsync -aL --include-from='$(srcdir)/macbuild/Contents/MacOS-files-copy.in' --exclude '*' $(DIST)/bin/ '$(dist_dest)/Contents/MacOS'
+	$(RM) '$(dist_dest)/Contents/MacOS/$(MOZ_APP_NAME)'
+	rsync -aL $(DIST)/bin/$(MOZ_APP_NAME) '$(dist_dest)/Contents/MacOS'
+	cp -RL $(DIST)/branding/firefox.icns '$(dist_dest)/Contents/Resources/firefox.icns'
+	cp -RL $(DIST)/branding/document.icns '$(dist_dest)/Contents/Resources/document.icns'
+ifdef MOZ_UPDATER
+	$(MKDIR) -p '$(dist_dest)/Contents/Library/LaunchServices'
+	mv -f '$(dist_dest)/Contents/MacOS/updater.app/Contents/MacOS/org.mozilla.updater' '$(dist_dest)/Contents/Library/LaunchServices'
+	ln -s ../../../../Library/LaunchServices/org.mozilla.updater '$(dist_dest)/Contents/MacOS/updater.app/Contents/MacOS/org.mozilla.updater'
+endif
+	printf APPLMOZB > '$(dist_dest)/Contents/PkgInfo'
+endif
diff --git a/basilisk/components/search/content/search.xml b/basilisk/components/search/content/search.xml
index d7ec8e2..1be5c00 100644
--- a/basilisk/components/search/content/search.xml
+++ b/basilisk/components/search/content/search.xml
@@ -398,8 +398,6 @@
               if (!aEngine) {
                 aEngine = this.currentEngine;
               }
-              BrowserSearch.recordOneoffSearchInTelemetry(aEngine, source, type,
-                                                          aWhere);
             }
           }
 
@@ -444,7 +442,6 @@
             isSuggestion: (!aOneOff && telemetrySearchDetails),
             selection: telemetrySearchDetails
           };
-          BrowserSearch.recordSearchInTelemetry(engine, "searchbar", details);
           // null parameter below specifies HTML response for search
           let params = {
             postData: submission.postData,
diff --git a/basilisk/configure.in b/basilisk/configure.in
index f7d6864..13f2ad5 100644
--- a/basilisk/configure.in
+++ b/basilisk/configure.in
@@ -8,6 +8,9 @@ dnl Things we need to carry from confvars.sh
 AC_DEFINE(MOZ_PHOENIX)
 AC_SUBST(MOZ_PHOENIX)
 
+AC_DEFINE(MOZ_AUSTRALIS)
+AC_SUBST(MOZ_AUSTRALIS)
+
 AC_DEFINE(MC_BASILISK)
 AC_SUBST(MC_BASILISK)
 
@@ -19,4 +22,4 @@ dnl ========================================================
 MOZ_ARG_DISABLE_BOOL(sync,
 [  --disable-sync           Disable Sync],
     MOZ_SERVICES_SYNC=,
-    MOZ_SERVICES_SYNC=1)
+    MOZ_SERVICES_SYNC=1)
\ No newline at end of file
diff --git a/basilisk/confvars.sh b/basilisk/confvars.sh
index 01e364f..64eb57e 100644
--- a/basilisk/confvars.sh
+++ b/basilisk/confvars.sh
@@ -6,9 +6,14 @@
 MOZ_APP_BASENAME=Basilisk
 MOZ_APP_VENDOR=Moonchild
 MOZ_PHOENIX=1
+MOZ_AUSTRALIS=1
 MC_BASILISK=1
 MOZ_UPDATER=
-MOZ_BUNDLED_FONTS=1
+
+if test "$OS_ARCH" = "WINNT" -o \
+        "$OS_ARCH" = "Linux"; then
+  MOZ_BUNDLED_FONTS=1
+fi
 
 # For Basilisk we want to use 52.9.YYYY.MM.DD as MOZ_APP_VERSION in release
 # builds so add-on developers have something to target while maintaining
diff --git a/basilisk/installer/package-manifest.in b/basilisk/installer/package-manifest.in
index 69c65cd..1a4f03f 100644
--- a/basilisk/installer/package-manifest.in
+++ b/basilisk/installer/package-manifest.in
@@ -50,7 +50,9 @@
 @RESPATH@/chrome/@AB_CD@@JAREXT@
 @RESPATH@/chrome/@AB_CD@.manifest
 @RESPATH@/dictionaries/*
+#if defined(XP_WIN) || defined(XP_LINUX)
 @RESPATH@/fonts/*
+#endif
 @RESPATH@/hyphenation/*
 @RESPATH@/browser/@PREF_DIR@/firefox-l10n.js
 #ifdef HAVE_MAKENSISU
@@ -478,8 +480,6 @@
 @RESPATH@/components/SettingsManager.manifest
 @RESPATH@/components/AppsService.js
 @RESPATH@/components/AppsService.manifest
-@RESPATH@/components/recording-cmdline.js
-@RESPATH@/components/recording-cmdline.manifest
 @RESPATH@/components/htmlMenuBuilder.js
 @RESPATH@/components/htmlMenuBuilder.manifest
 
@@ -502,11 +502,6 @@
 @RESPATH@/components/PeerConnection.manifest
 #endif
 
-@RESPATH@/chrome/marionette@JAREXT@
-@RESPATH@/chrome/marionette.manifest
-@RESPATH@/components/marionette.manifest
-@RESPATH@/components/marionette.js
-
 #ifdef MOZ_WEBSPEECH
 @RESPATH@/components/dom_webspeechsynth.xpt
 #endif
@@ -553,8 +548,6 @@
 @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
 @RESPATH@/chrome/toolkit@JAREXT@
 @RESPATH@/chrome/toolkit.manifest
-@RESPATH@/chrome/recording.manifest
-@RESPATH@/chrome/recording/*
 #ifdef MOZ_GTK
 @RESPATH@/browser/chrome/icons/default/default16.png
 @RESPATH@/browser/chrome/icons/default/default32.png