Bug 1408675 p3. Have Eclipse CDT globally set MOZILLA_CLIENT and the NSS include path. r=botond
authorJonathan Watt <jwatt@jwatt.org>
Wed, 31 Oct 2018 14:19:51 +0000
changeset 503554 9797d26fd00e11add5a6d941f0f9e4a0486f5180
parent 503553 ab9d9c4cd361557ea0f07e71e6b1a10fb0585938
child 503555 300e5ba9c14285bd5c5db15bb365287e1de8c1b9
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbotond
bugs1408675
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1408675 p3. Have Eclipse CDT globally set MOZILLA_CLIENT and the NSS include path. r=botond Differential Revision: https://phabricator.services.mozilla.com/D12010
python/mozbuild/mozbuild/backend/cpp_eclipse.py
--- a/python/mozbuild/mozbuild/backend/cpp_eclipse.py
+++ b/python/mozbuild/mozbuild/backend/cpp_eclipse.py
@@ -228,23 +228,25 @@ class CppEclipseBackend(CommonBackend):
         # noticeable impact on the time it takes to open the generated Eclipse
         # project.)  We do that by generating a template here that we can then
         # use for each individual directory in the loop below.
         #
         dirsettings_template = LANGUAGE_SETTINGS_TEMPLATE_DIR_HEADER
 
         # Add OS_COMPILE_CXXFLAGS args (same as OS_COMPILE_CFLAGS):
         dirsettings_template = dirsettings_template.replace('@PREINCLUDE_FILE_PATH@', os.path.join(self.environment.topobjdir, 'dist/include/mozilla-config.h'))
+        dirsettings_template += add_define('MOZILLA_CLIENT', '1')
 
         # Add EXTRA_INCLUDES args:
         dirsettings_template += add_objdir_include_path('dist/include')
 
         # Add OS_INCLUDES args:
         # XXX media/webrtc/trunk/webrtc's moz.builds reset this.
         dirsettings_template += add_objdir_include_path('dist/include/nspr')
+        dirsettings_template += add_objdir_include_path('dist/include/nss')
 
         # Finally, add anything else that makes things work better.
         #
         # Because of https://developer.mozilla.org/en-US/docs/Eclipse_CDT#Headers_are_only_parsed_once
         # we set MOZILLA_INTERNAL_API for all directories to make sure
         # headers are indexed with MOZILLA_INTERNAL_API set.  Unfortunately
         # this means that MOZILLA_EXTERNAL_API code will suffer.
         #