Bug 780414: Followup to fix my build. Sort-of-but-not-really-r=Callek
authorKyle Huey <khuey@kylehuey.com>
Sun, 05 Aug 2012 21:07:19 -0700
changeset 101515 c8d94fe7506a46415651d3b41fa340155a1fa7d1
parent 101514 4ef4ffe2bca1c6960f78d4289b287d89775cfd41
child 101541 6abf66d40494507a7d574397407cf48d8b20e9fe
child 101654 16a8b66f1503a7c3122384d89f9ed512575f11c5
push id23238
push userkhuey@mozilla.com
push dateMon, 06 Aug 2012 04:07:38 +0000
treeherdermozilla-central@c8d94fe7506a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs780414
milestone17.0a1
first release with
nightly linux32
c8d94fe7506a / 17.0a1 / 20120806030517 / files
nightly linux64
c8d94fe7506a / 17.0a1 / 20120806030517 / files
nightly mac
c8d94fe7506a / 17.0a1 / 20120806030517 / files
nightly win32
c8d94fe7506a / 17.0a1 / 20120806030517 / files
nightly win64
c8d94fe7506a / 17.0a1 / 20120806030517 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 780414: Followup to fix my build. Sort-of-but-not-really-r=Callek
build/ConfigStatus.py
js/src/build/ConfigStatus.py
--- a/build/ConfigStatus.py
+++ b/build/ConfigStatus.py
@@ -3,17 +3,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Combined with build/autoconf/config.status.m4, ConfigStatus is an almost
 # drop-in replacement for autoconf 2.13's config.status, with features
 # borrowed from autoconf > 2.5, and additional features.
 
 from __future__ import with_statement
 from optparse import OptionParser
-import sys, re, os, posixpath
+import sys, re, os, posixpath, ntpath
 from StringIO import StringIO
 # Standalone js doesn't have virtualenv.
 sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'config'))
 from Preprocessor import Preprocessor
 
 # Basic logging facility
 verbose = False
 def log(string):
@@ -148,17 +148,17 @@ class ConfigEnvironment(object):
             return dir
         return '.'
 
     def get_top_srcdir(self, file):
         '''Returns a normalized top_srcdir for the given file: if
         substs['top_srcdir'] is a relative path, it is relative to the
         topobjdir. Adjust it to be relative to the file path.'''
         top_srcdir = self.substs['top_srcdir']
-        if posixpath.isabs(top_srcdir):
+        if posixpath.isabs(top_srcdir) or ntpath.isabs(top_srcdir):
             return top_srcdir
         return posixpath.normpath(posixpath.join(self.get_depth(file), top_srcdir))
 
     def get_file_srcdir(self, file):
         '''Returns the srcdir for the given file, where srcdir is in msys
         format on windows, thus derived from top_srcdir.
         '''
         dir = self.get_relative_srcdir(file)
--- a/js/src/build/ConfigStatus.py
+++ b/js/src/build/ConfigStatus.py
@@ -3,17 +3,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Combined with build/autoconf/config.status.m4, ConfigStatus is an almost
 # drop-in replacement for autoconf 2.13's config.status, with features
 # borrowed from autoconf > 2.5, and additional features.
 
 from __future__ import with_statement
 from optparse import OptionParser
-import sys, re, os, posixpath
+import sys, re, os, posixpath, ntpath
 from StringIO import StringIO
 # Standalone js doesn't have virtualenv.
 sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'config'))
 from Preprocessor import Preprocessor
 
 # Basic logging facility
 verbose = False
 def log(string):
@@ -148,17 +148,17 @@ class ConfigEnvironment(object):
             return dir
         return '.'
 
     def get_top_srcdir(self, file):
         '''Returns a normalized top_srcdir for the given file: if
         substs['top_srcdir'] is a relative path, it is relative to the
         topobjdir. Adjust it to be relative to the file path.'''
         top_srcdir = self.substs['top_srcdir']
-        if posixpath.isabs(top_srcdir):
+        if posixpath.isabs(top_srcdir) or ntpath.isabs(top_srcdir):
             return top_srcdir
         return posixpath.normpath(posixpath.join(self.get_depth(file), top_srcdir))
 
     def get_file_srcdir(self, file):
         '''Returns the srcdir for the given file, where srcdir is in msys
         format on windows, thus derived from top_srcdir.
         '''
         dir = self.get_relative_srcdir(file)