Skip to content
Open
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 6 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ rustflags = [
]
linker = "clang"

[target.aarch64-apple-darwin]
rustflags = [
"-C",
"link-arg=-lxar"
]

[profile.profiling]
inherits = "release"
debug = true
18 changes: 9 additions & 9 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,24 @@ jobs:
build:
name: Windows Build
runs-on: windows-2022
env:
toolchain-version: 1.90.0
llvm-version: 14.0.6
steps:

- uses: actions/checkout@v3

- name: Install Rust
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.toolchain-version }}
toolchain: 1.90.0

- name: Install LLVM
uses: ghaith/install-llvm-action@latest
with:
version: ${{ env.llvm-version }}
directory: "./llvm"
shell: pwsh
run: |
$llvmUrl = "https://github.com/PLC-lang/llvm-package-windows/releases/download/v21.1.7/LLVM-21.1.7-win64.7z"
$llvmArchive = "LLVM-21.1.7-win64.7z"
Invoke-WebRequest -Uri $llvmUrl -OutFile $llvmArchive
7z x $llvmArchive -o"./llvm" -y
$llvmBin = (Resolve-Path "./llvm/bin").Path
echo "$llvmBin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append

- name: Cargo test (Unit)
run: cargo test --lib -- --nocapture
Expand All @@ -47,4 +48,3 @@ jobs:
with:
name: plc.exe
path: target/release/plc.exe

52 changes: 29 additions & 23 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,31 @@
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "codelldb",
"request": "launch",
"name": "Debug codelldb standard_lib",
"cargo": {
{
"type": "codelldb",
"request": "launch",
"name": "Debug codelldb standard_lib",
"cargo": {
"args": [
"build",
"--bin=plc",
"--package=plc_driver"
],
"filter": {
"name": "plc",
"kind": "bin"
}
},
"program": "target/debug/plc",
"args": [
"build",
"--bin=plc",
"--package=plc_driver"
"libs/stdlib/iec61131-st/*.st"
],
"filter": {
"name": "plc",
"kind": "bin"
}
},
"program": "target/debug/plc",
"args": ["libs/stdlib/iec61131-st/*.st"],
"cwd": "${workspaceFolder}",
"env": {
"RUST_LOG": "rusty"
"cwd": "${workspaceFolder}",
"env": {
"RUST_LOG": "rusty"
},
"terminal": "integrated"
},
"terminal": "integrated"
},
{
"type": "codelldb",
"request": "launch",
Expand All @@ -43,7 +45,11 @@
}
},
"program": "target/debug/plc",
"args": ["target/demo.st", "-g", "-c"],
"args": [
"target/demo.st",
"-g",
"-c"
],
"cwd": "${workspaceFolder}",
"env": {
"RUST_LOG": "rusty"
Expand All @@ -66,6 +72,7 @@
}
},
"args": [
"-j=1",
"target/demo.st",
"tests/lit/util/printf.pli"
],
Expand Down Expand Up @@ -107,7 +114,6 @@
"cwd": "${workspaceFolder}",
"program": "target/demo",
"terminal": "integrated"

}
]
}
}
Loading