فهرست منبع

add version check for socket and stddevice

pikastech 3 سال پیش
والد
کامیت
f09ea25237

+ 4 - 0
package/PikaStdDevice/PikaStdDevice_BaseDev.c

@@ -3,6 +3,10 @@
 #include "PikaObj.h"
 #include "dataStrs.h"
 
+#if !(PIKASCRIPT_VERSION_NUM >= PIKASCRIPT_VERSION_TO_NUM(1, 10, 4))
+#error "require pikascript kernal version >= v1.10.4"
+#endif
+
 PikaEventListener* g_pika_device_event_listener;
 
 void PikaStdDevice_BaseDev_addEventCallBack(PikaObj* self, Arg* eventCallBack) {

+ 4 - 0
package/socket/_socket.c

@@ -8,6 +8,10 @@
 #include "__platform_socket.h"
 #endif
 
+#if !(PIKASCRIPT_VERSION_NUM >= PIKASCRIPT_VERSION_TO_NUM(1, 10, 4))
+#error "require pikascript kernal version >= v1.10.4"
+#endif
+
 PIKA_WEAK int __platform_socket(int __domain, int __type, int __protocol) {
 #ifdef __linux__
     return socket(__domain, __type, __protocol);

+ 4 - 0
port/linux/package/pikascript/pikascript-lib/PikaStdDevice/PikaStdDevice_BaseDev.c

@@ -3,6 +3,10 @@
 #include "PikaObj.h"
 #include "dataStrs.h"
 
+#if !(PIKASCRIPT_VERSION_NUM >= PIKASCRIPT_VERSION_TO_NUM(1, 10, 4))
+#error "require pikascript kernal version >= v1.10.4"
+#endif
+
 PikaEventListener* g_pika_device_event_listener;
 
 void PikaStdDevice_BaseDev_addEventCallBack(PikaObj* self, Arg* eventCallBack) {

+ 4 - 0
port/linux/package/pikascript/pikascript-lib/socket/_socket.c

@@ -8,6 +8,10 @@
 #include "__platform_socket.h"
 #endif
 
+#if !(PIKASCRIPT_VERSION_NUM >= PIKASCRIPT_VERSION_TO_NUM(1, 10, 4))
+#error "require pikascript kernal version >= v1.10.4"
+#endif
+
 PIKA_WEAK int __platform_socket(int __domain, int __type, int __protocol) {
 #ifdef __linux__
     return socket(__domain, __type, __protocol);

+ 1 - 1
port/linux/version_config.py

@@ -1,3 +1,3 @@
 MajorVersion  =   "1"
 MinorVersion  =   "10"
-MicroVersion  =   "3"
+MicroVersion  =   "4"

+ 10 - 2
src/PikaObj.h

@@ -296,16 +296,24 @@ void* obj_getStruct(PikaObj* self, char* name);
 #define obj_setStruct(PikaObj_p_self, char_p_name, struct_) \
     args_setStruct(((PikaObj_p_self)->list), char_p_name, struct_)
 
-#define ABSTRACT_METHOD_DECLARE(x)                                        \
+#define ABSTRACT_METHOD_NEED_OVERRIDE_ERROR(_)                            \
     obj_setErrorCode(self, 1);                                            \
     __platform_printf("Error: abstract method `%s()` need override.\r\n", \
                       __FUNCTION__)
 
-#define WEAK_FUNCTION_NEED_OVERRIDE_ERROR(x)                            \
+#define WEAK_FUNCTION_NEED_OVERRIDE_ERROR(_)                            \
     __platform_printf("Error: weak function `%s()` need override.\r\n", \
                       __FUNCTION__);                                    \
     while (1)
 
 char* obj_cacheStr(PikaObj* self, char* str);
 
+#define PIKASCRIPT_VERSION_TO_NUM(majer, minor, micro) \
+    majer * 100 * 100 + minor * 100 + micro
+
+#define PIKASCRIPT_VERSION_NUM                                        \
+    PIKASCRIPT_VERSION_TO_NUM(PIKA_VERSION_MAJOR, PIKA_VERSION_MINOR, \
+                              PIKA_VERSION_MICRO)
+
+
 #endif

+ 2 - 2
src/PikaVersion.h

@@ -1,5 +1,5 @@
 #define PIKA_VERSION_MAJOR       1
 #define PIKA_VERSION_MINOR       10
-#define PIKA_VERSION_MICRO       3
+#define PIKA_VERSION_MICRO       4
 
-#define PIKA_EDIT_TIME      "2022/08/25 11:23:27"
+#define PIKA_EDIT_TIME      "2022/08/26 20:00:05"