mozilla
/
releases-comm-central
зеркало из https://github.com/mozilla/releases-comm-central.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1534028 - Remove MOZ_OMNIJAR defines and checks from suite. r=IanN

This commit is contained in:
Frank-Rainer Grahl 2019-03-16 12:24:18 +01:00
Родитель f3191998e8
Коммит a81e6d32d4
5 изменённых файлов: 494 добавлений и 575 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
suite/app/Makefile.in
Просмотреть файл

@ -73,7 +73,6 @@ GARBAGE += $(MOZ_APP_NAME).1
GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, browser-prefs.js)
endif
ifeq ($(MOZ_PACKAGER_FORMAT),omni)
# Make extensions end up as XPIs instead of flat chrome when doing omni.jar.
# Extensions that appear in dist/bin/extensions will get bundled with the
# application, ones that appear in dist/bin/distribution/extensions will be
@ -106,11 +105,8 @@ tools::
@$(MAKE) pack-ext STAGEDIST="$(DIST)/bin/extensions"
@$(MAKE) pack-ext STAGEDIST="$(DIST)/bin/distribution/extensions"
endif
# Additional macOS build steps.
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
# Anything below the above ifdef won't be included in mac builds. So be very
# careful what you add here.
MAC_APP_NAME = $(MOZ_APP_DISPLAYNAME)

4
suite/installer/Makefile.in
Просмотреть файл

@ -193,10 +193,6 @@ ifdef MOZ_CLANG_RT_ASAN_LIB_PATH
DEFINES += -DMOZ_CLANG_RT_ASAN_LIB=$(notdir $(MOZ_CLANG_RT_ASAN_LIB_PATH))
endif
ifeq ($(MOZ_PACKAGER_FORMAT),omni)
DEFINES += -DMOZ_OMNIJAR=1
endif
libs::
$(MAKE) -C $(topobjdir)/comm/suite/locales langpack

57
suite/installer/package-manifest.in
Просмотреть файл

@ -246,25 +246,10 @@
; classic theme
@RESPATH@/chrome/classic@JAREXT@
@RESPATH@/chrome/classic.manifest
#ifdef MOZ_OMNIJAR
@RESPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi
#else
@RESPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest
@RESPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
@RESPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
@RESPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
#endif
; modern theme
#ifdef MOZ_OMNIJAR
@RESPATH@/extensions/modern@themes.mozilla.org.xpi
#else
@RESPATH@/extensions/modern@themes.mozilla.org/chrome/modern@JAREXT@
@RESPATH@/extensions/modern@themes.mozilla.org/chrome.manifest
@RESPATH@/extensions/modern@themes.mozilla.org/icon.png
@RESPATH@/extensions/modern@themes.mozilla.org/install.rdf
@RESPATH@/extensions/modern@themes.mozilla.org/preview.png
#endif
; shell icons
#ifdef MOZ_GTK
@ -565,62 +550,20 @@ man/*
[chatzilla]
#ifdef MOZ_IRC
#ifdef MOZ_OMNIJAR
@RESPATH@/distribution/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}.xpi
#else
@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/chatzilla@JAREXT@
#ifdef MOZ_GTK
@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window.xpm
@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window16.xpm
#elifdef XP_WIN32
@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window.ico
#endif
@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome.manifest
@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/components/chatzilla-service.js
@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/components/components.list
@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/install.rdf
#endif
#ifdef LOCALE_BUILD
#ifdef MOZ_OMNIJAR
@RESPATH@/distribution/extensions/langpack-@AB_CD@@chatzilla.mozilla.org.xpi
#else
@RESPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/chrome/chatzilla@JAREXT@
@RESPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/chrome.manifest
@RESPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/install.js
@RESPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/install.rdf
#endif
#endif
#endif
[inspector]
#ifdef MOZ_DOMINSPECTOR
#ifdef MOZ_OMNIJAR
@RESPATH@/distribution/extensions/inspector@mozilla.org.xpi
#else
@RESPATH@/extensions/inspector@mozilla.org/install.rdf
@RESPATH@/extensions/inspector@mozilla.org/chrome.manifest
@RESPATH@/extensions/inspector@mozilla.org/chrome/inspector@JAREXT@
#ifdef MOZ_GTK
@RESPATH@/extensions/inspector@mozilla.org/platform/Linux/chrome/icons/default/winInspectorMain16.xpm
@RESPATH@/extensions/inspector@mozilla.org/platform/Linux/chrome/icons/default/winInspectorMain.xpm
#elifdef XP_WIN32
@RESPATH@/extensions/inspector@mozilla.org/platform/WINNT/chrome/icons/default/winInspectorMain.ico
#endif
@RESPATH@/extensions/inspector@mozilla.org/components/components.list
@RESPATH@/extensions/inspector@mozilla.org/components/inspector-cmdline.js
@RESPATH@/extensions/inspector@mozilla.org/defaults/preferences/inspector.js
#endif
#endif
[debugqa]
#ifdef MOZ_PACKAGE_DEBUGQA
#ifdef MOZ_OMNIJAR
@RESPATH@/distribution/extensions/debugQA@mozilla.org.xpi
#else
@RESPATH@/extensions/debugQA@mozilla.org/install.rdf
@RESPATH@/extensions/debugQA@mozilla.org/chrome.manifest
@RESPATH@/extensions/debugQA@mozilla.org/chrome/debugqa@JAREXT@
#endif
#endif
#ifdef MOZ_CALENDAR

1000
suite/installer/removed-files.in
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

2
suite/locales/Makefile.in
Просмотреть файл

@ -157,11 +157,9 @@ repackage-extensions: $(STAGEDIST)
ifdef MOZ_IRC
$(MAKE) -C $(DEPTH)/extensions/irc/locales repackage-zip-$(AB_CD) STAGEDIST=$(STAGEDIST)
endif
ifeq ($(MOZ_PACKAGER_FORMAT),omni)
$(NSINSTALL) -D $(STAGEDIST)/distribution/extensions
$(MAKE) -C ../app pack-ext AB_CD=$(AB_CD) STAGEDIST=$(STAGEDIST)/extensions;
$(MAKE) -C ../app pack-ext AB_CD=$(AB_CD) STAGEDIST=$(STAGEDIST)/distribution/extensions;
endif
langpack: langpack-$(AB_CD)