diff options
author | Dirk Baechle <dl9obn@darc.de> | 2011-08-29 18:10:35 +0000 |
---|---|---|
committer | Dirk Baechle <dl9obn@darc.de> | 2011-08-29 18:10:35 +0000 |
commit | fef4b77c39f3b16f2be8b480efb6b115775b1ff6 (patch) | |
tree | f278fc550baa71549006e28ec8a44a150b5900dc | |
parent | f4144ac05a0e2f243414d5ebf6eef9510a5c1bc4 (diff) | |
download | scons-git-fef4b77c39f3b16f2be8b480efb6b115775b1ff6.tar.gz |
-rw-r--r-- | .project | 17 | ||||
-rw-r--r-- | .pydevproject | 10 | ||||
-rw-r--r-- | latest_bug.patch | 96 | ||||
-rw-r--r-- | rev.txt | 10 |
4 files changed, 133 insertions, 0 deletions
diff --git a/.project b/.project new file mode 100644 index 000000000..925e8aea2 --- /dev/null +++ b/.project @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>scons_trunk</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.python.pydev.PyDevBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.python.pydev.pythonNature</nature> + </natures> +</projectDescription> diff --git a/.pydevproject b/.pydevproject new file mode 100644 index 000000000..3a69537d7 --- /dev/null +++ b/.pydevproject @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?eclipse-pydev version="1.0"?> + +<pydev_project> +<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.6</pydev_property> +<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property> +<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH"> +<path>/scons_trunk/src/engine</path> +</pydev_pathproperty> +</pydev_project> diff --git a/latest_bug.patch b/latest_bug.patch new file mode 100644 index 000000000..c23310542 --- /dev/null +++ b/latest_bug.patch @@ -0,0 +1,96 @@ +Index: doc/man/scons.1 +=================================================================== +--- doc/man/scons.1 (revision 5349) ++++ doc/man/scons.1 (working copy) +@@ -5456,9 +5456,9 @@ + This can be either: + 1) a Python function that will process + the Node (file) +-and return a list of strings (file names) ++and return a list of File Nodes + representing the implicit +-dependencies found in the contents; ++dependencies (file names) found in the contents; + or: + 2) a dictionary that maps keys + (typically the file suffix, but see below for more discussion) +@@ -5632,7 +5632,7 @@ + + XYZScanner = Scanner(xyz_scan) + +-SourceFileScanner.add_scanner('.xyx', XYZScanner) ++SourceFileScanner.add_scanner('.xyz', XYZScanner) + + env.Program('my_prog', ['file1.c', 'file2.f', 'file3.xyz']) + .EE +@@ -5937,7 +5937,7 @@ + for dir in path: + file = dir + os.sep + inc + if os.path.exists(file): +- results.append(file) ++ results.append(env.FileToNode(file)) + break + return results + +Index: src/engine/SCons/Environment.py +=================================================================== +--- src/engine/SCons/Environment.py (revision 5349) ++++ src/engine/SCons/Environment.py (working copy) +@@ -853,6 +853,12 @@ + self[key] = t + return self + ++ def DirnameToNode(self, args): ++ return self.arg2nodes(args, self.fs.Dir) ++ ++ def FilenameToNode(self, args): ++ return self.arg2nodes(args) ++ + # def MergeShellPaths(self, args, prepend=1): + # """ + # Merge the dict in args into the shell environment in env['ENV']. +Index: src/engine/SCons/Script/Main.py +=================================================================== +--- src/engine/SCons/Script/Main.py (revision 5349) ++++ src/engine/SCons/Script/Main.py (working copy) +@@ -972,6 +972,8 @@ + + progress_display("scons: Reading SConscript files ...") + ++ import objgraph ++ objgraph.show_growth(limit=3) + start_time = time.time() + try: + for script in scripts: +@@ -990,6 +992,8 @@ + + progress_display("scons: done reading SConscript files.") + ++ objgraph.show_growth() ++ + memory_stats.append('after reading SConscript files:') + count_stats.append(('post-', 'read')) + +@@ -1071,6 +1075,12 @@ + if not nodes: + exit_status = 2 + ++ objgraph.show_growth() ++ ++ import pdb ++ pdb.set_trace() ++ ++ + def _build_targets(fs, options, targets, target_top): + + global this_build_status +@@ -1398,6 +1408,9 @@ + + sys.exit(exit_status) + ++if __name__ == "__main__": ++ main() ++ + # Local Variables: + # tab-width:4 + # indent-tabs-mode:nil diff --git a/rev.txt b/rev.txt new file mode 100644 index 000000000..d73edd830 --- /dev/null +++ b/rev.txt @@ -0,0 +1,10 @@ +Dear reviewers, + +please check my changes for issue #2711: + + - improved documentation for custom decider function + +Regards, + +Dirk + |