Skip to content

Commit

Permalink
删除tools/kconfiglib文件夹,采用pip安装kconfiglib
Browse files Browse the repository at this point in the history
* 删除tools/kconfiglib文件夹,采用pip安装kconfiglib

* workflows/action_utest.yml添加安装kconfiglib
  • Loading branch information
Later-Comer committed Jun 30, 2024
1 parent dd1906c commit c09d7e1
Show file tree
Hide file tree
Showing 24 changed files with 12 additions and 17,838 deletions.
1 change: 1 addition & 0 deletions .github/workflows/action_utest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ jobs:
run: |
sudo apt-get update
sudo apt-get -yqq install scons qemu-system git
pip3 install kconfiglib
- name: Install Arm ToolChains
if: ${{ matrix.legs.QEMU_ARCH == 'arm' && matrix.legs.UTEST != 'rtsmart/arm' && success() }}
Expand Down
19 changes: 11 additions & 8 deletions tools/building.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,15 +143,18 @@ def PrepareBuilding(env, root_directory, has_libcpu=False, remove_components = [
Env['BSP_ROOT'] = Dir('#').abspath
os.environ["BSP_DIR"] = Dir('#').abspath
# set PKGS_ROOT in ENV
if not "PKGS_DIR" in os.environ:
if "ENV_ROOT" in os.environ:
os.environ["PKGS_DIR"] = os.path.join(os.environ["ENV_ROOT"], "packages")
elif sys.platform == "win32":
os.environ["PKGS_DIR"] = os.path.join(os.environ["USERPROFILE"], ".env/packages")
else:
os.environ["PKGS_DIR"] = os.path.join(os.environ["HOME"], ".env/packages")
if "PKGS_DIR" in os.environ:
pass
elif "PKGS_ROOT" in os.environ:
os.environ["PKGS_DIR"] = os.environ["PKGS_ROOT"]
elif "ENV_ROOT" in os.environ:
os.environ["PKGS_DIR"] = os.path.join(os.environ["ENV_ROOT"], "packages")
elif sys.platform == "win32":
os.environ["PKGS_DIR"] = os.path.join(os.environ["USERPROFILE"], ".env", "packages")
else:
os.environ["PKGS_DIR"] = os.path.join(os.environ["HOME"], ".env", "packages")

sys.path = sys.path + [os.path.join(Rtt_Root, 'tools'), os.path.join(Rtt_Root, 'tools/kconfiglib')]
sys.path += os.path.join(Rtt_Root, 'tools')

# {target_name:(CROSS_TOOL, PLATFORM)}
tgt_dict = {'mdk':('keil', 'armcc'),
Expand Down
4 changes: 0 additions & 4 deletions tools/kconfiglib/.gitignore

This file was deleted.

5 changes: 0 additions & 5 deletions tools/kconfiglib/LICENSE.txt

This file was deleted.

2 changes: 0 additions & 2 deletions tools/kconfiglib/MANIFEST.in

This file was deleted.

Loading

0 comments on commit c09d7e1

Please sign in to comment.