Explorar o código

Revert "[tools] use project's dir basename as default project name"

This reverts commit ea75800d5b3be3e63c6304afed8b06a3fdeae289.
Supper Thomas hai 5 meses
pai
achega
a7ee7b6617
Modificáronse 2 ficheiros con 3 adicións e 4 borrados
  1. 1 1
      .github/workflows/action_tools.yml
  2. 2 3
      tools/options.py

+ 1 - 1
.github/workflows/action_tools.yml

@@ -77,7 +77,7 @@ jobs:
       if: ${{ success() }}
       run: |
         echo "Test to dist project"
-        scons --dist --project-name=project -C $TEST_BSP_ROOT
+        scons --dist -C $TEST_BSP_ROOT
         scons --dist-ide -C $TEST_BSP_ROOT
         ls $TEST_BSP_ROOT
         ls $TEST_BSP_ROOT/dist

+ 2 - 3
tools/options.py

@@ -22,9 +22,8 @@
 # 2022-04-20     WuGensheng  Add Options to SCons
 #
 
-from SCons.Script import AddOption, Dir
+from SCons.Script import AddOption
 import platform
-import os
 
 def AddOptions():
     ''' ===== Add generic options to SCons ===== '''
@@ -46,7 +45,7 @@ def AddOptions():
     AddOption('--project-name',
                 dest = 'project-name',
                 type = 'string',
-                default = os.path.basename(Dir('#').abspath),
+                default = "project",
                 help = 'set project name')
     AddOption('--cscope',
                 dest = 'cscope',