Skip to content

Commit 3743187

Browse files
authored
Merge pull request #4 from RISC-OS-Community/develop
Weekly cumulative set of changes
2 parents 5f484a5 + c02720f commit 3743187

File tree

10 files changed

+96
-40
lines changed

10 files changed

+96
-40
lines changed

.github/ISSUE_TEMPLATE/bug.md

+23-21
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ If applicable
2929
# Traceback
3030

3131
```
32-
Paste here logs here...
32+
Paste any logs here...
3333
```
3434

3535
# RISC OS Release
@@ -39,30 +39,32 @@ Type the full RISC OS release of the system where you had the issue, for example
3939
# Loaded Modules
4040

4141
```
42-
Paste here the list of loaded modules. The get the list open a TaskWindow and type: help modules, then copy and paste here the output.
42+
Paste here the list of loaded modules. To get the list open a TaskWindow and type: help modules, then copy and paste here the output.
4343
```
4444

4545
# Platform
4646

47-
[] - Acorn Archimedes 3x0/4x0 series (with ARM 3)
48-
[] - Acorn A5000
49-
[] - Acorn A30x0 or A4000 series (with ARM250)
50-
[] - Acorn RiscPC 600 (with ARM 610)
51-
[] - Acorn RiscPC 700 (with ARM 710)
52-
[] - Acorn RiscPC StrongARM
53-
[] - Acorn RiscPC with Kinetic or Castle RiscPC
54-
[] - Acorn A7000/A7000+ or Castle A7000+
55-
[] - Raspberry Pi1 (model A or B)
56-
[] - Raspberry Pi2 (all models)
57-
[] - Raspberry Pi3 (all models)
58-
[] - Raspberry Pi4 (Please specify the amount of RAM in the Other Field at the end of this list)
59-
[] - Raspberry Pi400 (Please specify the amount of RAM in the Other field at the end of this list)
60-
[] - i.MX6 / Mini.M
61-
[] - PineBook / ARMBook
62-
[] - PandaBoard
63-
[] - WandaBoard or Quadro
64-
[] - Titanium board
65-
Other:
47+
- [ ] Acorn Archimedes 3x0/4x0 series (with ARM 3)
48+
- [ ] Acorn A540
49+
- [ ] Acorn A5000
50+
- [ ] Acorn A30x0 or A4000 series (with ARM250)
51+
- [ ] Acorn RiscPC 600 (with ARM 610)
52+
- [ ] Acorn RiscPC 700 (with ARM 710)
53+
- [ ] Acorn RiscPC StrongARM
54+
- [ ] Acorn RiscPC with Kinetic or Castle RiscPC
55+
- [ ] Acorn A7000/A7000+ or Castle A7000+
56+
- [ ] Raspberry Pi0 (all models)
57+
- [ ] Raspberry Pi1 (model A or B)
58+
- [ ] Raspberry Pi2 (all models)
59+
- [ ] Raspberry Pi3 (all models)
60+
- [ ] Raspberry Pi4 (Please specify the amount of RAM in the Other Field at the end of this list)
61+
- [ ] Raspberry Pi400 (Please specify the amount of RAM in the Other field at the end of this list)
62+
- [ ] i.MX6 / Mini.M
63+
- [ ] PineBook / ARMBook
64+
- [ ] PandaBoard
65+
- [ ] Wandboard or Quadro
66+
- [ ] Titanium board
67+
- [ ] Other:
6668

6769
# Other possible details
6870
Feel free to use this part as a free file where to add info we may have not think of above, thanks.

.github/ISSUE_TEMPLATE/bug.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ body:
5959
- type: dropdown
6060
id: platform
6161
attributes:
62-
label: Platfrom
62+
label: Platform
6363
description: Which platform are you running RISC OS on?
6464
options:
6565
- Acorn A3000 (with ARM 3)
@@ -79,6 +79,7 @@ body:
7979
- Elesar Titanium
8080
- PandaBoard
8181
- PandaBoard ES
82+
- Raspberry Pi 0 all models
8283
- Raspberry Pi 1 model A or B
8384
- Raspberry Pi 2 all models
8485
- Raspberry Pi 3B+

.gitignore

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
.history/
2+
.vscode/
3+
*.swp
4+
*.swo
5+
*.orig
6+

CONTRIBUTING.md

+22-7
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,23 @@ Please make sure you have a github account before you start. Also we recommend t
6969

7070
- [Create a github account](https://github.com/join)
7171
- [Add an RSA key to your github account](https://docs.github.com/en/github/authenticating-to-github/adding-a-new-ssh-key-to-your-github-account)
72-
- [It's a good practice to protect your accoutn by adding 2 factors authentication](https://docs.github.com/en/github/authenticating-to-github/configuring-two-factor-authentication)
73-
- [Join RISC OS Community, by filling up this form and give us your github account name and what type of contribution you would like to purse](https://paolozaino.wordpress.com/contact/)
72+
- [It's a good practice to protect your account by adding 2 factors authentication](https://docs.github.com/en/github/authenticating-to-github/configuring-two-factor-authentication)
73+
74+
## How to join this community
75+
To provide fixes and improvement to code, you do not necessarily need to join, however if you want to help by reviewing code or other more involved tasks or just be part of one of the team to quickly pick an issue to work on, you'll need to join the community.
76+
77+
To join, make sure you have your pre-requisites in place and then use the link [here](https://paolozaino.wordpress.com/contact/) to let us know you want to join.
78+
79+
In the request specify your github account username and which teams you would like to join between:
80+
81+
- Admin Team
82+
- Code Reviews Team
83+
- Dev Team
84+
- Docs Team
85+
- Graphics Design Team
86+
- Audio Design Team
87+
88+
I you want, you can request to join multiple teams.
7489

7590
## Contributing to this project/repository
7691
To contribute is fairly easy:
@@ -87,7 +102,7 @@ In general you'd want to:
87102
- Create your branch using: `git branch -b branch-name`
88103
- we suggest that you name your branches following this pattern: `your_nick-what_type_of_changes_you_are_applying` with no spaces, you can use either dash or underscore to your preference
89104
* If instead you want to use Forking:
90-
- Fork a repo from here to your guthub account. If you're not familiar with forking then [here there are useful info for you](https://docs.github.com/en/github/getting-started-with-github/fork-a-repo)
105+
- Fork a repo from here to your github account. If you're not familiar with forking then [here there are useful info for you](https://docs.github.com/en/github/getting-started-with-github/fork-a-repo)
91106
* Start adding your changes
92107
- If you need on-line RISC OS documentation you can find it [here](https://www.riscosopen.org/wiki/documentation/show/HomePage)
93108
- Where applicable stick to RISC OS Style guide
@@ -98,7 +113,7 @@ In general you'd want to:
98113
- [Official Programmer Documentation from RISC OS Open](https://www.riscosopen.org/wiki/documentation/show/Programmer%20documentation)
99114
- For changes that may require patching RISC OS Code or modifying RISC OS code in whatever form please also refer to the [Official Developer Documentation from RISC OS Open](https://www.riscosopen.org/wiki/documentation/show/Developer%20documentation)
100115
- Make sure you keep the documentation and code comments up-to-date with your changes
101-
* When done with your changes add them to your local git using: `git add ./what-you-chaged`
116+
* When done with your changes add them to your local git using: `git add ./what-you-changed`
102117
* Commit your changes using: `git commit -m "commit message"`
103118
- Make sure your commit messages are clear and meaningful to help reviewers to understand what you were trying to achieve
104119
- When possible try to make small commits and Pull Requests so that the review process can be quicker
@@ -108,15 +123,15 @@ In general you'd want to:
108123

109124
# Coding Style for C Developers
110125

111-
One of the best an dmost complete C Coding style guide is the Linux Kernel C Coding Style Guide. So, for all general C related coding you should follow such set of rules (learning it can also help you a lot in your Software Engineering career), here is the Linux Coding Style guide for you: [Linux Coding Style Guide](https://www.kernel.org/doc/html/v5.10/process/coding-style.html).
126+
One of the best and most complete C Coding style guide is the Linux Kernel C Coding Style Guide. So, for all general C related coding you should follow such set of rules (learning it can also help you a lot in your Software Engineering career), here is the Linux Coding Style guide for you: [Linux Coding Style Guide](https://www.kernel.org/doc/html/v5.10/process/coding-style.html).
112127

113-
Given that RISC OS is not linux and has its own ToolBox you shall consider all colliding rules to be superseeded by the corresponding rule in the RISC OS Style Guide, here is a link to how to obtain it: [RISC OS Style Guide](https://www.riscosopen.org/wiki/documentation/show/Style%20Guide)
128+
Given that RISC OS is not linux and has its own ToolBox you shall consider all colliding rules to be superseded by the corresponding rule in the RISC OS Style Guide, here is a link to how to obtain it: [RISC OS Style Guide](https://www.riscosopen.org/wiki/documentation/show/Style%20Guide)
114129

115130
Also please have a look at the Programming Conventions hosted on RISCOS.info, [click here to read them](http://www.riscos.info/index.php/Programming_Conventions)
116131

117132
ROOL DDE Compiler support C89 and C99 (and they started to add support for C11), so, if you need, [here](http://www.sourceformat.com/pdf/c-standard-international.pdf) you can find a good C99 standard guide (precisely the Committee Draft — May 6, 2005 ISO/IEC 9899:TC2) you can use as reference while coding.
118133

119-
If instead you prefer to use GCC, RISC OS has ative support for GCC 4 and the GCCSDK Project (building C code for RISC OS using GCC on Linux) support GCC 4, GCC 8 and they started to add GCC 10. You can fin dmor einfo on about this on [RISCOS.info](https://www.riscos.info/index.php/Cross-compiling_software_with_GCCSDK)
134+
If instead you prefer to use GCC, RISC OS has native support for GCC 4 and the GCCSDK Project (building C code for RISC OS using GCC on Linux) support GCC 4, GCC 8 and they started to add GCC 10. You can find more info on about this on [RISCOS.info](https://www.riscos.info/index.php/Cross-compiling_software_with_GCCSDK)
120135

121136
# Extra info for BBC BASIC developers
122137

LICENSE

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2021 Lua.org, PUC-Rio.
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

Readme

-11
This file was deleted.

Readme.md

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# RiscLua
2+
RiscLua is a port to RISC OS of the Lua programming language. It differs from standard Lua in a few small details to be more conformant to RISC OS. The packaging of RiscLua has also varied. At one point it was a relocatable module, but it was found that error-handling was easier when packaged as an application.
3+
4+
Lua license is included [here](LICENSE)
5+
6+
Changes to Lua port for RISC OS are copyright Gavin Wraith and distributed under the same license as Lua original code (MIT license)
7+
8+
9+
## Status:
10+
```
11+
RiscLua 86 (VFP)
12+
Based on Lua 5.4.3
13+
Compiler: GCC 4.7.4
14+
Libraries: riscos, lpeg
15+
Numbers: 64bit integers, 64bit vfp
16+
package.path: rlua86:lib.?,?
17+
package.cpath: rlua86:solib.?/so,?/so
18+
date: 2021/09/18
19+
```
20+
21+
For more info please click [here](http://www.wra1th.plus.com/lua/risclua.html)
22+

doc/.gitkeep

Whitespace-only changes.

src/.gitkeep

Whitespace-only changes.

tests/.gitkeep

Whitespace-only changes.

0 commit comments

Comments
 (0)