Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/builder/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ RUN mkdir -p /simics/ispm && \

RUN RUSTFLAGS="-C linker=clang -C link-arg=-fuse-ld=$(which ld.lld)" && \
export RUSTFLAGS && \
cargo install --path simics-rs/cargo-simics-build && \
cargo install cargo-simics-build && \
cargo simics-build -r && \
mkdir -p /packages && \
cp target/release/*.ispm /packages
2 changes: 1 addition & 1 deletion .github/builder/Dockerfile-internal
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ RUN ispm settings install-dir /simics && \

RUN RUSTFLAGS="-C linker=clang -C link-arg=-fuse-ld=$(which ld.lld)" && \
export RUSTFLAGS && \
cargo install --path simics-rs/cargo-simics-build && \
cargo install cargo-simics-build && \
SIMICS_PACKAGE_VERSION="$(ispm packages --list | grep 1000 | awk '{print $3}' | cut -d '.' -f1).$(grep -E '^version = ' < Cargo.toml | sed -n '$p' | grep -oE '\"[^\"]+\"' | tr -d '\"' | cut -d'.' -f2-)" && \
export SIMICS_PACKAGE_VERSION && \
cargo simics-build -r && \
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ jobs:

- name: Install SIMICS Build
run: |
cargo install --path simics-rs/cargo-simics-build
cargo install cargo-simics-build

- name: Build TSFFS Package
run: |
Expand Down Expand Up @@ -570,7 +570,7 @@ jobs:

- name: Setup, Build, and Install TSFFS
run: |
cargo install --path simics-rs/cargo-simics-build
cargo install cargo-simics-build
cargo simics-build -r

- name: Upload Distribution Package
Expand Down
10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ yaxpeax-riscv = { git = "https://github.com/DrChat/yaxpeax-riscv", version = "0.
"serde",
], rev = "0e2151b" }
crc32fast = "1.4.2"
simics = { path = "simics-rs/simics" }
simics = "0.1.1"
indoc = "2.0.5"
serde = { version = "1.0.203", features = ["derive"] }
serde_json = "1.0.117"
Expand All @@ -78,16 +78,16 @@ yaxpeax-arm = "0.2.5"
chrono = "0.4.38"

[dev-dependencies]
simics-test = { path = "simics-rs/simics-test" }
simics-test = "0.1.0"
anyhow = "1.0.86"
command-ext = "0.1.2"
indoc = "2.0.5"
ispm-wrapper = { path = "simics-rs/ispm-wrapper" }
ispm-wrapper = "0.1.0"
versions = { version = "6.2.0", features = ["serde"] }

[build-dependencies]
simics = { path = "simics-rs/simics" }
simics-build-utils = { path = "simics-rs/simics-build-utils" }
simics = "0.1.1"
simics-build-utils = "0.1.0"

[profile.release]
lto = true
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ WORKDIR /workspace/tsffs/
# Build the project by initializing it as a project associated with the local SIMICS installation
# and building the module using the build script. Then, install the built TSFFS SIMICS
# package into the local SIMICS installation for use.
RUN cargo install --path simics-rs/cargo-simics-build && \
RUN cargo install cargo-simics-build && \
cargo simics-build -r && \
ispm packages \
-i target/release/*-linux64.ispm \
Expand Down
2 changes: 1 addition & 1 deletion docs/src/setup/linux.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ cd $HOME/simics/tsffs/
With the repository cloned, you can install and run the build utility:

```sh
cargo install --path simics-rs/cargo-simics-build
cargo install cargo-simics-build
cargo simics-build -r
```

Expand Down
2 changes: 1 addition & 1 deletion docs/src/setup/windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ Clone TSFFS to your system (anywhere you like) and build with:
```powershell
git clone https://github.com/intel/tsffs
cd tsffs
cargo install --path simics-rs/cargo-simics-build
cargo install cargo-simics-build
cargo simics-build -r
```

Expand Down
2 changes: 1 addition & 1 deletion examples/manual-example/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ WORKDIR /workspace/tsffs/
# Build the project by initializing it as a project associated with the local SIMICS installation
# and building the module using the build script. Then, install the built TSFFS SIMICS
# package into the local SIMICS installation for use.
RUN cargo install --path simics-rs/cargo-simics-build && \
RUN cargo install cargo-simics-build && \
cargo simics-build -r && \
ispm packages \
-i target/release/*-linux64.ispm \
Expand Down
23 changes: 0 additions & 23 deletions scripts/update-simics-rs.sh

This file was deleted.

2 changes: 0 additions & 2 deletions simics-rs/.dockerignore

This file was deleted.

1 change: 0 additions & 1 deletion simics-rs/.github/.gitignore

This file was deleted.

3 changes: 0 additions & 3 deletions simics-rs/.github/linters/.flake8

This file was deleted.

10 changes: 0 additions & 10 deletions simics-rs/.github/linters/.hadolint.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions simics-rs/.github/linters/.isort.cfg

This file was deleted.

10 changes: 0 additions & 10 deletions simics-rs/.github/linters/.jscpd.json

This file was deleted.

39 changes: 0 additions & 39 deletions simics-rs/.github/linters/.markdown-lint.yml

This file was deleted.

4 changes: 0 additions & 4 deletions simics-rs/.github/linters/.mypy.ini

This file was deleted.

Empty file.
5 changes: 0 additions & 5 deletions simics-rs/.github/linters/.textlintrc

This file was deleted.

61 changes: 0 additions & 61 deletions simics-rs/.github/linters/.yaml-lint.yml

This file was deleted.

5 changes: 0 additions & 5 deletions simics-rs/.github/linters/actionlint.yml

This file was deleted.

6 changes: 0 additions & 6 deletions simics-rs/.gitignore

This file was deleted.

12 changes: 0 additions & 12 deletions simics-rs/CITATION.cff

This file was deleted.

Loading