Make navigator build again

custom-2020
Matt A. Tobin 4 years ago committed by Roy Tam
parent c67173bce3
commit 975a0935ba
  1. 2
      navigator/app.mozbuild
  2. 4
      navigator/app/Makefile.in
  3. 6
      navigator/app/moz.build
  4. 4
      navigator/base/jar.mn
  5. 35
      navigator/build.mk
  6. 2
      navigator/components/smile/src/smileApplication.js
  7. 4
      navigator/confvars.sh
  8. 2
      navigator/installer/Makefile.in
  9. 20
      navigator/installer/windows/Makefile.in
  10. 2
      navigator/moz.configure
  11. 10
      navigator/themes/modern/jar.mn

@ -13,7 +13,7 @@ if CONFIG['OS_TARGET'] in ('WINNT', 'Linux'):
DIRS += [
'/xpfe/components/autocomplete',
'/application/navigator',
'/navigator',
]
else:
error('This application does not support your platform.')

@ -38,9 +38,9 @@ include $(topsrcdir)/config/rules.mk
libs::
ifeq ($(OS_ARCH),WINNT)
$(EXIT_ON_ERROR) \
$(PERL) -pe 's/(?<!\r)\n/\r\n/g;' < $(topsrcdir)/application/navigator/installer/license.txt > $(DIST)/bin/license.txt
$(PERL) -pe 's/(?<!\r)\n/\r\n/g;' < $(topsrcdir)/navigator/installer/license.txt > $(DIST)/bin/license.txt
else
$(INSTALL) $(IFLAGS1) $(topsrcdir)/application/navigator/installer/license.txt $(DIST)/bin/
$(INSTALL) $(IFLAGS1) $(topsrcdir)/navigator/installer/license.txt $(DIST)/bin/
endif
ifneq ($(OS_ARCH),WINNT)

@ -11,9 +11,9 @@ SOURCES += ['nsNavigatorApp.cpp']
LOCAL_INCLUDES += [
'!/build',
'/toolkit/xre',
'/xpcom/base',
'/xpcom/build',
'/mozilla/toolkit/xre',
'/mozilla/xpcom/base',
'/mozilla/xpcom/build',
]
if CONFIG['OS_ARCH'] == 'WINNT':

@ -247,10 +247,10 @@ comm.jar:
content/communicator/sync/syncUtils.js (content/sync/syncUtils.js)
content/communicator/sync/syncUI.js (content/sync/syncUI.js)
content/communicator/labelsencodings.properties (/dom/encoding/labelsencodings.properties)
content/communicator/labelsencodings.properties (/mozilla/dom/encoding/labelsencodings.properties)
# the following file is a suite-specific override of the generic license.html, using suite/common/app-license.html as input:
* content/communicator/license.html (/toolkit/content/license.html)
* content/communicator/license.html (/mozilla/toolkit/content/license.html)
#ifdef XP_MACOSX
content/navigator/platformNavigationBindings.xul (content/mac/platformNavigationBindings.xul)

@ -2,40 +2,11 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
ifndef COMM_BUILD
installer:
@$(MAKE) -C application/navigator/installer installer
@$(MAKE) -C navigator/installer installer
package:
@$(MAKE) -C application/navigator/installer
package-compare:
@$(MAKE) -C application/navigator/installer package-compare
@$(MAKE) -C navigator/installer
install::
@$(MAKE) -C application/navigator/installer install
source-package::
@$(MAKE) -C application/navigator/installer source-package
upload::
@$(MAKE) -C application/navigator/installer upload
source-upload::
@$(MAKE) -C application/navigator/installer source-upload
# mochitests need to be run from the Mozilla build system
ifdef ENABLE_TESTS
# Backend is implemented in mozilla/testing/testsuite-targets.mk.
# This part is copied from mozilla/browser/build.mk.
mochitest-browser-chrome:
$(RUN_MOCHITEST) --browser-chrome
$(CHECK_TEST_ERROR)
mochitest:: mochitest-browser-chrome
.PHONY: mochitest-browser-chrome
endif
endif
@$(MAKE) -C navigator/installer install

@ -727,7 +727,7 @@ var ApplicationFactory = {
}
};
#include ../../../../../toolkit/components/exthelper/extApplication.js
#include ../../../../mozilla/toolkit/components/exthelper/extApplication.js
//=================================================
// Application constructor

@ -9,8 +9,8 @@ MOZ_APP_NAME=borealis
MOZ_APP_DISPLAYNAME=Borealis
MOZ_SUITE=1
BINOC_BOREALIS=1
MOZ_BRANDING_DIRECTORY=$MOZ_BUILD_APP/branding/nightly
MOZ_OFFICIAL_BRANDING_DIRECTORY=$MOZ_BUILD_APP/branding/nightly
MOZ_BRANDING_DIRECTORY=navigator/branding/nightly
MOZ_OFFICIAL_BRANDING_DIRECTORY=$MOZ_BRANDING_DIRECTORY
MOZ_EXTENSIONS_DEFAULT=" gio"
MOZ_UPDATER=1
# This should usually be the same as the value MAR_CHANNEL_ID.

@ -166,7 +166,7 @@ NON_OMNIJAR_FILES = \
INSTALL_SDK = 1
include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk
ifeq (Darwin, $(OS_ARCH))
BINPATH = $(_BINPATH)

@ -2,10 +2,10 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/package-name.mk
CONFIG_DIR = instgen
SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/uxp/7zSD.sfx
SFX_MODULE = $(MOZILLA_SRCDIR)/other-licenses/7zstub/uxp/7zSD.sfx
INSTALLER_FILES = \
app.tag \
@ -41,21 +41,21 @@ uninstaller::
$(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR)
$(call py_action,preprocessor,-Fsubstitution $(DEFINES) $(ACDEFINES) \
$(srcdir)/nsis/defines.nsi.in -o $(CONFIG_DIR)/defines.nsi)
$(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
--preprocess-locale $(topsrcdir) \
$(call EXPAND_LOCALE_SRCDIR,application/navigator/locales)/installer/windows $(AB_CD) $(CONFIG_DIR)
$(PYTHON) $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
--preprocess-locale $(MOZILLA_SRCDIR) \
$(call EXPAND_LOCALE_SRCDIR,navigator/locales)/installer/windows $(AB_CD) $(CONFIG_DIR)
$(CONFIG_DIR)/setup.exe::
$(RM) -r $(CONFIG_DIR) && mkdir $(CONFIG_DIR)
$(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR)
$(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR)
$(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
--convert-utf8-utf16le $(topsrcdir)/application/navigator/installer/license.txt $(CONFIG_DIR)/license.txt
$(PYTHON) $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
--convert-utf8-utf16le $(topsrcdir)/navigator/installer/license.txt $(CONFIG_DIR)/license.txt
$(call py_action,preprocessor,-Fsubstitution $(DEFINES) $(ACDEFINES) \
$(srcdir)/nsis/defines.nsi.in -o $(CONFIG_DIR)/defines.nsi)
$(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
$(PYTHON) $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
--preprocess-locale $(topsrcdir) \
$(call EXPAND_LOCALE_SRCDIR,application/navigator/locales)/installer/windows $(AB_CD) $(CONFIG_DIR)
$(call EXPAND_LOCALE_SRCDIR,navigator/locales)/installer/windows $(AB_CD) $(CONFIG_DIR)
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/makensis.mk
include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/makensis.mk

@ -4,4 +4,4 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
include('../../toolkit/moz.configure')
include('../mozilla/toolkit/moz.configure')

@ -268,7 +268,7 @@ modern.jar:
skin/modern/global/filepicker/folder-home.gif (global/filepicker/folder-home.gif)
skin/modern/global/filepicker/folder-new.gif (global/filepicker/folder-new.gif)
skin/modern/global/icons/authentication-48.png (global/icons/authentication-48.png)
skin/modern/global/icons/autoscroll.png (/toolkit/themes/windows/global/icons/autoscroll.png)
skin/modern/global/icons/autoscroll.png (/mozilla/toolkit/themes/windows/global/icons/autoscroll.png)
skin/modern/global/icons/blacklist_favicon.png (global/icons/blacklist_favicon.png)
skin/modern/global/icons/blacklist_large.png (global/icons/blacklist_large.png)
skin/modern/global/icons/close-act.gif (global/icons/close-act.gif)
@ -308,20 +308,20 @@ modern.jar:
skin/modern/global/icons/warning-64.png (global/icons/warning-64.png)
skin/modern/global/icons/wrap.png (global/icons/wrap.png)
skin/modern/global/media/checkerboard.png (global/media/checkerboard.png)
skin/modern/global/media/clicktoplay-bgtexture.png (/toolkit/themes/shared/media/clicktoplay-bgtexture.png)
skin/modern/global/media/error.png (/toolkit/themes/shared/media/error.png)
skin/modern/global/media/clicktoplay-bgtexture.png (/mozilla/toolkit/themes/shared/media/clicktoplay-bgtexture.png)
skin/modern/global/media/error.png (/mozilla/toolkit/themes/shared/media/error.png)
skin/modern/global/media/muteButton.png (global/media/muteButton.png)
skin/modern/global/media/pauseButton.png (global/media/pauseButton.png)
skin/modern/global/media/playButton.png (global/media/playButton.png)
skin/modern/global/media/scrubberThumb.png (global/media/scrubberThumb.png)
skin/modern/global/media/scrubberThumbWide.png (global/media/scrubberThumbWide.png)
skin/modern/global/media/throbber.png (/toolkit/themes/shared/media/throbber.png)
skin/modern/global/media/throbber.png (/mozilla/toolkit/themes/shared/media/throbber.png)
skin/modern/global/media/stalled.png (global/media/stalled.png)
skin/modern/global/media/TopLevelImageDocument.css (global/media/TopLevelImageDocument.css)
skin/modern/global/media/TopLevelVideoDocument.css (global/media/TopLevelVideoDocument.css)
skin/modern/global/media/unmuteButton.png (global/media/unmuteButton.png)
skin/modern/global/media/videocontrols.css (global/media/videocontrols.css)
skin/modern/global/media/videoClickToPlayButton.svg (/toolkit/themes/shared/media/videoClickToPlayButton.svg)
skin/modern/global/media/videoClickToPlayButton.svg (/mozilla/toolkit/themes/shared/media/videoClickToPlayButton.svg)
skin/modern/global/menu/menu-arrow-dis.gif (global/menu/menu-arrow-dis.gif)
skin/modern/global/menu/menu-arrow-hov.gif (global/menu/menu-arrow-hov.gif)
skin/modern/global/menu/menu-arrow.gif (global/menu/menu-arrow.gif)

Loading…
Cancel
Save