From dd1e950557102620cc846cf3648a21cc4add7007 Mon Sep 17 00:00:00 2001 From: Nick Holland Date: Tue, 6 Dec 2016 16:49:58 +0000 Subject: [PATCH] Fix C# build break Introduction of devel only properties to DALi and protecting of custom-actor-impl destructor caused some issues. For now devel only properties are ignored ( SWIG is having difficulties partly because normal actor properties are duplicated in actor-devel.h ) Change-Id: Ice82492943f7b47fd44b377c6737fc7ca9dbe0ca --- plugins/dali-swig/SWIG/dali-gc.i | 2 -- plugins/dali-swig/SWIG/events/animation-event.i | 2 -- plugins/dali-swig/property-wrapper.rb | 16 +++++++++++++--- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/plugins/dali-swig/SWIG/dali-gc.i b/plugins/dali-swig/SWIG/dali-gc.i index ea71121..a9566c8 100644 --- a/plugins/dali-swig/SWIG/dali-gc.i +++ b/plugins/dali-swig/SWIG/dali-gc.i @@ -1168,8 +1168,6 @@ DALI_CREATE_CUSTOM_DESTRUCTOR_FUNCTION( Dali, CameraActor ); DALI_CREATE_CUSTOM_DISPOSE_DERIVED_FUNCTION( Dali, CameraActor ); DALI_CREATE_CUSTOM_DESTRUCTOR_FUNCTION( Dali, CustomActor ); DALI_CREATE_CUSTOM_DISPOSE_DERIVED_FUNCTION( Dali, CustomActor ); -DALI_CREATE_CUSTOM_DESTRUCTOR_FUNCTION( Dali, CustomActorImpl ); -DALI_CREATE_CUSTOM_DISPOSE_DERIVED_FUNCTION( Dali, CustomActorImpl ); DALI_CREATE_CUSTOM_DESTRUCTOR_FUNCTION( Dali, ConnectionTracker ); DALI_CREATE_CUSTOM_DISPOSE_DERIVED_FUNCTION( Dali, ConnectionTracker ); DALI_CREATE_CUSTOM_DESTRUCTOR_FUNCTION( Dali, ConnectionTrackerInterface ); diff --git a/plugins/dali-swig/SWIG/events/animation-event.i b/plugins/dali-swig/SWIG/events/animation-event.i index c7dca56..bb21466 100644 --- a/plugins/dali-swig/SWIG/events/animation-event.i +++ b/plugins/dali-swig/SWIG/events/animation-event.i @@ -80,8 +80,6 @@ using System.Runtime.InteropServices; public static readonly int MaximumSize = NDalicPINVOKE.Actor_Property_MAXIMUM_SIZE_get(); public static readonly int InheritPosition = NDalicPINVOKE.Actor_Property_INHERIT_POSITION_get(); public static readonly int ClippingMode = NDalicPINVOKE.Actor_Property_CLIPPING_MODE_get(); - public static readonly int BatchParent = NDalicPINVOKE.Actor_Property_BATCH_PARENT_get(); - /** * @brief Event arguments that passed via Finished signal diff --git a/plugins/dali-swig/property-wrapper.rb b/plugins/dali-swig/property-wrapper.rb index e548f61..9d8394c 100755 --- a/plugins/dali-swig/property-wrapper.rb +++ b/plugins/dali-swig/property-wrapper.rb @@ -55,7 +55,7 @@ end # Property struct stores the information about a property after parsing the C++ DALI_PROPERTY macro -$propertyStruct = Struct.new("Property", :name, :type, :writable, :animatable,:constrainInput, :enum, :shortenum, :csharpGetter, :csharpSetter, :childProperty,) +$propertyStruct = Struct.new("Property", :name, :type, :writable, :animatable,:constrainInput, :enum, :shortenum, :develAPI, :csharpGetter, :csharpSetter, :childProperty,) # daliClass struct stores a class name and an array of properties $daliClassStruct = Struct.new("DaliClass", :name, :properties ) @@ -90,6 +90,16 @@ def extractPropertyInfo( propertyMacro ) # extract the property enum name Dali::Path::Property::POINTS -> POINTS shortenum = data[6].split(":").last + develAPI = false; + # Check if the property uses devel API + # Currently we ignore devel properties for now + if data[6].include? "Devel" + develAPI = true; + puts("Ignoring DEVEL API property: " + shortenum); + end + + + # store the :name, :type, :writable, :animatable, :constrainInput, :enum property = $propertyStruct.new; @@ -99,7 +109,7 @@ def extractPropertyInfo( propertyMacro ) property.animatable = (data[4] == "true") property.constrainInput = (data[5]=="true") property.enum = shortenum - + property.develAPI = develAPI; return property; end @@ -221,7 +231,7 @@ def writePropertiesToCSharpFile( daliClass ) for property in daliClass.properties - if (!property.childProperty) + if( (!property.childProperty) && (!property.develAPI)) file.write( property.csharpGetter ); file.write( property.csharpSetter ); end -- 2.7.4