wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-06 15:58:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #303 Part 2: Update build files for the new location

Browse source
This commit is contained in:
wolfbeast 2018-06-04 13:50:39 +02:00 • committed by Roy Tam
commit d224ddb0e5
9 changed files with 29 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

6
application/basilisk/app.mozbuild
View file

@ -10,6 +10,6 @@ if CONFIG['MOZ_EXTENSIONS']:
DIRS += ['/%s' % CONFIG['MOZ_BRANDING_DIRECTORY']]
# Never add dirs after browser because they apparently won't get
# packaged properly on Mac.
DIRS += ['/browser']
# Never add dirs after the browser root because they apparently won't
# get packaged properly on Mac.
DIRS += ['/application/basilisk']

26
application/basilisk/build.mk
View file

@ -3,43 +3,43 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
installer:
@$(MAKE) -C browser/installer installer
@$(MAKE) -C application/basilisk/installer installer
package:
@$(MAKE) -C browser/installer
@$(MAKE) -C application/basilisk/installer
package-compare:
@$(MAKE) -C browser/installer package-compare
@$(MAKE) -C application/basilisk/installer package-compare
stage-package:
@$(MAKE) -C browser/installer stage-package
@$(MAKE) -C application/basilisk/installer stage-package
sdk:
@$(MAKE) -C browser/installer make-sdk
@$(MAKE) -C application/basilisk/installer make-sdk
install::
@$(MAKE) -C browser/installer install
@$(MAKE) -C application/basilisk/installer install
clean::
@$(MAKE) -C browser/installer clean
@$(MAKE) -C application/basilisk/installer clean
distclean::
@$(MAKE) -C browser/installer distclean
@$(MAKE) -C application/basilisk/installer distclean
source-package::
@$(MAKE) -C browser/installer source-package
@$(MAKE) -C application/basilisk/installer source-package
upload::
@$(MAKE) -C browser/installer upload
@$(MAKE) -C application/basilisk/installer upload
source-upload::
@$(MAKE) -C browser/installer source-upload
@$(MAKE) -C application/basilisk/installer source-upload
hg-bundle::
@$(MAKE) -C browser/installer hg-bundle
@$(MAKE) -C application/basilisk/installer hg-bundle
l10n-check::
@$(MAKE) -C browser/locales l10n-check
@$(MAKE) -C application/basilisk/locales l10n-check
ifdef ENABLE_TESTS
# Implemented in testing/testsuite-targets.mk

2
application/basilisk/installer/Makefile.in
View file

@ -152,7 +152,7 @@ endif
# fail to produce a langpack. See bug 1255096.
libs::
ifeq (,$(filter FasterMake+RecursiveMake,$(BUILD_BACKENDS)))
$(MAKE) -C $(DEPTH)/browser/locales langpack
$(MAKE) -C $(DEPTH)/application/basilisk/locales langpack
endif
ifeq (WINNT,$(OS_ARCH))

8
application/basilisk/installer/windows/Makefile.in
View file

@ -32,12 +32,12 @@ include $(topsrcdir)/config/config.mk
ifdef LOCALE_MERGEDIR
PPL_LOCALE_ARGS = \
--l10n-dir=$(LOCALE_MERGEDIR)/browser/installer \
--l10n-dir=$(call EXPAND_LOCALE_SRCDIR,browser/locales)/installer \
--l10n-dir=$(topsrcdir)/browser/locales/en-US/installer \
--l10n-dir=$(LOCALE_MERGEDIR)/application/basilisk/installer \
--l10n-dir=$(call EXPAND_LOCALE_SRCDIR,application/basilisk/locales)/installer \
--l10n-dir=$(topsrcdir)/application/basilisk/locales/en-US/installer \
$(NULL)
else
PPL_LOCALE_ARGS=$(call EXPAND_LOCALE_SRCDIR,browser/locales)/installer
PPL_LOCALE_ARGS=$(call EXPAND_LOCALE_SRCDIR,application/basilisk/locales)/installer
endif
OVERRIDE_DEFAULT_GOAL := installer

6
application/basilisk/locales/l10n.ini
View file

@ -3,13 +3,13 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
[general]
depth = ../..
all = browser/locales/all-locales
depth = ../../..
all = application/basilisk/locales/all-locales
[compare]
dirs = browser
other-licenses/branding/firefox
browser/branding/official
application/basilisk/branding/official
devtools/client
[includes]

2
application/basilisk/moz.build
View file

@ -36,5 +36,5 @@ if CONFIG['MOZ_ARTIFACT_BUILDS']:
# Ensure a pre-built interfaces.xpt installed to the objdir by the artifact
# code is included by the top-level chrome.manifest.
EXTRA_COMPONENTS += [
'../build/prebuilt-interfaces.manifest',
'../../build/prebuilt-interfaces.manifest',
]

2
application/basilisk/moz.configure
View file

@ -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('../../toolkit/moz.configure')

5
build/moz.configure/init.configure
View file

@ -607,8 +607,9 @@ def include_project_configure(project, external_source_dir, build_env, help):
build_app = project[0]
# Uncomment when browser becomes application/basilisk
#if build_app == 'browser':
# XXX: Change this when 'browser' becomes invalid as an alias
if build_app == 'browser':
build_app = 'basilisk'
#die('The project "browser" is no longer valid. Perhaps you meant "basilisk" or "palemoon"?')
path_project_src_dir_application = os.path.join(base_dir, 'application/' + build_app, 'moz.configure')

2
client.mk
View file

@ -321,8 +321,6 @@ CONFIG_STATUS_DEPS := \
$(TOPSRCDIR)/CLOBBER \
$(TOPSRCDIR)/nsprpub/configure \
$(TOPSRCDIR)/config/milestone.txt \
$(TOPSRCDIR)/browser/config/version.txt \
$(TOPSRCDIR)/browser/config/version_display.txt \
$(TOPSRCDIR)/build/virtualenv_packages.txt \
$(TOPSRCDIR)/python/mozbuild/mozbuild/virtualenv.py \
$(TOPSRCDIR)/testing/mozbase/packages.txt \