Put trees in Globals.osx-fix

1 files changed, 20 insertions, 21 deletions

diff --git a/cdist b/cdist
index 159b41e..a5abbcc 100755
--- a/cdist
+++ b/cdist
@@ -30,12 +30,6 @@ import inspect
 
 TEMPORARY_DIRECTORY = '/tmp'
 
-class Globals:
-    quiet = False
-    command = None
-
-globals = Globals()
-
 class Error(Exception):
     def __init__(self, value):
         self.value = value
@@ -64,7 +58,12 @@ class Trees:
         self.trees.append(nt)
         return nt
 
-trees = Trees()
+class Globals:
+    quiet = False
+    command = None
+    trees = Trees()
+
+globals = Globals()
 
 
 #
@@ -323,7 +322,7 @@ class Target(object):
         self.debug = False
 
     def package(self, project, checkout):
-        tree = trees.get(project, checkout, self)
+        tree = globals.trees.get(project, checkout, self)
         tree.build_dependencies()
         tree.build(tree)
         return tree.call('package', tree.version), tree.git_commit
@@ -473,11 +472,11 @@ class OSXUniversalTarget(OSXTarget):
 
         for b in [32, 64]:
             target = OSXSingleTarget(b, os.path.join(self.directory, '%d' % b))
-            tree = trees.get(project, checkout, target)
+            tree = globals.trees.get(project, checkout, target)
             tree.build_dependencies()
             tree.build()
         
-        tree = trees.get(project, checkout, self)    
+        tree = globals.trees.get(project, checkout, self)    
         with TreeDirectory(tree):
             return tree.call('package', tree.version), tree.git_commit
 
@@ -497,7 +496,7 @@ class SourceTarget(Target):
         rmtree(self.directory)
 
     def package(self, project, checkout):
-        tree = trees.get(project, checkout, self)
+        tree = globals.trees.get(project, checkout, self)
         with TreeDirectory(self, tree):
             name = read_wscript_variable(os.getcwd(), 'APPNAME')
             command('./waf dist')
@@ -601,7 +600,7 @@ class Tree(object):
         if 'dependencies' in self.cscript:
             for d in self.cscript['dependencies'](self.target):
                 log('Building dependency %s %s of %s' % (d[0], d[1], self.name))
-                dep = trees.get(d[0], d[1], self.target)
+                dep = globals.trees.get(d[0], d[1], self.target)
                 dep.build_dependencies()
 
                 # Make the options to pass in from the option_defaults of the thing
@@ -697,7 +696,7 @@ def main():
             raise Error('you must specify -t or --target')
 
         target = target_factory(args.target, args.debug, args.work)
-        tree = trees.get(args.project, args.checkout, target)
+        tree = globals.trees.get(args.project, args.checkout, target)
         tree.build_dependencies()
         tree.build()
         if not args.keep:
@@ -736,7 +735,7 @@ def main():
             raise Error('you must specify --minor or --micro')
 
         target = SourceTarget()
-        tree = trees.get(args.project, args.checkout, target)
+        tree = globals.trees.get(args.project, args.checkout, target)
 
         version = tree.version
         version.to_release()
@@ -762,7 +761,7 @@ def main():
 
     elif globals.command == 'pot':
         target = SourceTarget()
-        tree = trees.get(args.project, args.checkout, target)
+        tree = globals.trees.get(args.project, args.checkout, target)
 
         pots = tree.call('make_pot')
         for p in pots:
@@ -772,7 +771,7 @@ def main():
 
     elif globals.command == 'changelog':
         target = SourceTarget()
-        tree = trees.get(args.project, args.checkout, target)
+        tree = globals.trees.get(args.project, args.checkout, target)
 
         with TreeDirectory(tree):
             text = open('ChangeLog', 'r')
@@ -818,7 +817,7 @@ def main():
 
     elif globals.command == 'manual':
         target = SourceTarget()
-        tree = trees.get(args.project, args.checkout, target)
+        tree = globals.trees.get(args.project, args.checkout, target)
 
         outs = tree.call('make_manual')
         for o in outs:
@@ -831,7 +830,7 @@ def main():
 
     elif globals.command == 'doxygen':
         target = SourceTarget()
-        tree = trees.get(args.project, args.checkout, target)
+        tree = globals.trees.get(args.project, args.checkout, target)
 
         dirs = tree.call('make_doxygen')
         if hasattr(dirs, 'strip') or (not hasattr(dirs, '__getitem__') and not hasattr(dirs, '__iter__')):
@@ -844,7 +843,7 @@ def main():
 
     elif globals.command == 'latest':
         target = SourceTarget()
-        tree = trees.get(args.project, args.checkout, target)
+        tree = globals.trees.get(args.project, args.checkout, target)
 
         with TreeDirectory(tree):
             f = command_and_read('git log --tags --simplify-by-decoration --pretty="%d"')
@@ -873,7 +872,7 @@ def main():
         target = None
         try:
             target = target_factory(args.target, args.debug, args.work)
-            tree = trees.get(args.project, args.checkout, target)
+            tree = globals.trees.get(args.project, args.checkout, target)
             with TreeDirectory(tree):
                 target.test(tree)
         except Error as e:
@@ -894,7 +893,7 @@ def main():
     elif globals.command == 'revision':
 
         target = SourceTarget()
-        tree = trees.get(args.project, args.checkout, target)
+        tree = globals.trees.get(args.project, args.checkout, target)
         with TreeDirectory(tree):
             print command_and_read('git rev-parse HEAD').readline().strip()[:7]
         target.cleanup()