Skip to content

Commit c978052

Browse files
authored
Revert "[tools] use project's dir basename as default project name"
This reverts commit ea75800.
1 parent 5e8602c commit c978052

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

.github/workflows/action_tools.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
if: ${{ success() }}
7878
run: |
7979
echo "Test to dist project"
80-
scons --dist --project-name=project -C $TEST_BSP_ROOT
80+
scons --dist -C $TEST_BSP_ROOT
8181
scons --dist-ide -C $TEST_BSP_ROOT
8282
ls $TEST_BSP_ROOT
8383
ls $TEST_BSP_ROOT/dist

tools/options.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@
2222
# 2022-04-20 WuGensheng Add Options to SCons
2323
#
2424

25-
from SCons.Script import AddOption, Dir
25+
from SCons.Script import AddOption
2626
import platform
27-
import os
2827

2928
def AddOptions():
3029
''' ===== Add generic options to SCons ===== '''
@@ -46,7 +45,7 @@ def AddOptions():
4645
AddOption('--project-name',
4746
dest = 'project-name',
4847
type = 'string',
49-
default = os.path.basename(Dir('#').abspath),
48+
default = "project",
5049
help = 'set project name')
5150
AddOption('--cscope',
5251
dest = 'cscope',

0 commit comments

Comments
 (0)