wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge mozilla-central to mozilla-inbound

Browse Source
This commit is contained in:
Ed Morley 2012-08-06 09:11:23 +01:00
commit c9f98a12e4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/ConfigStatus.py
View File

@ -8,7 +8,7 @@
from __future__ import with_statement from __future__ import with_statement
from optparse import OptionParser from optparse import OptionParser
import sys, re, os, posixpath import sys, re, os, posixpath, ntpath
from StringIO import StringIO from StringIO import StringIO
# Standalone js doesn't have virtualenv. # Standalone js doesn't have virtualenv.
sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'config')) sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'config'))
@ -153,7 +153,7 @@ class ConfigEnvironment(object):
substs['top_srcdir'] is a relative path, it is relative to the substs['top_srcdir'] is a relative path, it is relative to the
topobjdir. Adjust it to be relative to the file path.''' topobjdir. Adjust it to be relative to the file path.'''
top_srcdir = self.substs['top_srcdir'] 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 top_srcdir
return posixpath.normpath(posixpath.join(self.get_depth(file), top_srcdir)) return posixpath.normpath(posixpath.join(self.get_depth(file), top_srcdir))

4
js/src/build/ConfigStatus.py
View File

@ -8,7 +8,7 @@
from __future__ import with_statement from __future__ import with_statement
from optparse import OptionParser from optparse import OptionParser
import sys, re, os, posixpath import sys, re, os, posixpath, ntpath
from StringIO import StringIO from StringIO import StringIO
# Standalone js doesn't have virtualenv. # Standalone js doesn't have virtualenv.
sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'config')) sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'config'))
@ -153,7 +153,7 @@ class ConfigEnvironment(object):
substs['top_srcdir'] is a relative path, it is relative to the substs['top_srcdir'] is a relative path, it is relative to the
topobjdir. Adjust it to be relative to the file path.''' topobjdir. Adjust it to be relative to the file path.'''
top_srcdir = self.substs['top_srcdir'] 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 top_srcdir
return posixpath.normpath(posixpath.join(self.get_depth(file), top_srcdir)) return posixpath.normpath(posixpath.join(self.get_depth(file), top_srcdir))