Commits

dirkbaechle committed 84eaf2c

- removed erroneously added files, sorry hit the wrong button (upps)

Comments (0)

Files changed (4)

.project

-<?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>

.pydevproject

-<?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>

latest_bug.patch

-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

rev.txt

-Dear reviewers,
-
-please check my changes for issue #2711:
-
-  - improved documentation for custom decider function
-
-Regards,
-
-Dirk
-
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.