Skip to content

Commit e53dd72

Browse files
pzainopzaino
committedMar 20, 2022
started to add DeskRes stuff, build process and improved README.md with instructions on how to build
1 parent 5a41db1 commit e53dd72

25 files changed

+228
-0
lines changed
 

‎Config,feb

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
| Build Setup
2+
3+
| To Use DDE uncomment the following lines:
4+
5+
Set Maker$BuildCmd MkDDE
6+
Set Maker$CleanCmd MkCLeanDDE
7+
8+
| To use GCC uncomment the following lines:
9+
10+
| Set Maker$BuildCmd MkGCC
11+
| Set Maker$CleanCmd MkCleanGCC

‎Mk,fd7

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
| Generic builder script to build stuff on RISC OS
2+
| by Paolo Fabio Zaino
3+
4+
echo ++++++++++++++++++++++++
5+
echo ++ Building ++
6+
echo ++++++++++++++++++++++++
7+
8+
/<Obey$Dir>.Config
9+
10+
Set Build$Root <Obey$Dir>
11+
WimpSlot -min 2048K
12+
13+
Set Build$Source 0
14+
IfThere <Build$Root>.src Then IfThere <Build$Root>.src.<Maker$Ext> Then Set Build$Source 1
15+
16+
If "<Build$Source>" = "1" Then Dir <Build$Root>.src
17+
If "<Build$Source>" = "1" Then /@.^.<Maker$BuildCmd>
18+
If "<Build$Source>" = "0" Then echo Skipped, no Sources Makefile found.
19+
20+
Unset Build$Source
21+
22+
echo
23+
echo ---------------------
24+
echo
25+
26+
echo ---------------------
27+
echo Building Tests:
28+
echo ---------------------
29+
30+
Set Build$Tests 0
31+
IfThere <Build$Root>.tests Then IFThere <Build$Root>.tests.<Maker$Ext> Then Set Build$Tests
32+
If "<Build$Tests>" = "1" Then Dir <Build$Root>.tests
33+
If "<Build$Tests>" = "1" Then /@.^.<Maker$CleanCmd>
34+
If "<Build$Tests>" = "0" Then echo Skipped, no Makefile for tests found.
35+
Unset Build$Tests
36+
37+
echo
38+
echo ---------------------
39+
echo
40+
41+
Dir <Build$Root>

‎MkClean,fd7

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
| Generic Build Cleaner for DDE on RISC OS
2+
| by Paolo Fabio Zaino
3+
4+
echo ++++++++++++++++++++++++
5+
echo ++ Cleaning ++
6+
echo ++++++++++++++++++++++++
7+
8+
Set Build$Root <Obey$Dir>
9+
WimpSlot -min 2048k
10+
11+
Set Build$Source 0
12+
IfThere <Build$Root>.src Then IfThere <Build$Root>.src.Makefile Then Set Build$Source 1
13+
14+
If "<Build$Source>" = "1" Then Dir <Build$Root>.src
15+
If "<Build$Source>" = "1" Then amu clean -D action=clean -f MakeFileDDE
16+
If "<Build$Source>" = "1" Then stripdepnd MakeFileDDE
17+
If "<Build$Source>" = "0" Then echo Skipped, no Sources Makefile found.
18+
19+
Unset Build$Source
20+
21+
echo
22+
echo ---------------------
23+
echo
24+
25+
echo ---------------------
26+
echo Cleaning Tests:
27+
echo ---------------------
28+
29+
Set Build$Tests 0
30+
IfThere <Build$Root>.tests Then IFThere <Build$Root>.tests.Makefile Then Set Build$Tests
31+
If "<Build$Tests>" = "1" Then Dir <Build$Root>.tests
32+
If "<Build$Tests>" = "1" Then amu clean THROWBACK=-throwback -D action=clean -f MakeFileDDE
33+
If "<Build$Tests>" = "1" Then stripdepnd MakeFileDDE
34+
35+
If "<Build$Tests>" = "0" Then echo Skipped, no Makefile for tests found.
36+
Unset Build$Tests
37+
38+
echo
39+
echo ---------------------
40+
echo
41+
42+
Dir <Build$Root>

‎MkDDE,feb

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
| Build using DDE tools:
2+
3+
amu all -D MAKER=amu action=all MKFILE=MakefileDDE THROWBACK=-throwback -f MakefileDDE

‎MkGCC,feb

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
| Build using GCC tools:
2+
3+
make all -D MAKER=make action=all MKFILE=MakefileGCC THROWBACK=-throwback -f MakefileGCC

‎README.md

+11
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,14 @@ When installed via PackMan, DeskRes will be installed in your RISC OS Boot Seque
3838
If you are installing it manually we recommend you to install it in your UniBoot in the `Resources` directory.
3939

4040
Even when using a distributed configuration (aka sharing DeskCfg via ShareFS) DeskRes should **always** be installed in your local UniBoot `Resources` on your RISC OS system. This also improve boot performance btw.
41+
42+
## How to build this repository
43+
44+
You can either use GCC suite or ROOL DDE to build this repository.
45+
46+
To use GCC (or ROOL DDE) edit the `Config` file and ensure you comment out the lines for the suite you do NOT wish to use to build the repo.
47+
48+
Before you start your build, ensure that RISC OS Filer has seen the Compilers suite you would like to use to build this repo (otherwise the build process will fail return errors like "File not found" etc).
49+
50+
To start the build, double click on the `Mk` file from a RISC OS Filer window.
51+

‎src/Makefile ‎src/DeskCfg/MakefileDDE

File renamed without changes.

‎src/DeskCfg/MakefileGCC

Whitespace-only changes.

‎src/DeskCfg/Res/!Boot,feb

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
| RISC OS Desktop Configuration (part of the DME Project)
2+
| (c) by Paolo Fabio Zaino all rights reserved
3+
| distributed under Apache 2.0 license
4+
|
5+
| Note: This directory should have a copy stored for each
6+
| user account on the system.
7+
8+
IconSprites <Obey$Dir>.!Sprites
9+
10+
| Check if we need to setup DeskCfg:
11+
If "<DeskCfg$Dir>" = "" Then Set Setup$DME 1 Else Set Setup$DME 0
12+
If "<Setup$DME>" = "1" Then Set DeskCfg$Dir <Obey$Dir>
13+
If "<Setup$DME>" = "1" Then Set DeskCfg$Path <DeskCfg$Dir>.DME.
14+
15+
| Check if the directory structure is correct:
16+
If "<Setup$DME>" = "1" Then /<DeskCfg$Dir>.Utils.Setup
17+
18+
Unset Setup$DME

‎src/DeskCfg/Res/!Run,feb

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
| RISC OS Desktop Configuration (part of the DME Project)
2+
| (c) by Paolo Fabio Zaino all rights reserved
3+
| distributed under Apache 2.0 license
4+
|
5+
| Note: This directory should have a copy stored for each
6+
| user account on the system.
7+
8+
IconSprites <Obey$Dir>.!Sprites
9+
10+
| User double-clicked on DeskCfg so force setup:
11+
Set DeskCfg$Dir <Obey$Dir>
12+
Set DeskCfg$Path <DeskCfg$Dir>.DME.
13+
14+
| Open Config directory:
15+
Filer_OpenDir DeskCfg:

‎src/DeskCfg/Res/!Sprites,ff9

548 Bytes
Binary file not shown.

‎src/DeskCfg/Res/!Sprites22,ff9

996 Bytes
Binary file not shown.

‎src/DeskCfg/Res/.gitkeep

Whitespace-only changes.

‎src/DeskCfg/Utils/.gitkeep

Whitespace-only changes.

‎src/DeskCfg/Utils/CDefConfig,ffb

647 Bytes
Binary file not shown.

‎src/DeskCfg/Utils/Setup,feb

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
| Setup DeskCfg
2+
3+
| Check base directories structure:
4+
IfThere DeskCfg:Components Then Else CDir DeskCfg:Components
5+
IfThere DeskCfg:Gadgets Then Else CDir DeskCfg:Gadgets
6+
IfThere DeskCfg:Gadgets.Desktop Then Else CDir DeskCfg:Gadgets.Desktop
7+
IfThere DeskCfg:Gadgets.Iconbar Then Else CDir DeskCfg:Gadgets.Iconbar
8+
IfThere DeskCfg:PlugIns Then Else CDir DeskCfg:PlugIns
9+
10+
| Check DeskCfg requirements:
11+
IfThere DeskCfg:Components.DeskCfg Then Else CDir DeskCfg:Components.DeskCfg
12+
13+
| Build Default Configuration
14+
IfThere DeskCfg:Components.DeskCfg.Config Then Set Build$Config 0 Else Set Build$Config 1
15+
If "<Build$Config>" = "1" Then /<DeskCfg$Dir>.Utils.CDefConfig
16+
If "<Build$Config>" = "1" Then /DeskCfg:Components.DeskCfg.Config
17+
Unset Build$Config

‎src/DeskRes/MakefileDDE

Whitespace-only changes.

‎src/DeskRes/MakefileGCC

Whitespace-only changes.

‎src/DeskRes/Res/!Boot,feb

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
| RISC OS Desktop Resources (part of the DME Project)
2+
| (c) by Paolo Fabio Zaino all rights reserved
3+
| distributed under Apache 2.0 license
4+
|
5+
| Note: This directory should be stored in !Boot.Resources
6+
7+
IconSprites <Obey$Dir>.!Sprites
8+
9+
| Set the correct path to find !DeskCfg
10+
UnSet DeskCfg$Choices
11+
Set DeskCfg$Choices <Choices$Dir>
12+
If "<DeskCfg$Choices>" = "" AND "<Boot$OSVersion>" = "430" Then Set DeskCfg$Choices Boot:Choices.User.Single
13+
If "<DeskCfg$Choices>" = "" AND "<Boot$OSVersion>" = "600" Then Set DeskCfg$Choices Boot:Choices.User.Single
14+
If "<DeskCfg$Choices>" = "" Then Set DeskCfg$Choices Boot:Choices
15+
If "<DeskCfg$Dir>" = "" Then Repeat Filer_Boot <DeskCfg$Choices> -Applications -Tasks
16+
Unset DeskCfg$Choices
17+
18+
| Check if DeskCfg has been seen by the Filer:
19+
If "<DeskCfg$Dir>" = "" Then Error This Application requires that the Filer has Seen first !DeskCfg and it appears that !DeskCfg has not been seen by the filer!
20+
21+
| Set the current ObeyDir as DeskRes path
22+
Set DeskRes$Dir <Obey$Dir>
23+
Set DeskRes$Path <DeskRes$Dir>.DME.

‎src/DeskRes/Res/!Run,feb

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
| RISC OS Desktop Settings (part of the DME Project)
2+
| (c) by Paolo Fabio Zaino all rights reserved
3+
| distributed under Apache 2.0 license
4+
|
5+
| Note: This directory should be stored in !Boot.Resources
6+
7+
IconSprites <Obey$Dir>.!Sprites
8+
9+
| Set the correct path to find !DeskCfg
10+
UnSet DeskCfg$Choices
11+
Set DeskCfg$Choices <Choices$Dir>
12+
If "<DeskCfg$Choices>" = "" AND "<Boot$OSVersion>" = "430" Then Set DeskCfg$Choices Boot:Choices.User.Single
13+
If "<DeskCfg$Choices>" = "" AND "<Boot$OSVersion>" = "600" Then Set DeskCfg$Choices Boot:Choices.User.Single
14+
If "<DeskCfg$Choices>" = "" Then Set DeskCfg$Choices Boot:Choices
15+
If "<DeskCfg$Dir>" = "" Then Repeat Filer_Boot <DeskCfg$Choices> -Applications -Tasks
16+
Unset DeskCfg$Choices
17+
18+
| Check if DeskCfg has been seen by the Filer:
19+
If "<DeskCfg$Dir>" = "" Then Error This Application requires that the Filer has Seen first !DeskCfg and it appears that !DeskCfg has not been seen by the filer!
20+
21+
| Set the current ObeyDir as DeskRes path
22+
Set DeskRes$Dir <Obey$Dir>
23+
Set DeskRes$Path <DeskRes$Dir>.DME.
24+
25+
| Open the components directory
26+
Filer_OpenDir <DeskRes$Dir>.DME

‎src/DeskRes/Res/!Sprites,ff9

548 Bytes
Binary file not shown.

‎src/DeskRes/Res/!Sprites22,ff9

996 Bytes
Binary file not shown.

‎src/DeskRes/Res/.gitkeep

Whitespace-only changes.

‎src/DeskRes/Utils/.gitkeep

Whitespace-only changes.

‎src/MakefileDDE

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Master Makefile
2+
# This Makefile is designed to build/clean
3+
# all the components in the repository
4+
# Copyright (c) by Paolo Fabio Zaino
5+
# All rights reserved, distributed under Apache 2.0 license
6+
7+
#MAKER:=amu
8+
9+
COMPS:=DeskCfg DeskRes
10+
11+
$(COMPS):
12+
dir @.$@
13+
$(MAKER) $(action) -f $(MKFILE)
14+
dir ^
15+
16+
all: $(COMPS)
17+
18+
clean: $(COMPS)

0 commit comments

Comments
 (0)
Please sign in to comment.