summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2018-04-04 06:05:30 -0400
committerMatt A. Tobin <email@mattatobin.com>2018-04-04 06:05:30 -0400
commit942640c9012af3c4f3c6e07e1ab414079b578178 (patch)
tree6c966d92d23d568857336f8812526aaa6465153d
parentfba0b46f53fd803dc865f4f72628587582c8439b (diff)
downloadUXP-942640c9012af3c4f3c6e07e1ab414079b578178.tar
UXP-942640c9012af3c4f3c6e07e1ab414079b578178.tar.gz
UXP-942640c9012af3c4f3c6e07e1ab414079b578178.tar.lz
UXP-942640c9012af3c4f3c6e07e1ab414079b578178.tar.xz
UXP-942640c9012af3c4f3c6e07e1ab414079b578178.zip
[PALEMOON] First pass fix of obvious moz.build issues
-rw-r--r--application/palemoon/app.mozbuild2
-rw-r--r--application/palemoon/app/moz.build8
-rw-r--r--application/palemoon/build.mk24
-rw-r--r--application/palemoon/components/feeds/moz.build2
4 files changed, 17 insertions, 19 deletions
diff --git a/application/palemoon/app.mozbuild b/application/palemoon/app.mozbuild
index 0cbce0f72..1727d4f6b 100644
--- a/application/palemoon/app.mozbuild
+++ b/application/palemoon/app.mozbuild
@@ -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']
diff --git a/application/palemoon/app/moz.build b/application/palemoon/app/moz.build
index 929139a6a..28cd55a7e 100644
--- a/application/palemoon/app/moz.build
+++ b/application/palemoon/app/moz.build
@@ -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 += [
diff --git a/application/palemoon/build.mk b/application/palemoon/build.mk
index fc692eda5..ae490aca7 100644
--- a/application/palemoon/build.mk
+++ b/application/palemoon/build.mk
@@ -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
diff --git a/application/palemoon/components/feeds/moz.build b/application/palemoon/components/feeds/moz.build
index 1dea0ce77..7ae9141aa 100644
--- a/application/palemoon/components/feeds/moz.build
+++ b/application/palemoon/components/feeds/moz.build
@@ -35,5 +35,3 @@ for var in ('MOZ_APP_NAME', 'MOZ_MACBUNDLE_NAME'):
LOCAL_INCLUDES += [
'../build',
]
-
-FAIL_ON_WARNINGS = True