Skip to content

Commit 571f90a

Browse files
jedeoricjedeoric
authored
Merge pull request #4 from orix-software/develop
prepare new version
2 parents 5920292 + bd8fa0e commit 571f90a

File tree

14 files changed

+191
-54
lines changed

14 files changed

+191
-54
lines changed

‎.github/workflows/main.yml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: build
22

3-
# Controls when the action will run.
3+
# Controls when the action will run.
44
on:
55
# Triggers the workflow on push event only for all branches
66
push:
@@ -14,7 +14,7 @@ on:
1414
jobs:
1515
# This workflow contains a single job called "build"
1616
setup-sdk:
17-
runs-on: ubuntu-18.04
17+
runs-on: ubuntu-22.04
1818

1919
steps:
2020
- name: Cache sdk
@@ -26,7 +26,7 @@ jobs:
2626
orix-sdk/**/*
2727
md2hlp/**/*
2828
orix-software/**/*
29-
key: ${{ runner.os }}-orix-sdk_
29+
key: ${{ secrets.CACHE_ID }}-orix-sdk_
3030

3131
- name: Checkout cc65
3232
if: steps.cache-sdk.outputs.cache-hit != 'true'
@@ -83,13 +83,15 @@ jobs:
8383
build:
8484
# The type of runner that the job will run on
8585
needs: setup-sdk
86-
runs-on: ubuntu-18.04
86+
runs-on: ubuntu-22.04
8787
outputs:
8888
version: ${{ steps.job_vars.outputs.VERSION }}
8989
repo_name: ${{ steps.job_vars.outputs.REPO_NAME }}
9090

9191
steps:
9292
- uses: actions/checkout@v2
93+
with:
94+
submodules: recursive
9395

9496
- name: Set job variables
9597
id: job_vars
@@ -105,7 +107,7 @@ jobs:
105107
orix-sdk/**/*
106108
md2hlp/**/*
107109
orix-software/**/*
108-
key: ${{ runner.os }}-orix-sdk_
110+
key: ${{ secrets.CACHE_ID }}-orix-sdk_
109111

110112
- name: Prepare environment for project
111113
run: mv cc65 ../ && mv orix-software ../ && mv orix-sdk ../ && mv md2hlp ../
@@ -129,7 +131,7 @@ jobs:
129131

130132
upload:
131133
needs: build
132-
runs-on: ubuntu-18.04
134+
runs-on: ubuntu-22.04
133135
defaults:
134136
run:
135137
shell: bash

‎.gitmodules‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
[submodule "deps/orix-sdk"]
22
path = deps/orix-sdk
3-
url = https://github.com/assinie/orix-sdk.git
3+
url = https://github.com/assinie/orix-sdk
4+
[submodule "orix-sdk"]
5+
path = orix-sdk
6+
url = https://github.com/assinie/orix-sdk
7+
[submodule "deps/deps"]
8+
path = deps/deps
9+
url = https://github.com/assinie/orix-sdk

‎CHANGELOG.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
# 2022.2
1+
# 2022.4
22

3-
Built in order to manage fd file open
3+
* Built in order to manage fd file open
4+
* built in relocation binary
5+
* displays more informations from format 2

‎Makefile‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@ endif
2121

2222
$(PROGRAM): $(SOURCE)
2323
mkdir build/bin -p
24-
$(CC) -o build/bin/file $(CFLAGS) $(LDFILES) $(SOURCE)
25-
#$(CC) -o 800 $(CFLAGS) $(LDFILES) $(SOURCE)
26-
#$(CC) -o 900 $(CFLAGS) --config deps/orix-sdk/cfg/telestrat_900.cfg $(LDFILES) $(SOURCE)
27-
24+
mkdir build/usr/share/man -p
25+
$(CC) -o 1000 $(CFLAGS) $(LDFILES) $(SOURCE) --start-addr 1000
26+
$(CC) -o 1256 $(CFLAGS) $(LDFILES) $(SOURCE) --start-addr 1256
2827
# Reloc
29-
#python deps/orix-sdk/bin/relocbin.py3 800 900 $(PROGRAM) 3
28+
chmod +x deps/orix-sdk/bin/relocbin.py3
29+
deps/orix-sdk/bin/relocbin.py3 -o build/bin/file -2 1000 1256
30+
cd docs && ../../md2hlp/src/md2hlp.py3 --file file.md --output ../build/usr/share/man/file.hlp && cd ..
3031

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2022.2
1+
2022.4

‎deps/orix-sdk‎

‎docs/file.hlp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
2+
 Shell 2022.2  Command: file
3+
 Shell 2022.2  Command: file test file type SYNOPSYS file myfile EXAMPLES file music.wav Detects file : orix, wav, gz, lz77, tape, vhi SOURCE  Src code : https://github.com/orix-software/file.git (Assembly and C)

src/man/file.md renamed to docs/file.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
# Command: file
22

3-
### test file type
3+
## test file type
44

55
## SYNOPSYS
6+
67
+ file myfile
78

89
## EXAMPLES
10+
911
+ file music.wav
1012

1113
Detects file : orix, wav, gz, lz77, tape, vhi
1214

1315
## SOURCE
14-
Src code : https://github.com/oric-software/file.git (Assembly and C)
16+
17+
Src code : https://github.com/orix-software/file.git (Assembly and C)

‎docs/md2hlp.cfg‎

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
[DEFAULT]
2+
;
3+
; Default options
4+
;
5+
Version = 2
6+
Break on hyphens = True
7+
8+
Head = ^A
9+
Paragraph =
10+
Initial Indent = _
11+
Subsequent Indent = _
12+
Align =
13+
List =
14+
15+
quote block = _^@^W
16+
17+
#bold = ^@^W,^G^P
18+
bold = ^T, ^P
19+
20+
italic = ^C,^G
21+
underline = ^F,^G
22+
strike_through = ^E,^G
23+
24+
#quote = ^@^V,^G^P
25+
quote = ^v,^v
26+
27+
# Orix n'a pas le jeu de caracteres graphiques
28+
#cite = ^IJ^H,
29+
cite = _|,
30+
31+
32+
link = ^T,^P
33+
34+
ink_black = ^@
35+
ink_red = ^A
36+
ink_green = ^B
37+
ink_yellow = ^C
38+
ink_blue = ^D
39+
ink_purple = ^E
40+
ink_cyan = ^F
41+
ink_white = ^G
42+
43+
simple_height = ^H
44+
simple_graph = ^I
45+
double_height = ^J
46+
blink_simple = ^L
47+
blink_double = ^N
48+
49+
paper_black = ^P
50+
paper_red = ^Q
51+
paper_green = ^R
52+
paper_yellow = ^S
53+
paper_blue = ^T
54+
paper_purple = ^U
55+
paper_cyan = ^V
56+
paper_white = ^W
57+
58+
59+
; ==============================================================================
60+
61+
62+
63+
[Heading1]
64+
;
65+
; Default for Heading 1
66+
;
67+
Head = __^J ^Q_Shell 2022.2 ^P___
68+
69+
[Heading3]
70+
;
71+
; Default for Heading 3
72+
;
73+
Head = ^L^C
74+
Align = ^
75+
76+
77+
78+
; ==============================================================================
79+
80+
81+
82+
[SYNOPSYS]
83+
;
84+
; Defaults for SYNOPSYS section
85+
;
86+
Initial Indent = ________
87+
Paragraph = ^B
88+
List = ^B
89+
90+
91+
92+
[DESCRIPTION]
93+
;
94+
; Defaults for DESCRIPTION section
95+
;
96+
Initial Indent = ______
97+
Subsequent Indent = __
98+
99+
[OPTIONS]
100+
; Defaults for OPTIONS section
101+
;
102+
Initial Indent = __^B
103+
Subsequent Indent = __^B
104+
List = ^A
105+
106+
107+
[EXAMPLES]
108+
;
109+
; Defaults for EXAMPLES section
110+
;
111+
Initial Indent = ________
112+
Paragraph = ^B
113+
List = ^B
114+
115+
116+
117+
[NOTES]
118+
;
119+
; Defaults for NOTES section
120+
;
121+
122+
123+
124+
[SOURCE]
125+
;
126+
; Defaults for SOURCE section
127+
;
128+
Break on hyphens = False
129+
Initial Indent = '^F '
130+
Subsequent Indent = '^F'
131+

‎run.Sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ ORICUTRON_PATH="/mnt/c/Users/plifp/OneDrive/oric/oricutron_wsl/oricutron"
33
CA65_INC=/usr/share/cc65/asminc/
44
mkdir build/bin/ -p
55
cl65 -o build/bin/file -ttelestrat src/file.c
6+
cl65 -o 1000 -ttelestrat src/file.c --start-addr \$800
7+
cl65 -o 1256 -ttelestrat src/file.c --start-addr \$900
8+
deps/orix-sdk/bin/relocbin.py3 -o build/bin/file -2 1000 1256
69
cp build/bin/file $ORICUTRON_PATH/sdcard/bin
710
cd $ORICUTRON_PATH
811
./oricutron

0 commit comments

Comments
 (0)