diff options
Diffstat (limited to 'python/mozbuild')
| -rw-r--r-- | python/mozbuild/mozbuild/android_version_code.py | 2 | ||||
| -rw-r--r-- | python/mozbuild/mozbuild/jar.py | 2 | ||||
| -rw-r--r-- | python/mozbuild/mozbuild/preprocessor.py | 17 | ||||
| -rw-r--r-- | python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py | 2 |
4 files changed, 8 insertions, 15 deletions
diff --git a/python/mozbuild/mozbuild/android_version_code.py b/python/mozbuild/mozbuild/android_version_code.py index 69ce22b8e..6d9445c63 100644 --- a/python/mozbuild/mozbuild/android_version_code.py +++ b/python/mozbuild/mozbuild/android_version_code.py @@ -79,7 +79,7 @@ def android_version_code_v1(buildid, cpu_arch=None, min_sdk=0, max_sdk=0): ''' def hours_since_cutoff(buildid): # The ID is formatted like YYYYMMDDHHMMSS (using - # datetime.now().strftime('%Y%m%d%H%M%S'); see build/variables.py). + # datetime.utcnow().strftime('%Y%m%d%H%M%S'); see build/variables.py). # The inverse function is time.strptime. # N.B.: the time module expresses time as decimal seconds since the # epoch. diff --git a/python/mozbuild/mozbuild/jar.py b/python/mozbuild/mozbuild/jar.py index d40751b69..98333482b 100644 --- a/python/mozbuild/mozbuild/jar.py +++ b/python/mozbuild/mozbuild/jar.py @@ -460,7 +460,7 @@ class JarMaker(object): pp.setMarker('%') pp.out = outf pp.do_include(inf) - pp.failUnused(realsrc) + pp.warnUnused(realsrc) outf.close() inf.close() return diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py index e8aac7057..2e7eed1ca 100644 --- a/python/mozbuild/mozbuild/preprocessor.py +++ b/python/mozbuild/mozbuild/preprocessor.py @@ -316,20 +316,13 @@ class Preprocessor: if defines: self.context.update(defines) - def failUnused(self, file): + def warnUnused(self, file): msg = None if self.actionLevel == 0 and not self.silenceMissingDirectiveWarnings: - msg = 'no preprocessor directives found' + sys.stderr.write('{0}: WARNING: no preprocessor directives found\n'.format(file)) elif self.actionLevel == 1: - msg = 'no useful preprocessor directives found' - if msg: - class Fake(object): pass - fake = Fake() - fake.context = { - 'FILE': file, - 'LINE': None, - } - raise Preprocessor.Error(fake, msg, None) + sys.stderr.write('{0}: WARNING: no useful preprocessor directives found\n'.format(file)) + pass def setMarker(self, aMarker): """ @@ -385,7 +378,7 @@ class Preprocessor: self.out = output self.do_include(input, False) - self.failUnused(input.name) + self.warnUnused(input.name) if depfile: mk = Makefile() diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py index 2ef93792b..c58fde86e 100644 --- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py +++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py @@ -313,7 +313,7 @@ class LinuxToolchainTest(BaseToolchainTest): '/usr/bin/clang-3.3': CLANG_3_3 + CLANG_PLATFORM_X86_64_LINUX, '/usr/bin/clang++-3.3': CLANGXX_3_3 + CLANG_PLATFORM_X86_64_LINUX, } - GCC_4_7_RESULT = ('Only GCC 4.8 or newer is supported ' + GCC_4_7_RESULT = ('Only GCC 4.9 or newer is supported ' '(found version 4.7.3).') GXX_4_7_RESULT = GCC_4_7_RESULT GCC_4_9_RESULT = CompilerResult( |