Merge from trunk.

[SVN r33793]

src/build-system.jam

@@ -386,10 +386,15 @@ else if $(clean)
     for local t in [ virtual-target.all-targets ]
     {
         local p = [ $(t).project ] ;
-        if $(t) in $(targets-to-clean)
-           || [ is-child [ $(p).project-module ] ] = true
-        {
-            to-clean += $(t) ;
+
+        # Remove only derived targets.
+        if [ $(t).action ]
+        {                    
+            if $(t) in $(targets-to-clean)
+              || [ is-child [ $(p).project-module ] ] = true
+              {
+                  to-clean += $(t) ;
+              }        
         }        
     }
     local to-clean-actual ;

src/tools/cast.jam

@@ -72,7 +72,7 @@ rule cast ( name type : sources * : requirements * : default-build *
     if ! $(real-type)
     {
         errors.user-error "No type corresponds to main target rule nam '$(type)'"
-          : "Hint: try lowercase the name" ;
+          : "Hint: try lowercase name" ;
     }
     
         

test/clean.py

@@ -114,13 +114,17 @@ t.expect_nothing("sub2/bin/$toolset/debug/sub2.obj")
 t.expect_nothing("sub3/bin/$toolset/debug/sub3.obj")
 
 
+# Regression test: sources of the 'cast' rule were mistakenly
+# deleted.
+t.rm(".")
+t.write("Jamroot", """
+import cast ;
+cast a cpp : a.h ;
+""")
+t.write("a.h", "")
 
-
-
-
-
-
-
+t.run_build_system("--clean")
+t.expect_nothing("a.h")
 
 t.cleanup()