Update swig, supports virtual inheritance (#395)

sync V3.8.1 to develop

linux/bin/swig/share/swig/4.1.0/javascript/cocos/javascript.swg

@@ -21,4 +21,11 @@
 %include <javascriptinit.swg>
 
 #define %module_macro(m) %feature("module_macro","m")
-#define %release_returned_cpp_object_in_gc(method)  %feature("release_returned_cpp_object_in_gc", "1") method
+#define %release_returned_cpp_object_in_gc(method)  %feature("release_returned_cpp_object_in_gc", "1") method
+
+%define %virtual_inherit(klass) 
+%feature("virtual_inherit", "1") klass;
+%typemap(in) klass *self
+%{ $1 = SE_THIS_OBJECT_VIRTUAL<$*ltype, cc::VirtualInheritBase>(s);
+if (nullptr == $1) return true;%}
+%enddef

linux/bin/swig/share/swig/4.1.0/javascript/cocos/javascriptcode.swg

@@ -22,8 +22,7 @@ static bool $jswrapper(se::State& s) // NOLINT(readability-identifier-naming)
     $js_check_arg_count
     $jslocals
     $jscode
-    auto *ptr = JSB_MAKE_PRIVATE_OBJECT_WITH_INSTANCE(result);
-    s.thisObject()->setPrivateObject(ptr);
+    $js_set_private_object
     return true;
 }
 SE_BIND_CTOR($jswrapper, __jsb_$jsmangledname_class, js_delete_$jsdtor)%}
@@ -62,8 +61,7 @@ static bool $jswrapper(se::State& s) // NOLINT(readability-identifier-naming)
     CC_UNUSED bool ok = true;
     $jslocals
     $jscode
-    auto *ptr = JSB_MAKE_PRIVATE_OBJECT_WITH_INSTANCE(result);
-    s.thisObject()->setPrivateObject(ptr);
+    $js_set_private_object
     return true;
 }
 %}
@@ -86,19 +84,20 @@ static bool $jswrapper(se::State& s) // NOLINT(readability-identifier-naming)
 
 /* -----------------------------------------------------------------------------
  * js_dtor:  template for a destructor wrapper
- *   - $jsmangledname:  mangled class name
+ *   - $classname_mangled:  mangled class name
  *   - $jstype:         class type
  * ----------------------------------------------------------------------------- */
 %fragment ("js_dtor", "templates")
 %{
 static bool $jswrapper(se::State& s) {
+  cc::invokeOnGarbageCollectMethod<$jsclass_type>(s);
   return true;
 }
 SE_BIND_FINALIZE_FUNC($jswrapper) %}
 
 /* -----------------------------------------------------------------------------
  * js_dtor:  template for a destructor wrapper
- *   - $jsmangledname:  mangled class name
+ *   - $classname_mangled:  mangled class name
  *   - $jstype:         class type
  *   - ${destructor_action}: The custom destructor action to invoke.
  * ----------------------------------------------------------------------------- */
@@ -106,6 +105,7 @@ SE_BIND_FINALIZE_FUNC($jswrapper) %}
 %{
 static bool $jswrapper(se::State& s)
 {
+  cc::invokeOnGarbageCollectMethod<$jsclass_type>(s);
   return true;
 }
 SE_BIND_FINALIZE_FUNC($jswrapper) %}

mac/bin/swig/share/swig/4.1.0/javascript/cocos/javascript.swg

@@ -21,4 +21,11 @@
 %include <javascriptinit.swg>
 
 #define %module_macro(m) %feature("module_macro","m")
-#define %release_returned_cpp_object_in_gc(method)  %feature("release_returned_cpp_object_in_gc", "1") method
+#define %release_returned_cpp_object_in_gc(method)  %feature("release_returned_cpp_object_in_gc", "1") method
+
+%define %virtual_inherit(klass) 
+%feature("virtual_inherit", "1") klass;
+%typemap(in) klass *self
+%{ $1 = SE_THIS_OBJECT_VIRTUAL<$*ltype, cc::VirtualInheritBase>(s);
+if (nullptr == $1) return true;%}
+%enddef

mac/bin/swig/share/swig/4.1.0/javascript/cocos/javascriptcode.swg

@@ -22,8 +22,7 @@ static bool $jswrapper(se::State& s) // NOLINT(readability-identifier-naming)
     $js_check_arg_count
     $jslocals
     $jscode
-    auto *ptr = JSB_MAKE_PRIVATE_OBJECT_WITH_INSTANCE(result);
-    s.thisObject()->setPrivateObject(ptr);
+    $js_set_private_object
     return true;
 }
 SE_BIND_CTOR($jswrapper, __jsb_$jsmangledname_class, js_delete_$jsdtor)%}
@@ -62,8 +61,7 @@ static bool $jswrapper(se::State& s) // NOLINT(readability-identifier-naming)
     CC_UNUSED bool ok = true;
     $jslocals
     $jscode
-    auto *ptr = JSB_MAKE_PRIVATE_OBJECT_WITH_INSTANCE(result);
-    s.thisObject()->setPrivateObject(ptr);
+    $js_set_private_object
     return true;
 }
 %}
@@ -86,19 +84,20 @@ static bool $jswrapper(se::State& s) // NOLINT(readability-identifier-naming)
 
 /* -----------------------------------------------------------------------------
  * js_dtor:  template for a destructor wrapper
- *   - $jsmangledname:  mangled class name
+ *   - $classname_mangled:  mangled class name
  *   - $jstype:         class type
  * ----------------------------------------------------------------------------- */
 %fragment ("js_dtor", "templates")
 %{
 static bool $jswrapper(se::State& s) {
+  cc::invokeOnGarbageCollectMethod<$jsclass_type>(s);
   return true;
 }
 SE_BIND_FINALIZE_FUNC($jswrapper) %}
 
 /* -----------------------------------------------------------------------------
  * js_dtor:  template for a destructor wrapper
- *   - $jsmangledname:  mangled class name
+ *   - $classname_mangled:  mangled class name
  *   - $jstype:         class type
  *   - ${destructor_action}: The custom destructor action to invoke.
  * ----------------------------------------------------------------------------- */
@@ -106,6 +105,7 @@ SE_BIND_FINALIZE_FUNC($jswrapper) %}
 %{
 static bool $jswrapper(se::State& s)
 {
+  cc::invokeOnGarbageCollectMethod<$jsclass_type>(s);
   return true;
 }
 SE_BIND_FINALIZE_FUNC($jswrapper) %}

openharmony/CMakeLists.txt

@@ -72,6 +72,13 @@ set_target_properties(curl PROPERTIES
   IMPORTED_LOCATION ${ohos_lib_dir}/libcurl.a
 )
 
+# curl needs to link the following libraries.  
+list(APPEND CC_EXTERNAL_LIBS
+    mbedtls
+    mbedcrypto
+    mbedx509
+)
+
 set(se_libs_name)
 
 if(USE_SE_V8)
@@ -122,9 +129,6 @@ endif()
 if(USE_SOCKET)
     list(APPEND CC_EXTERNAL_LIBS
         websockets
-        mbedtls
-        mbedcrypto
-        mbedx509
     )
 endif()
 

versions.txt

@@ -40,7 +40,7 @@ png
     openharmony: 1.6.37
 sdl
     win32: 2.0.10
-    win64: 2.0.14
+    win64: 2.28.1
     linux: 2.0.20
 
 jpeg
@@ -139,7 +139,5 @@ glslang (Built using https://github.com/YunHsiao/glslang/tree/build)
     linux:      11.5.0
     openharmony:11.5.0 (commit: 1978c76)
     
-swig ( Built using https://github.com/cocos/swig/tree/cocos-se, executable files are downloaded from https://github.com/cocos/swig/releases/tag/cocos-v1.1.5 )
-    win64:      cocos-v1.1.5 (commit: 42543c0)
-    mac:        cocos-v1.1.5 (commit: 42543c0)
-    linux:      cocos-v1.1.5 (commit: 42543c0)
+swig ( Built using https://github.com/cocos/swig/tree/cocos-se, executable files are downloaded from https://github.com/cocos/swig/releases/tag/cocos-v1.1.7 )
+    all:      cocos-v1.1.7 (commit: 7969da2)

win64/bin/swig/share/swig/4.1.0/javascript/cocos/javascript.swg

@@ -21,4 +21,11 @@
 %include <javascriptinit.swg>
 
 #define %module_macro(m) %feature("module_macro","m")
-#define %release_returned_cpp_object_in_gc(method)  %feature("release_returned_cpp_object_in_gc", "1") method
+#define %release_returned_cpp_object_in_gc(method)  %feature("release_returned_cpp_object_in_gc", "1") method
+
+%define %virtual_inherit(klass) 
+%feature("virtual_inherit", "1") klass;
+%typemap(in) klass *self
+%{ $1 = SE_THIS_OBJECT_VIRTUAL<$*ltype, cc::VirtualInheritBase>(s);
+if (nullptr == $1) return true;%}
+%enddef

win64/bin/swig/share/swig/4.1.0/javascript/cocos/javascriptcode.swg

@@ -22,8 +22,7 @@ static bool $jswrapper(se::State& s) // NOLINT(readability-identifier-naming)
     $js_check_arg_count
     $jslocals
     $jscode
-    auto *ptr = JSB_MAKE_PRIVATE_OBJECT_WITH_INSTANCE(result);
-    s.thisObject()->setPrivateObject(ptr);
+    $js_set_private_object
     return true;
 }
 SE_BIND_CTOR($jswrapper, __jsb_$jsmangledname_class, js_delete_$jsdtor)%}
@@ -62,8 +61,7 @@ static bool $jswrapper(se::State& s) // NOLINT(readability-identifier-naming)
     CC_UNUSED bool ok = true;
     $jslocals
     $jscode
-    auto *ptr = JSB_MAKE_PRIVATE_OBJECT_WITH_INSTANCE(result);
-    s.thisObject()->setPrivateObject(ptr);
+    $js_set_private_object
     return true;
 }
 %}
@@ -86,19 +84,20 @@ static bool $jswrapper(se::State& s) // NOLINT(readability-identifier-naming)
 
 /* -----------------------------------------------------------------------------
  * js_dtor:  template for a destructor wrapper
- *   - $jsmangledname:  mangled class name
+ *   - $classname_mangled:  mangled class name
  *   - $jstype:         class type
  * ----------------------------------------------------------------------------- */
 %fragment ("js_dtor", "templates")
 %{
 static bool $jswrapper(se::State& s) {
+  cc::invokeOnGarbageCollectMethod<$jsclass_type>(s);
   return true;
 }
 SE_BIND_FINALIZE_FUNC($jswrapper) %}
 
 /* -----------------------------------------------------------------------------
  * js_dtor:  template for a destructor wrapper
- *   - $jsmangledname:  mangled class name
+ *   - $classname_mangled:  mangled class name
  *   - $jstype:         class type
  *   - ${destructor_action}: The custom destructor action to invoke.
  * ----------------------------------------------------------------------------- */
@@ -106,6 +105,7 @@ SE_BIND_FINALIZE_FUNC($jswrapper) %}
 %{
 static bool $jswrapper(se::State& s)
 {
+  cc::invokeOnGarbageCollectMethod<$jsclass_type>(s);
   return true;
 }
 SE_BIND_FINALIZE_FUNC($jswrapper) %}