This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Upgrade GYP to r1010

  • Loading branch information...
1 parent c2ae39b commit 80dd8182907314ae99f5572798c86176e2086c47 @ry ry committed Aug 23, 2011
View
@@ -0,0 +1 @@
+*.pyc
View
@@ -210,8 +210,8 @@ def main(argv=None):
'freebsd8': ['make'],
'cygwin': ['msvs'],
'win32': ['msvs'],
- 'linux2': ['make'],
- 'linux3': ['make'],
+ 'linux2': ['make', 'ninja'],
+ 'linux3': ['make', 'ninja'],
'darwin': ['make', 'xcode'],
}[sys.platform]
@@ -213,20 +213,16 @@ def Write(self, writer=common.WriteOnDiff):
IndexError: An entry appears multiple times.
"""
# Walk the entry tree and collect all the folders and projects.
- all_entries = []
+ all_entries = set()
entries_to_check = self.entries[:]
while entries_to_check:
- # Pop from the beginning of the list to preserve the user's order.
e = entries_to_check.pop(0)
- # A project or folder can only appear once in the solution's folder tree.
- # This also protects from cycles.
+ # If this entry has been visited, nothing to do.
if e in all_entries:
- #raise IndexError('Entry "%s" appears more than once in solution' %
- # e.name)
continue
- all_entries.append(e)
+ all_entries.add(e)
# If this is a folder, check its entries too.
if isinstance(e, MSVSFolder):
@@ -8,7 +8,7 @@
import StringIO
import unittest
-import MSVSSettings
+import gyp.MSVSSettings as MSVSSettings
class TestSequenceFunctions(unittest.TestCase):
@@ -6,7 +6,7 @@
""" Unit tests for the easy_xml.py file. """
-import easy_xml
+import gyp.easy_xml as easy_xml
import unittest
import StringIO
Oops, something went wrong.

0 comments on commit 80dd818

Please sign in to comment.