From 6d614170cbfa958564eb5f824234ad5a9e484344 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Fri, 2 Feb 2018 05:06:10 -0500 Subject: Revert "Add Basilisk" This reverts commit e72ef92b5bdc43cd2584198e2e54e951b70299e8. --- application/basilisk/locales/Makefile.in | 180 ------------------------------- 1 file changed, 180 deletions(-) delete mode 100644 application/basilisk/locales/Makefile.in (limited to 'application/basilisk/locales/Makefile.in') diff --git a/application/basilisk/locales/Makefile.in b/application/basilisk/locales/Makefile.in deleted file mode 100644 index bde3ae30b..000000000 --- a/application/basilisk/locales/Makefile.in +++ /dev/null @@ -1,180 +0,0 @@ -# vim:set ts=8 sw=8 sts=8 noet: -# 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/. - -include $(topsrcdir)/config/config.mk - -SUBMAKEFILES += \ - $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/Makefile \ - $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile \ - $(NULL) - -# This makefile uses variable overrides from the libs-% target to -# build non-default locales to non-default dist/ locations. Be aware! - -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. You _must_ -# override them when MOZ_PKG_PRETTYNAMES is defined - the defaults will not -# work in that case. -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)@firefox.mozilla.org - -L10N_PREF_JS_EXPORTS = $(call MERGE_FILE,firefox-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 - -ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT))) -MOZ_PKG_MAC_DSSTORE=$(ABS_DIST)/branding/dsstore -MOZ_PKG_MAC_BACKGROUND=$(ABS_DIST)/branding/background.png -MOZ_PKG_MAC_ICON=$(ABS_DIST)/branding/disk.icns -MOZ_PKG_MAC_EXTRA=--symlink '/Applications:/ ' -endif - -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) - -STUB_HOOK = $(NSINSTALL) -D '$(ABS_DIST)/$(PKG_INST_PATH)'; \ - $(RM) '$(ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \ - cp ../installer/windows/l10ngen/stub.exe '$(ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \ - chmod 0755 '$(ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \ - $(NULL) -endif - -SEARCHPLUGINS_FILENAMES := $(shell $(call py_action,output_searchplugins_list,$(srcdir)/search/list.json $(AB_CD))) -SEARCHPLUGINS_PATH := .deps/generated_$(AB_CD) -SEARCHPLUGINS_TARGET := libs searchplugins -SEARCHPLUGINS := $(foreach plugin,$(addsuffix .xml,$(SEARCHPLUGINS_FILENAMES)),$(or $(wildcard $(srcdir)/searchplugins/$(plugin)),$(warning Missing searchplugin: $(plugin)))) -# Some locale-specific search plugins may have preprocessor directives, but the -# default en-US ones do not. -SEARCHPLUGINS_FLAGS := --silence-missing-directive-warnings -PP_TARGETS += SEARCHPLUGINS - -list-json = $(SEARCHPLUGINS_PATH)/list.json -GARBAGE += $(list-json) - -libs:: searchplugins - -# Required for l10n.mk - defines a list of app sub dirs that should -# be included in langpack xpis. -DIST_SUBDIRS = $(DIST_SUBDIR) - -include $(topsrcdir)/config/rules.mk - -include $(topsrcdir)/toolkit/locales/l10n.mk - -$(list-json): $(call mkdir_deps,$(SEARCHPLUGINS_PATH)) $(if $(IS_LANGUAGE_REPACK),FORCE) - $(call py_action,generate_searchjson,$(srcdir)/search/list.json $(AB_CD) $(list-json)) -searchplugins:: $(list-json) - -$(DIST)/branding: - $(NSINSTALL) -D $@ - -DEFINES += -DBOOKMARKS_INCLUDE_DIR=$(dir $(call MERGE_FILE,profile/bookmarks.inc)) - -libs-%: - $(NSINSTALL) -D $(DIST)/install - @$(MAKE) -C ../../../toolkit/locales libs-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)' - @$(MAKE) -C ../../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* - @$(MAKE) -C ../../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* -# @$(MAKE) -C ../extensions/pocket/locale AB_CD=$* XPI_NAME=locale-$* -ifndef RELEASE_OR_BETA - @$(MAKE) -C ../extensions/presentation/locale AB_CD=$* XPI_NAME=locale-$* -endif - @$(MAKE) -C ../../../intl/locales AB_CD=$* XPI_NAME=locale-$* - @$(MAKE) -C ../../../devtools/client/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=$(PREF_DIR) - @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* -ifdef NIGHTLY_BUILD - @$(MAKE) -C ../extensions/webcompat-reporter/locale AB_CD=$* XPI_NAME=locale-$* -endif - -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 \ - $(topsrcdir)/browser/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 - - -langpack: langpack-$(AB_CD) - -# This is a generic target that will make a langpack, repack ZIP (+tarball) -# builds, and repack an installer if applicable. It is called from the -# tinderbox scripts. Alter it with caution. - -installers-%: clobber-% langpack-% repackage-win32-installer-% repackage-zip-% - @echo 'repackaging done' - -ifdef MOZ_UPDATER -# Note that we want updater.ini to be in the top directory, not the browser/ -# subdirectory, because that's where the updater is installed and runs. -libs:: $(call MERGE_FILE,updater/updater.ini) $(call mkdir_deps,$(DIST)/bin) -ifeq ($(OS_ARCH),WINNT) - cat $< $(srcdir)/../installer/windows/nsis/updater_append.ini | \ - sed -e 's/^InfoText=/Info=/' -e 's/^TitleText=/Title=/' | \ - sed -e 's/%MOZ_APP_DISPLAYNAME%/$(MOZ_APP_DISPLAYNAME)/' > \ - $(FINAL_TARGET)/../updater.ini -else - cat $< | \ - sed -e 's/^InfoText=/Info=/' -e 's/^TitleText=/Title=/' | \ - sed -e 's/%MOZ_APP_DISPLAYNAME%/$(MOZ_APP_DISPLAYNAME)/' > \ - $(FINAL_TARGET)/../updater.ini -endif -endif - -ident: - @printf 'fx_revision ' - @$(PYTHON) $(topsrcdir)/config/printconfigsetting.py \ - $(STAGEDIST)/application.ini App SourceStamp - @printf 'buildid ' - @$(PYTHON) $(topsrcdir)/config/printconfigsetting.py \ - $(STAGEDIST)/application.ini App BuildID - -merge-%: -ifdef LOCALE_MERGEDIR - $(RM) -rf $(LOCALE_MERGEDIR) - $(topsrcdir)/mach compare-locales --merge-dir $(LOCALE_MERGEDIR) $* -endif - @echo - -# test target, depends on make package -# try to repack x-test, with just toolkit/defines.inc being there -l10n-check:: INNER_UNMAKE_PACKAGE=true -l10n-check:: - $(RM) -rf x-test - $(NSINSTALL) -D x-test/toolkit - echo '#define MOZ_LANG_TITLE Just testing' > x-test/toolkit/defines.inc - @# ZIP_IN='$(ZIP_IN)' will pass down the *current* value of ZIP_IN, based - @# on MOZ_SIMPLE_PACKAGE_NAME not being reset, overwriting the value it - @# would get with MOZ_SIMPLE_PACKAGE_NAME reset. - $(MAKE) installers-x-test L10NBASEDIR='$(PWD)' LOCALE_MERGEDIR='$(PWD)/mergedir' ZIP_IN='$(ZIP_IN)' MOZ_SIMPLE_PACKAGE_NAME= UNIVERSAL_BINARY= - $(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/unpack.py $(DIST)/l10n-stage/$(MOZ_PKG_DIR)$(_RESPATH) - cd $(DIST)/l10n-stage && test $$(cat $(MOZ_PKG_DIR)$(_RESPATH)/update.locale) = x-test -- cgit v1.2.3