[PALEMOON] First pass fix of obvious moz.build issues

This commit is contained in:
NTD 2018-04-04 06:05:30 -04:00 committed by Roy Tam
commit 3e9cfdb92a
4 changed files with 17 additions and 19 deletions

View file

@ -13,5 +13,5 @@ DIRS += ['/%s' % CONFIG['MOZ_BRANDING_DIRECTORY']]
# Never add tier dirs after browser because they apparently won't get
# packaged properly on Mac.
DIRS += ['/browser']
DIRS += ['/application/palemoon']

View file

@ -8,9 +8,9 @@ DIRS += ['profile/extensions']
if CONFIG['OS_ARCH'] == 'WINNT' and CONFIG['MOZ_ASAN']:
GoannaProgram(CONFIG['MOZ_APP_NAME'])
GeckoProgram(CONFIG['MOZ_APP_NAME'])
else:
GoannaProgram(CONFIG['MOZ_APP_NAME'], msvcrt='static')
GeckoProgram(CONFIG['MOZ_APP_NAME'], msvcrt='static')
JS_PREFERENCE_FILES += [
'profile/palemoon.js',
@ -36,8 +36,8 @@ for var in ('MOZILLA_OFFICIAL', 'LIBXUL_SDK'):
DEFINES['XPCOM_GLUE'] = True
GENERATED_INCLUDES += [
'/build',
LOCAL_INCLUDES += [
'!/build',
]
LOCAL_INCLUDES += [

View file

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

View file

@ -35,5 +35,3 @@ for var in ('MOZ_APP_NAME', 'MOZ_MACBUNDLE_NAME'):
LOCAL_INCLUDES += [
'../build',
]
FAIL_ON_WARNINGS = True