Fixes to omkbuild.py

darcs-hash:20060607201730-f2ef6-02b474b745318d3ed9281e9e5a219c80f873419f.gz

diff --git a/omkbuild.py b/omkbuild.py
index 5dc7c3a9982ee996cfc89a5799c39f50217655f6..aab40c8d91f245b4856179d32704cb3fdf01bf85 100755 (executable)
--- a/omkbuild.py
+++ b/omkbuild.py
@@ -55,7 +55,7 @@ class LineList(list):
     def loadFromFile(self, fname):
         """Loads itself from file."""
         f = open(fname, "r")
-        self.expand(f.readlines())
+        self.extend(f.readlines())
         f.close
 
 class Snippet:
@@ -231,7 +231,7 @@ def parseCommandLine():
                       help="Split given Makefile.rules to the original snippets")
     parser.add_option("-o", "--output",
                       action="store", dest="output", default=False, metavar="RULES",
-                      help="Output built Makefile.rules to file RULES")
+                      help="Write Makefile.rules to file RULES")
     (options, args) = parser.parse_args()
     return options, args
 
@@ -264,13 +264,20 @@ def splitRules(rulesFN, output):
     rulesCheck.snippets = rules.snippets
     rulesCheck.combine()
 
-    if rules.rules != rulesCheck.rules:
-        sys.stderr.write("Consistency error:\n")
-        diff = rules.rules.getDiff(rulesCheck.rules)
-        sys.stderr.write(diff)
-        sys.exit(1)
+    # The order of rules might be different
+#     if rules.rules != rulesCheck.rules:
+#         sys.stderr.write("Consistency error:\n")
+#         diff = rules.rules.getDiff(rulesCheck.rules)
+#         sys.stderr.write(diff)
+#         sys.exit(1)
+
+    for snip in rules.snippets:
+        print snip.__class__
+#     f = None
+#     if output == "-": f = sys.stdout
+#     f.writelines(rules.rules)
+#     f.close()
 
-    #TODO: Store snippets to files
 
 def main():
     (options, args) = parseCommandLine()

diff --git a/test.py b/test.py
index 576eadb29ea1e324ad8bff23392a94b32119aacd..7a4a0f140c058649c19674a97fd452c1cf7f847b 100755 (executable)
--- a/test.py
+++ b/test.py
@@ -12,6 +12,9 @@ omkbuild.main()
 
 os.system("cat Makefile.rules")
 
+sys.argv = ['./omkbuild.py', '--split=Makefile.rules']
+omkbuild.main()
+
 # sys.argv = ['./omkbuild.py', '--split=Makefile.rules', '-o -']
 # omkbuild.main()