fix misspelling

Author: xianjimli

SConstruct

@@ -8,15 +8,15 @@ import compile_config
 import awtk_config as awtk
 
 awtk.scons_db_check_and_remove()
-complie_helper = compile_config.get_curr_config()
+compile_helper = compile_config.get_curr_config()
 
 APP_CCFLAGS = ' '
 
 AWTK_LIB_PATH = awtk.joinPath(awtk.BIN_DIR, "libawtk.so");
 if os.path.exists(AWTK_LIB_PATH) :
   os.remove(AWTK_LIB_PATH)
 
-APP_ROOT = complie_helper.get_value('APP', '')
+APP_ROOT = compile_helper.get_value('APP', '')
 if len (APP_ROOT) > 0:
   app_sconstruct = awtk.joinPath(APP_ROOT, 'SConstruct')
   if not os.path.exists(APP_ROOT) or not os.path.exists(app_sconstruct):
@@ -43,7 +43,7 @@ env = DefaultEnvironment(CCFLAGS = awtk.CCFLAGS + APP_CCFLAGS,
 TK_ROOT_VAR = awtk.joinPath(awtk.VAR_DIR, 'awtk')
 VariantDir(TK_ROOT_VAR, awtk.TK_ROOT)
 
-if APP_ROOT == '' and complie_helper.get_value('BUILD_DEMOS', True):
+if APP_ROOT == '' and compile_helper.get_value('BUILD_DEMOS', True):
   APP_PROJ_VAR = [awtk.joinPath(TK_ROOT_VAR, 'demos/SConscript')]
 else:
   APP_PROJ_VAR = []
@@ -79,8 +79,8 @@ if os.environ['LCD_DEVICES'] == 'wayland' or os.environ['LCD_DEVICES'] == 'egl_f
 else :
   SConscriptFiles += [ 'awtk-port/SConscript' ]
 
-os.environ['BUILD_TOOLS'] = str(complie_helper.get_value('BUILD_TOOLS', True))
-if complie_helper.get_value('BUILD_TOOLS', True) :
+os.environ['BUILD_TOOLS'] = str(compile_helper.get_value('BUILD_TOOLS', True))
+if compile_helper.get_value('BUILD_TOOLS', True) :
   SConscriptFiles += [
     awtk.joinPath(TK_ROOT_VAR, 'tools/common/SConscript'), 
     awtk.joinPath(TK_ROOT_VAR, 'tools/ui_gen/xml_to_ui/SConscript'),
@@ -115,8 +115,8 @@ def build_app():
       shutil.copy(awtk.joinPath(app_bin, file), linux_fb_bin)
 
 def compile_end() :
-  complie_helper.save_last_complie_argv()
-  complie_helper.output_compile_data(awtk.TK_ROOT)
+  compile_helper.save_last_compile_argv()
+  compile_helper.output_compile_data(awtk.TK_ROOT)
   build_app()
 
 atexit.register(compile_end)

awtk-port/SConscript

@@ -1,7 +1,7 @@
 import os
 import copy
 import scons_argv
-complie_helper = scons_argv.get_compile_config()
+compile_helper = scons_argv.get_compile_config()
 
 BIN_DIR = os.environ['BIN_DIR'];
 LIB_DIR = os.environ['LIB_DIR'];
@@ -33,7 +33,7 @@ elif LCD_DEVICES =='egl_for_gbm' :
 
 awtk_linux_fb = env.Library(os.path.join(LIB_DIR, 'awtk_linux_fb'), SOURCES)
 
-extern_codes = complie_helper.get_value('EXTERN_CODE', None)
+extern_codes = compile_helper.get_value('EXTERN_CODE', None)
 if extern_codes != None :
   all_extern_codes = []
   for extern_code in extern_codes :

awtk-wayland/SConscript

@@ -1,7 +1,7 @@
 import os
 import copy
 import scons_argv
-complie_helper = scons_argv.get_compile_config()
+compile_helper = scons_argv.get_compile_config()
 
 BIN_DIR = os.environ['BIN_DIR'];
 LIB_DIR = os.environ['LIB_DIR'];
@@ -18,7 +18,7 @@ elif LCD_DEVICES == 'egl_for_wayland' :
 
 awtk_linux_fb = env.Library(os.path.join(LIB_DIR, 'awtk_linux_fb'), SOURCES)
 
-extern_codes = complie_helper.get_value('EXTERN_CODE', None)
+extern_codes = compile_helper.get_value('EXTERN_CODE', None)
 if extern_codes != None :
   all_extern_codes = []
   for extern_code in extern_codes :

awtk_config.py

@@ -2,7 +2,7 @@
 import platform
 import shutil
 import scons_argv
-complie_helper = scons_argv.get_compile_config()
+compile_helper = scons_argv.get_compile_config()
 
 from awtk_config_common import TKC_STATIC_LIBS
 from awtk_config_common import joinPath, toWholeArchive, genIdlAndDefEx, setEnvSpawn, genDllLinkFlags, copySharedLib, cleanSharedLib, scons_db_check_and_remove
@@ -45,7 +45,7 @@ def lcd_devices_is_egl(lcd_devices):
 # LCD_DEVICES='egl_for_x11'
 # LCD_DEVICES='egl_for_gbm'
 # LCD_DEVICES='egl_for_wayland'
-LCD_DEVICES = complie_helper.get_value('LCD_DEVICES', LCD_DEVICES)
+LCD_DEVICES = compile_helper.get_value('LCD_DEVICES', LCD_DEVICES)
 
 NANOVG_BACKEND=''
 VGCANVAS='NANOVG'
@@ -57,7 +57,7 @@ def lcd_devices_is_egl(lcd_devices):
 #os.environ['USE_SSE2'] = 'true'
 #os.environ['USE_SSSE3'] = 'true'
 #VGCANVAS='NANOVG_PLUS'
-VGCANVAS = complie_helper.get_value('VGCANVAS', VGCANVAS)
+VGCANVAS = compile_helper.get_value('VGCANVAS', VGCANVAS)
 
 if LCD_DEVICES =='fb' or LCD_DEVICES =='drm' or LCD_DEVICES =='wayland':
   LCD='LINUX_FB'
@@ -71,7 +71,7 @@ def lcd_devices_is_egl(lcd_devices):
 #INPUT_ENGINE='t9'
 #INPUT_ENGINE='t9ext'
 INPUT_ENGINE='pinyin'
-INPUT_ENGINE = complie_helper.get_value('INPUT_ENGINE', INPUT_ENGINE)
+INPUT_ENGINE = compile_helper.get_value('INPUT_ENGINE', INPUT_ENGINE)
 
 COMMON_CCFLAGS=' -DHAS_STD_MALLOC -DHAS_STDIO -DHAS_FAST_MEMCPY -DWITH_VGCANVAS -DWITH_UNICODE_BREAK '
 COMMON_CCFLAGS=COMMON_CCFLAGS+' -DLOAD_ASSET_WITH_MMAP=1 -DWITH_SOCKET=1 '
@@ -103,7 +103,7 @@ def lcd_devices_is_egl(lcd_devices):
     COMMON_CCFLAGS = COMMON_CCFLAGS + ' -DWITH_IME_NULL '
 
 GRAPHIC_BUFFER='default'
-if complie_helper.get_value('WITH_CUSTOM_GRAPHIC_BUFFER', False) :
+if compile_helper.get_value('WITH_CUSTOM_GRAPHIC_BUFFER', False) :
   GRAPHIC_BUFFER='custom'
   #GRAPHIC_BUFFER='jzgpu'
 #if GRAPHIC_BUFFER == 'jzgpu':
@@ -150,37 +150,37 @@ def lcd_devices_is_egl(lcd_devices):
 #TOOLS_PREFIX='/opt/android-ndk-r20b/toolchains/llvm/prebuilt/linux-x86_64/bin/'
 #TOOLS_PREFIX='/Users/jim/android/android-ndk-r21d/toolchains/llvm/prebuilt/darwin-x86_64/bin/'
 
-TOOLS_PREFIX = complie_helper.get_unique_value('TOOLS_PREFIX', TOOLS_PREFIX)
-TSLIB_LIB_DIR = complie_helper.get_unique_value('TSLIB_LIB_DIR', TSLIB_LIB_DIR)
-TSLIB_INC_DIR = complie_helper.get_unique_value('TSLIB_INC_DIR', TSLIB_INC_DIR)
-OS_FLAGS = complie_helper.get_value('OS_FLAGS', OS_FLAGS)
-OS_LINKFLAGS = complie_helper.get_value('OS_LINKFLAGS', OS_LINKFLAGS)
+TOOLS_PREFIX = compile_helper.get_unique_value('TOOLS_PREFIX', TOOLS_PREFIX)
+TSLIB_LIB_DIR = compile_helper.get_unique_value('TSLIB_LIB_DIR', TSLIB_LIB_DIR)
+TSLIB_INC_DIR = compile_helper.get_unique_value('TSLIB_INC_DIR', TSLIB_INC_DIR)
+OS_FLAGS = compile_helper.get_value('OS_FLAGS', OS_FLAGS)
+OS_LINKFLAGS = compile_helper.get_value('OS_LINKFLAGS', OS_LINKFLAGS)
 
 TARGET_ARCH = platform.architecture();
 
-if complie_helper.get_value('PLATFORM', 'linux') == 'android' :
+if compile_helper.get_value('PLATFORM', 'linux') == 'android' :
   # for android
   TSLIB_LIB_DIR=''
   TSLIB_INC_DIR=''
-  CC = TOOLS_PREFIX + complie_helper.get_value('TOOLS_CC', 'armv7a-linux-androideabi16-clang')
-  CXX = TOOLS_PREFIX + complie_helper.get_value('TOOLS_CXX', 'armv7a-linux-androideabi16-clang++')
-  LD = TOOLS_PREFIX + complie_helper.get_value('TOOLS_LD', 'arm-linux-androideabi-ld')
-  AR = TOOLS_PREFIX + complie_helper.get_value('TOOLS_AR', 'arm-linux-androideabi-ar')
-  STRIP = TOOLS_PREFIX + complie_helper.get_value('TOOLS_STRIP', 'arm-linux-androideabi-strip')
-  RANLIB = TOOLS_PREFIX + complie_helper.get_value('TOOLS_RANLIB', 'arm-linux-androideabi-ranlib') 
+  CC = TOOLS_PREFIX + compile_helper.get_value('TOOLS_CC', 'armv7a-linux-androideabi16-clang')
+  CXX = TOOLS_PREFIX + compile_helper.get_value('TOOLS_CXX', 'armv7a-linux-androideabi16-clang++')
+  LD = TOOLS_PREFIX + compile_helper.get_value('TOOLS_LD', 'arm-linux-androideabi-ld')
+  AR = TOOLS_PREFIX + compile_helper.get_value('TOOLS_AR', 'arm-linux-androideabi-ar')
+  STRIP = TOOLS_PREFIX + compile_helper.get_value('TOOLS_STRIP', 'arm-linux-androideabi-strip')
+  RANLIB = TOOLS_PREFIX + compile_helper.get_value('TOOLS_RANLIB', 'arm-linux-androideabi-ranlib') 
   OS_LINKFLAGS=' -Wl,--allow-multiple-definition '
-  OS_LIBS = complie_helper.get_value('OS_LIBS', []) + ['stdc++', 'm']
+  OS_LIBS = compile_helper.get_value('OS_LIBS', []) + ['stdc++', 'm']
   OS_FLAGS='-Wall -Os -DFB_DEVICE_FILENAME=\\\"\"/dev/graphics/fb0\\\"\" '
 else :
-  CC = TOOLS_PREFIX + complie_helper.get_value('TOOLS_CC', 'gcc') 
-  CXX = TOOLS_PREFIX + complie_helper.get_value('TOOLS_CXX', 'g++')
-  LD = TOOLS_PREFIX + complie_helper.get_value('TOOLS_LD', 'g++')
-  AR = TOOLS_PREFIX + complie_helper.get_value('TOOLS_AR', 'ar')
-  RANLIB = TOOLS_PREFIX + complie_helper.get_value('TOOLS_RANLIB', 'ranlib')
-  STRIP = TOOLS_PREFIX + complie_helper.get_value('TOOLS_STRIP', 'strip')
-  OS_LIBS = complie_helper.get_value('OS_LIBS', []) + ['stdc++', 'pthread', 'rt', 'm', 'dl']
-
-OS_DEBUG = complie_helper.get_value('DEBUG', False)
+  CC = TOOLS_PREFIX + compile_helper.get_value('TOOLS_CC', 'gcc') 
+  CXX = TOOLS_PREFIX + compile_helper.get_value('TOOLS_CXX', 'g++')
+  LD = TOOLS_PREFIX + compile_helper.get_value('TOOLS_LD', 'g++')
+  AR = TOOLS_PREFIX + compile_helper.get_value('TOOLS_AR', 'ar')
+  RANLIB = TOOLS_PREFIX + compile_helper.get_value('TOOLS_RANLIB', 'ranlib')
+  STRIP = TOOLS_PREFIX + compile_helper.get_value('TOOLS_STRIP', 'strip')
+  OS_LIBS = compile_helper.get_value('OS_LIBS', []) + ['stdc++', 'pthread', 'rt', 'm', 'dl']
+
+OS_DEBUG = compile_helper.get_value('DEBUG', False)
 if OS_DEBUG :
   OS_FLAGS += ' -g -O0 '
 else :
@@ -213,10 +213,10 @@ def lcd_devices_is_egl(lcd_devices):
 COMMON_CCFLAGS = COMMON_CCFLAGS+' -DWITH_EVENT_RECORDER_PLAYER=1 '
 COMMON_CCFLAGS = COMMON_CCFLAGS + ' -DWITH_WIDGET_TYPE_CHECK=1 '
 
-if complie_helper.get_value('ENABLE_CURSOR', True) :
+if compile_helper.get_value('ENABLE_CURSOR', True) :
   COMMON_CCFLAGS = COMMON_CCFLAGS + ' -DENABLE_CURSOR '
 
-if complie_helper.get_value('WITH_G2D', True) :
+if compile_helper.get_value('WITH_G2D', True) :
   COMMON_CCFLAGS = COMMON_CCFLAGS + ' -DWITH_G2D '
 
 if TSLIB_LIB_DIR != '':
@@ -228,7 +228,7 @@ def lcd_devices_is_egl(lcd_devices):
 LIBPATH=[LIB_DIR, BIN_DIR] + OS_LIBPATH
 CCFLAGS=OS_FLAGS + COMMON_CCFLAGS 
 
-if complie_helper.get_value('EXTERN_CODE', None) != None :
+if compile_helper.get_value('EXTERN_CODE', None) != None :
   LINKFLAGS=OS_LINKFLAGS + toWholeArchive(['__extern_code'])
 
 STATIC_LIBS =['awtk_global', 'fscript_ext_widgets', 'extwidgets', 'widgets', 'awtk_linux_fb', 'base', 'gpinyin', 'linebreak', 'fribidi']
@@ -297,8 +297,8 @@ def lcd_devices_is_egl(lcd_devices):
   LIBPATH = [TSLIB_LIB_DIR] + LIBPATH;
   CPPPATH = [TSLIB_INC_DIR] + CPPPATH;
 
-LIBPATH += complie_helper.get_value('OS_LIBPATH', [])
-CPPPATH += complie_helper.get_value('OS_CPPPATH', [])
+LIBPATH += compile_helper.get_value('OS_LIBPATH', [])
+CPPPATH += compile_helper.get_value('OS_CPPPATH', [])
 
 os.environ['LCD'] = LCD
 os.environ['LCD_DEVICES'] = LCD_DEVICES

awtk_config_common.py

@@ -3,7 +3,7 @@
 import platform
 import shutil
 import compile_config
-complie_helper = compile_config.get_curr_config_for_awtk()
+compile_helper = compile_config.get_curr_config_for_awtk()
 
 import sys
 if sys.version_info.major == 2:
@@ -81,7 +81,7 @@ def joinPath(root, subdir):
 NANOVG_BACKEND = ''
 NATIVE_WINDOW = ''
 #TOOLS_NAME = 'mingw'
-TOOLS_NAME = complie_helper.get_value('TOOLS_NAME', TOOLS_NAME)
+TOOLS_NAME = compile_helper.get_value('TOOLS_NAME', TOOLS_NAME)
 
 if OS_NAME == 'Windows':
     TK_ROOT = TK_ROOT.replace('\\', '\\\\')
@@ -96,7 +96,7 @@ def joinPath(root, subdir):
 OS_PROJECTS = []
 # only for c compiler flags
 COMMON_CFLAGS = ''
-OS_DEBUG = complie_helper.get_value('DEBUG', True)
+OS_DEBUG = compile_helper.get_value('DEBUG', True)
 
 if OS_NAME == 'Darwin':
 

docs/changes.md

@@ -1,5 +1,8 @@
 # 最新动态
 
+2024/12/30
+  * 修改编译脚本拼写错误(感谢兆坤提供补丁)
+
 2024/12/29
   * 公共坐标改用原子操作(感谢兆坤提供补丁)
   * 支持原子操作(感谢兆坤提供补丁)

scons_argv.py

@@ -49,15 +49,15 @@ def get_compile_config() :
     return compile_config.get_curr_config()
   else :
     INIT = True
-    complie_helper = compile_config.get_curr_config_for_awtk()
-    return complie_helper
+    compile_helper = compile_config.get_curr_config_for_awtk()
+    return compile_helper
 
 
 def init(ARGUMENTS) :
   global INIT
   INIT = True
-  complie_helper = compile_config.complie_helper()
-  complie_helper.set_compile_config(COMPILE_CONFIG)
-  complie_helper.try_load_default_config()
-  complie_helper.scons_user_sopt(ARGUMENTS)
-  compile_config.set_curr_config(complie_helper)
+  compile_helper = compile_config.compile_helper()
+  compile_helper.set_compile_config(COMPILE_CONFIG)
+  compile_helper.try_load_default_config()
+  compile_helper.scons_user_sopt(ARGUMENTS)
+  compile_config.set_curr_config(compile_helper)