Merge "C# Improve property injector script" into devel/master

diff --git a/plugins/dali-swig/property-wrapper.rb b/plugins/dali-swig/property-wrapper.rb
index 8e76da6..1f3fc62 100755 (executable)
--- a/plugins/dali-swig/property-wrapper.rb
+++ b/plugins/dali-swig/property-wrapper.rb
@@ -360,7 +360,7 @@ def writeDaliCoreProperties
     puts("Scanning folder: #{$daliCorePath}\n\n");
 
     # Executed a recursive grep over dali-core for the DALI_PROPERTY macro
-    result =`grep --include *.cpp  -r "DALI_PROPERTY( \" #{$daliCorePath}`
+    result =`grep --include \\*.cpp  -r "DALI_PROPERTY( \" #{$daliCorePath}`
 
 
     # We now have a list of lines that look like this:
@@ -408,7 +408,7 @@ def writeDaliToolkitProperties
     # DALI_PROPERTY_REGISTRATION
     # DALI_ANIMATABLE_PROPERTY_REGISTRATION
     # DALI_CHILD_PROPERTY_REGISTRATION
-    result =`grep --include *.cpp  -w 'Control::Impl::SetProperty\\|DALI_ANIMATABLE_PROPERTY_REGISTRATION_WITH_DEFAULT(\\|DALI_CHILD_PROPERTY_REGISTRATION(\\|DALI_ANIMATABLE_PROPERTY_REGISTRATION(\\|DALI_PROPERTY_REGISTRATION' -r #{$daliToolkitPath}`
+    result =`grep --include \\*.cpp  -w 'Control::Impl::SetProperty\\|DALI_ANIMATABLE_PROPERTY_REGISTRATION_WITH_DEFAULT(\\|DALI_CHILD_PROPERTY_REGISTRATION(\\|DALI_ANIMATABLE_PROPERTY_REGISTRATION(\\|DALI_PROPERTY_REGISTRATION' -r #{$daliToolkitPath}`
 
     if( result == "" )
       puts("Error parsing #{$daliToolkitPath} no properties found")