Skip to content

Commit

Permalink
Bug Fixed: Error when uploading, building, verifying from icestudio
Browse files Browse the repository at this point in the history
  • Loading branch information
Obijuan committed Mar 23, 2024
1 parent 7b37e5e commit bec545c
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 9 deletions.
9 changes: 9 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,15 @@
//-- Change to the folder with the example to test
"cwd": "${workspaceFolder}/test-examples/Alhambra-II/ledon"
},
{
"name": "Apio verify",
"type": "debugpy",
"request": "launch",
"program": "${file}",
"args": ["verify","--board", "alhambra-ii", "-p","/home/obijuan/Test/ice-build/01-LEDs-buttons"],
"console": "internalConsole",
"justMyCode": true,
},
{
"name": "Upload (Alhambra II)",
"type": "debugpy",
Expand Down
3 changes: 2 additions & 1 deletion apio/commands/graph.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
# -- Licence GPLv2
"""Main implementation of APIO GRAPH command"""

from pathlib import Path
import click
from apio.managers.scons import SCons
from apio import util
Expand All @@ -25,7 +26,7 @@
@click.option(
"-p",
"--project-dir",
type=str,
type=Path,
metavar="path",
help="Set the target directory for the project.",
)
Expand Down
3 changes: 2 additions & 1 deletion apio/commands/lint.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
# -- Licence GPLv2
"""Main implementation of APIO LINT command"""

from pathlib import Path
import click
from apio.managers.scons import SCons
from apio import util
Expand Down Expand Up @@ -47,7 +48,7 @@
@click.option(
"-p",
"--project-dir",
type=str,
type=Path,
metavar="path",
help="Set the target directory for the project.",
)
Expand Down
3 changes: 2 additions & 1 deletion apio/commands/sim.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
# -- Licence GPLv2
"""Main implementation of APIO SIM command"""

from pathlib import Path
import click
from apio.managers.scons import SCons
from apio import util
Expand All @@ -17,7 +18,7 @@
@click.option(
"-p",
"--project-dir",
type=str,
type=Path,
metavar="path",
help="Set the target directory for the project.",
)
Expand Down
3 changes: 2 additions & 1 deletion apio/commands/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
# -- Licence GPLv2
"""Main implementation of APIO TEST command"""

from pathlib import Path
import click
from apio.managers.scons import SCons
from apio import util
Expand All @@ -24,7 +25,7 @@
@click.option(
"-p",
"--project-dir",
type=str,
type=Path,
metavar="path",
help="Set the target directory for the project.",
)
Expand Down
3 changes: 2 additions & 1 deletion apio/commands/time.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
# -- Licence GPLv2
"""Main implementation of APIO time command"""

from pathlib import Path
import click
from apio.managers.scons import SCons
from apio import util
Expand Down Expand Up @@ -47,7 +48,7 @@
@click.option(
"-p",
"--project-dir",
type=str,
type=Path,
metavar="path",
help="Set the target directory for the project.",
)
Expand Down
3 changes: 2 additions & 1 deletion apio/commands/upload.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
# -- Licence GPLv2
"""Implement the apio upload command"""

from pathlib import Path
import click
from apio.managers.scons import SCons
from apio.managers.drivers import Drivers
Expand Down Expand Up @@ -55,7 +56,7 @@
@click.option(
"-p",
"--project-dir",
type=str,
type=Path,
metavar="path",
help="Set the target directory for the project.",
)
Expand Down
4 changes: 2 additions & 2 deletions apio/commands/verify.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# -- Licence GPLv2
"""Main implementation of APIO VERIFY command"""


from pathlib import Path
import click
from apio.managers.scons import SCons
from apio import util
Expand All @@ -26,7 +26,7 @@
@click.option(
"-p",
"--project-dir",
type=str,
type=Path,
metavar="path",
help="Set the target directory for the project.",
)
Expand Down
2 changes: 1 addition & 1 deletion apio/managers/scons.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def __init__(self, project_dir: Path):
self.resources = Resources()

# -- Project path is given
if not project_dir:
if project_dir:
# Check if it is a correct folder
# (or create a new one)
project_dir = util.check_dir(project_dir)
Expand Down

0 comments on commit bec545c

Please sign in to comment.