Bug 1451847 - Part 2. May 2018 Installer and l10n rollup for SeaMonkey. r=IanN
--HG-- rename : suite/branding/nightly/package/mac/background.png => suite/branding/nightly/background.png rename : suite/branding/nightly/package/windows/branding.nsi => suite/branding/nightly/branding.nsi rename : suite/branding/nightly/jar.mn => suite/branding/nightly/content/jar.mn rename : suite/branding/nightly/content/icon32.png => suite/branding/nightly/default.png rename : suite/branding/nightly/icons/gtk/default128.png => suite/branding/nightly/default128.png rename : suite/branding/nightly/content/icon48.png => suite/branding/nightly/default48.png rename : suite/branding/nightly/content/icon64.png => suite/branding/nightly/default64.png rename : suite/branding/nightly/package/mac/disk.icns => suite/branding/nightly/disk.icns rename : suite/branding/nightly/icons/mac/document.icns => suite/branding/nightly/document.icns rename : suite/branding/nightly/package/mac/dsstore => suite/branding/nightly/dsstore rename : suite/locales/en-US/chrome/branding/brand.dtd => suite/branding/nightly/locales/en-US/brand.dtd rename : suite/locales/en-US/chrome/branding/brand.properties => suite/branding/nightly/locales/en-US/brand.properties rename : suite/branding/nightly/icons/mac/seamonkey.icns => suite/branding/nightly/seamonkey.icns rename : suite/branding/nightly/package/windows/wizHeader.bmp => suite/branding/nightly/wizHeader.bmp rename : suite/branding/nightly/package/windows/wizHeaderRTL.bmp => suite/branding/nightly/wizHeaderRTL.bmp rename : suite/branding/nightly/package/windows/wizWatermark.bmp => suite/branding/nightly/wizWatermark.bmp
This commit is contained in:
Frank-Rainer Grahl
Родитель
db00994500
Коммит
a1dd99b0aa
|
|
@ -2,11 +2,12 @@
|
|||
# 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/.
|
||||
|
||||
AB_CD = $(MOZ_UI_LOCALE)
|
||||
AB_CD = $(MOZ_UI_LOCALE)
|
||||
|
||||
# For splash.rc
|
||||
DEFINES += \
|
||||
-DSEAMONKEY_ICO=\"$(DIST)/bin/chrome/icons/default/main-window.ico\" \
|
||||
-DHTML_FILE_ICO=\"$(DIST)/bin/chrome/icons/default/html-file.ico\" \
|
||||
-DSEAMONKEY_ICO='"$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/icons/windows/main-window.ico"' \
|
||||
-DHTML_FILE_ICO='"$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/icons/windows/html-file.ico"' \
|
||||
$(NULL)
|
||||
|
||||
# Build a binary bootstrapping with XRE_main
|
||||
|
|
@ -145,9 +146,10 @@ tools:: $(PROGRAM)
|
|||
rm -f '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES)/mangle' '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES)/shlibsign'
|
||||
rm -f '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/$(PROGRAM)'
|
||||
rsync -aL $(PROGRAM) '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS'
|
||||
cp -RL $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/seamonkey.icns '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/seamonkey.icns'
|
||||
cp -RL $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/document.icns '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/document.icns'
|
||||
-cp -L $(DIST)/bin/mangle $(DIST)/bin/shlibsign '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES)'
|
||||
cp -RL $(DIST)/branding/icons/*.icns '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/'
|
||||
printf APPLMOZZ > '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/PkgInfo'
|
||||
# remove CVS dirs from packaged app
|
||||
# remove CVS dirs from packaged app
|
||||
find '$(DIST)/$(MOZ_MACBUNDLE_NAME)' -type d -name "CVS" -prune -exec rm -rf {} \;
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -0,0 +1,75 @@
|
|||
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||
# vim: set filetype=python:
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# 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/.
|
||||
|
||||
@template
|
||||
def SeaMonkeyBranding():
|
||||
JS_PREFERENCE_FILES += [
|
||||
'seamonkey-branding.js',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
|
||||
FINAL_TARGET_FILES.chrome.icons.default += [
|
||||
'default.png',
|
||||
'default128.png',
|
||||
'default16.png',
|
||||
'default48.png',
|
||||
'default64.png',
|
||||
]
|
||||
# Note: mac icons are handled in /suite/app during the final application
|
||||
# packaging
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk3'):
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
|
||||
icon_suffix = '.ico'
|
||||
else:
|
||||
icon_suffix = '.png'
|
||||
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
|
||||
icon_dir = 'gtk'
|
||||
else:
|
||||
icon_dir = CONFIG['MOZ_WIDGET_TOOLKIT']
|
||||
|
||||
desktop_icons = [
|
||||
'abcardWindow',
|
||||
'ablistWindow',
|
||||
'addressbookWindow',
|
||||
'bookmarkproperties',
|
||||
'downloadManager',
|
||||
'editorWindow',
|
||||
'findBookmarkWindow',
|
||||
'findHistoryWindow',
|
||||
'history-window',
|
||||
'JSConsoleWindow',
|
||||
'main-window',
|
||||
'messengerWindow',
|
||||
'msgcomposeWindow',
|
||||
'places',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
|
||||
# Windows icons
|
||||
desktop_icons += [
|
||||
'gif-file',
|
||||
'html-file',
|
||||
'image-file',
|
||||
'jpeg-file',
|
||||
'script-file',
|
||||
'xml-file',
|
||||
'xul-file',
|
||||
]
|
||||
|
||||
desktop_icons_small = []
|
||||
desktop_icons_large = []
|
||||
|
||||
if icon_dir == 'gtk':
|
||||
desktop_icons_small = [ '%s16' % i for i in desktop_icons ]
|
||||
desktop_icons_large = [ '%s48' % i for i in desktop_icons ]
|
||||
|
||||
FINAL_TARGET_FILES.chrome.icons.default += [
|
||||
'icons/%s/%s%s' % (icon_dir, i, icon_suffix) for i in sorted(
|
||||
desktop_icons + desktop_icons_small + desktop_icons_large
|
||||
)
|
||||
]
|
||||
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# 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/.
|
||||
|
||||
# Note: mac icons are handled in /suite/app during the final application
|
||||
# packaging
|
||||
|
||||
include $(moztopsrcdir)/config/rules.mk
|
||||
|
||||
export::
|
||||
$(NSINSTALL) -D $(DIST)/branding
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
cp $(srcdir)/package/windows/branding.nsi $(DIST)/branding/branding.nsi
|
||||
cp $(srcdir)/package/windows/wizHeader.bmp $(DIST)/branding/wizHeader.bmp
|
||||
cp $(srcdir)/package/windows/wizHeaderRTL.bmp $(DIST)/branding/wizHeaderRTL.bmp
|
||||
cp $(srcdir)/package/windows/wizWatermark.bmp $(DIST)/branding/wizWatermark.bmp
|
||||
endif
|
||||
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
||||
$(NSINSTALL) -D $(DIST)/branding
|
||||
$(NSINSTALL) -D $(DIST)/branding/icons
|
||||
cp $(srcdir)/icons/mac/document.icns $(DIST)/branding/icons/document.icns
|
||||
cp $(srcdir)/icons/mac/seamonkey.icns $(DIST)/branding/icons/seamonkey.icns
|
||||
cp $(srcdir)/package/mac/dsstore $(DIST)/branding/dsstore
|
||||
cp $(srcdir)/package/mac/background.png $(DIST)/branding/background.png
|
||||
cp $(srcdir)/package/mac/disk.icns $(DIST)/branding/disk.icns
|
||||
endif
|
||||
|
До Ширина: | Высота: | Размер: 24 KiB После Ширина: | Высота: | Размер: 24 KiB |
|
|
@ -0,0 +1,17 @@
|
|||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# 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/.
|
||||
#filter substitution
|
||||
|
||||
comm.jar:
|
||||
% content branding %content/branding/ contentaccessible=yes
|
||||
content/branding/about.png (about.png)
|
||||
content/branding/icon16.png (../default16.png)
|
||||
content/branding/icon32.png (../default.png)
|
||||
content/branding/icon48.png (../default48.png)
|
||||
content/branding/icon64.png (../default64.png)
|
||||
content/branding/icon128.png (../default128.png)
|
||||
content/branding/aboutRights.js (aboutRights.js)
|
||||
content/branding/aboutRights.xhtml (aboutRights.xhtml)
|
||||
content/branding/messenger-start-bg.png (messenger-start-bg.png)
|
||||
content/branding/messenger-start-hdr.png (messenger-start-hdr.png)
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||
# vim: set filetype=python:
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# 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/.
|
||||
|
||||
JAR_MANIFESTS += ['jar.mn']
|
||||
|
До Ширина: | Высота: | Размер: 1.9 KiB После Ширина: | Высота: | Размер: 1.9 KiB |
|
До Ширина: | Высота: | Размер: 12 KiB После Ширина: | Высота: | Размер: 12 KiB |
Двоичный файл не отображается.
|
После Ширина: | Высота: | Размер: 810 B |
|
До Ширина: | Высота: | Размер: 4.2 KiB После Ширина: | Высота: | Размер: 4.2 KiB |
|
До Ширина: | Высота: | Размер: 7.4 KiB После Ширина: | Высота: | Размер: 7.4 KiB |
|
|
@ -1,298 +0,0 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* 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/. */
|
||||
|
||||
/* XPM */
|
||||
static char *pixmap[] = {
|
||||
/* width height ncols cpp */
|
||||
"32 32 256 2",
|
||||
/* Colors */
|
||||
"00 c #000000",
|
||||
"01 c #FFFFFF",
|
||||
"02 c #EFF7F7",
|
||||
"03 c #6B94B5",
|
||||
"04 c #5A7B9C",
|
||||
"05 c #527394",
|
||||
"06 c #425A73",
|
||||
"07 c #101010",
|
||||
"08 c #EFEFF7",
|
||||
"09 c #101829",
|
||||
"0A c #CED6E7",
|
||||
"0B c #000818",
|
||||
"0C c #8494B5",
|
||||
"0D c #C6CEDE",
|
||||
"0E c #63738C",
|
||||
"0F c #8C9CB5",
|
||||
"10 c #5A6B84",
|
||||
"11 c #9CADC6",
|
||||
"12 c #31425A",
|
||||
"13 c #4A6384",
|
||||
"14 c #455C7A",
|
||||
"15 c #394B64",
|
||||
"16 c #3D5069",
|
||||
"17 c #526B8C",
|
||||
"18 c #516A8B",
|
||||
"19 c #4E6686",
|
||||
"1A c #5A7394",
|
||||
"1B c #637B9C",
|
||||
"1C c #6B84A5",
|
||||
"1D c #738CAD",
|
||||
"1E c #52637B",
|
||||
"1F c #849CBD",
|
||||
"20 c #8CA5C6",
|
||||
"21 c #6384AD",
|
||||
"22 c #6B8CB5",
|
||||
"23 c #7394BD",
|
||||
"24 c #7B9CC6",
|
||||
"25 c #84A5CE",
|
||||
"26 c #8CADD6",
|
||||
"27 c #101821",
|
||||
"28 c #3D4F64",
|
||||
"29 c #9CC6F7",
|
||||
"2A c #D6DEE7",
|
||||
"2B c #081018",
|
||||
"2C c #213142",
|
||||
"2D c #344C65",
|
||||
"2E c #38516B",
|
||||
"2F c #4A6B8C",
|
||||
"30 c #39526B",
|
||||
"31 c #638CB5",
|
||||
"32 c #29394A",
|
||||
"33 c #527393",
|
||||
"34 c #6B94BD",
|
||||
"35 c #4B6885",
|
||||
"36 c #324457",
|
||||
"37 c #739CC6",
|
||||
"38 c #7BA5CE",
|
||||
"39 c #6384A5",
|
||||
"3A c #84ADD6",
|
||||
"3B c #6B8CAD",
|
||||
"3C c #7394B5",
|
||||
"3D c #232D37",
|
||||
"3E c #84A5C6",
|
||||
"3F c #94B5D6",
|
||||
"40 c #738CA5",
|
||||
"41 c #7B94AD",
|
||||
"42 c #849CB5",
|
||||
"43 c #9CB5CE",
|
||||
"44 c #A5BDD6",
|
||||
"45 c #8494A5",
|
||||
"46 c #424A52",
|
||||
"47 c #A5B5C6",
|
||||
"48 c #ADBDCE",
|
||||
"49 c #CED6DE",
|
||||
"4A c #182129",
|
||||
"4B c #4A637B",
|
||||
"4C c #394A5A",
|
||||
"4D c #526373",
|
||||
"4E c #5A6B7B",
|
||||
"4F c #738494",
|
||||
"50 c #B5C6D6",
|
||||
"51 c #BDCEDE",
|
||||
"52 c #4A6A86",
|
||||
"53 c #73A5CE",
|
||||
"54 c #638CAD",
|
||||
"55 c #7BADD6",
|
||||
"56 c #516F88",
|
||||
"57 c #739CBD",
|
||||
"58 c #526F87",
|
||||
"59 c #8CB5D6",
|
||||
"5A c #67849C",
|
||||
"5B c #A9CAE7",
|
||||
"5C c #5A84A5",
|
||||
"5D c #4A6B84",
|
||||
"5E c #52738C",
|
||||
"5F c #5A7B94",
|
||||
"60 c #7BA5C6",
|
||||
"61 c #6B8CA5",
|
||||
"62 c #84B5D6",
|
||||
"63 c #425A6B",
|
||||
"64 c #324451",
|
||||
"65 c #5A7384",
|
||||
"66 c #9CB5C6",
|
||||
"67 c #DAEBF7",
|
||||
"68 c #527B94",
|
||||
"69 c #4A6373",
|
||||
"6A c #526B7B",
|
||||
"6B c #94ADBD",
|
||||
"6C c #8CBDD6",
|
||||
"6D c #475A63",
|
||||
"6E c #A5C6D6",
|
||||
"6F c #B5C6CE",
|
||||
"70 c #11181B",
|
||||
"71 c #94C6D6",
|
||||
"72 c #BDE7E7",
|
||||
"73 c #E7EFEF",
|
||||
"74 c #484915",
|
||||
"75 c #FFFC00",
|
||||
"76 c #FFFF00",
|
||||
"77 c #FAF900",
|
||||
"78 c #0C0C00",
|
||||
"79 c #FFFA00",
|
||||
"7A c #FFF800",
|
||||
"7B c #FFF700",
|
||||
"7C c #F7F200",
|
||||
"7D c #F7EF00",
|
||||
"7E c #F3EC00",
|
||||
"7F c #EFEA00",
|
||||
"80 c #EDE600",
|
||||
"81 c #E8E000",
|
||||
"82 c #E5DD00",
|
||||
"83 c #E2DA00",
|
||||
"84 c #DAD200",
|
||||
"85 c #514E00",
|
||||
"86 c #FFF200",
|
||||
"87 c #F9EC00",
|
||||
"88 c #F3E800",
|
||||
"89 c #F1E400",
|
||||
"8A c #EDE000",
|
||||
"8B c #E9DD00",
|
||||
"8C c #E4D900",
|
||||
"8D c #E3D700",
|
||||
"8E c #DFD600",
|
||||
"8F c #DED300",
|
||||
"90 c #DDD100",
|
||||
"91 c #DACF00",
|
||||
"92 c #D9CE00",
|
||||
"93 c #D4C900",
|
||||
"94 c #CFC500",
|
||||
"95 c #C5BA00",
|
||||
"96 c #B4AC00",
|
||||
"97 c #B0A700",
|
||||
"98 c #9A9300",
|
||||
"99 c #958D00",
|
||||
"9A c #8E8700",
|
||||
"9B c #736E00",
|
||||
"9C c #635E00",
|
||||
"9D c #5C5700",
|
||||
"9E c #4D4900",
|
||||
"9F c #434000",
|
||||
"A0 c #EBDF01",
|
||||
"A1 c #E9DF01",
|
||||
"A2 c #D1C701",
|
||||
"A3 c #AEA501",
|
||||
"A4 c #DDD203",
|
||||
"A5 c #272501",
|
||||
"A6 c #BDB507",
|
||||
"A7 c #E7CC00",
|
||||
"A8 c #171506",
|
||||
"A9 c #FDD900",
|
||||
"AA c #FCD400",
|
||||
"AB c #CEB335",
|
||||
"AC c #8F7928",
|
||||
"AD c #B99D35",
|
||||
"AE c #ECC645",
|
||||
"AF c #F3C643",
|
||||
"B0 c #FBCD46",
|
||||
"B1 c #F1C243",
|
||||
"B2 c #EEBE3F",
|
||||
"B3 c #C29834",
|
||||
"B4 c #906D26",
|
||||
"B5 c #060503",
|
||||
"B6 c #C28D31",
|
||||
"B7 c #FFBB42",
|
||||
"B8 c #FDB43F",
|
||||
"B9 c #F1AE3D",
|
||||
"BA c #F7A93A",
|
||||
"BB c #E9A53B",
|
||||
"BC c #090704",
|
||||
"BD c #F7A53A",
|
||||
"BE c #C1822E",
|
||||
"BF c #915D20",
|
||||
"C0 c #FC9E38",
|
||||
"C1 c #5C2E00",
|
||||
"C2 c #FD9A36",
|
||||
"C3 c #F79535",
|
||||
"C4 c #8B551E",
|
||||
"C5 c #BC6E28",
|
||||
"C6 c #E88C35",
|
||||
"C7 c #E88B35",
|
||||
"C8 c #DE8734",
|
||||
"C9 c #934400",
|
||||
"CA c #E9822E",
|
||||
"CB c #CE7329",
|
||||
"CC c #BC6B25",
|
||||
"CD c #FC9034",
|
||||
"CE c #E88733",
|
||||
"CF c #92511E",
|
||||
"D0 c #E78131",
|
||||
"D1 c #FC8331",
|
||||
"D2 c #87461A",
|
||||
"D3 c #EA7C2E",
|
||||
"D4 c #BC6425",
|
||||
"D5 c #FC7C2F",
|
||||
"D6 c #C15F24",
|
||||
"D7 c #934B1C",
|
||||
"D8 c #BC5E24",
|
||||
"D9 c #BD6329",
|
||||
"DA c #FE772D",
|
||||
"DB c #7B4221",
|
||||
"DC c #792A00",
|
||||
"DD c #FE752B",
|
||||
"DE c #FF732C",
|
||||
"DF c #E8692A",
|
||||
"E0 c #7B3918",
|
||||
"E1 c #BD5A29",
|
||||
"E2 c #FF6D2A",
|
||||
"E3 c #F76D2B",
|
||||
"E4 c #BD5221",
|
||||
"E5 c #F66327",
|
||||
"E6 c #FF6A29",
|
||||
"E7 c #F55B25",
|
||||
"E8 c #E85923",
|
||||
"E9 c #FF6227",
|
||||
"EA c #FF6328",
|
||||
"EB c #BD4A21",
|
||||
"EC c #BD4218",
|
||||
"ED c #FE5A26",
|
||||
"EE c #7B3118",
|
||||
"EF c #E84F21",
|
||||
"F0 c #BD4221",
|
||||
"F1 c #B53918",
|
||||
"F2 c #F24C21",
|
||||
"F3 c #E4461F",
|
||||
"F4 c #73524A",
|
||||
"F5 c #AD3118",
|
||||
"F6 c #7B2918",
|
||||
"F7 c #732918",
|
||||
"F8 c #DA391A",
|
||||
"F9 c #B53118",
|
||||
"FA c #521810",
|
||||
"FB c #732118",
|
||||
"FC c #7B2118",
|
||||
"FD c #020101",
|
||||
"FE c #C2C2C2",
|
||||
".. s None c None",
|
||||
"..44390517171705050505050505050505050505050505051A0404041A4B4E..",
|
||||
"5B723B4B69694D6A101010101010101010101010101010100E5A0C201D4B3246",
|
||||
"265B4701010101010101010101010101010101010101010101010101014F2C12",
|
||||
"575F01676C3A5337373737373737373737375757575757230321045D013F133D",
|
||||
"0365016E715537340303030303030303030303030303223139685D06015C3070",
|
||||
"3C6A0171592A6702432A0251667302482121212139395C040513060122052C00",
|
||||
"231E016C552A0202472A02026F2A02020404040404055E5D4B06013439152B..",
|
||||
"241E0159383E02025A61020804040273040505055E2F130663013403062700..",
|
||||
"601E016238430250050F020D05110248050505172F130663013403064A00....",
|
||||
"251E01623850024205470247056F026B0505172F130663013403064A0007....",
|
||||
"251E0162530A0240050D02420549024105172F130663013403064AFDDB07....",
|
||||
"251E01625373021B0573021C0573021B172F130663013403064ABCC8DB07....",
|
||||
"251E016253310405050505050505051852140000003403064ABCB9C8DB07....",
|
||||
"251E0162533104050505050505051900009492A4A6006D4ABCB1B9C6E007....",
|
||||
"251E01625331040505050505335800A38A8C7E7E8D8C0074AEB1B7C7E007....",
|
||||
"251E016253310405050505052800879A9E9E75767B8B8FFDABB0B7C6E007....",
|
||||
"251E0162533104050505051600A1938686869A8699988790FDB2B8C7E007....",
|
||||
"251E0162533104050505172D008D978585967B7BA8857C818200BDCEE007....",
|
||||
"251E01625331040505172E00A27F7780969B75799CA57C7F9100C0CAEE07....",
|
||||
"251E016253310405172F150084777676757776757B7975888300C2CAEE07....",
|
||||
"251E01625331045E2F133600A0A67D75767576767676767D8300C2D0F707....",
|
||||
"251E016253310417130664FE00869F96847A7A7A79797B828E00CDD3EE07....",
|
||||
"251E0162375405130663FE3500978C009BA7A9A9AA9D989000CAD1DFF607....",
|
||||
"254E016237392F14630134563D00918AFDDCC9C9C10089A200D1D5DFF607....",
|
||||
"2510013A340413060134033670A500918C00000000869400D3D5DDE8F607....",
|
||||
"250E0138545E06013403064AB5ACAB00918A89888B9578D2D5DAE6E8F607....",
|
||||
"25400134044B013403064AB5ADADACB40000000000CFD7DADEE2E9EFF607....",
|
||||
"3C1F01395D013403064AA8AFAFB3B6BEBFC4C4CFD7D6DEE2E6EAEDF3FB07....",
|
||||
"3C3F0101013422064AB5BBBBBABDC3C5CCD4D4D8E3E3E5E5E7E7F2F8FA07....",
|
||||
"542945222205304A00CBCBD9D9D9E1E4E4E4EBEBEBF0ECF1F1F9F5FCF407....",
|
||||
"4C172D1330322700070707070707070707070707070707070707070707......",
|
||||
"..4C090B4A2B....................................................",
|
||||
};
|
||||
Двоичные данные
suite/branding/nightly/icons/gtk/default.png
Двоичные данные
suite/branding/nightly/icons/gtk/default.png
Двоичный файл не отображается.
|
До Ширина: | Высота: | Размер: 2.0 KiB |
Двоичные данные
suite/branding/nightly/icons/gtk/default16.png
Двоичные данные
suite/branding/nightly/icons/gtk/default16.png
Двоичный файл не отображается.
|
До Ширина: | Высота: | Размер: 842 B |
Двоичные данные
suite/branding/nightly/icons/gtk/default48.png
Двоичные данные
suite/branding/nightly/icons/gtk/default48.png
Двоичный файл не отображается.
|
До Ширина: | Высота: | Размер: 3.3 KiB |
|
|
@ -4,7 +4,7 @@ window icons. The SVG images are not directly used in the software, but stored
|
|||
here for reference and as a base for possible later revisions or new icons
|
||||
that may be created in the future.
|
||||
|
||||
All image files in this directory and images derived from them are licenced
|
||||
All image files in this directory and images derived from them are licensed
|
||||
under the MPL 2 as follows:
|
||||
|
||||
This Source Code Form is subject to the terms of the Mozilla Public
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# 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/.
|
||||
|
||||
comm.jar:
|
||||
% content branding %content/branding/ contentaccessible=yes
|
||||
content/branding/about.png (content/about.png)
|
||||
content/branding/icon32.png (content/icon32.png)
|
||||
content/branding/icon48.png (content/icon48.png)
|
||||
content/branding/icon64.png (content/icon64.png)
|
||||
content/branding/aboutRights.js (content/aboutRights.js)
|
||||
content/branding/aboutRights.xhtml (content/aboutRights.xhtml)
|
||||
content/branding/messenger-start-bg.png (content/messenger-start-bg.png)
|
||||
content/branding/messenger-start-hdr.png (content/messenger-start-hdr.png)
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
#filter substitution
|
||||
|
||||
@AB_CD@.jar:
|
||||
% locale branding @AB_CD@ %locale/@AB_CD@/branding/
|
||||
locale/@AB_CD@/branding/brand.dtd (%brand.dtd)
|
||||
locale/@AB_CD@/branding/brand.properties (%brand.properties)
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
# vim: set filetype=python:
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# 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/.
|
||||
|
||||
JAR_MANIFESTS += ['jar.mn']
|
||||
|
|
@ -3,67 +3,7 @@
|
|||
# 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/.
|
||||
|
||||
JAR_MANIFESTS += ['jar.mn']
|
||||
DIRS += ['content', 'locales']
|
||||
|
||||
# Note: mac icons are handled in /suite/app during the final application
|
||||
# packaging
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk3'):
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
|
||||
icon_suffix = '.ico'
|
||||
else:
|
||||
icon_suffix = '.png'
|
||||
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
|
||||
icon_dir = 'gtk'
|
||||
else:
|
||||
icon_dir = CONFIG['MOZ_WIDGET_TOOLKIT']
|
||||
|
||||
desktop_icons = [
|
||||
'abcardWindow',
|
||||
'ablistWindow',
|
||||
'addressbookWindow',
|
||||
'bookmarkproperties',
|
||||
'downloadManager',
|
||||
'editorWindow',
|
||||
'findBookmarkWindow',
|
||||
'findHistoryWindow',
|
||||
'history-window',
|
||||
'JSConsoleWindow',
|
||||
'main-window',
|
||||
'messengerWindow',
|
||||
'msgcomposeWindow',
|
||||
'places',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
|
||||
# Windows icons
|
||||
desktop_icons += [
|
||||
'gif-file',
|
||||
'html-file',
|
||||
'image-file',
|
||||
'jpeg-file',
|
||||
'script-file',
|
||||
'xml-file',
|
||||
'xul-file',
|
||||
]
|
||||
|
||||
desktop_icons_small = []
|
||||
desktop_icons_large = []
|
||||
|
||||
if icon_dir == 'gtk':
|
||||
FINAL_TARGET_FILES.chrome.icons.default += [
|
||||
'icons/gtk/default128.png'
|
||||
]
|
||||
|
||||
desktop_icons += [
|
||||
'default'
|
||||
]
|
||||
|
||||
desktop_icons_small = [ '%s16' % i for i in desktop_icons ]
|
||||
desktop_icons_large = [ '%s48' % i for i in desktop_icons ]
|
||||
|
||||
FINAL_TARGET_FILES.chrome.icons.default += [
|
||||
'icons/%s/%s%s' % (icon_dir, i, icon_suffix) for i in sorted(
|
||||
desktop_icons + desktop_icons_small + desktop_icons_large
|
||||
)
|
||||
]
|
||||
include('../../../suite/branding/branding-common.mozbuild')
|
||||
SeaMonkeyBranding()
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
// For future use
|
||||
|
До Ширина: | Высота: | Размер: 25 KiB После Ширина: | Высота: | Размер: 25 KiB |
|
До Ширина: | Высота: | Размер: 25 KiB После Ширина: | Высота: | Размер: 25 KiB |
|
До Ширина: | Высота: | Размер: 151 KiB После Ширина: | Высота: | Размер: 151 KiB |
|
|
@ -3,9 +3,6 @@
|
|||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
ifndef COMM_BUILD
|
||||
installer:
|
||||
@$(MAKE) -C $(commtopobjdir)/suite/installer installer
|
||||
|
||||
package:
|
||||
@$(MAKE) -C $(commtopobjdir)/suite/installer
|
||||
|
||||
|
|
@ -26,7 +23,7 @@ source-upload::
|
|||
|
||||
# make -j1 because dependencies in l10n build targets don't work
|
||||
# with parallel builds
|
||||
merge-% installers-% langpack-% chrome-%:
|
||||
merge-% installers-% langpack-% chrome-% clobber-%:
|
||||
$(MAKE) -j1 -C $(commtopobjdir)/suite/locales $@
|
||||
|
||||
# mochitests need to be run from the Mozilla build system
|
||||
|
|
|
|||
|
|
@ -141,9 +141,9 @@ DEFINES += -DHAVE_MAKENSISU=1
|
|||
endif
|
||||
|
||||
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
|
||||
MOZ_PKG_MAC_DSSTORE=branding/dsstore
|
||||
MOZ_PKG_MAC_BACKGROUND=branding/background.png
|
||||
MOZ_PKG_MAC_ICON=branding/disk.icns
|
||||
MOZ_PKG_MAC_DSSTORE=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/dsstore
|
||||
MOZ_PKG_MAC_BACKGROUND=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/background.png
|
||||
MOZ_PKG_MAC_ICON=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/disk.icns
|
||||
MOZ_PKG_MAC_EXTRA=--symlink "/Applications:/ "
|
||||
endif
|
||||
|
||||
|
|
@ -215,11 +215,6 @@ package-compare:: $(MOZ_PKG_MANIFEST)
|
|||
-diff -u $(DIST)/pack-list.txt $(DIST)/bin-list.txt
|
||||
rm -f $(DIST)/pack-list.txt $(DIST)/bin-list.txt
|
||||
|
||||
installer:
|
||||
ifdef INSTALLER_DIR
|
||||
$(MAKE) -C $(INSTALLER_DIR)
|
||||
endif
|
||||
|
||||
# The comm-* source stamp is already there.
|
||||
PLATFORM_SOURCE_STAMP = $(firstword $(shell hg -R "$(moztopsrcdir)" parent --template="{node|short}\n" 2>/dev/null))
|
||||
PLATFORM_SOURCE_REPO = $(shell hg -R "$(moztopsrcdir)" showconfig paths.default 2>/dev/null | sed -e "s/^ssh:/https:/")
|
||||
|
|
|
|||
|
|
@ -389,6 +389,7 @@
|
|||
@RESPATH@/chrome/icons/default/default.png
|
||||
@RESPATH@/chrome/icons/default/default16.png
|
||||
@RESPATH@/chrome/icons/default/default48.png
|
||||
@RESPATH@/chrome/icons/default/default64.png
|
||||
@RESPATH@/chrome/icons/default/default128.png
|
||||
@RESPATH@/chrome/icons/default/downloadManager.png
|
||||
@RESPATH@/chrome/icons/default/downloadManager16.png
|
||||
|
|
|
|||
|
|
@ -670,7 +670,6 @@ Throbber-small.gif
|
|||
@DIR_MACOS@defaults/pref/services-aitc.js
|
||||
@DIR_MACOS@defaults/pref/services-notifications.js
|
||||
@DIR_MACOS@defaults/pref/smime.js
|
||||
@DIR_MACOS@defaults/pref/suite-l10n.js
|
||||
@DIR_MACOS@defaults/autoconfig/
|
||||
@DIR_MACOS@defaults/autoconfig/platform.js
|
||||
@DIR_MACOS@defaults/autoconfig/prefcalls.js
|
||||
|
|
|
|||
|
|
@ -40,27 +40,11 @@ else
|
|||
PPL_LOCALE_ARGS=$(call EXPAND_COMM_LOCALE_SRCDIR,suite/locales)/installer/windows
|
||||
endif
|
||||
|
||||
OVERRIDE_DEFAULT_GOAL := installer
|
||||
installer::
|
||||
$(MAKE) -C .. installer-stage
|
||||
$(MAKE) $(CONFIG_DIR)/setup.exe
|
||||
|
||||
# For building the uninstaller during the application build so it can be
|
||||
# included for mar file generation.
|
||||
uninstaller::
|
||||
$(RM) -r $(CONFIG_DIR) && mkdir $(CONFIG_DIR)
|
||||
$(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR)
|
||||
$(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) $(moztopsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
|
||||
--preprocess-locale $(moztopsrcdir) \
|
||||
$(PPL_LOCALE_ARGS) $(AB_CD) $(CONFIG_DIR)
|
||||
|
||||
$(CONFIG_DIR)/setup.exe::
|
||||
$(RM) -r $(CONFIG_DIR) && mkdir $(CONFIG_DIR)
|
||||
$(RM) -r $(CONFIG_DIR)
|
||||
$(MKDIR) $(CONFIG_DIR)
|
||||
$(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR)
|
||||
$(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR)
|
||||
$(INSTALL) $(addprefix $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/,$(BRANDING_FILES)) $(CONFIG_DIR)
|
||||
$(PYTHON) $(moztopsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
|
||||
--convert-utf8-utf16le $(commtopsrcdir)/suite/installer/license.txt $(CONFIG_DIR)/license.txt
|
||||
$(call py_action,preprocessor,-Fsubstitution $(DEFINES) $(ACDEFINES) \
|
||||
|
|
@ -69,5 +53,7 @@ $(CONFIG_DIR)/setup.exe::
|
|||
--preprocess-locale $(moztopsrcdir) \
|
||||
$(PPL_LOCALE_ARGS) $(AB_CD) $(CONFIG_DIR)
|
||||
|
||||
GARBARGE_DIRS += instgen
|
||||
|
||||
include $(moztopsrcdir)/config/rules.mk
|
||||
include $(moztopsrcdir)/toolkit/mozapps/installer/windows/nsis/makensis.mk
|
||||
|
|
|
|||
|
|
@ -2,6 +2,9 @@
|
|||
# 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/.
|
||||
|
||||
LOCALE_TOPDIR=$(commtopsrcdir)
|
||||
LOCALE_RELATIVEDIR=suite/locales
|
||||
|
||||
include $(moztopsrcdir)/config/config.mk
|
||||
|
||||
MERGE_FILES = $(foreach f,$(1),$(call MERGE_FILE,$(f)))
|
||||
|
|
@ -16,6 +19,7 @@ _ABS_SRCDIR := $(abspath $(commtopsrcdir))
|
|||
|
||||
SUBMAKEFILES += \
|
||||
$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/Makefile \
|
||||
$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile \
|
||||
$(NULL)
|
||||
|
||||
# This makefile uses variable overrides from the libs-% target to
|
||||
|
|
@ -26,21 +30,13 @@ PWD := $(CURDIR)
|
|||
# These are defaulted to be compatible with the files the wget-en-US target
|
||||
# pulls. You may override them if you provide your own files.
|
||||
ZIP_IN ?= $(ABS_DIST)/$(PACKAGE)
|
||||
WIN32_INSTALLER_IN ?= $(ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
|
||||
RETRIEVE_WINDOWS_INSTALLER = 1
|
||||
|
||||
MOZ_LANGPACK_EID=langpack-$(AB_CD)@seamonkey.mozilla.org
|
||||
|
||||
# For Nightly, we know where to get the builds from to do local repacks
|
||||
ifdef NIGHTLY_BUILD
|
||||
export EN_US_BINARY_URL ?= https://archive.mozilla.org/pub/seamonkey/nightly/latest-comm-central-trunk
|
||||
endif
|
||||
|
||||
L10N_PREF_JS_EXPORTS = $(call MERGE_FILE,suite-l10n.js)
|
||||
L10N_PREF_JS_EXPORTS_PATH = $(FINAL_TARGET)/$(PREF_DIR)
|
||||
L10N_PREF_JS_EXPORTS_FLAGS = $(PREF_PPFLAGS) --silence-missing-directive-warnings
|
||||
PP_TARGETS += L10N_PREF_JS_EXPORTS
|
||||
|
||||
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
|
||||
MOZ_PKG_MAC_DSSTORE=$(ABS_DIST)/branding/dsstore
|
||||
MOZ_PKG_MAC_BACKGROUND=$(ABS_DIST)/branding/background.png
|
||||
|
|
@ -49,16 +45,6 @@ MOZ_PKG_MAC_EXTRA=--symlink '/Applications:/ '
|
|||
endif
|
||||
|
||||
MOZ_SFX_PACKAGE=$(commtopsrcdir)/other-licenses/7zstub/seamonkey/7zSD.sfx
|
||||
MOZ_INSTALLER_PATH=$(commtopsrcdir)/suite/installer/windows
|
||||
|
||||
ifeq (WINNT,$(OS_ARCH))
|
||||
UNINSTALLER_PACKAGE_HOOK = $(RM) -r $(STAGEDIST)/uninstall; \
|
||||
$(NSINSTALL) -D $(STAGEDIST)/uninstall; \
|
||||
cp ../installer/windows/l10ngen/helper.exe $(STAGEDIST)/uninstall; \
|
||||
$(RM) $(ABS_DIST)/l10n-stage/setup.exe; \
|
||||
cp ../installer/windows/l10ngen/setup.exe $(ABS_DIST)/l10n-stage; \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
NON_OMNIJAR_FILES = \
|
||||
defaults/messenger/mailViews.dat \
|
||||
|
|
@ -90,6 +76,10 @@ DIST_SUBDIRS = $(DIST_SUBDIR)
|
|||
|
||||
include $(moztopsrcdir)/config/rules.mk
|
||||
|
||||
ifeq ($(commreltopsrcdir),comm)
|
||||
COMPARE_LOCALES_DEFINES += -Dmozilla=..
|
||||
endif
|
||||
|
||||
include $(moztopsrcdir)/toolkit/locales/l10n.mk
|
||||
|
||||
$(list-txt): $(call mkdir_deps,$(SEARCHPLUGINS_PATH)) $(if $(IS_LANGUAGE_REPACK),FORCE)
|
||||
|
|
@ -108,7 +98,7 @@ BOOKMARKS_INC_FILE = $(call MERGE_FILE,profile/bookmarks.inc)
|
|||
BOOKMARKS_XTRA_FILE = $(call MERGE_FILE,profile/bookmarks.extra)
|
||||
|
||||
# the #include in the .in file requires all to be in the same dir, sadly.
|
||||
%/defaults/profile/bookmarks.html: $(BOOKMARKS_INC_FILE) $(BOOKMARKS_XTRA_FILE) generic/profile/bookmarks.html.in
|
||||
%/defaults/profile/bookmarks.html: $(BOOKMARKS_INC_FILE) $(BOOKMARKS_XTRA_FILE) generic/profile/bookmarks.html.in
|
||||
$(SYSINSTALL) -D $(dir $@)
|
||||
$(RM) -rf profile/*bookmarks*
|
||||
$(NSINSTALL) -D profile
|
||||
|
|
@ -140,7 +130,7 @@ libs:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME)))
|
|||
|
||||
# Extend l10n.mk clobber-% target for our localised extensions
|
||||
ifdef MOZ_IRC
|
||||
clobber-%:
|
||||
clobber-extensions-%:
|
||||
$(RM) -rf $(DIST)/xpi-stage/chatzilla-$* $(DIST)/xpi-stage/chatzilla-*.$*.xpi
|
||||
endif
|
||||
|
||||
|
|
@ -149,46 +139,26 @@ libs-%:
|
|||
# merge if we're not en-US. Conditional function because
|
||||
# we need the current value of AB_CD.
|
||||
$(if $(filter en-US,$(AB_CD)),, @$(MAKE) merge-$*)
|
||||
ifdef MOZ_CALENDAR
|
||||
$(if $(filter en-US,$(AB_CD)),, @$(MAKE) -C ../../calendar/lightning merge-$*)
|
||||
endif
|
||||
$(NSINSTALL) -D $(DIST)/install
|
||||
@$(MAKE) -C $(DEPTH)/toolkit/locales libs-$*
|
||||
# @$(MAKE) -C $(DEPTH)/services/sync/locales AB_CD=$* XPI_NAME=locale-$*
|
||||
@$(MAKE) -C ../../editor/ui/locales AB_CD=$* XPI_NAME=locale-$*
|
||||
ifdef MOZ_CALENDAR
|
||||
@$(MAKE) -C ../../calendar/locales AB_CD=$* XPI_NAME=locale-$*
|
||||
endif
|
||||
ifdef MOZ_IRC
|
||||
@$(MAKE) -C $(DEPTH)/extensions/irc/locales libs-$*
|
||||
endif
|
||||
@$(MAKE) -C $(DEPTH)/extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$*
|
||||
@$(MAKE) -B searchplugins AB_CD=$* XPI_NAME=locale-$*
|
||||
@$(MAKE) -C $(DEPTH)/devtools/client/locales AB_CD=$* XPI_NAME=locale-$*
|
||||
@$(MAKE) -C $(DEPTH)/devtools/startup/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
|
||||
@$(MAKE) -B searchplugins AB_CD=$* XPI_NAME=locale-$*
|
||||
@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref
|
||||
@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$*
|
||||
|
||||
repackage-win32-installer: WIN32_INSTALLER_OUT=$(ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
|
||||
repackage-win32-installer: $(call ESCAPE_WILDCARD,$(WIN32_INSTALLER_IN)) $(SUBMAKEFILES) libs-$(AB_CD)
|
||||
@echo 'Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT).'
|
||||
$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY) export
|
||||
$(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen l10ngen/setup.exe l10ngen/7zSD.sfx
|
||||
$(MAKE) repackage-zip \
|
||||
AB_CD=$(AB_CD) \
|
||||
MOZ_PKG_FORMAT=SFX7Z \
|
||||
ZIP_IN='$(WIN32_INSTALLER_IN)' \
|
||||
ZIP_OUT='$(WIN32_INSTALLER_OUT)' \
|
||||
SFX_HEADER='$(PWD)/../installer/windows/l10ngen/7zSD.sfx \
|
||||
$(_ABS_SRCDIR)/suite/installer/windows/app.tag'
|
||||
|
||||
ifeq (WINNT,$(OS_ARCH))
|
||||
repackage-win32-installer-%: unpack
|
||||
@$(MAKE) repackage-win32-installer AB_CD=$* WIN32_INSTALLER_IN='$(WIN32_INSTALLER_IN)'
|
||||
|
||||
repackage-zip-%: repackage-win32-installer-%
|
||||
|
||||
else
|
||||
repackage-win32-installer-%: ;
|
||||
endif
|
||||
|
||||
repackage-zip: repackage-extensions
|
||||
package-win32-installer: WIN32_INSTALLER_OUT=$(ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
|
||||
package-win32-installer: $(SUBMAKEFILES)
|
||||
$(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen ZIP_IN='$(ZIP_OUT)' installer
|
||||
|
||||
repackage-extensions: $(STAGEDIST)
|
||||
ifdef MOZ_IRC
|
||||
|
|
@ -202,6 +172,24 @@ endif
|
|||
|
||||
langpack: langpack-$(AB_CD)
|
||||
|
||||
# This is a generic target that will make a langpack, repack ZIP (+tarball)
|
||||
# builds, and repack and installer if applicable. It is called from the
|
||||
# tinderbox scripts. Alter it with caution.
|
||||
installers-%: IS_LANGUAGE_REPACK=1
|
||||
installers-%:
|
||||
@$(MAKE) clobber-$*
|
||||
ifdef MOZ_IRC
|
||||
@$(MAKE) clobber-extensions-%*
|
||||
endif
|
||||
@$(MAKE) libs-$*
|
||||
@$(MAKE) package-langpack-$*
|
||||
@$(MAKE) repackage-zip-$*
|
||||
@$(MAKE) repackage-extensions AB_CD=$*
|
||||
ifeq (WINNT,$(OS_ARCH))
|
||||
@$(MAKE) package-win32-installer AB_CD=$*
|
||||
endif
|
||||
@echo 'repackaging done'
|
||||
|
||||
ifdef MOZ_UPDATER
|
||||
libs:: $(call MERGE_FILE,updater/updater.ini) $(call mkdir_deps,$(DIST)/bin)
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
|
|
@ -217,13 +205,6 @@ else
|
|||
endif
|
||||
endif
|
||||
|
||||
ifndef IS_LANGPACK
|
||||
ifdef MOZ_CRASHREPORTER
|
||||
libs:: $(call MERGE_FILE,crashreporter/crashreporter-override.ini)
|
||||
$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)
|
||||
endif
|
||||
endif
|
||||
|
||||
ident:
|
||||
@printf 'comm_revision '
|
||||
@$(PYTHON) $(moztopsrcdir)/config/printconfigsetting.py \
|
||||
|
|
@ -235,67 +216,6 @@ ident:
|
|||
@$(PYTHON) $(moztopsrcdir)/config/printconfigsetting.py \
|
||||
'$(STAGEDIST)/application.ini' App BuildID
|
||||
|
||||
.PHONY: repackage-extensions
|
||||
|
||||
ifdef MOZ_IRC
|
||||
MOZ_PKG_EXTRAL10N += extensions/langpack-$(AB_CD)@chatzilla.mozilla.org=$(DIST)/xpi-stage/chatzilla-$(AB_CD)
|
||||
endif
|
||||
|
||||
ifdef MOZ_CALENDAR
|
||||
LIGHTNING_PATH=$(commtopobjdir)/calendar/lightning
|
||||
GDATA_PATH=$(commtopobjdir)/calendar/providers/gdata
|
||||
|
||||
define run-calendar-rule
|
||||
$(MAKE) -C $(LIGHTNING_PATH) $(subst calendar-,,$@) AB_CD=$(AB_CD)
|
||||
$(MAKE) -C $(GDATA_PATH) $(subst calendar-,,$@) AB_CD=$(AB_CD)
|
||||
endef
|
||||
|
||||
sm-wget-en-US:
|
||||
$(NSINSTALL) -D $(ABS_DIST)/$(PKG_PATH)
|
||||
(cd $(ABS_DIST)/$(PKG_PATH) && $(WGET) --no-cache -nv --no-iri -N '$(EN_US_BINARY_URL)/$(PACKAGE)')
|
||||
@echo 'Downloaded $(EN_US_BINARY_URL)/$(PACKAGE) to $(ABS_DIST)/$(PKG_PATH)/$(PACKAGE)'
|
||||
ifdef RETRIEVE_WINDOWS_INSTALLER
|
||||
ifeq ($(OS_ARCH), WINNT)
|
||||
$(NSINSTALL) -D $(ABS_DIST)/$(PKG_INST_PATH)
|
||||
(cd $(ABS_DIST)/$(PKG_INST_PATH) && $(WGET) --no-cache -nv --no-iri -N '$(EN_US_BINARY_URL)/$(PKG_PATH)$(PKG_INST_BASENAME).exe')
|
||||
@echo 'Downloaded $(EN_US_BINARY_URL)/$(PKG_PATH)$(PKG_INST_BASENAME).exe to $(ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe'
|
||||
endif
|
||||
endif
|
||||
|
||||
# Add calendar targets for pattern rules. Unfortunately multiple pattern rules
|
||||
# on the left hand side do something different with make, therefore we need to
|
||||
# write a line for each target.
|
||||
calendar-clobber-%:
|
||||
$(run-calendar-rule)
|
||||
calendar-langpack-%: AB_CD=$*
|
||||
calendar-langpack-%:
|
||||
$(run-calendar-rule)
|
||||
calendar-repackage-zip-%: AB_CD=$*
|
||||
calendar-repackage-zip-%:
|
||||
$(run-calendar-rule)
|
||||
calendar-wget-en-US: sm-wget-en-US
|
||||
$(run-calendar-rule)
|
||||
calendar-unpack:
|
||||
$(run-calendar-rule)
|
||||
|
||||
# Hook into l10n.mk, providing extra arguments to l10n-repack.py
|
||||
ifdef NIGHTLY_BUILD
|
||||
MOZ_PKG_EXTRAL10N += extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}=$(DIST)/xpi-stage/lightning-$(AB_CD)
|
||||
else
|
||||
MOZ_PKG_EXTRAL10N += distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}=$(DIST)/xpi-stage/lightning-$(AB_CD)
|
||||
endif
|
||||
|
||||
# Hook calendar targets to the mail non-pattern rules
|
||||
wget-en-US: calendar-wget-en-US
|
||||
unpack: calendar-unpack
|
||||
|
||||
# Hook into the pattern rules, this will be used later on in the installers-% target.
|
||||
CALENDAR_INSTALLERS_TARGETS = calendar-clobber-% calendar-langpack-% calendar-repackage-zip-%
|
||||
endif
|
||||
|
||||
# This is a generic target that will make a langpack, repack ZIP (+tarball)
|
||||
# builds, and repack and installer if applicable. It is called from the
|
||||
# tinderbox scripts. Alter it with caution.
|
||||
installers-%: IS_LANGUAGE_REPACK=1
|
||||
installers-%: clobber-% $(CALENDAR_INSTALLERS_TARGETS) langpack-% repackage-win32-installer-% repackage-zip-%
|
||||
@echo 'repackaging done'
|
||||
|
|
|
|||
|
|
@ -6,8 +6,11 @@ def test(mod, path, entity=None):
|
|||
import re
|
||||
# ignore anything but SeaMonkey
|
||||
if mod not in ("netwerk", "dom", "toolkit", "security/manager",
|
||||
"devtools/client", "devtools/shared", "devtools/shim",
|
||||
"editor/ui", "suite", "services/sync"):
|
||||
"devtools/client", "devtools/shared", "devtools/startup",
|
||||
"suite",
|
||||
"editor/ui",
|
||||
"extensions/spellcheck",
|
||||
"services/sync"):
|
||||
return "ignore"
|
||||
# ignore temporary files, hiden files and files from rejects
|
||||
if (re.match(r".*?\/[.#].+", path) or
|
||||
|
|
@ -23,7 +26,6 @@ def test(mod, path, entity=None):
|
|||
path == "profile/bookmarks.extra" or
|
||||
path == "profile/panels.extra" or
|
||||
path == "defines.inc" or
|
||||
path == "suite-l10n.js" or
|
||||
re.match(r"chrome\/common\/help\/images\/[A-Za-z-_]+\.[a-z]+", path))
|
||||
else "error")
|
||||
if path == "defines.inc":
|
||||
|
|
|
|||
|
|
@ -23,8 +23,6 @@
|
|||
% locale navigator-platform @AB_CD@ %locale/@AB_CD@/navigator-platform/mac/ os=Darwin
|
||||
% locale navigator-platform @AB_CD@ %locale/@AB_CD@/navigator-platform/win/ os=WINNT
|
||||
% locale navigator-region @AB_CD@ %locale/@AB_CD@/navigator-region/
|
||||
locale/@AB_CD@/branding/brand.dtd (%chrome/branding/brand.dtd)
|
||||
locale/@AB_CD@/branding/brand.properties (%chrome/branding/brand.properties)
|
||||
locale/@AB_CD@/branding/aboutRights.dtd (%chrome/branding/aboutRights.dtd)
|
||||
locale/@AB_CD@/branding/aboutRights.properties (%chrome/branding/aboutRights.properties)
|
||||
locale/@AB_CD@/communicator/askViewZoom.dtd (%chrome/common/askViewZoom.dtd)
|
||||
|
|
|
|||
|
|
@ -48,6 +48,19 @@ locales = [
|
|||
reference = "editor/ui/locales/en-US/**"
|
||||
l10n = "{l}editor/ui/**"
|
||||
|
||||
[[paths]]
|
||||
reference = "services/sync/locales/en-US/**"
|
||||
l10n = "{l}services/sync/**"
|
||||
|
||||
[[includes]]
|
||||
path = "{mozilla}/toolkit/locales/l10n.toml"
|
||||
|
||||
[[includes]]
|
||||
path = "calendar/locales/l10n.toml"
|
||||
|
||||
[[includes]]
|
||||
path = "{mozilla}/devtools/client/locales/l10n.toml"
|
||||
|
||||
[[paths]]
|
||||
reference = "{mozilla}/devtools/startup/locales/en-US/**"
|
||||
l10n = "{l}devtools/startup/**"
|
||||
|
|
@ -57,23 +70,13 @@ locales = [
|
|||
reference = "{mozilla}/devtools/shim/locales/en-US/**"
|
||||
l10n = "{l}devtools/shim/**"
|
||||
|
||||
[[paths]]
|
||||
reference = "{mozilla}/services/sync/locales/en-US/**"
|
||||
l10n = "{l}services/sync/**"
|
||||
|
||||
[[includes]]
|
||||
path = "{mozilla}/devtools/client/locales/l10n.toml"
|
||||
|
||||
[[includes]]
|
||||
path = "{mozilla}/toolkit/locales/l10n.toml"
|
||||
|
||||
# ignore MOZ_LANGPACK_CONTRIBUTORS
|
||||
[[filters]]
|
||||
path = "{l}suite/defines.inc"
|
||||
key = "MOZ_LANGPACK_CONTRIBUTORS"
|
||||
action = "ignore"
|
||||
|
||||
# defines.inc and all-l10n.js can be missing completely
|
||||
# defines.inc and suite-l10n.js can be missing completely
|
||||
[[filters]]
|
||||
path = [
|
||||
"{l}suite/defines.inc",
|
||||
|
|
|
|||
|
|
@ -5,6 +5,12 @@
|
|||
|
||||
JAR_MANIFESTS += ['jar.mn']
|
||||
|
||||
# If DIST_SUBDIR ever gets unset in browser this path might be wrong due to PREF_DIR changing.
|
||||
LOCALIZED_PP_FILES.defaults.pref += ['en-US/suite-l10n.js']
|
||||
|
||||
if CONFIG['MOZ_CRASHREPORTER']:
|
||||
LOCALIZED_FILES += ['en-US/crashreporter/crashreporter-override.ini']
|
||||
|
||||
DEFINES['MOZ_APP_MAXVERSION'] = CONFIG['MOZ_APP_MAXVERSION']
|
||||
|
||||
FINAL_TARGET_FILES.defaults.profile += [
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче