[更新] 更新curl libssh2 zlib源码

README.md

@@ -0,0 +1,3 @@
+# libcurl2rtt
+The curl library ported on the RT-Thread platform. | 基于 RT-Thread 移植的 curl 库. 
+

SConscript

@@ -4,94 +4,17 @@
 # @Author: Copyright (c) 2018-2019, liu2guang 1004383796@qq.com
 #---------------------------------------------------------------------------------
 import os
-from building import * 
-Import('RTT_ROOT')
-Import('rtconfig')
+from building import *
 
-#---------------------------------------------------------------------------------
-# Package configuration
-#---------------------------------------------------------------------------------
-PKGNAME = "curl"
-DEPENDS = [""]
-
-#---------------------------------------------------------------------------------
-# Compile the configuration 
-#---------------------------------------------------------------------------------
-SOURCES          = Glob("curl*/lib/*.c")       + \
-                   Glob("curl*/lib/vauth/*.c") + \
-                   Glob("curl*/lib/vquic/*.c") + \
-                   Glob("curl*/lib/vssh/*.c")  + \
-                   Glob("curl*/lib/vtls/*.c")  + \
-                   Glob("curl*/src/*.c")
-
-LOCAL_CPPPATH    = [] 
-LOCAL_CCFLAGS    = "" 
-LOCAL_ASFLAGS    = ""
-
-CPPPATH          = [os.path.join(GetCurrentDir(), '.'),
-                    os.path.join(GetCurrentDir(), 'curl_v7.67.0/lib'), 
-                    os.path.join(GetCurrentDir(), 'curl_v7.67.0/include')] 
-
-CCFLAGS          = "" 
-ASFLAGS          = ""
-
-CPPDEFINES       = ["HAVE_CONFIG_H", "BUILDING_LIBCURL"]
-LOCAL_CPPDEFINES = []
-
-LIBS             = [] 
-LIBPATH          = [GetCurrentDir()] 
-
-LINKFLAGS        = "" 
-
-#---------------------------------------------------------------------------------
-# Feature clip configuration, optional 
-#---------------------------------------------------------------------------------
-
-#---------------------------------------------------------------------------------
-# Compiler platform configuration, optional
-#---------------------------------------------------------------------------------
-if rtconfig.CROSS_TOOL == "gcc":
-    LOCAL_CCFLAGS += ' -std=gnu99 -Ofast -w' 
+objs = []
+cwd  = GetCurrentDir()
+list = os.listdir(cwd)
 
-if rtconfig.CROSS_TOOL == "iar":
-    print("Warning: No iar platform was tested!!!")
+for item in list:
+    if os.path.isfile(os.path.join(cwd, item, 'SConscript')):
+        objs = objs + SConscript(os.path.join(item, 'SConscript'))
 
-if rtconfig.CROSS_TOOL == "keil":
-    LOCAL_CCFLAGS += ' --gnu -W --diag_suppress=870'
-
-#---------------------------------------------------------------------------------
-# System variables
-#---------------------------------------------------------------------------------
-objs   = [] 
-root   = GetCurrentDir() 
-
-#---------------------------------------------------------------------------------
-# Sub target
-#---------------------------------------------------------------------------------
-list = os.listdir(root)
-if GetDepend(DEPENDS):
-    for d in list:
-        path = os.path.join(root, d)
-        if os.path.isfile(os.path.join(path, 'SConscript')):
-            objs = objs + SConscript(os.path.join(d, 'SConscript')) 
-
-#---------------------------------------------------------------------------------
-# Main target
-#---------------------------------------------------------------------------------
-objs += DefineGroup(name = PKGNAME, src = SOURCES, depend = DEPENDS, 
-                   CPPPATH          = CPPPATH, 
-                   CCFLAGS          = CCFLAGS, 
-                   ASFLAGS          = ASFLAGS, 
-                   LOCAL_CPPPATH    = LOCAL_CPPPATH, 
-                   LOCAL_CCFLAGS    = LOCAL_CCFLAGS, 
-                   LOCAL_ASFLAGS    = LOCAL_ASFLAGS, 
-                   CPPDEFINES       = CPPDEFINES, 
-                   LOCAL_CPPDEFINES = LOCAL_CPPDEFINES, 
-                   LIBS             = LIBS, 
-                   LIBPATH          = LIBPATH,
-                   LINKFLAGS        = LINKFLAGS) 
-                   
-Return("objs") 
+Return('objs')
 #---------------------------------------------------------------------------------
 # End
 #---------------------------------------------------------------------------------

cleanup.bat

@@ -1,13 +0,0 @@
-@echo off
-SET VERSION="v7.67.0"
-
-rd/s/q "curl_%VERSION%\.github"
-rd/s/q "curl_%VERSION%\CMake"
-rd/s/q "curl_%VERSION%\docs"
-rd/s/q "curl_%VERSION%\m4"
-rd/s/q "curl_%VERSION%\packages"
-rd/s/q "curl_%VERSION%\plan9"
-rd/s/q "curl_%VERSION%\projects"
-rd/s/q "curl_%VERSION%\scripts"
-rd/s/q "curl_%VERSION%\tests"
-rd/s/q "curl_%VERSION%\winbuild"

curl/SConscript

@@ -0,0 +1,97 @@
+#-*- encoding: utf-8 -*-
+#---------------------------------------------------------------------------------
+# @File:   Sconscript for Package 
+# @Author: Copyright (c) 2018-2019, liu2guang 1004383796@qq.com
+#---------------------------------------------------------------------------------
+import os
+from building import * 
+Import('RTT_ROOT')
+Import('rtconfig')
+
+#---------------------------------------------------------------------------------
+# Package configuration
+#---------------------------------------------------------------------------------
+PKGNAME = "curl"
+DEPENDS = [""]
+
+#---------------------------------------------------------------------------------
+# Compile the configuration 
+#---------------------------------------------------------------------------------
+SOURCES          = Glob("curl*/lib/*.c")       + \
+                   Glob("curl*/lib/vauth/*.c") + \
+                   Glob("curl*/lib/vquic/*.c") + \
+                   Glob("curl*/lib/vssh/*.c")  + \
+                   Glob("curl*/lib/vtls/*.c")  + \
+                   Glob("curl*/src/*.c")
+
+LOCAL_CPPPATH    = [] 
+LOCAL_CCFLAGS    = "" 
+LOCAL_ASFLAGS    = ""
+
+CPPPATH          = [os.path.join(GetCurrentDir(), '.'),
+                    os.path.join(GetCurrentDir(), 'curl_v7.67.0/lib'), 
+                    os.path.join(GetCurrentDir(), 'curl_v7.67.0/include')] 
+
+CCFLAGS          = "" 
+ASFLAGS          = ""
+
+CPPDEFINES       = ["HAVE_CONFIG_H", "BUILDING_LIBCURL"]
+LOCAL_CPPDEFINES = []
+
+LIBS             = [] 
+LIBPATH          = [GetCurrentDir()] 
+
+LINKFLAGS        = "" 
+
+#---------------------------------------------------------------------------------
+# Feature clip configuration, optional 
+#---------------------------------------------------------------------------------
+
+#---------------------------------------------------------------------------------
+# Compiler platform configuration, optional
+#---------------------------------------------------------------------------------
+if rtconfig.CROSS_TOOL == "gcc":
+    LOCAL_CCFLAGS += ' -std=gnu99 -Ofast -w' 
+
+if rtconfig.CROSS_TOOL == "iar":
+    print("Warning: No iar platform was tested!!!")
+
+if rtconfig.CROSS_TOOL == "keil":
+    LOCAL_CCFLAGS += ' --gnu -W --diag_suppress=870'
+
+#---------------------------------------------------------------------------------
+# System variables
+#---------------------------------------------------------------------------------
+objs   = [] 
+root   = GetCurrentDir() 
+
+#---------------------------------------------------------------------------------
+# Sub target
+#---------------------------------------------------------------------------------
+list = os.listdir(root)
+if GetDepend(DEPENDS):
+    for d in list:
+        path = os.path.join(root, d)
+        if os.path.isfile(os.path.join(path, 'SConscript')):
+            objs = objs + SConscript(os.path.join(d, 'SConscript')) 
+
+#---------------------------------------------------------------------------------
+# Main target
+#---------------------------------------------------------------------------------
+objs += DefineGroup(name = PKGNAME, src = SOURCES, depend = DEPENDS, 
+                   CPPPATH          = CPPPATH, 
+                   CCFLAGS          = CCFLAGS, 
+                   ASFLAGS          = ASFLAGS, 
+                   LOCAL_CPPPATH    = LOCAL_CPPPATH, 
+                   LOCAL_CCFLAGS    = LOCAL_CCFLAGS, 
+                   LOCAL_ASFLAGS    = LOCAL_ASFLAGS, 
+                   CPPDEFINES       = CPPDEFINES, 
+                   LOCAL_CPPDEFINES = LOCAL_CPPDEFINES, 
+                   LIBS             = LIBS, 
+                   LIBPATH          = LIBPATH,
+                   LINKFLAGS        = LINKFLAGS) 
+                   
+Return("objs") 
+#---------------------------------------------------------------------------------
+# End
+#---------------------------------------------------------------------------------