Skip to content

Commit 866a372

Browse files
DAK404DAK404
committed
Repository Update
* Added Nion Foundry Build System using GNU Make * Restructured the Tools directory * Removed the bash shell scripts to compile the program * Updated .gitignore * Updated vscode tasks * Updated Github Automation actions
1 parent 95f1cab commit 866a372

17 files changed

+165
-326
lines changed

‎.github/workflows/WorkflowBuildFromDev.yml‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
steps:
1414
- name: Check Path
1515
run: echo ${{ github.workspace }}
16-
16+
1717
- name: Checkout Code
1818
uses: actions/checkout@v4
1919
with:
@@ -25,21 +25,11 @@ jobs:
2525
distribution: 'oracle'
2626
java-version: '21'
2727

28-
- name: Copy SourceCompileProgram.sh to Source Directory
29-
run: cp ./Tools/Silent/Linux/SourceCompileProgram.sh ./Source/
30-
31-
- name: Create Binaries directory
32-
run: mkdir ./Binaries
33-
34-
- name: Copy BuildSigner to Binaries Directory
35-
run: cp ./Tools/Interactive/BuildSigner.java ./Binaries/
36-
37-
- name: Run SourceCompileProgram.sh to compile program
38-
working-directory: ./Source
39-
run: sh ./SourceCompileProgram.sh
28+
- name: Run Makefile to compile program
29+
run: make project=Cataphract all 2>&1 | tee CompileLogs/Compile.log
4030

4131
- name: Upload the Build Artefacts
4232
uses: actions/upload-artifact@v4
4333
with:
4434
name: Cataphract
45-
path: ${{ github.workspace }}/Binaries/
35+
path: ${{ github.workspace }}/Binaries/

‎.github/workflows/WorkflowBuildFromMain.yml‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,39 +7,29 @@ on:
77

88
jobs:
99
DevBuild:
10-
name: Build From main Branch
10+
name: Build From Development Branch
1111
runs-on: ubuntu-latest
1212

1313
steps:
1414
- name: Check Path
1515
run: echo ${{ github.workspace }}
16-
16+
1717
- name: Checkout Code
1818
uses: actions/checkout@v4
1919
with:
20-
ref: main
20+
ref: Development
2121

2222
- name: Setup Java
2323
uses: actions/setup-java@v4
2424
with:
2525
distribution: 'oracle'
2626
java-version: '21'
2727

28-
- name: Copy SourceCompileProgram.sh to Source Directory
29-
run: cp ./Tools/Silent/Linux/SourceCompileProgram.sh ./Source/
30-
31-
- name: Create Binaries directory
32-
run: mkdir ./Binaries
33-
34-
- name: Copy BuildSigner to Binaries Directory
35-
run: cp ./Tools/Interactive/BuildSigner.java ./Binaries/
36-
37-
- name: Run SourceCompileProgram.sh to compile program
38-
working-directory: ./Source
39-
run: sh ./SourceCompileProgram.sh
28+
- name: Run Makefile to compile program
29+
run: make project=Cataphract all 2>&1 | tee CompileLogs/Compile.log
4030

4131
- name: Upload the Build Artefacts
4232
uses: actions/upload-artifact@v4
4333
with:
4434
name: Cataphract
45-
path: ${{ github.workspace }}/Binaries/
35+
path: ${{ github.workspace }}/Binaries/

‎.gitignore‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11

2+
Binaries/*
3+
4+
CompileLogs/*
5+
6+
docs/*
27

38
Source/*.bat
49
Source/*.cmd
@@ -7,6 +12,4 @@ Source/*.sh
712
Source/Truncheon/Core/DebugMainMenu.java
813
Source/Truncheon/Modules
914

10-
Binaries/*
11-
1215
Tools/SQLite Driver

‎.vscode/tasks.json‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,30 @@
11
{
2-
// See https://go.microsoft.com/fwlink/?LinkId=733558
3-
// for the documentation about the tasks.json format
42
"version": "2.0.0",
53
"tasks": [
64
{
7-
"label": "BuildProgram",
5+
"label": "Build Cataphract Kernel (Linux)",
86
"type": "shell",
9-
"windows": {
10-
"command": ".\\SourceCompileProgram.cmd"
11-
},
12-
"linux": {
13-
"command": "sh SourceCompileProgram.sh"
14-
},
15-
"options": {
16-
"cwd": "${workspaceFolder}/Source"
7+
"command": "make",
8+
"args": [
9+
"project=Cataphract",
10+
"kernel"
11+
],
12+
"group": {
13+
"kind": "build",
14+
"isDefault": true
1715
},
1816
"problemMatcher": [],
17+
"detail": "Build the Cataphract kernel on Linux"
18+
},
19+
{
20+
"label": "Build Cataphract Kernel (Windows)",
21+
"type": "shell",
22+
"command": ".\\SourceCompileProgram.cmd",
1923
"group": {
2024
"kind": "build",
21-
"isDefault": true
25+
"isDefault": false
2226
}
2327
}
2428
]
25-
}
29+
}
30+

‎Source/Cataphract/API/Minotaur/PolicyManager.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@ private final void viewPolicyInfo()throws Exception
218218
private final void displaySettings()throws Exception
219219
{
220220
Build.viewBuildInfo();
221+
IOStreams.println("--------------------------------------------");
221222
IOStreams.println(" Minotaur Policy Editor 2.0 ");
222223
IOStreams.println("--------------------------------------------");
223224
IOStreams.println(" - Current Policy Configuration - ");
@@ -280,5 +281,6 @@ private final void resetPolicyFile()throws Exception
280281

281282
savePolicy("module", "off");
282283
savePolicy("policy", "off");
284+
savePolicy("auth", "off");
283285
}
284286
}

‎Tools/Interactive/BuildSigner.java‎ renamed to ‎Tools/BuildSigner.java‎

File renamed without changes.

‎Tools/GitHub-Automation/WorkflowBuildFromDev.yml‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
steps:
1414
- name: Check Path
1515
run: echo ${{ github.workspace }}
16-
16+
1717
- name: Checkout Code
1818
uses: actions/checkout@v4
1919
with:
@@ -25,21 +25,11 @@ jobs:
2525
distribution: 'oracle'
2626
java-version: '21'
2727

28-
- name: Copy SourceCompileProgram.sh to Source Directory
29-
run: cp ./Tools/Silent/Linux/SourceCompileProgram.sh ./Source/
30-
31-
- name: Create Binaries directory
32-
run: mkdir ./Binaries
33-
34-
- name: Copy BuildSigner to Binaries Directory
35-
run: cp ./Tools/Interactive/BuildSigner.java ./Binaries/
36-
37-
- name: Run SourceCompileProgram.sh to compile program
38-
working-directory: ./Source
39-
run: sh ./SourceCompileProgram.sh
28+
- name: Run Makefile to compile program
29+
run: make project=Cataphract all 2>&1 | tee CompileLogs/Compile.log
4030

4131
- name: Upload the Build Artefacts
4232
uses: actions/upload-artifact@v4
4333
with:
4434
name: Cataphract
45-
path: ${{ github.workspace }}/Binaries/
35+
path: ${{ github.workspace }}/Binaries/

‎Tools/GitHub-Automation/WorkflowBuildFromMain.yml‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ on:
77

88
jobs:
99
DevBuild:
10-
name: Build From main Branch
10+
name: Build From Development Branch
1111
runs-on: ubuntu-latest
1212

1313
steps:
1414
- name: Check Path
1515
run: echo ${{ github.workspace }}
16-
16+
1717
- name: Checkout Code
1818
uses: actions/checkout@v4
1919
with:
@@ -25,21 +25,11 @@ jobs:
2525
distribution: 'oracle'
2626
java-version: '21'
2727

28-
- name: Copy SourceCompileProgram.sh to Source Directory
29-
run: cp ./Tools/Silent/Linux/SourceCompileProgram.sh ./Source/
30-
31-
- name: Create Binaries directory
32-
run: mkdir ./Binaries
33-
34-
- name: Copy BuildSigner to Binaries Directory
35-
run: cp ./Tools/Interactive/BuildSigner.java ./Binaries/
36-
37-
- name: Run SourceCompileProgram.sh to compile program
38-
working-directory: ./Source
39-
run: sh ./SourceCompileProgram.sh
28+
- name: Run Makefile to compile program
29+
run: make project=Cataphract all 2>&1 | tee CompileLogs/Compile.log
4030

4131
- name: Upload the Build Artefacts
4232
uses: actions/upload-artifact@v4
4333
with:
4434
name: Cataphract
45-
path: ${{ github.workspace }}/Binaries/
35+
path: ${{ github.workspace }}/Binaries/

‎Tools/Silent/Linux/SourceCompileDocs.sh‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎Tools/Silent/Linux/SourceCompileDocs_Internal.sh‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)