Menu
▾
▴
ro-oslib-commits — list to notify of all commits to OSLib
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(39) |
Dec
(23) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(4) |
Feb
(8) |
Mar
|
Apr
|
May
|
Jun
(25) |
Jul
(2) |
Aug
(3) |
Sep
(9) |
Oct
|
Nov
(2) |
Dec
(21) |
| 2004 |
Jan
(57) |
Feb
|
Mar
|
Apr
|
May
(49) |
Jun
|
Jul
(8) |
Aug
(5) |
Sep
(2) |
Oct
(2) |
Nov
(2) |
Dec
|
| 2005 |
Jan
(2) |
Feb
|
Mar
(12) |
Apr
|
May
(5) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(17) |
| 2006 |
Jan
(5) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
(3) |
Jul
(4) |
Aug
(5) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
(3) |
Feb
|
Mar
|
Apr
(18) |
May
(13) |
Jun
(17) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(4) |
Dec
|
|
From: <th...@us...> - 2007-11-29 21:26:28
|
Revision: 292
http://ro-oslib.svn.sourceforge.net/ro-oslib/?rev=292&view=rev
Author: thughes
Date: 2007-11-29 13:26:14 -0800 (Thu, 29 Nov 2007)
Log Message:
-----------
Add support to Toolbox_ShowObject for showing an object as a child
window. (20071129-1, Christian Ludlam)
Modified Paths:
--------------
trunk/!OSLib/Source/Toolbox/oslib/Toolbox.swi
trunk/!OSLib/docs/ChangeLog
Modified: trunk/!OSLib/Source/Toolbox/oslib/Toolbox.swi
===================================================================
--- trunk/!OSLib/Source/Toolbox/oslib/Toolbox.swi 2007-11-19 17:19:03 UTC (rev 291)
+++ trunk/!OSLib/Source/Toolbox/oslib/Toolbox.swi 2007-11-29 21:26:14 UTC (rev 292)
@@ -14,10 +14,14 @@
specifying a position",
Toolbox_Full = .Struct (OS_Box: visible, .Int: xscroll, .Int: yscroll,
Wimp_W: next) "One way of specifying a position",
+ Toolbox_Child = .Struct (OS_Box: visible, .Int: xscroll, .Int: yscroll,
+ Wimp_W: next, Wimp_WindowFlags: flags, Wimp_W: parent,
+ Wimp_WindowNestingFlags: linkage) "One way of specifying a position",
Toolbox_Position =
.Union
( OS_Coord: top_left,
- Toolbox_Full: full "A distributed union for each object type"
+ Toolbox_Full: full "A distributed union for each object type",
+ Toolbox_Child: child
) "One way of specifying a position";
CONST
@@ -206,8 +210,9 @@
// ) );
TYPE Toolbox_ShowFlags = .Bits;
-CONST Toolbox_ShowAsMenu = Toolbox_ShowFlags: 1,
- Toolbox_ShowAsSubMenu = Toolbox_ShowFlags: 2;
+CONST Toolbox_ShowAsMenu = Toolbox_ShowFlags: 1,
+ Toolbox_ShowAsSubMenu = Toolbox_ShowFlags: 2,
+ Toolbox_ShowAsChildWindow = Toolbox_ShowFlags: 4;
SWI Toolbox_ShowObject =
( NUMBER 0x44EC3 "Shows an object on the screen",
ENTRY
Modified: trunk/!OSLib/docs/ChangeLog
===================================================================
--- trunk/!OSLib/docs/ChangeLog 2007-11-19 17:19:03 UTC (rev 291)
+++ trunk/!OSLib/docs/ChangeLog 2007-11-29 21:26:14 UTC (rev 292)
@@ -14,7 +14,9 @@
build system (currently only supporting cross-compilation); renamed
top !OsLib into !OSLib.
(20071119-1, John Tytgat / John-Mark Bell)
-
+ - Add support to Toolbox_ShowObject for showing an object as a
+ child window. (20071129-1, Christian Ludlam)
+
* Bug Fixes:
- Macro.h/Macro.Hdr: the macro Bool didn't write its result to first
parameter but modified the 2nd one. (20070505-1, John Tytgat)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <th...@us...> - 2007-11-18 17:03:39
|
Revision: 290
http://ro-oslib.svn.sourceforge.net/ro-oslib/?rev=290&view=rev
Author: thughes
Date: 2007-11-18 09:03:37 -0800 (Sun, 18 Nov 2007)
Log Message:
-----------
Added support for OS_AMBControl based on reverse engineering
of it's behaviour. (20071118-3, Graham Shaw)
Modified Paths:
--------------
trunk/!OsLib/Source/Core/oslib/OS.swi
trunk/!OsLib/docs/ChangeLog
Modified: trunk/!OsLib/Source/Core/oslib/OS.swi
===================================================================
--- trunk/!OsLib/Source/Core/oslib/OS.swi 2007-11-18 16:35:14 UTC (rev 289)
+++ trunk/!OsLib/Source/Core/oslib/OS.swi 2007-11-18 17:03:37 UTC (rev 290)
@@ -2459,9 +2459,119 @@
SWI OS_CallASWI = //RO3.7+ Not APCS-compliant
( NUMBER 0x6F "Calls a run-time determined SWI - RISC O S 3.7+", ABSENT);
+
+TYPE OS_AMB = .Int "Application memory block";
+
+TYPE OS_AMBControlFlags = .Bits;
+CONST OS_GivenAMBPageRange = OS_AMBControlFlags: %100000000;
+
SWI OS_AMBControl = //RO3.7+
- ( NUMBER 0x70 "For system use only - RISC O S 3.7+", ABSENT);
+ ( NUMBER 0x70 "Performs operations on application memory blocks -
+ see individual reason codes - RISC O S 3.7+", ABSENT);
+SWI OSAMBControl_Create =
+ ( NUMBER 0x70,
+ ENTRY
+ ( R0 # 0 "Creates an application memory block - RISC O S 3.7+",
+ R1 = .Int: pages
+ ),
+ EXIT
+ ( R1 = .Int: pages_out,
+ R2 = OS_AMB: amb
+ )
+ );
+
+SWI OSAMBControl_Delete =
+ ( NUMBER 0x70,
+ ENTRY
+ ( R0 # 1 "Removes an application memory block - RISC O S 3.7+",
+ R2 = OS_AMB: amb
+ )
+ );
+
+SWI OSAMBControl_Resize =
+ ( NUMBER 0x70,
+ ENTRY
+ ( R0 # 2 "Extends or shrinks an application memory block -
+ RISC O S 3.7+",
+ R1 = .Int: pages,
+ R2 = OS_AMB: amb
+ ),
+ EXIT
+ ( R1 = .Int: pages_out,
+ R2 = OS_AMB: amb_out,
+ R3 = .Int: pages_before
+ )
+ );
+
+SWI OSAMBControl_Map =
+ ( NUMBER 0x70,
+ ENTRY
+ ( R0 # 3 "Map an application memory block into virtual memory -
+ RISC O S 3.7+",
+ R0 | OS_AMBControlFlags: flags,
+ R1 -> .Data: base_address,
+ R2 = OS_AMB: amb,
+ R3 = .Int: start,
+ R4 = .Int: end
+ )
+ );
+
+SWI OSAMBControl_Info =
+ ( NUMBER 0x70,
+ ENTRY
+ ( R0 # 4 "Read information about an application memory block -
+ RISC O S 3.7+",
+ R2 = OS_AMB: amb
+ ),
+ EXIT
+ ( R1 -> .Data: base_address,
+ R3 = .Int: pages
+ )
+ );
+
+TYPE OS_LazySwapping = .Int;
+CONST
+ OS_LazySwappingDisable = OS_LazySwapping: 0,
+ OS_LazySwappingEnable = OS_LazySwapping: 1,
+ OS_LazySwappingRead = OS_LazySwapping: -1;
+
+SWI OSAMBControl_LazySwapping =
+ ( NUMBER 0x70,
+ ENTRY
+ ( R0 # 5 "Read or change lazy task swapping state - RISC O S 3.7+",
+ R1 = OS_LazySwapping: action
+ ),
+ EXIT
+ ( R1 = OS_LazySwapping: state
+ )
+ );
+
+TYPE OS_AMBFlags = .Bits;
+
+TYPE OS_AMBInfo =
+ .Struct
+ ( OS_AMB: amb,
+ .Int: pages,
+ .Ref .Data: base_address,
+ OS_AMBFlags: flags
+ );
+
+TYPE OS_AMBTable =
+ .Struct
+ ( .Int: count,
+ OS_AMB: current_amb,
+ OS_AMBInfo: entries ...
+ );
+
+SWI OSAMBControl_Enumerate =
+ ( NUMBER 0x70,
+ ENTRY
+ ( R0 # 8 "Enumerate application memory blocks - RISC O S 3.7+",
+ R1 = .Ref OS_AMBTable: table
+ )
+ );
+
SWI OS_CallASWIR12 = //RO3.7+ Not APCS-Compliant
( NUMBER 0x71 "Calls a run-time determined SWI - RISC O S 3.7+", ABSENT);
// ( NUMBER 0x71 "Calls a run-time determined SWI - RISC O S 3.7+",
Modified: trunk/!OsLib/docs/ChangeLog
===================================================================
--- trunk/!OsLib/docs/ChangeLog 2007-11-18 16:35:14 UTC (rev 289)
+++ trunk/!OsLib/docs/ChangeLog 2007-11-18 17:03:37 UTC (rev 290)
@@ -6,6 +6,8 @@
----------
* Enhancemnts
+ - Added support for OS_AMBControl based on reverse engineering
+ of it's behaviour. (20071118-3, Graham Shaw)
- Added support for OS_ClaimSWI, OS_ReleaseSWI and OS_ClaimOSSWI
based on usenet discussion (http://tinyurl.com/2vfp8k).
(20071118-2, Graham Shaw)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <th...@us...> - 2007-11-18 16:35:16
|
Revision: 289
http://ro-oslib.svn.sourceforge.net/ro-oslib/?rev=289&view=rev
Author: thughes
Date: 2007-11-18 08:35:14 -0800 (Sun, 18 Nov 2007)
Log Message:
-----------
Added support for OS_ClaimSWI, OS_ReleaseSWI and OS_ClaimOSSWI based on
usenet discussion (http://tinyurl.com/2vfp8k). (20071118-2, Graham Shaw)
Modified Paths:
--------------
trunk/!OsLib/Source/Core/oslib/OS.swi
trunk/!OsLib/docs/ChangeLog
Modified: trunk/!OsLib/Source/Core/oslib/OS.swi
===================================================================
--- trunk/!OsLib/Source/Core/oslib/OS.swi 2007-11-18 16:09:19 UTC (rev 288)
+++ trunk/!OsLib/Source/Core/oslib/OS.swi 2007-11-18 16:35:14 UTC (rev 289)
@@ -1884,6 +1884,24 @@
R1! = OS_ColourNumber: colour_number
) );
+SWI OS_ClaimSWI =
+ ( NUMBER 0x62 "Claims a software interrupt",
+ ENTRY
+ ( R0 = .Int: swi,
+ R1 -> .Asm: routine,
+ R2 = .Ref .Data: handle //should be int, like other handles
+ )
+ );
+
+SWI OS_ReleaseSWI =
+ ( NUMBER 0x63 "Release a software interrupt",
+ ENTRY
+ ( R0 = .Int: swi,
+ R1 -> .Asm: routine,
+ R2 = .Ref .Data: handle //should be int, like other handles
+ )
+ );
+
TYPE OS_PointerType = .Int;
CONST
PointerV_TypeQuadrature = OS_PointerType: 0,
@@ -2482,6 +2500,34 @@
SWI OS_EnterUSR26 = //RO4+
( NUMBER 0x74 "Enter 26 bit user mode - RISC O S 4+");
+SWI OS_ClaimOSSWI =
+ ( NUMBER 0x77 "Claims or releases a software interrupt -
+ see individual reason codes", ABSENT);
+
+SWI OSClaimOSSWI_Claim =
+ ( NUMBER 0x77,
+ ENTRY
+ ( R0 # 0 "Claims a software interrupt",
+ R1 = .Int: swi,
+ R2 -> .Asm: routine,
+ R3 = .Ref .Data: handle //should be int, like other handles
+ ),
+ EXIT
+ ( R2 -> .Asm: old_routine,
+ R3 = .Ref .Data: old_handle
+ )
+ );
+
+SWI OSClaimOSSWI_Release =
+ ( NUMBER 0x77,
+ ENTRY
+ ( R0 # 1 "Releases a software interrupt",
+ R1 = .Int: swi,
+ R2 -> .Asm: routine,
+ R3 = .Ref .Data: handle //should be int, like other handles
+ )
+ );
+
TYPE OS_HardwareFlags = .Bits;
SWI OS_Hardware =
Modified: trunk/!OsLib/docs/ChangeLog
===================================================================
--- trunk/!OsLib/docs/ChangeLog 2007-11-18 16:09:19 UTC (rev 288)
+++ trunk/!OsLib/docs/ChangeLog 2007-11-18 16:35:14 UTC (rev 289)
@@ -5,15 +5,20 @@
OSLib 7.00 - In development
----------
-* Build Environment
- - OSLib sources are now on sourceforge.net SVN managed i.s.o. CVS.
- (20070414-1, John Tytgat)
+* Enhancemnts
+ - Added support for OS_ClaimSWI, OS_ReleaseSWI and OS_ClaimOSSWI
+ based on usenet discussion (http://tinyurl.com/2vfp8k).
+ (20071118-2, Graham Shaw)
* Bug Fixes
- Corrected register usage for PDumper_TidyJob and definition of
PDumper_Format and added some new format values based on a news
posting (http://tinyurl.com/2wofsw). (20071118-1, Richard Spencer)
+* Build Environment
+ - OSLib sources are now on sourceforge.net SVN managed i.s.o. CVS.
+ (20070414-1, John Tytgat)
+
OSLib 6.90 - Tony van der Hoff 02/01/2007
----------
* Enhancemnts
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <th...@us...> - 2007-11-18 16:09:25
|
Revision: 288
http://ro-oslib.svn.sourceforge.net/ro-oslib/?rev=288&view=rev
Author: thughes
Date: 2007-11-18 08:09:19 -0800 (Sun, 18 Nov 2007)
Log Message:
-----------
Corrected register usage for PDumper_TidyJob and definition of
PDumper_Format and added some new format values based on a news
posting (http://tinyurl.com/2wofsw). (20071118-1, Richard Spencer)
Modified Paths:
--------------
trunk/!OsLib/Source/User/oslib/PDumper.swi
trunk/!OsLib/docs/ChangeLog
Modified: trunk/!OsLib/Source/User/oslib/PDumper.swi
===================================================================
--- trunk/!OsLib/Source/User/oslib/PDumper.swi 2007-11-18 16:06:32 UTC (rev 287)
+++ trunk/!OsLib/Source/User/oslib/PDumper.swi 2007-11-18 16:09:19 UTC (rev 288)
@@ -45,12 +45,18 @@
PDumper_FeatureHalftoneColour = PDumper_Features: %100,
PDumper_FeatureDiffusedColour = PDumper_Features: %1000;
-TYPE PDumper_Format = .Bits;
+TYPE PDumper_Format = .Int;
CONST
- PDumper_FormatHalftoneGrey = PDumper_Format: %1,
- PDumper_FormatDiffusedGrey = PDumper_Format: %10,
- PDumper_FormatHalftoneColour = PDumper_Format: %100,
- PDumper_FormatDiffusedColour = PDumper_Format: %1000;
+ PDumper_FormatHalftoneGrey = PDumper_Format: 0,
+ PDumper_FormatDiffusedGrey = PDumper_Format: 1,
+ PDumper_FormatHalftoneColour = PDumper_Format: 2,
+ PDumper_FormatDiffusedColour = PDumper_Format: 3,
+ PDumper_FormatHalftoneMultipassColour = PDumper_Format: 4,
+ PDumper_FormatDiffusedMultipassColour = PDumper_Format: 5,
+ PDumper_FormatHalftone16BppColour = PDumper_Format: 6,
+ PDumper_FormatDiffused16BppColour = PDumper_Format: 7,
+ PDumper_FormatHalftone32BppColour = PDumper_Format: 8,
+ PDumper_FormatDiffused32BppColour = PDumper_Format: 9;
TYPE PDumper_HalftoneFlags = .Bits;
CONST
@@ -76,7 +82,7 @@
R1 = PDumper_JobFlags: flags, R2 -> .String: palette_file_name));
SWI PDumper_TidyJob = (NUMBER 0x41B05 "Releases workspace used for a job",
ENTRY (R0 = .Ref .Int: anchor,
- R3 -> .Int: tags, R2 = .Bool: end_of_document));
+ R1 -> .Int: tags, R2 = .Bool: end_of_document));
SWI PDumper_SetColour = (NUMBER 0x41B06 "Processes the colour setting
required by the printer dumper", ENTRY (R0 = .Ref .Int: anchor,
R1 = OS_Colour: colour, R2 = PDumper_StripType: strip_type_and_pass_no,
Modified: trunk/!OsLib/docs/ChangeLog
===================================================================
--- trunk/!OsLib/docs/ChangeLog 2007-11-18 16:06:32 UTC (rev 287)
+++ trunk/!OsLib/docs/ChangeLog 2007-11-18 16:09:19 UTC (rev 288)
@@ -9,6 +9,11 @@
- OSLib sources are now on sourceforge.net SVN managed i.s.o. CVS.
(20070414-1, John Tytgat)
+* Bug Fixes
+ - Corrected register usage for PDumper_TidyJob and definition of
+ PDumper_Format and added some new format values based on a news
+ posting (http://tinyurl.com/2wofsw). (20071118-1, Richard Spencer)
+
OSLib 6.90 - Tony van der Hoff 02/01/2007
----------
* Enhancemnts
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2007-06-21 00:41:28
|
Revision: 284
http://ro-oslib.svn.sourceforge.net/ro-oslib/?rev=284&view=rev
Author: jtytgat
Date: 2007-06-20 17:41:27 -0700 (Wed, 20 Jun 2007)
Log Message:
-----------
Make clean remove everything
Modified Paths:
--------------
branches/simplified-build/!OSLib/Source/Test/Test/Makefile
Modified: branches/simplified-build/!OSLib/Source/Test/Test/Makefile
===================================================================
--- branches/simplified-build/!OSLib/Source/Test/Test/Makefile 2007-06-21 00:30:05 UTC (rev 283)
+++ branches/simplified-build/!OSLib/Source/Test/Test/Makefile 2007-06-21 00:41:27 UTC (rev 284)
@@ -9,7 +9,7 @@
all: test_c$(EXEEXT) test_cpp$(EXEEXT) test_s$(EXEEXT)
clean:
- -$(RM) test_c,ff8 test_c,e1f test_cpp,ff8 test_cpp,e1f test_s,ff8 test_s,e1f test_s$(EXEEXT).o small_test.o all_oslib.h all_oslib.Hdr
+ -$(RM) test_c,ff8 test_c,e1f test_cpp,ff8 test_cpp,e1f test_s,ff8 test_s,e1f test_s,ff8.o test_s,e1f.o small_test.o all_oslib.h all_oslib.Hdr
test_c$(EXEEXT): test.c small_test.o all_oslib.h
$(CC) -o $@ -I$(TOPHEADERDIR) test.c small_test.o $(OSLIBLIB)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2007-06-21 00:30:11
|
Revision: 283
http://ro-oslib.svn.sourceforge.net/ro-oslib/?rev=283&view=rev
Author: jtytgat
Date: 2007-06-20 17:30:05 -0700 (Wed, 20 Jun 2007)
Log Message:
-----------
Make sure a 'make clean' cleans all intermediate files except the ones in the Release directory
Modified Paths:
--------------
branches/simplified-build/!OSLib/Source/Makefile
branches/simplified-build/!OSLib/Source/Makefile.setup.CROSSGCC_AOF
branches/simplified-build/!OSLib/Source/Makefile.setup.CROSSGCC_ELF
branches/simplified-build/!OSLib/Source/OSLibSupport/Makefile
branches/simplified-build/!OSLib/Source/Test/Test/Makefile
branches/simplified-build/!OSLib/Source/Test/readvarval/Makefile
Modified: branches/simplified-build/!OSLib/Source/Makefile
===================================================================
--- branches/simplified-build/!OSLib/Source/Makefile 2007-06-20 23:58:10 UTC (rev 282)
+++ branches/simplified-build/!OSLib/Source/Makefile 2007-06-21 00:30:05 UTC (rev 283)
@@ -79,6 +79,7 @@
$(MAKE) -C Toolbox/oslib $@
$(MAKE) -C User/oslib $@
-$(RM) $(BUILDDIR)
+ $(MAKE) -C OSLibSupport $@
$(MAKE) -C Test $@
oslib: $(OSLIBLIB)
Modified: branches/simplified-build/!OSLib/Source/Makefile.setup.CROSSGCC_AOF
===================================================================
--- branches/simplified-build/!OSLib/Source/Makefile.setup.CROSSGCC_AOF 2007-06-20 23:58:10 UTC (rev 282)
+++ branches/simplified-build/!OSLib/Source/Makefile.setup.CROSSGCC_AOF 2007-06-21 00:30:05 UTC (rev 283)
@@ -37,6 +37,7 @@
export INSTALL := $(GCCSDK_INSTALL_ENV)/ro-install
export ASMEXT := .asm
+export EXEEXT := ,ff8
export LIBSUFFIX := o
export OSLIBLIB := $(BUILDDIR)/OSLib32.$(LIBSUFFIX)
Modified: branches/simplified-build/!OSLib/Source/Makefile.setup.CROSSGCC_ELF
===================================================================
--- branches/simplified-build/!OSLib/Source/Makefile.setup.CROSSGCC_ELF 2007-06-20 23:58:10 UTC (rev 282)
+++ branches/simplified-build/!OSLib/Source/Makefile.setup.CROSSGCC_ELF 2007-06-21 00:30:05 UTC (rev 283)
@@ -37,6 +37,7 @@
export INSTALL := $(GCCSDK_INSTALL_ENV)/ro-install
export ASMEXT := .gas
+export EXEEXT := ,e1f
export LIBSUFFIX := a
export OSLIBLIB := $(BUILDDIR)/libOSLib32.$(LIBSUFFIX)
Modified: branches/simplified-build/!OSLib/Source/OSLibSupport/Makefile
===================================================================
--- branches/simplified-build/!OSLib/Source/OSLibSupport/Makefile 2007-06-20 23:58:10 UTC (rev 282)
+++ branches/simplified-build/!OSLib/Source/OSLibSupport/Makefile 2007-06-21 00:30:05 UTC (rev 283)
@@ -1,4 +1,4 @@
-# ...
+# Build various support routines for OSLib users.
SUBDIRS = Choices_ Err_ Events_ Message_ Task_ trace_ X_
Modified: branches/simplified-build/!OSLib/Source/Test/Test/Makefile
===================================================================
--- branches/simplified-build/!OSLib/Source/Test/Test/Makefile 2007-06-20 23:58:10 UTC (rev 282)
+++ branches/simplified-build/!OSLib/Source/Test/Test/Makefile 2007-06-21 00:30:05 UTC (rev 283)
@@ -1,22 +1,23 @@
-# ...
+# Test the inclusion of all C and assembler headers (the former in C and C++
+# programs.
ALL_CHEADERS := $(wildcard $(HEADERDIR)/*.h)
ALL_ASMHEADERS := $(wildcard $(HEADERDIR)/*.Hdr)
.PHONY: all clean
-all: test_c test_cpp test_s
+all: test_c$(EXEEXT) test_cpp$(EXEEXT) test_s$(EXEEXT)
clean:
- -$(RM) test_c test_cpp test_s small_test.o all_oslib.h all_oslib.Hdr
+ -$(RM) test_c,ff8 test_c,e1f test_cpp,ff8 test_cpp,e1f test_s,ff8 test_s,e1f test_s$(EXEEXT).o small_test.o all_oslib.h all_oslib.Hdr
-test_c: test.c small_test.o all_oslib.h
+test_c$(EXEEXT): test.c small_test.o all_oslib.h
$(CC) -o $@ -I$(TOPHEADERDIR) test.c small_test.o $(OSLIBLIB)
-test_cpp: test.cc all_oslib.h
+test_cpp$(EXEEXT): test.cc all_oslib.h
$(CXX) -o $@ -I$(TOPHEADERDIR) $< $(OSLIBLIB)
-test_s: test$(ASMEXT) all_oslib.Hdr
+test_s$(EXEEXT): test$(ASMEXT) all_oslib.Hdr
$(AS) -o $@.o -I$(TOPHEADERDIR) $<
$(CC) -o $@ $@.o
Modified: branches/simplified-build/!OSLib/Source/Test/readvarval/Makefile
===================================================================
--- branches/simplified-build/!OSLib/Source/Test/readvarval/Makefile 2007-06-20 23:58:10 UTC (rev 282)
+++ branches/simplified-build/!OSLib/Source/Test/readvarval/Makefile 2007-06-21 00:30:05 UTC (rev 283)
@@ -1,13 +1,13 @@
-# ...
+# Test os_read_var_val_size interface.
.PHONY: all clean
-all: readvarval
+all: readvarval$(EXEEXT)
clean:
- -$(RM) readvarval readvarval.o
+ -$(RM) readvarval,ff8 readvarval,e1f readvarval.o
-readvarval: readvarval.o $(OSLIBLIB)
+readvarval$(EXEEXT): readvarval.o $(OSLIBLIB)
$(CC) -o $@ $^
.SUFFIXES: .o .c
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2007-06-20 23:58:12
|
Revision: 282
http://ro-oslib.svn.sourceforge.net/ro-oslib/?rev=282&view=rev
Author: jtytgat
Date: 2007-06-20 16:58:10 -0700 (Wed, 20 Jun 2007)
Log Message:
-----------
Ignore ELF binaries
Property Changed:
----------------
branches/simplified-build/!OSLib/Source/Test/readvarval/
Property changes on: branches/simplified-build/!OSLib/Source/Test/readvarval
___________________________________________________________________
Name: svn:ignore
- bin
o
*.o
*.o,ffd
tree,ffd
*,ff8
+ *,ff8
*,e1f
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2007-06-20 23:57:33
|
Revision: 281
http://ro-oslib.svn.sourceforge.net/ro-oslib/?rev=281&view=rev
Author: jtytgat
Date: 2007-06-20 16:57:31 -0700 (Wed, 20 Jun 2007)
Log Message:
-----------
Ignore ELF binaries & call the assembler routines 'main' so that they are called from C runtime library.
Modified Paths:
--------------
branches/simplified-build/!OSLib/Source/Test/Test/test.asm
branches/simplified-build/!OSLib/Source/Test/Test/test.gas
Property Changed:
----------------
branches/simplified-build/!OSLib/Source/Test/Test/
Property changes on: branches/simplified-build/!OSLib/Source/Test/Test
___________________________________________________________________
Name: svn:ignore
- *,ff8
all_oslib.h
all_oslib.Hdr
+ *,ff8
*,e1f
all_oslib.h
all_oslib.Hdr
Modified: branches/simplified-build/!OSLib/Source/Test/Test/test.asm
===================================================================
--- branches/simplified-build/!OSLib/Source/Test/Test/test.asm 2007-06-20 23:56:11 UTC (rev 280)
+++ branches/simplified-build/!OSLib/Source/Test/Test/test.asm 2007-06-20 23:57:31 UTC (rev 281)
@@ -4,22 +4,13 @@
EXPORT |_main|
AREA code, CODE
- ENTRY
-|_main| SWI XOS_GetEnv ; get the environment
- SWIVS OS_GenerateError ; exit on error
-
- MOV sp, r1 ; set up a stack
-
- STMFD sp!, {lr} ; save the return address
+|main| STMFD sp!, {lr} ; save the return address
ADR R0, message ; write the message std out
SWI OS_Write0
-
SWI OS_NewLine
- LDMFD sp!, {lr}
+ LDMFD sp!, {pc}
- SWI OS_Exit ; return
-
message = "Hello World from ObjAsm",0
END
Modified: branches/simplified-build/!OSLib/Source/Test/Test/test.gas
===================================================================
--- branches/simplified-build/!OSLib/Source/Test/Test/test.gas 2007-06-20 23:56:11 UTC (rev 280)
+++ branches/simplified-build/!OSLib/Source/Test/Test/test.gas 2007-06-20 23:57:31 UTC (rev 281)
@@ -4,21 +4,14 @@
#include "all_oslib.Hdr"
.text
- .global _main
+ .global main
-_main: SWI XOS_GetEnv @ get the environment
- SWIVS OS_GenerateError @ exit on error
-
- MOV sp, r1 @ set up a stack
-
- STMFD sp!, {lr} @ save the return address
+main: STMFD sp!, {lr} @ save the return address
ADR R0, message @ write the message std out
SWI OS_Write0
SWI OS_NewLine
- LDMFD sp!, {lr} @ return
+ LDMFD sp!, {pc} @ return
- SWI OS_Exit
-
message:
.asciz "Hello World from GNU assembler"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2007-06-20 23:56:13
|
Revision: 280
http://ro-oslib.svn.sourceforge.net/ro-oslib/?rev=280&view=rev
Author: jtytgat
Date: 2007-06-20 16:56:11 -0700 (Wed, 20 Jun 2007)
Log Message:
-----------
Follow the \!OsLib -> \!OSLib rename
Modified Paths:
--------------
branches/simplified-build/!OSLib/Source/Makefile
Modified: branches/simplified-build/!OSLib/Source/Makefile
===================================================================
--- branches/simplified-build/!OSLib/Source/Makefile 2007-06-20 23:53:47 UTC (rev 279)
+++ branches/simplified-build/!OSLib/Source/Makefile 2007-06-20 23:56:11 UTC (rev 280)
@@ -69,7 +69,7 @@
release-src:
-$(MKDIR) $(RELEASEDIR)
-$(RM) $(BUILDDIR)/\!OSLib $(RELEASEDIR)/OSLib-src.zip
- svn export $(SOURCEDIR)/../../\!OsLib $(BUILDDIR)/\!OSLib && cd $(BUILDDIR) && $(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/OSLib-src.zip \!OSLib
+ svn export $(SOURCEDIR)/../ $(BUILDDIR)/\!OSLib && cd $(BUILDDIR) && $(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/OSLib-src.zip \!OSLib
clean:
$(MAKE) -C Types/oslib $@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2007-06-20 23:53:48
|
Revision: 279
http://ro-oslib.svn.sourceforge.net/ro-oslib/?rev=279&view=rev
Author: jtytgat
Date: 2007-06-20 16:53:47 -0700 (Wed, 20 Jun 2007)
Log Message:
-----------
Create empty directories used during building
Added Paths:
-----------
branches/simplified-build/!OSLib/Bin/
branches/simplified-build/!OSLib/Release/
branches/simplified-build/!OSLib/Source/Computer/oslib/l/
branches/simplified-build/!OSLib/Source/Core/oslib/l/
branches/simplified-build/!OSLib/Source/Toolbox/oslib/l/
branches/simplified-build/!OSLib/Source/User/oslib/l/
Property changes on: branches/simplified-build/!OSLib/Bin
___________________________________________________________________
Name: svn:ignore
+ *
Property changes on: branches/simplified-build/!OSLib/Release
___________________________________________________________________
Name: svn:ignore
+ *
Property changes on: branches/simplified-build/!OSLib/Source/Computer/oslib/l
___________________________________________________________________
Name: svn:ignore
+ *
Property changes on: branches/simplified-build/!OSLib/Source/Core/oslib/l
___________________________________________________________________
Name: svn:ignore
+ *
Property changes on: branches/simplified-build/!OSLib/Source/Toolbox/oslib/l
___________________________________________________________________
Name: svn:ignore
+ *
Property changes on: branches/simplified-build/!OSLib/Source/User/oslib/l
___________________________________________________________________
Name: svn:ignore
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2007-06-20 00:29:56
|
Revision: 278
http://ro-oslib.svn.sourceforge.net/ro-oslib/?rev=278&view=rev
Author: jtytgat
Date: 2007-06-19 17:29:53 -0700 (Tue, 19 Jun 2007)
Log Message:
-----------
Use official OSLib spelling as main directory name in our repository.
Added Paths:
-----------
branches/simplified-build/!OSLib/
Removed Paths:
-------------
branches/simplified-build/!OsLib/
Copied: branches/simplified-build/!OSLib (from rev 277, branches/simplified-build/!OsLib)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2007-06-20 00:27:50
|
Revision: 277
http://ro-oslib.svn.sourceforge.net/ro-oslib/?rev=277&view=rev
Author: jtytgat
Date: 2007-06-19 17:27:48 -0700 (Tue, 19 Jun 2007)
Log Message:
-----------
Documentation update
Modified Paths:
--------------
branches/simplified-build/!OsLib/!Readme
branches/simplified-build/!OsLib/docs/ChangeLog
branches/simplified-build/!OsLib/docs/OSLib_readme
Added Paths:
-----------
branches/simplified-build/!OsLib/docs/COPYING
Removed Paths:
-------------
branches/simplified-build/!OsLib/Make,fd7
branches/simplified-build/!OsLib/docs/Copying
Property Changed:
----------------
branches/simplified-build/!OsLib/
Property changes on: branches/simplified-build/!OsLib
___________________________________________________________________
Name: svn:ignore
- Bin
release
zips
tree,ffd
+ Bin
Release
Modified: branches/simplified-build/!OsLib/!Readme
===================================================================
--- branches/simplified-build/!OsLib/!Readme 2007-06-20 00:13:15 UTC (rev 276)
+++ branches/simplified-build/!OsLib/!Readme 2007-06-20 00:27:48 UTC (rev 277)
@@ -1,127 +1,127 @@
-!OSLib.!Readme 20051231
+OSLib
+=====
-******************************************************************************
-
Introduction
------------
- This is the OSLib source release. It contains everything you need to build
-(and modify) OSLib, its build tools, and OSLibSupport. It is available by CVS
+This is the OSLib source release. It contains everything you need to build
+and modify OSLib, its build tools, and OSLibSupport. It is available by SVN
from http://ro-oslib.sourceforge.net.
+Building
+--------
-*****************************************************************************
+Currently from OSLib 7 onwards, the only supported build method is via
+cross-compilation using GCCSDK http://gccsdk.riscos.info/. Also from
+OSLib 7 onwards we can build an AOF (APCS-32) OSLib version using
+GCCSDK 3.4.6 and an ELF (APCS-32) OSLib version using GCCSDK 4.
- Directory structure
- -------------------
+The deliverables for each of the AOF and ELF builds are:
- NOTE: It is essential that the work directory can handle long file names;
-unpack the archive or checkout the repository into an appropriate RaFS,
-LongFiles, or XFiles directory, as appropriate, if you do not have RISC OS 4.
+- OSLib-unix.zip: zip archive containing the OSLib32 library and the C &
+ assembler headers in Unix filename format (i.e. header.h seen on Unix, or,
+ header/h seen on RISC OS).
+ This should be used by the OSLib users cross-compiling on a non-RISC OS
+ host. Users who build OSLib themselves via cross-compiling, it is easier
+ to install this library and its headers directly in the GCCSDK environment
+ using the 'install' Makefile target instead of unzipping the contents of
+ this zip file.
- The top level directory is called !OSLib (Under CVS the work directory is
-called OSLib, which contains !OSLib). Double-clicking on this causes a number
-of environment variables (all names are prefixed with 'OSLib$'), which are
-used during the build process. Any environment variables pointing to an
-installed OSLib are overwritten, so that !OSLib becomes the reference, and
-any builds use the development library contained herein.
+- OSLib-wide.zip: zip archive containing the OSLib library and the C &
+ assembler headers in RISC OS filename format (i.e. h.header on RISC OS).
+ This should be used by the OSLib users compiling on RISC OS.
- Within !OSLib, there are a number of subdirectories:OSLibSupport contains
-the sources to the OSLib Support library; Source contains the source to OSLib
-itself, together with some test applications; and Tools contains the sources
-to a number of tools required to build OSLib.
+- OSLibSupport-unix.zip: zip archive containing the OSLibSupport32 library
+ and its header files for cross-compile usage.
- Below these, OSLibSupport contains a subdirectory for each of the major
-components of the library, plus a 'h' directory containing the public headers
-(under UNIX, these are .h files); Source contains subdirectories for each of
-the four component areas of OSLib (to avoid more than 77 files per
-directory); it also contains a Test directory in which reside a number of
-test files which are executed during the build process. Tools contains
-further subdirectories for each of the specialised tools used to build OSLib.
-Of these, DefMod (now at version 2) is the most important, translating the
-SWI definitions into assembler sources. Bison is required to interpret the
-DefMod language definition file, and is used to build DefMod. ReduceAOF
-removes redundant chunk headers form the AOF files before placing them in the
-library, thus minimising the size of the latter. IndexHelp and BindHelp are
-used to process the Help output from DefMod to create the StrongHelp manuals.
-Rm is a small file deletion utility, with the ability to process multiple
-arguments, and StripDepends is used to clean a Make file of all the
-(installation-specific) dynamic dependency information. Since some of these
-tools are themselves dependant upon OSLib, the build order is critical.
+- OSLibSupport.zip: zip archive containing the OSLibSupport32 library
+ and its header files for use under RISC OS.
- Additional subdirectories are created during the build process.
+- OSLibStrongHelp.zip: zip archive containing StrongHelp file of this
+ OSLib release.
-*****************************************************************************
+- OSLibExamples.zip: zip archive containg the PRM example files
- Building OSLib under RISC OS
- ----------------------------
+- OSLib-src.zip: all SVN sources used to make this release happen.
- You'll need:
+[ Note: pre-OSLib 7 releases also had a 'deep' OSLib deliverable for RISC OS
+ users who were using OSLib on a filing system supporting only a limited
+ number of files per directory like some of the old FileCore disc formats.
+ As this is of a very limited interest today, this is no longer supported. ]
- 1. An (image) filing system capable of handling long file names. Many of
-the source files have names longer than 10 characters, and problems will
-arise if these are not preserved.
+Build prerequisites
+-------------------
- 2. A Make utility. OSLib is currently built using Acorn's AMU, which is
-part of the Castle's C/C++ 6.0 package. It is essential that at least that
-version is used, as the makefile structure uses the latest extensions. A
-current WIP is to produce a set of make files to build OSLib using the GCCSDK
-package under RISC OS; it is quite possible to do this, but currently you're
-on your own.
+At least GCCSDK 3.4.6 R2 (http://gccsdk.riscos.info/) for AOF builds,
+and GCCSDK 4 for ELF builds. You need also to have setup the environment
+variables GCCSDK_INSTALL_CROSSBIN and GCCSDK_INSTAL_ENV. Cfr. the GCCSDK
+installation notes.
- 3. An Assembler. Currently, DefMod, in its RISC OS incarnation, is
-hard-wired to call Acorn's ObjAsm, again part of Acorn's C/C++ package. I am
-not aware of any other assembler being successfully used; indeed this is
-unlikely without changes to DefMod.
+[ Note: the GCCSDK 3.4.6 AOF compiler is $GCCSDK_INSTALL_CROSSBIN/gcc
+ while the GCCSDK 4 ELF compiler is
+ $GCCSDK_INSTALL_CROSSBIN/arm-unknown-riscos-gcc. It is therefore
+ possible to have both GCCSDK 3.4 and GCCSDK 4 installed using the
+ same $GCCSDK_INSTALL_CROSSBIN value. Mind that you can not share
+ the same $GCCSDK_INSTALL_ENV value as this would result in overwriting
+ AOF or ELF header and libraries files during cross-compilation. ]
- 4. A C compiler. Currently the tools and OSLibSupport are built using
-Norcroft C, but I know of no reason why GNU C should not be used.
+Supported Makefile targets
+--------------------------
- The entire build process is divided into a number of sub-projects, each
-with its own make file, named AMUmakefile, to distinguish it from any other
-make system.
+For the GCCSDK cross-compiler user:
- To build OSLib "out of the box", under RISC OS, all that is necessary is to
-double-click on the 'Make' TaskObey, which will look after the entire build
-process and place a distributable OSLib in the 'release' sub-directory. There
-are 2 versions provided: "wide", which uses a wide directory structure
-suitable for RISC OS 4, or any file system capable of containing more than 77
-files per directory; and "deep", which contains a file structure suitable for
-RISC OS 3. Directory "OSLibHelp" contains the StrongHelp manual, and
-directory "OSLibSupport" contains the optional support library. On my
-StrongArm Risc PC the entire process takes just over two hours to complete;
-somewhat longer over a network connection.
+ - install-aof/install-elf: builds & installs the AOF respectively
+ the ELF OSLib version in the GCCSDK environment.
+ - install: defaults to install-elf target.
- For more experienced users, there are more targets in the AMUmakefile,
-which may be invoked by typing "make <target>" at the command line, with the
-default directory set appropriately. Of these, "Make distclean" is perhaps
-one of the more useful; it restores the directories to their condition at
-chaeckout. "Make dist" creates a set of zip files for distribution; for this
-you require a copy of infozip in the run path (I used to use SparkFS, but
-this has problems compressing such a large archive).
+For the OSLib developer using the GCCSDK cross-compiler:
- No doubt I've got some of it wrong, and will be grateful for any comments
-and amendments.
+ - all: builds the ELF OSLib version and the StrongHelp OSLib file.
+ The build results are written in Source/Build subdirectory.
+ - oslib-elf: builds the ELF OSLib version
+ - oslib-aof: builds the AOF OSLib version
+ - cstrong: builds the StrongHelp OSLib file.
+ - tools: builds the host OSLib tools which are going to be used during
+ the main OSLib building.
-*****************************************************************************
+For the OSLib release manager:
- Building OSLib under UNIX/Linux
- -------------------------------
+ - release: builds both the AOF and ELF OSLib libraries and StrongHelp
+ OSLib file, does some sanity testing and finally zips the end result
+ in the Release/CROSSGCC_AOF and Release/CROSSGCC_ELF subdirectories.
- Building under Linux is possible with the support of the GCCSDK, which can
-be found at <http://gccsdk.riscos.info/>. You'll need at least GCCSDK
-3.4.5 Release 1.
+For all:
- Otherwise, building under LINUX is very similar to building under RISC OS.
-In a terminal, in the appropriate directory, type "make all", and watch it
-all happen by magic. It all happens in 10 minutes on my 1.1 GHz Linux box; a
-vast improvement over the 2 hours or more under RISC OS. Again "make dist"
-and "make distclean" work very much as expected. Dig around inside the
-GNUmakefiles for other less-useful targets.
+ - clean: to remove all build generated files.
- Thanks are due to Druck, for supplying the initial "portable OSLib", upon
-which, with enhancements, the tools are built.
+Tools
+-----
-*****************************************************************************
+The Tools directory contains further subdirectories for each of the
+specialised tools used to build OSLib. Of these, DefMod (now at version 2) is
+the most important, translating the SWI definitions into assembler sources.
+Bison is required to interpret the DefMod language definition file, and is
+used to build DefMod.
- Tony van der Hoff. mailto: <osl...@co...>
+ReduceAOF (not used for ELF builds) removes redundant chunk headers form the
+AOF files before placing them in the library, thus minimising the size of the
+latter.
+
+IndexHelp and BindHelp are used to process the Help output from DefMod to
+create the StrongHelp manuals.
+
+Rm is a small file deletion utility, with the ability to process multiple
+arguments, and StripDepends is used to clean a Make file of all the
+(installation-specific) dynamic dependency information. Rm and StripDepends
+are currently not used (nor needed) in the cross-compilation build of OSLib.
+
+Since some of these tools are themselves dependant upon OSLib, the build
+order is critical.
+
+Credits
+-------
+
+Thanks are due to Druck, for supplying the initial "portable OSLib", upon
+which, with enhancements, the tools are built via cross-compilation.
+
+-EOF-
Deleted: branches/simplified-build/!OsLib/Make,fd7
===================================================================
--- branches/simplified-build/!OsLib/Make,fd7 2007-06-20 00:13:15 UTC (rev 276)
+++ branches/simplified-build/!OsLib/Make,fd7 2007-06-20 00:27:48 UTC (rev 277)
@@ -1,7 +0,0 @@
-| !OSLib.Make 20040304
-Echo <sys$time> !OSLib.Make %0
-SetEval OSLib$Slot 4*1024
-do wimpslot -min <OSLib$Slot>K
-if "<C$MODE>" = "32" then Do AMU -f <Obey$Dir>.AMUmakefile -desktop %0 APCS=32
-if "<C$MODE>" <>"32" then Do AMU -f <Obey$Dir>.AMUmakefile -desktop %0 APCS=26
-Echo <sys$time> Done
Copied: branches/simplified-build/!OsLib/docs/COPYING (from rev 273, branches/simplified-build/!OsLib/docs/Copying)
===================================================================
--- branches/simplified-build/!OsLib/docs/COPYING (rev 0)
+++ branches/simplified-build/!OsLib/docs/COPYING 2007-06-20 00:27:48 UTC (rev 277)
@@ -0,0 +1,248 @@
+ GNU GENERAL PUBLIC LICENCE
+ Version 1, February 1989
+
+ Copyright (C) 1989 Free Software Foundation, Inc.
+ 675 Mass Ave, Cambridge, MA 02139, U S A
+ Everyone is permitted to copy and distribute verbatim copies
+ of this licence document, but changing it is not allowed.
+
+ Preamble
+
+ The licence agreements of most software companies try to keep users
+at the mercy of those companies. By contrast, our General Public
+Licence is intended to guarantee your freedom to share and change free
+software---to make sure the software is free for all its users. The
+General Public Licence applies to the Free Software Foundation's
+software and to any other programme whose authors commit to using it.
+You can use it for your programmes, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Specifically, the General Public Licence is designed to make
+sure that you have the freedom to give away or sell copies of free
+software, that you receive source code or can get it if you want it,
+that you can change the software or use pieces of it in new free
+programmes; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of a such a programme, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must tell them their rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this licence which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENCE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This Licence Agreement applies to any programme or other work which
+contains a notice placed by the copyright holder saying it may be
+distributed under the terms of this General Public Licence. The
+"Programme", below, refers to any such programme or work, and a "work based
+on the Programme" means either the Programme or any work containing the
+Programme or a portion of it, either verbatim or with modifications. Each
+licensee is addressed as "you".
+
+ 1. You may copy and distribute verbatim copies of the Programme's source
+code as you receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice and
+disclaimer of warranty; keep intact all the notices that refer to this
+General Public Licence and to the absence of any warranty; and give any
+other recipients of the Programme a copy of this General Public Licence
+along with the Programme. You may charge a fee for the physical act of
+transferring a copy.
+
+ 2. You may modify your copy or copies of the Programme or any portion of
+it, and copy and distribute such modifications under the terms of Paragraph
+1 above, provided that you also do the following:
+
+ a) cause the modified files to carry prominent notices stating that
+ you changed the files and the date of any change; and
+
+ b) cause the whole of any work that you distribute or publish, that
+ in whole or in part contains the Programme or any part thereof, either
+ with or without modifications, to be licensed at no charge to all
+ third parties under the terms of this General Public Licence (except
+ that you may choose to grant warranty protection to some or all
+ third parties, at your option).
+
+ c) If the modified programme normally reads commands interactively when
+ run, you must cause it, when started running for such interactive use
+ in the simplest and most usual way, to print or display an
+ announcement including an appropriate copyright notice and a notice
+ that there is no warranty (or else, saying that you provide a
+ warranty) and that users may redistribute the programme under these
+ conditions, and telling the user how to view a copy of this General
+ Public Licence.
+
+ d) You may charge a fee for the physical act of transferring a
+ copy, and you may at your option offer warranty protection in
+ exchange for a fee.
+
+Mere aggregation of another independent work with the Programme (or its
+derivative) on a volume of a storage or distribution medium does not bring
+the other work under the scope of these terms.
+
+ 3. You may copy and distribute the Programme (or a portion or derivative of
+it, under Paragraph 2) in object code or executable form under the terms of
+Paragraphs 1 and 2 above provided that you also do one of the following:
+
+ a) accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of
+ Paragraphs 1 and 2 above; or,
+
+ b) accompany it with a written offer, valid for at least three
+ years, to give any third party free (except for a nominal charge
+ for the cost of distribution) a complete machine-readable copy of the
+ corresponding source code, to be distributed under the terms of
+ Paragraphs 1 and 2 above; or,
+
+ c) accompany it with the information you received as to where the
+ corresponding source code may be obtained. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the programme in object code or executable form alone.)
+
+Source code for a work means the preferred form of the work for making
+modifications to it. For an executable file, complete source code means
+all the source code for all modules it contains; but, as a special
+exception, it need not include source code for modules which are standard
+libraries that accompany the operating system on which the executable
+file runs, or for standard header files or definitions files that
+accompany that operating system.
+
+ 4. You may not copy, modify, sublicense, distribute or transfer the
+Programme except as expressly provided under this General Public Licence.
+Any attempt otherwise to copy, modify, sublicense, distribute or transfer
+the Programme is void, and will automatically terminate your rights to use
+the Programme under this Licence. However, parties who have received
+copies, or rights to use copies, from you under this General Public
+Licence will not have their licences terminated so long as such parties
+remain in full compliance.
+
+ 5. By copying, distributing or modifying the Programme (or any work based
+on the Programme) you indicate your acceptance of this licence to do so,
+and all its terms and conditions.
+
+ 6. Each time you redistribute the Programme (or any work based on the
+Programme), the recipient automatically receives a licence from the original
+licensor to copy, distribute or modify the Programme subject to these
+terms and conditions. You may not impose any further restrictions on the
+recipients' exercise of the rights granted herein.
+
+ 7. The Free Software Foundation may publish revised and/or new versions
+of the General Public Licence from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Programme
+specifies a version number of the licence which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Programme does not specify a version number of
+the licence, you may choose any version ever published by the Free Software
+Foundation.
+
+ 8. If you wish to incorporate parts of the Programme into other free
+programmes whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 9. BECAUSE THE PROGRAMME IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAMME, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAMME "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAMME IS WITH YOU. SHOULD THE
+PROGRAMME PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 10. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAMME AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAMME (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAMME TO OPERATE WITH ANY OTHER
+PROGRAMMES), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ Appendix: How to Apply These Terms to Your New Programmes
+
+ If you develop a new programme, and you want it to be of the greatest
+possible use to humanity, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these
+terms.
+
+ To do so, attach the following notices to the programme. It is safest to
+attach them to the start of each source file to most effectively convey
+the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the programme's name and a brief idea of what it does.>
+ Copyright (C) 19yy <name of author>
+
+ This programme is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public Licence as published by
+ the Free Software Foundation; either version 1, or (at your option)
+ any later version.
+
+ This programme is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public Licence for more details.
+
+ You should have received a copy of the GNU General Public Licence
+ along with this programme; if not, write to the Free Software
+ Foundation, Inc, 675 Mass Ave, Cambridge, MA 02139, USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the programme is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) 19xx name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the
+appropriate parts of the General Public Licence. Of course, the
+commands you use may be called something other than `show w' and `show
+c'; they could even be mouse-clicks or menu items--whatever suits your
+programme.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the programme, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ programme `Gnomovision' (a programme to direct compilers to make passes
+ at assemblers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+That's all there is to it!
Modified: branches/simplified-build/!OsLib/docs/ChangeLog
===================================================================
--- branches/simplified-build/!OsLib/docs/ChangeLog 2007-06-20 00:13:15 UTC (rev 276)
+++ branches/simplified-build/!OsLib/docs/ChangeLog 2007-06-20 00:27:48 UTC (rev 277)
@@ -5,19 +5,22 @@
OSLib 7.00 - In development
----------
+* Enhancements:
+ - Added support for GCCSDK 4 ELF output (also APCS-32 only).
+ (xxx, John Tytgat / John-Mark Bell)
* Bug Fixes:
- Macro.h/Macro.Hdr: the macro Bool didn't write its result to first
parameter but modified the 2nd one. (20070505-1, John Tytgat)
-* Build Environment
+* Build Environment:
- OSLib sources are now on sourceforge.net SVN managed i.s.o. CVS.
(20070414-1, John Tytgat)
OSLib 6.90 - Tony van der Hoff 02/01/2007
----------
-* Enhancemnts
+* Enhancements:
- Added 7 Reporter SWIs (20060125-2, Phil Ludlam)
-* Bug Fixes
+* Bug Fixes:
- PCI.swi: Amended PCI_HardwareAddress to return Address in R4
(20060718-1, Christian Ludlam)
- OS.swi: As documented in http://www.iyonix.com/32bit/32bit.shtml
@@ -36,7 +39,7 @@
for consistency.
(20070102-1, Christian Ludlam)
-* Build Environment
+* Build Environment:
- GNUmakefile: install target didn't properly copy all generated header
files (20060125-1, John Tytgat)
- DefMod2: gcc in GCCSDK 3.4.6 Release 1 onwards will pass the APCS flavour
@@ -49,7 +52,7 @@
OSLib 6.80 - Tony van der Hoff 31/12/2005
----------
-* Enhancemnts
+* Enhancements:
- Added constants for FPSR bits to FPEmulator (20041020-1, Tom Hughes)
- Added extra Iconbar flags definitions (20050102-1, John Tytgat)
- Added BufferModifyFlags2, which returns old and new flags values
@@ -63,7 +66,7 @@
- Added definitions for LineEditor, ZapFontMenu, and ZapRedraw modules
(20050506-2, Christian Ludlam)
-* Bug Fixes
+* Bug Fixes:
- Toolbox_RegisterObjectModule and Toolbox_RegisterPostFilter had
SWI numbers swapped. (See OSLib 6.21 fixes) Corrected back again.
(20040816-1, Christian Ludlam)
@@ -71,7 +74,7 @@
under UNIX (20040922-1, Stefan Bellon)
- OSLibSupport library was missing Event* functions. (20041121-1 David Ruck)
-* Build Environment
+* Build Environment:
- OSLibSupport is no longer built with 26 bit linkage, because GCC no longer
supports it.
- OSLibSupport is now additionaly available with a Unix file structure
@@ -162,7 +165,7 @@
- Added INCLUDE definition to bison makefile and corrected typo in bison
readme (20031229-2 J.Tytgat)
-* Bug fixes
+* Bug fixes:
- Corrected character case for NEEDS Wimp in Alarm.swi
(20031227-1, Tony van der Hoff).
- Corrected PCI_EnumerateFunctions using reserved keyword 'class' for
@@ -244,7 +247,7 @@
- Added OS_ReadLine32, OS_HeapSort32 and OS_SubstituteArgs32 for 32 bit
support in RISC O S 5. (Tom Hughes)
-* Build Environment
+* Build Environment:
- OSLib may now be built under either a 26-bit or a 32-bit environment. This is
autodetected, and the build tools are linked accordingly. To this end YACC,
which had been coded in pre-ANSI C, has been replaced by a modern port of
@@ -312,7 +315,6 @@
OSLib Version 6.30 - Tony van der Hoff - 01/11/2001
------------------
Enhancements:
-
* DefMod:
- The new portable DefMod2 is now part of the Tools distribution (Stewart Brodie)
this allows DefMod to be built and/or executed under UNIX as well as RISC OS.
@@ -346,7 +348,6 @@
OSLib Version 6.22 - Tony van der Hoff - not released
------------------
Enhancements:
-
* OSLib:
- ToolAction gadget is defined (TV)
- New constant Draggable_DragEndedToolboxIds (TV)
Deleted: branches/simplified-build/!OsLib/docs/Copying
===================================================================
--- branches/simplified-build/!OsLib/docs/Copying 2007-06-20 00:13:15 UTC (rev 276)
+++ branches/simplified-build/!OsLib/docs/Copying 2007-06-20 00:27:48 UTC (rev 277)
@@ -1,248 +0,0 @@
- GNU GENERAL PUBLIC LICENCE
- Version 1, February 1989
-
- Copyright (C) 1989 Free Software Foundation, Inc.
- 675 Mass Ave, Cambridge, MA 02139, U S A
- Everyone is permitted to copy and distribute verbatim copies
- of this licence document, but changing it is not allowed.
-
- Preamble
-
- The licence agreements of most software companies try to keep users
-at the mercy of those companies. By contrast, our General Public
-Licence is intended to guarantee your freedom to share and change free
-software---to make sure the software is free for all its users. The
-General Public Licence applies to the Free Software Foundation's
-software and to any other programme whose authors commit to using it.
-You can use it for your programmes, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Specifically, the General Public Licence is designed to make
-sure that you have the freedom to give away or sell copies of free
-software, that you receive source code or can get it if you want it,
-that you can change the software or use pieces of it in new free
-programmes; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of a such a programme, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must tell them their rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this licence which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENCE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This Licence Agreement applies to any programme or other work which
-contains a notice placed by the copyright holder saying it may be
-distributed under the terms of this General Public Licence. The
-"Programme", below, refers to any such programme or work, and a "work based
-on the Programme" means either the Programme or any work containing the
-Programme or a portion of it, either verbatim or with modifications. Each
-licensee is addressed as "you".
-
- 1. You may copy and distribute verbatim copies of the Programme's source
-code as you receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice and
-disclaimer of warranty; keep intact all the notices that refer to this
-General Public Licence and to the absence of any warranty; and give any
-other recipients of the Programme a copy of this General Public Licence
-along with the Programme. You may charge a fee for the physical act of
-transferring a copy.
-
- 2. You may modify your copy or copies of the Programme or any portion of
-it, and copy and distribute such modifications under the terms of Paragraph
-1 above, provided that you also do the following:
-
- a) cause the modified files to carry prominent notices stating that
- you changed the files and the date of any change; and
-
- b) cause the whole of any work that you distribute or publish, that
- in whole or in part contains the Programme or any part thereof, either
- with or without modifications, to be licensed at no charge to all
- third parties under the terms of this General Public Licence (except
- that you may choose to grant warranty protection to some or all
- third parties, at your option).
-
- c) If the modified programme normally reads commands interactively when
- run, you must cause it, when started running for such interactive use
- in the simplest and most usual way, to print or display an
- announcement including an appropriate copyright notice and a notice
- that there is no warranty (or else, saying that you provide a
- warranty) and that users may redistribute the programme under these
- conditions, and telling the user how to view a copy of this General
- Public Licence.
-
- d) You may charge a fee for the physical act of transferring a
- copy, and you may at your option offer warranty protection in
- exchange for a fee.
-
-Mere aggregation of another independent work with the Programme (or its
-derivative) on a volume of a storage or distribution medium does not bring
-the other work under the scope of these terms.
-
- 3. You may copy and distribute the Programme (or a portion or derivative of
-it, under Paragraph 2) in object code or executable form under the terms of
-Paragraphs 1 and 2 above provided that you also do one of the following:
-
- a) accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of
- Paragraphs 1 and 2 above; or,
-
- b) accompany it with a written offer, valid for at least three
- years, to give any third party free (except for a nominal charge
- for the cost of distribution) a complete machine-readable copy of the
- corresponding source code, to be distributed under the terms of
- Paragraphs 1 and 2 above; or,
-
- c) accompany it with the information you received as to where the
- corresponding source code may be obtained. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the programme in object code or executable form alone.)
-
-Source code for a work means the preferred form of the work for making
-modifications to it. For an executable file, complete source code means
-all the source code for all modules it contains; but, as a special
-exception, it need not include source code for modules which are standard
-libraries that accompany the operating system on which the executable
-file runs, or for standard header files or definitions files that
-accompany that operating system.
-
- 4. You may not copy, modify, sublicense, distribute or transfer the
-Programme except as expressly provided under this General Public Licence.
-Any attempt otherwise to copy, modify, sublicense, distribute or transfer
-the Programme is void, and will automatically terminate your rights to use
-the Programme under this Licence. However, parties who have received
-copies, or rights to use copies, from you under this General Public
-Licence will not have their licences terminated so long as such parties
-remain in full compliance.
-
- 5. By copying, distributing or modifying the Programme (or any work based
-on the Programme) you indicate your acceptance of this licence to do so,
-and all its terms and conditions.
-
- 6. Each time you redistribute the Programme (or any work based on the
-Programme), the recipient automatically receives a licence from the original
-licensor to copy, distribute or modify the Programme subject to these
-terms and conditions. You may not impose any further restrictions on the
-recipients' exercise of the rights granted herein.
-
- 7. The Free Software Foundation may publish revised and/or new versions
-of the General Public Licence from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Programme
-specifies a version number of the licence which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Programme does not specify a version number of
-the licence, you may choose any version ever published by the Free Software
-Foundation.
-
- 8. If you wish to incorporate parts of the Programme into other free
-programmes whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 9. BECAUSE THE PROGRAMME IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAMME, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAMME "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAMME IS WITH YOU. SHOULD THE
-PROGRAMME PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 10. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAMME AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAMME (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAMME TO OPERATE WITH ANY OTHER
-PROGRAMMES), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- Appendix: How to Apply These Terms to Your New Programmes
-
- If you develop a new programme, and you want it to be of the greatest
-possible use to humanity, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these
-terms.
-
- To do so, attach the following notices to the programme. It is safest to
-attach them to the start of each source file to most effectively convey
-the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
- <one line to give the programme's name and a brief idea of what it does.>
- Copyright (C) 19yy <name of author>
-
- This programme is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public Licence as published by
- the Free Software Foundation; either version 1, or (at your option)
- any later version.
-
- This programme is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public Licence for more details.
-
- You should have received a copy of the GNU General Public Licence
- along with this programme; if not, write to the Free Software
- Foundation, Inc, 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the programme is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) 19xx name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the
-appropriate parts of the General Public Licence. Of course, the
-commands you use may be called something other than `show w' and `show
-c'; they could even be mouse-clicks or menu items--whatever suits your
-programme.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the programme, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- programme `Gnomovision' (a programme to direct compilers to make passes
- at assemblers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-That's all there is to it!
Modified: branches/simplified-build/!OsLib/docs/OSLib_readme
===================================================================
--- branches/simplified-build/!OsLib/docs/OSLib_readme 2007-06-20 00:13:15 UTC (rev 276)
+++ branches/simplified-build/!OsLib/docs/OSLib_readme 2007-06-20 00:27:48 UTC (rev 277)
@@ -1,10 +1,8 @@
-!OSLib.docs.OSLib_readme 20020410
-
Introduction
------------
OSLib is a set of functions and C headers to provide complete coverage of
-the RISC O\xA0S application programmer's interface in C. It provides access from
-C code to all RISC O\xA0S system calls ("SWI's") which is
+the RISC OS application programmer's interface in C. It provides access from
+C code to all RISC OS system calls ("SWI's") which is
efficient: often, memory access is completely avoided;
@@ -17,26 +15,26 @@
register-safe: hides (often idiosyncratic) register allocation;
language-independent: although the headers are specific to C, the
- library is not - any A\xA0P\xA0C\xA0S-conformant language can call it.
+ library is not - any APCS-32 conformant language can call it.
It also provides names for all the data structures and reason codes used by
-the A\xA0P\xA0I. Code that uses it is superior to similar code using _kernel_swi()
+the API. Code that uses it is superior to similar code using _kernel_swi()
or _swix(), both in terms of the compile-time checking that is available, and
the size and speed of the code generated.
- OSLib provides a very convenient interface to the RISC O\xA0S programmer,
+ OSLib provides a very convenient interface to the RISC OS programmer,
since all the facilities of the C compiler are available to catch errors and
generate good code. It is conceptually very small, in that it is completely
documented by this file. As a bonus, code written using it is smaller and
faster than code written using other means.
- OSLib is copyright \xA9 1994-2002 Jonathan Coxhead and OSLib maintainers. It
+ OSLib is copyright (c) 1994-2002 Jonathan Coxhead and OSLib maintainers. It
is distributed in the hope that it will be useful, but without any warranty;
without even the implied warranty of merchantability or fitness for a
particular purpose.
OSLib is released under the GNU public licence - for details see the file
-"copying" included with this release. The copyright holders have granted a
+"COPYING" included with this release. The copyright holders have granted a
relaxation of the conditions of this licence to allow its use in constructing
proprietary software. This means that it is free software itself, but
applications linked to it need not be. It follows that any changes to OSLib
@@ -65,22 +63,23 @@
Installation
------------
Having downloaded the appropriate archive for your system - the one named
-'OSLib' is suitable for directory structures with less than 77 files per
-directory, whereas 'OSLibRO4' fequires a file system which can handle more
-than 77 files per directory - you will see a number of
-files, and one directory.
+"OSLib-wide.zip" is to be used on RISC OS on a filing system supporting
+a large number of objects per directory (read: not the old FileCore format
+with its 77 objects per directory limitation) The file "OSLib-unix.zip"
+is to be used on UNIX-alike systems for cross-compilation of RISC OS
+programs.
-The file you are presently reading is OSLib-readme, and contains the basic
+The file you are presently reading is "OSLib-readme", and contains the basic
introduction to OSLib, and how to install it.
-Make sure you read the "Copying" text so that you know what you may and may
+Make sure you read the "COPYING" text so that you know what you may and may
not legally do.
The "ChangeLog" text contains details on how OSLib has evolved over the
-years, and will be useful if you're upgrading, and and you find it's
+years, and will be useful if you're upgrading, and and you find its
behaviour to be subtly different.
-The "API_readme" file describes the relationships between OSLib names, and
+The "OSLib_API" file describes the relationships between OSLib names, and
the associated PRM descriptions.
Finally, the OSLib directory is what it's all about; you should copy this to
@@ -93,7 +92,7 @@
Using OSLib
-----------
At the top level in the OSLib directory you will find an Obey file named
-SetVars. When this is run, the OSLib: path is set up. If you want to change
+"SetVars". When this is run, the OSLib: path is set up. If you want to change
it, that's fine, but the default is really all you need. Make sure SetVars is
executed before you attempt to build anything using the library.
@@ -101,7 +100,7 @@
---------
In any source file from which you want to call an OSLib veneer, you will
have to specify where it is to be found with a line of the type
-#include\xA0"oslib/wimp.h". In this example, the "oslib/" prefix ensures that
+#include�"oslib/wimp.h". In this example, the "oslib/" prefix ensures that
"wimp.h" is loaded from oslib, as opposed to any other library. When
compiling, you need to ensure that the compiler can locate OSLib, by
specifying "-IOSLib:" on the command line.
@@ -114,26 +113,35 @@
For GCC the equivalent command would be (note that there are better ways of
using GCC to compile and link):
- gcc -c -IOSLibSupport:,OSLib: -o foo.o foo.c
+ gcc -c -IOSLibSupport: -IOSLib: -o foo.o foo.c
+For assembling with GCC (AOF):
+
+ gcc -c -IOSLib: -xassembler-with-cpp -mapcs-32 -Wa,-objasm,-apcs32 -o foo.o foo.s
+
+For assembling with GCC (ELF):
+
+ gcc -c -IOSLib: -xassembler-with-cpp -o foo.o foo.s
+
Please refer to your compiler manual for details on the use of the command line.
- The above gives the preferred way of using OSLib. However, much existing
-code will not contain the "oslib/" prefix in the #include line. If you don't
-want to change things, and are not worried about name collisions, then you
-may specify "-IOSLibInclude:" on the command line, which will allow the
-compiler to locate files without the prefix. In new code, always use the
-prefixed form for safety.
-
Linking
-------
The only OSLib-specific precaution required for the linking stage is to include
OSLib (and OSLibSupport, if required) on the command line.
-A typical Link command would be:
+A typical Norcroft Link command would be:
link foo1.o foo2.o ... OSLibSupport:OSLibSupport.o OSLib:OSLib.o C:stubs.o
+For GCC (AOF) this is:
+
+ gcc -o final foo1.o foo2.o ... OSLibSupport:OSLibSupport.o OSLib:OSLib.o
+
+For GCC (ELF) this is:
+
+ gcc -o final foo1.o foo2.o ... -LOSLibSupport: -lOSLibSupport -LOSLib: -lOSLib
+
Again, this is inherent in the tool usage, there is nothing special about
its use with OSLib.
@@ -147,5 +155,4 @@
The OSLib web-site is at http://ro-oslib.sourceforge.net.
--------------------
-Tony van der Hoff.
-20030227
+OSLib Developers.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2007-06-20 00:13:16
|
Revision: 276
http://ro-oslib.svn.sourceforge.net/ro-oslib/?rev=276&view=rev
Author: jtytgat
Date: 2007-06-19 17:13:15 -0700 (Tue, 19 Jun 2007)
Log Message:
-----------
Update of svn:ignore properties
Property Changed:
----------------
branches/simplified-build/!OsLib/Source/
branches/simplified-build/!OsLib/Source/Macros/oslib/
branches/simplified-build/!OsLib/Source/Types/oslib/
Property changes on: branches/simplified-build/!OsLib/Source
___________________________________________________________________
Name: svn:ignore
- HelpData
OSLib,3d6
*.o
*.o,*
o
*.list
+ Build
Property changes on: branches/simplified-build/!OsLib/Source/Macros/oslib
___________________________________________________________________
Name: svn:ignore
+ Macros.Hdr
Property changes on: branches/simplified-build/!OsLib/Source/Types/oslib
___________________________________________________________________
Name: svn:ignore
+ Types.Hdr
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2007-06-19 23:59:59
|
Revision: 275
http://ro-oslib.svn.sourceforge.net/ro-oslib/?rev=275&view=rev
Author: jtytgat
Date: 2007-06-19 16:59:51 -0700 (Tue, 19 Jun 2007)
Log Message:
-----------
- Get AOF and ELF test in sync.
- Update svn:ignore property.
- Make test_s a standalone program, not an AOF/ELF object file.
Modified Paths:
--------------
branches/simplified-build/!OsLib/Source/Test/Test/Makefile
branches/simplified-build/!OsLib/Source/Test/Test/test.asm
branches/simplified-build/!OsLib/Source/Test/Test/test.gas
Property Changed:
----------------
branches/simplified-build/!OsLib/Source/Test/Test/
Property changes on: branches/simplified-build/!OsLib/Source/Test/Test
___________________________________________________________________
Name: svn:ignore
- *,ff8
h.oslib
oslib.h
Hdr.OSLib
OSLib.Hdr
bin
o
l
+ *,ff8
all_oslib.h
all_oslib.Hdr
Modified: branches/simplified-build/!OsLib/Source/Test/Test/Makefile
===================================================================
--- branches/simplified-build/!OsLib/Source/Test/Test/Makefile 2007-06-19 22:03:42 UTC (rev 274)
+++ branches/simplified-build/!OsLib/Source/Test/Test/Makefile 2007-06-19 23:59:51 UTC (rev 275)
@@ -17,7 +17,8 @@
$(CXX) -o $@ -I$(TOPHEADERDIR) $< $(OSLIBLIB)
test_s: test$(ASMEXT) all_oslib.Hdr
- $(AS) -o $@ -I$(TOPHEADERDIR) $<
+ $(AS) -o $@.o -I$(TOPHEADERDIR) $<
+ $(CC) -o $@ $@.o
small_test.o: small_test$(ASMEXT) all_oslib.Hdr
$(AS) -o $@ -I$(TOPHEADERDIR) $<
Modified: branches/simplified-build/!OsLib/Source/Test/Test/test.asm
===================================================================
--- branches/simplified-build/!OsLib/Source/Test/Test/test.asm 2007-06-19 22:03:42 UTC (rev 274)
+++ branches/simplified-build/!OsLib/Source/Test/Test/test.asm 2007-06-19 23:59:51 UTC (rev 275)
@@ -1,25 +1,24 @@
; Test assembler headers
GET all_oslib.Hdr ; gets all OSLib headers
- EXPORT |entry|
- EXPORT |exit|
+ EXPORT |_main|
AREA code, CODE
ENTRY
-|entry| SWI XOS_GetEnv ; get the environment
- MOVVS pc, lr ; exit on error
+|_main| SWI XOS_GetEnv ; get the environment
+ SWIVS OS_GenerateError ; exit on error
MOV sp, r1 ; set up a stack
- STMFD sp!, {lr} ; save the return address
-
- ADR R0, message ; write the message std out
+ STMFD sp!, {lr} ; save the return address
+ ADR R0, message ; write the message std out
SWI OS_Write0
SWI OS_NewLine
+ LDMFD sp!, {lr}
-|exit| ldmfd sp!, {pc} ; return
+ SWI OS_Exit ; return
message = "Hello World from ObjAsm",0
Modified: branches/simplified-build/!OsLib/Source/Test/Test/test.gas
===================================================================
--- branches/simplified-build/!OsLib/Source/Test/Test/test.gas 2007-06-19 22:03:42 UTC (rev 274)
+++ branches/simplified-build/!OsLib/Source/Test/Test/test.gas 2007-06-19 23:59:51 UTC (rev 275)
@@ -4,21 +4,19 @@
#include "all_oslib.Hdr"
.text
- .global entry
+ .global _main
-entry: SWI XOS_GetEnv @ get the environment
- sWIVS OS_GenerateError @ exit on error
+_main: SWI XOS_GetEnv @ get the environment
+ SWIVS OS_GenerateError @ exit on error
MOV sp, r1 @ set up a stack
STMFD sp!, {lr} @ save the return address
-
ADR R0, message @ write the message std out
SWI OS_Write0
SWI OS_NewLine
+ LDMFD sp!, {lr} @ return
- ldmfd sp!, {lr} @ return
-exit:
SWI OS_Exit
message:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2007-06-19 22:03:45
|
Revision: 274
http://ro-oslib.svn.sourceforge.net/ro-oslib/?rev=274&view=rev
Author: jtytgat
Date: 2007-06-19 15:03:42 -0700 (Tue, 19 Jun 2007)
Log Message:
-----------
Finishing touches
Modified Paths:
--------------
branches/simplified-build/!OsLib/Tools/DefMod2/CHANGES
branches/simplified-build/!OsLib/Tools/DefMod2/README
branches/simplified-build/!OsLib/Tools/DefMod2/defmod.y
branches/simplified-build/!OsLib/Tools/Makefile
Added Paths:
-----------
branches/simplified-build/!OsLib/Tools/DefMod2/COPYING
Removed Paths:
-------------
branches/simplified-build/!OsLib/Tools/DefMod2/Copying
Property Changed:
----------------
branches/simplified-build/!OsLib/Tools/BindHelp/
branches/simplified-build/!OsLib/Tools/DefMod2/
branches/simplified-build/!OsLib/Tools/IndexHelp/
branches/simplified-build/!OsLib/Tools/ReduceAOF/
Property changes on: branches/simplified-build/!OsLib/Tools/BindHelp
___________________________________________________________________
Name: svn:ignore
- BindHelp
o
+ bindhelp
o
Property changes on: branches/simplified-build/!OsLib/Tools/DefMod2
___________________________________________________________________
Name: svn:ignore
+ defmod
Modified: branches/simplified-build/!OsLib/Tools/DefMod2/CHANGES
===================================================================
--- branches/simplified-build/!OsLib/Tools/DefMod2/CHANGES 2007-06-19 00:34:28 UTC (rev 273)
+++ branches/simplified-build/!OsLib/Tools/DefMod2/CHANGES 2007-06-19 22:03:42 UTC (rev 274)
@@ -1,4 +1,9 @@
+CHANGES (Mid 2007)
+==================
+GCCSDK 4 ELF support (-asmtype option)
+Made APCS-32 output default.
+
CHANGES
=======
Copied: branches/simplified-build/!OsLib/Tools/DefMod2/COPYING (from rev 246, branches/simplified-build/!OsLib/Tools/DefMod2/Copying)
===================================================================
--- branches/simplified-build/!OsLib/Tools/DefMod2/COPYING (rev 0)
+++ branches/simplified-build/!OsLib/Tools/DefMod2/COPYING 2007-06-19 22:03:42 UTC (rev 274)
@@ -0,0 +1,248 @@
+ GNU GENERAL PUBLIC LICENCE
+ Version 1, February 1989
+
+ Copyright (C) 1989 Free Software Foundation, Inc.
+ 675 Mass Ave, Cambridge, MA 02139, U S A
+ Everyone is permitted to copy and distribute verbatim copies
+ of this licence document, but changing it is not allowed.
+
+ Preamble
+
+ The licence agreements of most software companies try to keep users
+at the mercy of those companies. By contrast, our General Public
+Licence is intended to guarantee your freedom to share and change free
+software---to make sure the software is free for all its users. The
+General Public Licence applies to the Free Software Foundation's
+software and to any other programme whose authors commit to using it.
+You can use it for your programmes, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Specifically, the General Public Licence is designed to make
+sure that you have the freedom to give away or sell copies of free
+software, that you receive source code or can get it if you want it,
+that you can change the software or use pieces of it in new free
+programmes; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of a such a programme, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must tell them their rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this licence which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENCE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This Licence Agreement applies to any programme or other work which
+contains a notice placed by the copyright holder saying it may be
+distributed under the terms of this General Public Licence. The
+"Programme", below, refers to any such programme or work, and a "work based
+on the Programme" means either the Programme or any work containing the
+Programme or a portion of it, either verbatim or with modifications. Each
+licensee is addressed as "you".
+
+ 1. You may copy and distribute verbatim copies of the Programme's source
+code as you receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice and
+disclaimer of warranty; keep intact all the notices that refer to this
+General Public Licence and to the absence of any warranty; and give any
+other recipients of the Programme a copy of this General Public Licence
+along with the Programme. You may charge a fee for the physical act of
+transferring a copy.
+
+ 2. You may modify your copy or copies of the Programme or any portion of
+it, and copy and distribute such modifications under the terms of Paragraph
+1 above, provided that you also do the following:
+
+ a) cause the modified files to carry prominent notices stating that
+ you changed the files and the date of any change; and
+
+ b) cause the whole of any work that you distribute or publish, that
+ in whole or in part contains the Programme or any part thereof, either
+ with or without modifications, to be licensed at no charge to all
+ third parties under the terms of this General Public Licence (except
+ that you may choose to grant warranty protection to some or all
+ third parties, at your option).
+
+ c) If the modified programme normally reads commands interactively when
+ run, you must cause it, when started running for such interactive use
+ in the simplest and most usual way, to print or display an
+ announcement including an appropriate copyright notice and a notice
+ that there is no warranty (or else, saying that you provide a
+ warranty) and that users may redistribute the programme under these
+ conditions, and telling the user how to view a copy of this General
+ Public Licence.
+
+ d) You may charge a fee for the physical act of transferring a
+ copy, and you may at your option offer warranty protection in
+ exchange for a fee.
+
+Mere aggregation of another independent work with the Programme (or its
+derivative) on a volume of a storage or distribution medium does not bring
+the other work under the scope of these terms.
+
+ 3. You may copy and distribute the Programme (or a portion or derivative of
+it, under Paragraph 2) in object code or executable form under the terms of
+Paragraphs 1 and 2 above provided that you also do one of the following:
+
+ a) accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of
+ Paragraphs 1 and 2 above; or,
+
+ b) accompany it with a written offer, valid for at least three
+ years, to give any third party free (except for a nominal charge
+ for the cost of distribution) a complete machine-readable copy of the
+ corresponding source code, to be distributed under the terms of
+ Paragraphs 1 and 2 above; or,
+
+ c) accompany it with the information you received as to where the
+ corresponding source code may be obtained. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the programme in object code or executable form alone.)
+
+Source code for a work means the preferred form of the work for making
+modifications to it. For an executable file, complete source code means
+all the source code for all modules it contains; but, as a special
+exception, it need not include source code for modules which are standard
+libraries that accompany the operating system on which the executable
+file runs, or for standard header files or definitions files that
+accompany that operating system.
+
+ 4. You may not copy, modify, sublicense, distribute or transfer the
+Programme except as expressly provided under this General Public Licence.
+Any attempt otherwise to copy, modify, sublicense, distribute or transfer
+the Programme is void, and will automatically terminate your rights to use
+the Programme under this Licence. However, parties who have received
+copies, or rights to use copies, from you under this General Public
+Licence will not have their licences terminated so long as such parties
+remain in full compliance.
+
+ 5. By copying, distributing or modifying the Programme (or any work based
+on the Programme) you indicate your acceptance of this licence to do so,
+and all its terms and conditions.
+
+ 6. Each time you redistribute the Programme (or any work based on the
+Programme), the recipient automatically receives a licence from the original
+licensor to copy, distribute or modify the Programme subject to these
+terms and conditions. You may not impose any further restrictions on the
+recipients' exercise of the rights granted herein.
+
+ 7. The Free Software Foundation may publish revised and/or new versions
+of the General Public Licence from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Programme
+specifies a version number of the licence which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Programme does not specify a version number of
+the licence, you may choose any version ever published by the Free Software
+Foundation.
+
+ 8. If you wish to incorporate parts of the Programme into other free
+programmes whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 9. BECAUSE THE PROGRAMME IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAMME, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAMME "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAMME IS WITH YOU. SHOULD THE
+PROGRAMME PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 10. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAMME AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAMME (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAMME TO OPERATE WITH ANY OTHER
+PROGRAMMES), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ Appendix: How to Apply These Terms to Your New Programmes
+
+ If you develop a new programme, and you want it to be of the greatest
+possible use to humanity, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these
+terms.
+
+ To do so, attach the following notices to the programme. It is safest to
+attach them to the start of each source file to most effectively convey
+the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the programme's name and a brief idea of what it does.>
+ Copyright (C) 19yy <name of author>
+
+ This programme is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public Licence as published by
+ the Free Software Foundation; either version 1, or (at your option)
+ any later version.
+
+ This programme is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public Licence for more details.
+
+ You should have received a copy of the GNU General Public Licence
+ along with this programme; if not, write to the Free Software
+ Foundation, Inc, 675 Mass Ave, Cambridge, MA 02139, USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the programme is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) 19xx name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the
+appropriate parts of the General Public Licence. Of course, the
+commands you use may be called something other than `show w' and `show
+c'; they could even be mouse-clicks or menu items--whatever suits your
+programme.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the programme, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ programme `Gnomovision' (a programme to direct compilers to make passes
+ at assemblers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+That's all there is to it!
Deleted: branches/simplified-build/!OsLib/Tools/DefMod2/Copying
===================================================================
--- branches/simplified-build/!OsLib/Tools/DefMod2/Copying 2007-06-19 00:34:28 UTC (rev 273)
+++ branches/simplified-build/!OsLib/Tools/DefMod2/Copying 2007-06-19 22:03:42 UTC (rev 274)
@@ -1,248 +0,0 @@
- GNU GENERAL PUBLIC LICENCE
- Version 1, February 1989
-
- Copyright (C) 1989 Free Software Foundation, Inc.
- 675 Mass Ave, Cambridge, MA 02139, U S A
- Everyone is permitted to copy and distribute verbatim copies
- of this licence document, but changing it is not allowed.
-
- Preamble
-
- The licence agreements of most software companies try to keep users
-at the mercy of those companies. By contrast, our General Public
-Licence is intended to guarantee your freedom to share and change free
-software---to make sure the software is free for all its users. The
-General Public Licence applies to the Free Software Foundation's
-software and to any other programme whose authors commit to using it.
-You can use it for your programmes, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Specifically, the General Public Licence is designed to make
-sure that you have the freedom to give away or sell copies of free
-software, that you receive source code or can get it if you want it,
-that you can change the software or use pieces of it in new free
-programmes; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of a such a programme, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must tell them their rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this licence which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENCE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This Licence Agreement applies to any programme or other work which
-contains a notice placed by the copyright holder saying it may be
-distributed under the terms of this General Public Licence. The
-"Programme", below, refers to any such programme or work, and a "work based
-on the Programme" means either the Programme or any work containing the
-Programme or a portion of it, either verbatim or with modifications. Each
-licensee is addressed as "you".
-
- 1. You may copy and distribute verbatim copies of the Programme's source
-code as you receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice and
-disclaimer of warranty; keep intact all the notices that refer to this
-General Public Licence and to the absence of any warranty; and give any
-other recipients of the Programme a copy of this General Public Licence
-along with the Programme. You may charge a fee for the physical act of
-transferring a copy.
-
- 2. You may modify your copy or copies of the Programme or any portion of
-it, and copy and distribute such modifications under the terms of Paragraph
-1 above, provided that you also do the following:
-
- a) cause the modified files to carry prominent notices stating that
- you changed the files and the date of any change; and
-
- b) cause the whole of any work that you distribute or publish, that
- in whole or in part contains the Programme or any part thereof, either
- with or without modifications, to be licensed at no charge to all
- third parties under the terms of this General Public Licence (except
- that you may choose to grant warranty protection to some or all
- third parties, at your option).
-
- c) If the modified programme normally reads commands interactively when
- run, you must cause it, when started running for such interactive use
- in the simplest and most usual way, to print or display an
- announcement including an appropriate copyright notice and a notice
- that there is no warranty (or else, saying that you provide a
- warranty) and that users may redistribute the programme under these
- conditions, and telling the user how to view a copy of this General
- Public Licence.
-
- d) You may charge a fee for the physical act of transferring a
- copy, and you may at your option offer warranty protection in
- exchange for a fee.
-
-Mere aggregation of another independent work with the Programme (or its
-derivative) on a volume of a storage or distribution medium does not bring
-the other work under the scope of these terms.
-
- 3. You may copy and distribute the Programme (or a portion or derivative of
-it, under Paragraph 2) in object code or executable form under the terms of
-Paragraphs 1 and 2 above provided that you also do one of the following:
-
- a) accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of
- Paragraphs 1 and 2 above; or,
-
- b) accompany it with a written offer, valid for at least three
- years, to give any third party free (except for a nominal charge
- for the cost of distribution) a complete machine-readable copy of the
- corresponding source code, to be distributed under the terms of
- Paragraphs 1 and 2 above; or,
-
- c) accompany it with the information you received as to where the
- corresponding source code may be obtained. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the programme in object code or executable form alone.)
-
-Source code for a work means the preferred form of the work for making
-modifications to it. For an executable file, complete source code means
-all the source code for all modules it contains; but, as a special
-exception, it need not include source code for modules which are standard
-libraries that accompany the operating system on which the executable
-file runs, or for standard header files or definitions files that
-accompany that operating system.
-
- 4. You may not copy, modify, sublicense, distribute or transfer the
-Programme except as expressly provided under this General Public Licence.
-Any attempt otherwise to copy, modify, sublicense, distribute or transfer
-the Programme is void, and will automatically terminate your rights to use
-the Programme under this Licence. However, parties who have received
-copies, or rights to use copies, from you under this General Public
-Licence will not have their licences terminated so long as such parties
-remain in full compliance.
-
- 5. By copying, distributing or modifying the Programme (or any work based
-on the Programme) you indicate your acceptance of this licence to do so,
-and all its terms and conditions.
-
- 6. Each time you redistribute the Programme (or any work based on the
-Programme), the recipient automatically receives a licence from the original
-licensor to copy, distribute or modify the Programme subject to these
-terms and conditions. You may not impose any further restrictions on the
-recipients' exercise of the rights granted herein.
-
- 7. The Free Software Foundation may publish revised and/or new versions
-of the General Public Licence from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Programme
-specifies a version number of the licence which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Programme does not specify a version number of
-the licence, you may choose any version ever published by the Free Software
-Foundation.
-
- 8. If you wish to incorporate parts of the Programme into other free
-programmes whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 9. BECAUSE THE PROGRAMME IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAMME, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAMME "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAMME IS WITH YOU. SHOULD THE
-PROGRAMME PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 10. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAMME AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAMME (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAMME TO OPERATE WITH ANY OTHER
-PROGRAMMES), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- Appendix: How to Apply These Terms to Your New Programmes
-
- If you develop a new programme, and you want it to be of the greatest
-possible use to humanity, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these
-terms.
-
- To do so, attach the following notices to the programme. It is safest to
-attach them to the start of each source file to most effectively convey
-the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
- <one line to give the programme's name and a brief idea of what it does.>
- Copyright (C) 19yy <name of author>
-
- This programme is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public Licence as published by
- the Free Software Foundation; either version 1, or (at your option)
- any later version.
-
- This programme is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public Licence for more details.
-
- You should have received a copy of the GNU General Public Licence
- along with this programme; if not, write to the Free Software
- Foundation, Inc, 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the programme is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) 19xx name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the
-appropriate parts of the General Public Licence. Of course, the
-commands you use may be called something other than `show w' and `show
-c'; they could even be mouse-clicks or menu items--whatever suits your
-programme.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the programme, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- programme `Gnomovision' (a programme to direct compilers to make passes
- at assemblers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-That's all there is to it!
Modified: branches/simplified-build/!OsLib/Tools/DefMod2/README
===================================================================
--- branches/simplified-build/!OsLib/Tools/DefMod2/README 2007-06-19 00:34:28 UTC (rev 273)
+++ branches/simplified-build/!OsLib/Tools/DefMod2/README 2007-06-19 22:03:42 UTC (rev 274)
@@ -1,83 +1,41 @@
-
README
======
This distribution contains a patched defmod that can be built on UNIX systems
-as well as RISC OS systems.
+as well as RISC OS systems (although the latter hasn't recently been tested).
-The sources to defmod are in the defmod directory. An example UNIX
-environment for building OSLib itself is in unix_eg
+AUTHORS
+=======
-Please have a go with this software and see if it works for you.
+Original defmod development was done by Jonathan Coxhead. After making the
+OSLib sources available under GPL, the development continued by several of
+the SourceForge OSLib (ro-oslib) developers. Stewart Brodie (st...@eh...)
+contributed the changes to build and run defmod on UNIX systems.
-
-
-Stewart Brodie (st...@eh...)
-October 18th 2001
-
-
-
-
REQUIREMENTS
============
bison 1.28 must be installed on your UNIX system.
You must have GNU make (gmake on FreeBSD systems).
You must have bash.
+You must either have GCCSDK 3.4.6 R2 (http://gccsdk.riscos.info/) or AsmAsm
+for AOF output or GCCSDK 4 (http://gccsdk.riscos.info/) for ELF output.
-To perform the demonstration build, you will need an "armasm" on
-your path that is an ARM assembler compatible with RISC OS objasm.
-You will also require "armlib" on your path that is compatible
-with RISC OS libfile (see note at end too)
+LICENSE
+=======
+This programme is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public Licence as published by
+the Free Software Foundation; either version 1, or (at your option)
+any later version.
+This programme is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public Licence for more details.
-HOWTO
-=====
+You should have received a copy of the GNU General Public Licence
+along with this programme; if not, write to the Free Software
+Foundation, Inc, 675 Mass Ave, Cambridge, MA 02139, USA.
-Copy all the contents of this archive to a UNIX system.
-
-In defmod/ports/solaris, do:
-
-$ make links
-$ make
-
-Construct a build directory from the top-level of the unpacked archive:
-
-$ cd unix_eg
-$ mkdir defs # if it wasn't already there
-
-Copy all the defmod definition files from OSLib into this directory.
-There's around 150 in total - just copy them all in here.
-
-Rename the files to have a .swi suffix (example in /bin/sh):
-
-$ for i in defs/*
-> do
-> mv $i $i.swi
-> done
-
-Then you should be able to build it:
-
-$ make # or gmake on FreeBSD
-
-This will build all the .h, all the .hdr and the OSLib.a file. Depending on
-your machine, this could take anything from a few seconds to a few minutes
-(compared with over an hour on a Risc PC ;-)
-
-Depending on your UNIX, the armlib call may fail with "Too many arguments"
-because I'm allowing the shell to expand the parameters instead of OSLib.
-If this happens, sorry - you'll need to do:
-
-$ find tmp -name "*.o" > ViaFile
-$ armlib -c -o OSLib.a -via ViaFile
-
-
-NOTES
-=====
-
-Please see the CHANGES file for notes on what I've changed for both the
-generic defmod software and to support execution on UNIX systems.
-
-
#END#
Modified: branches/simplified-build/!OsLib/Tools/DefMod2/defmod.y
===================================================================
--- branches/simplified-build/!OsLib/Tools/DefMod2/defmod.y 2007-06-19 00:34:28 UTC (rev 273)
+++ branches/simplified-build/!OsLib/Tools/DefMod2/defmod.y 2007-06-19 22:03:42 UTC (rev 274)
@@ -1154,7 +1154,7 @@
{ const char* helptext = "DefMod" VERSION_INFO ". Copyright � Jonathan Coxhead, 1994.\r"
"DefMod comes with ABSOLUTELY NO WARRANTY.\r"
"This is free software, and you are welcome to redistribute it "
- "under certain conditions. See the file Copying for details.\r"
+ "under certain conditions. See the file COPYING for details.\r"
"Usage: DefMod <type> [-v] [-help] "
"[-o <output-dir> | > <output-file>] "
"[-byte_wide <byte-wide-file>] "
Property changes on: branches/simplified-build/!OsLib/Tools/IndexHelp
___________________________________________________________________
Name: svn:ignore
- IndexHelp
o
+ indexhelp
o
Modified: branches/simplified-build/!OsLib/Tools/Makefile
===================================================================
--- branches/simplified-build/!OsLib/Tools/Makefile 2007-06-19 00:34:28 UTC (rev 273)
+++ branches/simplified-build/!OsLib/Tools/Makefile 2007-06-19 22:03:42 UTC (rev 274)
@@ -1,4 +1,5 @@
-# ...
+# Top makefile for building all the tools used for OSLib build.
+# Only the tools needed during the cross-compile build are built.
ALL = BindHelp DefMod2 IndexHelp ReduceAOF
Property changes on: branches/simplified-build/!OsLib/Tools/ReduceAOF
___________________________________________________________________
Name: svn:ignore
- reduceaof
o
+ reduceaof
o
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2007-06-19 00:34:30
|
Revision: 273
http://ro-oslib.svn.sourceforge.net/ro-oslib/?rev=273&view=rev
Author: jtytgat
Date: 2007-06-18 17:34:28 -0700 (Mon, 18 Jun 2007)
Log Message:
-----------
Zipping up an OSLib32 release didn't work.
Modified Paths:
--------------
branches/simplified-build/!OsLib/Source/Makefile
Modified: branches/simplified-build/!OsLib/Source/Makefile
===================================================================
--- branches/simplified-build/!OsLib/Source/Makefile 2007-06-19 00:13:57 UTC (rev 272)
+++ branches/simplified-build/!OsLib/Source/Makefile 2007-06-19 00:34:28 UTC (rev 273)
@@ -39,7 +39,7 @@
-$(RM) $(RELEASEDIR)/$(BUILDTYPE)/OSLib-wide.zip
-$(MKDIR) $(HEADERDIR)/h $(HEADERDIR)/Hdr $(TOPHEADERDIR)/$(LIBSUFFIX)
cd $(HEADERDIR) && find . -type f -exec rename 's/(.+)\.(.+)/$$2\/$$1/' {} \;
- $(CP) $(OSLIBLIB) $(TOPHEADERDIR)/$(LIBSUFFIX)/$(basename $(OSLIBLIB))
+ $(CP) $(OSLIBLIB) $(TOPHEADERDIR)/$(LIBSUFFIX)/$(basename $(notdir $(OSLIBLIB)))
cd $(TOPHEADERDIR) && $(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/$(BUILDTYPE)/OSLib-wide.zip .
$(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/$(BUILDTYPE)/OSLib-wide.zip SetVars,feb
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2007-06-19 00:14:00
|
Revision: 272
http://ro-oslib.svn.sourceforge.net/ro-oslib/?rev=272&view=rev
Author: jtytgat
Date: 2007-06-18 17:13:57 -0700 (Mon, 18 Jun 2007)
Log Message:
-----------
- Empty OSF32.Hdr/OSCore32.Hdr: those were not doing something important in previous
versions. Assembler headers are already OS_F/OS_FW neutral.
- Added OSLibSupport support back.
- Added release related targets.
Modified Paths:
--------------
branches/simplified-build/!OsLib/Makefile
branches/simplified-build/!OsLib/Source/Makefile
branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_AOF
branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_ELF
branches/simplified-build/!OsLib/Source/Types/oslib/OSCore32.AOFHdr
branches/simplified-build/!OsLib/Source/Types/oslib/OSCore32.ELFHdr
branches/simplified-build/!OsLib/Source/Types/oslib/OSF32.AOFHdr
branches/simplified-build/!OsLib/Source/Types/oslib/OSF32.ELFHdr
branches/simplified-build/!OsLib/Source/Types/oslib/Types.AOFHdr
Added Paths:
-----------
branches/simplified-build/!OsLib/Source/OSLibSupport/Makefile
Modified: branches/simplified-build/!OsLib/Makefile
===================================================================
--- branches/simplified-build/!OsLib/Makefile 2007-06-19 00:03:11 UTC (rev 271)
+++ branches/simplified-build/!OsLib/Makefile 2007-06-19 00:13:57 UTC (rev 272)
@@ -1,45 +1,67 @@
-# ...
+# OSLib's top Makefile to build ELF/AOF OSLib versions, install them in the
+# GCCSDK cross-compiler environment and to create OSLib releases.
+# Written by OSLib Development Team.
-.PHONY: all clean install release oslib-aof oslib-aof-n-release oslib-elf oslib-elf-n-release cstrong cstrong-n-release Tools
+.PHONY: all install install-aof install-elf clean oslib-aof oslib-elf cstrong \
+ release oslib-aof-n-release oslib-elf-n-release \
+ oslib-examples-n-release oslib-src-n-release cstrong-n-release \
+ tools
+# The default all/install target is ELF.
all: oslib-elf cstrong
+install: install-elf
+ @echo OSLib ELF installed
+
+# Installs the ELF headers & library in GCCSDK environment.
+install-elf: oslib-elf
+ $(MAKE) -C Source install BUILDTYPE=CROSSGCC_ELF
+
+# Installs the AOF headers & library in GCCSDK environment.
+install-aof: oslib-aof
+ $(MAKE) -C Source install BUILDTYPE=CROSSGCC_AOF
+
clean:
$(MAKE) -C Tools clean
$(MAKE) -C Source clean
-# Installs the ELF headers & library in GCCSDK environment.
-install: oslib-elf
- $(MAKE) -C Source install
+oslib-aof: tools
+ $(MAKE) -C Source clean
+ $(MAKE) -C Source oslib BUILDTYPE=CROSSGCC_AOF
+ $(MAKE) -C Source oslibsupport BUILDTYPE=CROSSGCC_AOF
+oslib-elf: tools
+ $(MAKE) -C Source clean
+ $(MAKE) -C Source oslib BUILDTYPE=CROSSGCC_ELF
+ $(MAKE) -C Source oslibsupport BUILDTYPE=CROSSGCC_ELF
+
+cstrong: tools
+ $(MAKE) -C Source cstrong
+
+## vv Release targets (BEGIN)
# Builds a full AOF and ELF based OSLib release:
-release: oslib-aof-n-release oslib-elf-n-release cstrong-n-release
+release: oslib-aof-n-release oslib-elf-n-release oslib-examples-n-release \
+ oslib-src-n-release cstrong-n-release
@echo Done.
-oslib-aof: Tools
- $(MAKE) -C Source clean
- $(MAKE) -C Source oslib BUILDTYPE=CROSSGCC_AOF
- $(MAKE) -C Source oslibsupport BUILDTYPE=CROSSGCC_AOF
-
oslib-aof-n-release: oslib-aof
$(MAKE) -C Source release-oslib BUILDTYPE=CROSSGCC_AOF
$(MAKE) -C Source release-oslibsupport BUILDTYPE=CROSSGCC_AOF
-oslib-elf: Tools
- $(MAKE) -C Source clean
- $(MAKE) -C Source oslib BUILDTYPE=CROSSGCC_ELF
- $(MAKE) -C Source oslibsupport BUILDTYPE=CROSSGCC_ELF
-
oslib-elf-n-release: oslib-elf
$(MAKE) -C Source release-oslib BUILDTYPE=CROSSGCC_ELF
$(MAKE) -C Source release-oslibsupport BUILDTYPE=CROSSGCC_ELF
-cstrong: Tools
- $(MAKE) -C Source cstrong
+oslib-examples-n-release:
+ $(MAKE) -C Source release-examples
+oslib-src-n-release:
+ $(MAKE) -C Source release-src
+
cstrong-n-release: cstrong
$(MAKE) -C Source release-cstrong
+## ^^ Release targets (END)
# Build the tools and install them.
-Tools:
- $(MAKE) -C $@ install
+tools:
+ $(MAKE) -C Tools install
Modified: branches/simplified-build/!OsLib/Source/Makefile
===================================================================
--- branches/simplified-build/!OsLib/Source/Makefile 2007-06-19 00:03:11 UTC (rev 271)
+++ branches/simplified-build/!OsLib/Source/Makefile 2007-06-19 00:13:57 UTC (rev 272)
@@ -1,4 +1,7 @@
-# ...
+# OSLib Source Makefile building the OSLib library and its headers.
+# The necessary OSLib build progreams (like defmod, bindhelp, etc) should
+# already be built upfront.
+# Written by OSLib Development Team.
# Build type: CROSSGCC_AOF, CROSSGCC_ELF (default), [NORCROFT_AOF: not supported yet]
export BUILDTYPE ?= CROSSGCC_ELF
@@ -10,28 +13,33 @@
endif
include Makefile.setup.$(BUILDTYPE)
-.PHONY: all install release-oslib release-oslibsupport release-cstrong clean oslib oslibsupport cstrong BuildRequirements
-all: oslib cstrong oslibsupport
+.PHONY: all install \
+ release-oslib release-oslibsupport release-cstrong release-examples release-src \
+ clean oslib oslibsupport cstrong BuildRequirements
+all: oslib oslibsupport
test: oslib
$(MAKE) -C Test
# Only for GCCSDK Autobuilder cross-compilation install purposes:
-install: oslib
- cd $(BUILDDIR) && $(INSTALL) OSLib32.o $(GCCSDK_INSTALL_ENV)/lib/libOSLib32.o
+install: oslib oslibsupport
+ -$(MKDIR) $(GCCSDK_INSTALL_ENV)/lib
+ cd $(dir $(OSLIBLIB)) && $(INSTALL) $(notdir $(OSLIBLIB)) $(GCCSDK_INSTALL_ENV)/lib/$(notdir $(OSLIBLIB))
+ -$(MKDIR) $(GCCSDK_INSTALL_ENV)/include/oslib
cd $(HEADERDIR) && $(INSTALL) *.h *.Hdr $(GCCSDK_INSTALL_ENV)/include/oslib
+ $(MAKE) -C OSLibSupport install
# Sanity test and if successful then zips the OSLib library & its headers (Unix and RISC OS 'wide' distribution):
release-oslib: test
-$(MKDIR) $(RELEASEDIR)/$(BUILDTYPE)
-$(RM) $(RELEASEDIR)/$(BUILDTYPE)/OSLib-unix.zip
cd $(TOPHEADERDIR) && $(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/$(BUILDTYPE)/OSLib-unix.zip oslib
- cd $(BUILDDIR) && $(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/$(BUILDTYPE)/OSLib-unix.zip OSLib32.o
+ cd $(BUILDDIR) && $(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/$(BUILDTYPE)/OSLib-unix.zip $(notdir $(OSLIBLIB))
$(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/$(BUILDTYPE)/OSLib-unix.zip SetVars,feb
-$(RM) $(RELEASEDIR)/$(BUILDTYPE)/OSLib-wide.zip
- -$(MKDIR) $(HEADERDIR)/h $(HEADERDIR)/Hdr $(TOPHEADERDIR)/o
+ -$(MKDIR) $(HEADERDIR)/h $(HEADERDIR)/Hdr $(TOPHEADERDIR)/$(LIBSUFFIX)
cd $(HEADERDIR) && find . -type f -exec rename 's/(.+)\.(.+)/$$2\/$$1/' {} \;
- $(CP) $(OSLIBLIB) $(TOPHEADERDIR)/o/OSLib32
+ $(CP) $(OSLIBLIB) $(TOPHEADERDIR)/$(LIBSUFFIX)/$(basename $(OSLIBLIB))
cd $(TOPHEADERDIR) && $(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/$(BUILDTYPE)/OSLib-wide.zip .
$(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/$(BUILDTYPE)/OSLib-wide.zip SetVars,feb
@@ -41,15 +49,28 @@
-$(RM) $(RELEASEDIR)/$(BUILDTYPE)/OSLibSupport-unix.zip
cd $(OSLIBSUPPORTDIR) && $(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/$(BUILDTYPE)/OSLibSupport-unix.zip .
-$(RM) $(RELEASEDIR)/$(BUILDTYPE)/OSLibSupport.zip
- -$(MKDIR) $(OSLIBSUPPORTDIR)/h $(OSLIBSUPPORTDIR)/o
+ -$(MKDIR) $(OSLIBSUPPORTDIR)/h $(OSLIBSUPPORTDIR)/$(LIBSUFFIX)
cd $(OSLIBSUPPORTDIR) && find . -type f -exec rename 's/(.+)\.(.+)/$$2\/$$1/' {} \;
cd $(OSLIBSUPPORTDIR) && $(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/$(BUILDTYPE)/OSLibSupport.zip .
# Zips the StrongHelp file:
-release-cstrong:
- $(MKDIR) $(RELEASEDIR)/$(BUILDTYPE)
- cd $(BUILDDIR) && $(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/$(BUILDTYPE)/OSLibStrongHelp $(notdir $(OSLIBCSTRONG))
+release-cstrong: cstrong
+ -$(MKDIR) $(RELEASEDIR)
+ -$(RM) $(RELEASEDIR)/OSLibStrongHelp.zip
+ cd $(BUILDDIR) && $(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/OSLibStrongHelp.zip $(notdir $(OSLIBCSTRONG))
+# Zips the OSLib examples:
+release-examples:
+ -$(MKDIR) $(RELEASEDIR)
+ -$(RM) $(BUILDDIR)/OSLibExamples $(RELEASEDIR)/OSLibExamples.zip
+ svn export $(EXAMPLESDIR) $(BUILDDIR)/OSLibExamples && cd $(BUILDDIR) && $(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/OSLibExamples.zip OSLibExamples
+
+# Zips the !OSLib sources:
+release-src:
+ -$(MKDIR) $(RELEASEDIR)
+ -$(RM) $(BUILDDIR)/\!OSLib $(RELEASEDIR)/OSLib-src.zip
+ svn export $(SOURCEDIR)/../../\!OsLib $(BUILDDIR)/\!OSLib && cd $(BUILDDIR) && $(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/OSLib-src.zip \!OSLib
+
clean:
$(MAKE) -C Types/oslib $@
$(MAKE) -C Computer/oslib $@
Modified: branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_AOF
===================================================================
--- branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_AOF 2007-06-19 00:03:11 UTC (rev 271)
+++ branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_AOF 2007-06-19 00:13:57 UTC (rev 272)
@@ -11,6 +11,7 @@
export BINDIR := $(SOURCEDIR)/../Bin
export BUILDDIR := $(SOURCEDIR)/Build
export RELEASEDIR := $(SOURCEDIR)/../Release
+export EXAMPLESDIR := $(SOURCEDIR)/../examples
export TOPHEADERDIR := $(BUILDDIR)/Header
export HEADERDIR := $(TOPHEADERDIR)/oslib
@@ -36,6 +37,8 @@
export INSTALL := $(GCCSDK_INSTALL_ENV)/ro-install
export ASMEXT := .asm
+export LIBSUFFIX := o
-export OSLIBLIB := $(BUILDDIR)/OSLib32.o
+export OSLIBLIB := $(BUILDDIR)/OSLib32.$(LIBSUFFIX)
+export OSLIBSUPPORTLIB := $(OSLIBSUPPORTDIR)/OSLibSupport32.$(LIBSUFFIX)
export OSLIBCSTRONG := $(BUILDDIR)/OSLib,3d6
Modified: branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_ELF
===================================================================
--- branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_ELF 2007-06-19 00:03:11 UTC (rev 271)
+++ branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_ELF 2007-06-19 00:13:57 UTC (rev 272)
@@ -11,6 +11,7 @@
export BINDIR := $(SOURCEDIR)/../Bin
export BUILDDIR := $(SOURCEDIR)/Build
export RELEASEDIR := $(SOURCEDIR)/../Release
+export EXAMPLESDIR := $(SOURCEDIR)/../examples
export TOPHEADERDIR := $(BUILDDIR)/Header
export HEADERDIR := $(TOPHEADERDIR)/oslib
@@ -36,6 +37,8 @@
export INSTALL := $(GCCSDK_INSTALL_ENV)/ro-install
export ASMEXT := .gas
+export LIBSUFFIX := a
-export OSLIBLIB := $(BUILDDIR)/OSLib32.o
+export OSLIBLIB := $(BUILDDIR)/libOSLib32.$(LIBSUFFIX)
+export OSLIBSUPPORTLIB := $(OSLIBSUPPORTDIR)/libOSLibSupport32.$(LIBSUFFIX)
export OSLIBCSTRONG := $(BUILDDIR)/OSLib,3d6
Added: branches/simplified-build/!OsLib/Source/OSLibSupport/Makefile
===================================================================
--- branches/simplified-build/!OsLib/Source/OSLibSupport/Makefile (rev 0)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Makefile 2007-06-19 00:13:57 UTC (rev 272)
@@ -0,0 +1,36 @@
+# ...
+
+SUBDIRS = Choices_ Err_ Events_ Message_ Task_ trace_ X_
+
+FILES = $(addsuffix /Modules, $(SUBDIRS))
+
+HEADERS = Choices.h Err.h Event.h Gadgettypes.h Message.h Systypes.h \
+ Task.h Toolboxtypes.h trace.h Wimptypes.h X.h
+
+include $(FILES)
+
+.PHONY: all clean install
+
+all: $(OSLIBSUPPORTLIB)
+
+clean:
+ -$(RM) $(OSLIBSUPPORTLIB)
+ -$(RM) $(OBJS)
+
+install: $(OSLIBSUPPORTLIB)
+ -$(MKDIR) $(GCCSDK_INSTALL_ENV)/lib
+ cd $(dir $(OSLIBSUPPORTLIB)) && $(INSTALL) $(notdir $(OSLIBSUPPORTLIB)) $(GCCSDK_INSTALL_ENV)/lib/$(notdir $(OSLIBSUPPORTLIB))
+ -$(MKDIR) $(GCCSDK_INSTALL_ENV)/include
+ cd $(OSLIBSUPPORTDIR) && $(INSTALL) $(HEADERS) $(GCCSDK_INSTALL_ENV)/include
+
+$(OSLIBSUPPORTLIB): $(OBJS)
+ -$(MKDIR) $(OSLIBSUPPORTDIR)/Doc
+ $(LIBFILE) $@ $(OBJS)
+ $(CP) $(HEADERS) $(OSLIBSUPPORTDIR)
+ $(CP) Doc/X $(OSLIBSUPPORTDIR)/Doc/X
+
+.SUFFIXES:
+.SUFFIXES: .o .h .Hdr
+
+%.o: %.c $(HEADERS)
+ $(CC) -c $< -I. -I$(TOPHEADERDIR) -o $@
Modified: branches/simplified-build/!OsLib/Source/Types/oslib/OSCore32.AOFHdr
===================================================================
--- branches/simplified-build/!OsLib/Source/Types/oslib/OSCore32.AOFHdr 2007-06-19 00:03:11 UTC (rev 271)
+++ branches/simplified-build/!OsLib/Source/Types/oslib/OSCore32.AOFHdr 2007-06-19 00:13:57 UTC (rev 272)
@@ -1,20 +0,0 @@
-;/* OSCore32.Hdr
-;** Used by OSCore.HDR to create the short synonyms for 32-bit file handles
-;**
-;** Tony van der Hoff 10-11-01
-;*/
-
- [ :LNOT: :DEF: OSCore32_Hdr
- GBLL OSCore32_Hdr
-
- [ :LNOT: :DEF: OSF32_Hdr
- GET OSLIB:oslib.Hdr.OSF32
- ]
-
- [ :LNOT: :DEF: OSLIB_F8
- ]
-
- ]
-
-
- END
Modified: branches/simplified-build/!OsLib/Source/Types/oslib/OSCore32.ELFHdr
===================================================================
--- branches/simplified-build/!OsLib/Source/Types/oslib/OSCore32.ELFHdr 2007-06-19 00:03:11 UTC (rev 271)
+++ branches/simplified-build/!OsLib/Source/Types/oslib/OSCore32.ELFHdr 2007-06-19 00:13:57 UTC (rev 272)
@@ -1,6 +0,0 @@
-@ OSCore32.Hdr
-@ Used by OSCore.Hdr to create the short synonyms for 32-bit file handles
-@
-@ Tony van der Hoff 10-11-01
-
-#include "oslib/OSF32.Hdr"
Modified: branches/simplified-build/!OsLib/Source/Types/oslib/OSF32.AOFHdr
===================================================================
--- branches/simplified-build/!OsLib/Source/Types/oslib/OSF32.AOFHdr 2007-06-19 00:03:11 UTC (rev 271)
+++ branches/simplified-build/!OsLib/Source/Types/oslib/OSF32.AOFHdr 2007-06-19 00:13:57 UTC (rev 272)
@@ -1,18 +0,0 @@
-; OSF32.h
-; creates a short-form synonym for OS_FW
-;
-; Tony van der Hoff 10-11-01
-;
-
- [ :LNOT: :DEF: OSF32_Hdr
- GBLL OSF32_Hdr
-
- [ :LNOT: :DEF: OSLIB_F8
- GBLS $OS_F
-;$OS_F SETS OS_FW ; TV 20021128
-OS_F SETS OS_FW
- ]
-
- ]
-
- END
Modified: branches/simplified-build/!OsLib/Source/Types/oslib/OSF32.ELFHdr
===================================================================
--- branches/simplified-build/!OsLib/Source/Types/oslib/OSF32.ELFHdr 2007-06-19 00:03:11 UTC (rev 271)
+++ branches/simplified-build/!OsLib/Source/Types/oslib/OSF32.ELFHdr 2007-06-19 00:13:57 UTC (rev 272)
@@ -1,11 +0,0 @@
-@ OSF32.h
-@ creates a short-form synonym for OS_FW
-@
-@ Tony van der Hoff 10-11-01
-
-#ifndef OSF32_Hdr
-# define OSF32_Hdr
-
-# define OS_F OS_FW
-
-#endif
Modified: branches/simplified-build/!OsLib/Source/Types/oslib/Types.AOFHdr
===================================================================
--- branches/simplified-build/!OsLib/Source/Types/oslib/Types.AOFHdr 2007-06-19 00:03:11 UTC (rev 271)
+++ branches/simplified-build/!OsLib/Source/Types/oslib/Types.AOFHdr 2007-06-19 00:13:57 UTC (rev 272)
@@ -1,5 +1,5 @@
[ :LNOT: :DEF: Types_Hdr
- GBLL Types_Hdr
+ GBLS Types_Hdr
R0 RN 0
R1 RN 1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2007-06-19 00:03:14
|
Revision: 271
http://ro-oslib.svn.sourceforge.net/ro-oslib/?rev=271&view=rev
Author: jtytgat
Date: 2007-06-18 17:03:11 -0700 (Mon, 18 Jun 2007)
Log Message:
-----------
Improved testing AOF/ELF case
Modified Paths:
--------------
branches/simplified-build/!OsLib/Source/Test/Test/Makefile
branches/simplified-build/!OsLib/Source/Test/Test/test.asm
branches/simplified-build/!OsLib/Source/Test/Test1/Makefile
branches/simplified-build/!OsLib/Source/Test/Test1/test.asm
branches/simplified-build/!OsLib/Source/Test/Test1/test.c
Added Paths:
-----------
branches/simplified-build/!OsLib/Source/Test/Test/small_test.asm
branches/simplified-build/!OsLib/Source/Test/Test/small_test.gas
Removed Paths:
-------------
branches/simplified-build/!OsLib/Source/Test/Test/mkhdr.c
branches/simplified-build/!OsLib/Source/Test/Test/small_test.s
Modified: branches/simplified-build/!OsLib/Source/Test/Test/Makefile
===================================================================
--- branches/simplified-build/!OsLib/Source/Test/Test/Makefile 2007-05-31 16:14:13 UTC (rev 270)
+++ branches/simplified-build/!OsLib/Source/Test/Test/Makefile 2007-06-19 00:03:11 UTC (rev 271)
@@ -19,7 +19,7 @@
test_s: test$(ASMEXT) all_oslib.Hdr
$(AS) -o $@ -I$(TOPHEADERDIR) $<
-small_test.o: small_test.s all_oslib.Hdr
+small_test.o: small_test$(ASMEXT) all_oslib.Hdr
$(AS) -o $@ -I$(TOPHEADERDIR) $<
all_oslib.h: $(ALL_CHEADERS)
Deleted: branches/simplified-build/!OsLib/Source/Test/Test/mkhdr.c
===================================================================
--- branches/simplified-build/!OsLib/Source/Test/Test/mkhdr.c 2007-05-31 16:14:13 UTC (rev 270)
+++ branches/simplified-build/!OsLib/Source/Test/Test/mkhdr.c 2007-06-19 00:03:11 UTC (rev 271)
@@ -1,158 +0,0 @@
-/* mkhdr.c
-** Make a header file out of a list of modules
-** syntax: mkhdr [-c -s] <hdrfile> {<module> ...}
-*/
-
-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-
-//#define DEBUG
-
-typedef enum
- {
- mode_NONE,
- mode_C,
- mode_ASM,
- } mode_t;
-
-#define TMP_SIZ 64
-
-static int ToLower( char *dest, const char *src, int max )
-{
- int chars = 0;
-
- while ( (*src != '\0') && (chars < max) )
- {
- *dest++ = (char)tolower( *src++ );
- chars++;
- }
-
- *dest = '\0';
- return chars;
-}
-
-int main (int argc, const char **argv)
-{
- int status = 0;
- mode_t mode = mode_NONE;
- FILE *hdr = 0;
-
- fprintf( stderr, "mkhdr " __DATE__ " \xA9Tony van der Hoff\n\n" );
-
- if ( argc < 4 )
- {
- fprintf( stderr,
- "Usage:\tmkhdr [options] hdrfile module1 module2 ... moduleN\n\n"
- "Options:\t-c:\tgenerate c-style header file\n"
- "\t\t-s:\tgenerate objasm-style header file\n"
- );
- status = -1;
- }
-
- if ( status == 0 )
- {
-#ifdef DEBUG
- fprintf( stderr,
- "Option: %s\n"
- "Output: %s\n"
- , argv[1]
- , argv[2]
- );
- for ( int i = 3; i < argc; ++i )
- {
- fprintf( stderr, "%s ", argv[i] );
- }
- fputs( "\n",stderr );
-#endif
- if ( strcmp( argv[1], "-s" ) == 0 )
- mode = mode_ASM;
- else if ( strcmp( argv[1], "-c" ) == 0 )
- mode = mode_C;
-
- if ( mode == mode_NONE )
- {
- fprintf( stderr,
- "Error: invalid or no translation mode defined\n"
- );
- status = -1;
- }
- }
-
- if (status == 0)
- {
- hdr = fopen( argv[2], "w" );
- if ( hdr == 0 )
- {
- fprintf( stderr,
- "Error: File %s failed to open\n",
- argv[2]
- );
- status = -1;
- }
- else
- {
- }
- }
-
- if (status == 0)
- {
- time_t tim = time( 0 );
-
- switch ( mode )
- {
- case mode_C:
- fprintf( hdr,
- "/* %s - Generated by mkhdr [" __DATE__ "] on %s */\n",
- argv[2], ctime( &tim )
- );
- break;
-
- case mode_ASM:
- fprintf( hdr,
- ";%s - Generated by mkhdr [" __DATE__ "] on %s\n",
- argv[2], ctime( &tim )
- );
- break;
- }
-
- for ( int i = 3; i < argc; ++i )
- {
- char temp[ TMP_SIZ ];
-
- switch ( mode )
- {
- case mode_C:
- ToLower( temp, argv[i], TMP_SIZ );
- fprintf( hdr,
- "#include \"oslib/%s.h\"\n",
- temp
- );
- break;
-
- case mode_ASM:
- fprintf( hdr,
- //"\tGET\toslib.Hdr.%s\n",
- "\tGET\toslib/%s.Hdr\n",
- argv[i]
- );
- break;
- } /* end switch */
- } /* end for */
-
- switch ( mode )
- {
- case mode_ASM:
- fprintf( hdr,
- "\tEND\n"
- );
- break;
- }
- } /* status == 0 */
-
- if ( hdr )
- fclose( hdr );
-
- return status;
-}
Copied: branches/simplified-build/!OsLib/Source/Test/Test/small_test.asm (from rev 261, branches/simplified-build/!OsLib/Source/Test/Test/small_test.s)
===================================================================
--- branches/simplified-build/!OsLib/Source/Test/Test/small_test.asm (rev 0)
+++ branches/simplified-build/!OsLib/Source/Test/Test/small_test.asm 2007-06-19 00:03:11 UTC (rev 271)
@@ -0,0 +1,72 @@
+ GET oslib/OSGBPB.Hdr
+ GET oslib/Macros.Hdr
+
+ AREA code, CODE
+
+ ; void EnumCSD (void);
+ EXPORT |EnumCSD|
+|EnumCSD|
+ STMFD R13!, {R4-R11, R14}
+ MOV R4, #0
+|loop|
+ MOV R0, #OSGBPB_DirEntriesInfoStamped
+ LDR R1, =dirname
+ LDR R2, =buffer
+ MOV R3, #10
+ MOV R5, #endbuffer - buffer
+ LDR R6, =wildcard
+ SWI OS_GBPB
+ CMP R4, #-1
+ LDMEQFD R13!, {R4-R11, PC}
+
+ TEQ R3, #0
+|printloop|
+ BEQ loop
+
+ LDR R0, [R2, #OSGBPB_InfoStampedBase_size]
+ BL PrintHex
+
+ ADD R2, R2, #OSGBPB_InfoStampedBase
+ MOV R0, R2
+ SWI OS_Write0
+ SWI OS_NewLine
+ ; Skip object name:
+|skipname|
+ LDRB R14, [R2], #1
+ TEQ R14, #0
+ BNE skipname
+; Following OSLib macro doesn't seem to be appreciated by as.
+; Align , R2, R2
+ ADD R2, R2, #3
+ BIC R2, R2, #3
+
+ SUBS R3, R3, #1
+ B printloop
+
+|dirname|
+ = "@", 0
+|wildcard|
+ = "*", 0
+ ALIGN
+
+ ; R0 = hex address to be printed
+|PrintHex|
+ STMFD R13!, {R0-R7, R14}
+ ADR R1, PrintHexBuffer
+ MOV R2, #PrintHexBufferEnd - PrintHexBuffer
+ SWI OS_ConvertHex8
+ ADR R0, PrintHexBuffer
+ SWI OS_Write0
+ SWI OS_NewLine
+ LDMFD R13!, {R0-R7, PC}
+|PrintHexBuffer|
+ # 16
+|PrintHexBufferEnd|
+ ALIGN
+
+ AREA data, DATA, NOINIT
+|buffer|
+ # 256
+|endbuffer|
+
+ END
Copied: branches/simplified-build/!OsLib/Source/Test/Test/small_test.gas (from rev 261, branches/simplified-build/!OsLib/Source/Test/Test/small_test.s)
===================================================================
--- branches/simplified-build/!OsLib/Source/Test/Test/small_test.gas (rev 0)
+++ branches/simplified-build/!OsLib/Source/Test/Test/small_test.gas 2007-06-19 00:03:11 UTC (rev 271)
@@ -0,0 +1,69 @@
+#include "oslib/OSGBPB.Hdr"
+#include "oslib/Macros.Hdr"
+
+ .text
+
+ @ void EnumCSD (void);
+ .global EnumCSD
+EnumCSD:
+ STMFD R13!, {R4-R11, R14}
+ MOV R4, #0
+loop:
+ MOV R0, #OSGBPB_DirEntriesInfoStamped
+ LDR R1, =dirname
+ LDR R2, =buffer
+ MOV R3, #10
+ MOV R5, #endbuffer - buffer
+ LDR R6, =wildcard
+ SWI OS_GBPB
+ CMP R4, #-1
+ LDMEQFD R13!, {R4-R11, PC}
+
+ TEQ R3, #0
+printloop:
+ BEQ loop
+
+ LDR R0, [R2, #OSGBPB_InfoStampedBase_size]
+ BL PrintHex
+
+ ADD R2, R2, #OSGBPB_InfoStampedBase
+ MOV R0, R2
+ SWI OS_Write0
+ SWI OS_NewLine
+ @ Skip object name:
+skipname:
+ LDRB R14, [R2], #1
+ TEQ R14, #0
+ BNE skipname
+ Align , R2, R2
+
+ SUBS R3, R3, #1
+ B printloop
+
+dirname:
+ .asciz "@"
+wildcard:
+ .asciz "*"
+ .align
+
+ @ R0 = hex address to be printed
+PrintHex:
+ STMFD R13!, {R0-R7, R14}
+ ADR R1, PrintHexBuffer
+ MOV R2, #PrintHexBufferEnd - PrintHexBuffer
+ SWI OS_ConvertHex8
+ ADR R0, PrintHexBuffer
+ SWI OS_Write0
+ SWI OS_NewLine
+ LDMFD R13!, {R0-R7, PC}
+PrintHexBuffer:
+ .space 16
+PrintHexBufferEnd:
+ .align
+
+ .bss
+buffer:
+ .space 256
+endbuffer:
+
+ .end
Deleted: branches/simplified-build/!OsLib/Source/Test/Test/small_test.s
===================================================================
--- branches/simplified-build/!OsLib/Source/Test/Test/small_test.s 2007-05-31 16:14:13 UTC (rev 270)
+++ branches/simplified-build/!OsLib/Source/Test/Test/small_test.s 2007-06-19 00:03:11 UTC (rev 271)
@@ -1,69 +0,0 @@
-#include "oslib/OSGBPB.Hdr"
-#include "oslib/Macros.Hdr"
-
- .text
-
- @ void EnumCSD (void);
- .global EnumCSD
-EnumCSD:
- STMFD R13!, {R4-R11, R14}
- MOV R4, #0
-loop:
- MOV R0, #OSGBPB_DirEntriesInfoStamped
- LDR R1, =dirname
- LDR R2, =buffer
- MOV R3, #10
- MOV R5, #endbuffer - buffer
- LDR R6, =wildcard
- SWI OS_GBPB
- CMP R4, #-1
- LDMEQ R13!, {R4-R11, PC}
-
- TEQ R3, #0
-printloop:
- BEQ loop
-
- LDR R0, [R2, #OSGBPB_InfoStampedBase_size]
- BL PrintHex
-
- ADD R2, R2, #OSGBPB_InfoStampedBase
- MOV R0, R2
- SWI OS_Write0
- SWI OS_NewLine
- @ Skip object name:
-skipname:
- LDRB R14, [R2], #1
- TEQ R14, #0
- BNE skipname
- Align , R2, R2
-
- SUBS R3, R3, #1
- B printloop
-
-dirname:
- .asciz "@"
-wildcard:
- .asciz "*"
- .align
-
- @ R0 = hex address to be printed
-PrintHex:
- STMFD R13!, {R0-R7, R14}
- ADR R1, PrintHexBuffer
- MOV R2, #PrintHexBufferEnd - PrintHexBuffer
- SWI OS_ConvertHex8
- ADR R0, PrintHexBuffer
- SWI OS_Write0
- SWI OS_NewLine
- LDMFD R13!, {R0-R7, PC}
-PrintHexBuffer:
- .space 16
-PrintHexBufferEnd:
- .align
-
- .bss
-buffer:
- .space 256
-endbuffer:
-
- .end
Modified: branches/simplified-build/!OsLib/Source/Test/Test/test.asm
===================================================================
--- branches/simplified-build/!OsLib/Source/Test/Test/test.asm 2007-05-31 16:14:13 UTC (rev 270)
+++ branches/simplified-build/!OsLib/Source/Test/Test/test.asm 2007-06-19 00:03:11 UTC (rev 271)
@@ -1,7 +1,5 @@
-;test assembler headers
- ; faffing about with directory name to get ObjAsm to behave properly
- GET ../Test/OSLib.Hdr ; gets all OSLib headers
-; GET Hdr.OSLib ; alternative format for OBJASM
+; Test assembler headers
+ GET all_oslib.Hdr ; gets all OSLib headers
EXPORT |entry|
EXPORT |exit|
@@ -14,14 +12,14 @@
MOV sp, r1 ; set up a stack
- STMFD sp!, {lr} ; save the return address
+ STMFD sp!, {lr} ; save the return address
- ADR R0, message ; write the message std out
+ ADR R0, message ; write the message std out
SWI OS_Write0
SWI OS_NewLine
-|exit| ldmfd sp!, {pc} ; return
+|exit| ldmfd sp!, {pc} ; return
message = "Hello World from ObjAsm",0
Modified: branches/simplified-build/!OsLib/Source/Test/Test1/Makefile
===================================================================
--- branches/simplified-build/!OsLib/Source/Test/Test1/Makefile 2007-05-31 16:14:13 UTC (rev 270)
+++ branches/simplified-build/!OsLib/Source/Test/Test1/Makefile 2007-06-19 00:03:11 UTC (rev 271)
@@ -1,4 +1,6 @@
-# ...
+# This test will include all C headers and ASM headers one for one and see if
+# they either can be used stand-alone, either pull enough other headers files
+# in.
ALL_CHEADERS := $(wildcard $(HEADERDIR)/*.h)
ALL_ASMHEADERS := $(wildcard $(HEADERDIR)/*.Hdr)
@@ -24,14 +26,14 @@
ifeq ($(BUILDTYPE),CROSSGCC_ELF)
s_%.o: $(HEADERDIR)/%.Hdr
- @echo "Testing $(subst .o,.Hdr,$(subst s_,,$@))"
+ @echo "Testing $(subst .o,.Hdr,$(subst s_,,$@)) (ELF)"
@echo "#include \"oslib/$(subst .o,.Hdr,$(subst s_,,$@))\"" > include.Hdr
@$(AS) $(TEST_S) -I$(TOPHEADERDIR) -o /dev/null
@touch $@
else
s_%.o: $(HEADERDIR)/%.Hdr
- @echo "Testing $(subst .o,.Hdr,$(subst s_,,$@))"
- @echo " GET oslib/$(subst .o,.Hdr,$(subst s_,,$@))" > include.Hdr
+ @echo "Testing $(subst .o,.Hdr,$(subst s_,,$@)) (AOF)"
+ @echo "\tGET\toslib/$(subst .o,.Hdr,$(subst s_,,$@))" > include.Hdr
@$(AS) $(TEST_S) -I$(TOPHEADERDIR) -o /dev/null
@touch $@
endif
Modified: branches/simplified-build/!OsLib/Source/Test/Test1/test.asm
===================================================================
--- branches/simplified-build/!OsLib/Source/Test/Test1/test.asm 2007-05-31 16:14:13 UTC (rev 270)
+++ branches/simplified-build/!OsLib/Source/Test/Test1/test.asm 2007-06-19 00:03:11 UTC (rev 271)
@@ -1,13 +1,11 @@
-;test each assembler header
- ; faffing about with directory name to get ObjAsm to behave properly
- GET ../Test1/include.Hdr ; gets all OSLib headers
+; Test each assembler header individually
+ GET include.Hdr ; gets all OSLib headers
+
EXPORT |entry|
AREA code, CODE
- ENTRY
-|entry| MOV pc, lr ; exit on error
+|entry| MOV pc, lr
END
-
Modified: branches/simplified-build/!OsLib/Source/Test/Test1/test.c
===================================================================
--- branches/simplified-build/!OsLib/Source/Test/Test1/test.c 2007-05-31 16:14:13 UTC (rev 270)
+++ branches/simplified-build/!OsLib/Source/Test/Test1/test.c 2007-06-19 00:03:11 UTC (rev 271)
@@ -1,10 +1,8 @@
-/* test a new OSLib build by #includeing each headers
-*/
+/* test a new OSLib build by #include'ing each headers */
-//INCLUDE
#include "include.h"
int main (void)
{
- return 0;
+ return 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2007-05-31 16:14:16
|
Revision: 270
http://ro-oslib.svn.sourceforge.net/ro-oslib/?rev=270&view=rev
Author: tonyvdh
Date: 2007-05-31 09:14:13 -0700 (Thu, 31 May 2007)
Log Message:
-----------
point at updated OSLibSupport-690-1.zip (properly this time, I hope)
Modified Paths:
--------------
trunk/website/release-6.90.html
Modified: trunk/website/release-6.90.html
===================================================================
--- trunk/website/release-6.90.html 2007-05-31 15:40:15 UTC (rev 269)
+++ trunk/website/release-6.90.html 2007-05-31 16:14:13 UTC (rev 270)
@@ -71,7 +71,7 @@
</td></tr>
<tr BGCOLOR="#80FFFF"><td>
- <a href="http://downloads.sourceforge.net/ro-oslib/OSLibSupport.zip">
+ <a href="http://downloads.sourceforge.net/ro-oslib/OSLibSupport-690-1.zip">
Support Library
</a>
(APCS-32, 32-bit only) providing higher-level calls for tasking,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2007-05-31 15:40:29
|
Revision: 269
http://ro-oslib.svn.sourceforge.net/ro-oslib/?rev=269&view=rev
Author: tonyvdh
Date: 2007-05-31 08:40:15 -0700 (Thu, 31 May 2007)
Log Message:
-----------
point to new OSLibSupport.zip
Modified Paths:
--------------
trunk/website/release-6.90.html
Modified: trunk/website/release-6.90.html
===================================================================
--- trunk/website/release-6.90.html 2007-05-06 23:43:12 UTC (rev 268)
+++ trunk/website/release-6.90.html 2007-05-31 15:40:15 UTC (rev 269)
@@ -71,7 +71,7 @@
</td></tr>
<tr BGCOLOR="#80FFFF"><td>
- <a href="http://downloads.sourceforge.net/ro-oslib/OSLibSupport-6.90.zip">
+ <a href="http://downloads.sourceforge.net/ro-oslib/OSLibSupport.zip">
Support Library
</a>
(APCS-32, 32-bit only) providing higher-level calls for tasking,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2007-05-06 23:43:14
|
Revision: 268
http://ro-oslib.svn.sourceforge.net/ro-oslib/?rev=268&view=rev
Author: jtytgat
Date: 2007-05-06 16:43:12 -0700 (Sun, 06 May 2007)
Log Message:
-----------
Added OSLibSupport back in the build.
Modified Paths:
--------------
branches/simplified-build/!OsLib/Makefile
branches/simplified-build/!OsLib/Source/Makefile
branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_AOF
branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_ELF
branches/simplified-build/!OsLib/Source/OSLibSupport/Choices_/Modules
branches/simplified-build/!OsLib/Source/OSLibSupport/Err_/Modules
branches/simplified-build/!OsLib/Source/OSLibSupport/Events_/Modules
branches/simplified-build/!OsLib/Source/OSLibSupport/Message_/Modules
branches/simplified-build/!OsLib/Source/OSLibSupport/Task_/Modules
branches/simplified-build/!OsLib/Source/OSLibSupport/X_/Modules
branches/simplified-build/!OsLib/Source/OSLibSupport/trace_/Modules
branches/simplified-build/!OsLib/Source/Test/Test/Makefile
Added Paths:
-----------
branches/simplified-build/!OsLib/Source/OSLibSupport/
branches/simplified-build/!OsLib/Source/SetVars,feb
Removed Paths:
-------------
branches/simplified-build/!OsLib/OSLibSupport/
branches/simplified-build/!OsLib/Source/Clean,fd7
branches/simplified-build/!OsLib/Source/Make,fd7
branches/simplified-build/!OsLib/Source/OSLibSupport/AMUmakefile
branches/simplified-build/!OsLib/Source/OSLibSupport/AMUmakefile.source
branches/simplified-build/!OsLib/Source/OSLibSupport/Choices_/AMUmakefile
branches/simplified-build/!OsLib/Source/OSLibSupport/Choices_/GNUmakefile
branches/simplified-build/!OsLib/Source/OSLibSupport/Err_/AMUmakefile
branches/simplified-build/!OsLib/Source/OSLibSupport/Err_/GNUmakefile
branches/simplified-build/!OsLib/Source/OSLibSupport/Events_/AMUmakefile
branches/simplified-build/!OsLib/Source/OSLibSupport/Events_/GNUmakefile
branches/simplified-build/!OsLib/Source/OSLibSupport/Events_/Make,fd7
branches/simplified-build/!OsLib/Source/OSLibSupport/GNUmakefile
branches/simplified-build/!OsLib/Source/OSLibSupport/GNUmakefile.source
branches/simplified-build/!OsLib/Source/OSLibSupport/Make,fd7
branches/simplified-build/!OsLib/Source/OSLibSupport/Message_/AMUmakefile
branches/simplified-build/!OsLib/Source/OSLibSupport/Message_/GNUmakefile
branches/simplified-build/!OsLib/Source/OSLibSupport/Message_/Make,fd7
branches/simplified-build/!OsLib/Source/OSLibSupport/Task_/AMUmakefile
branches/simplified-build/!OsLib/Source/OSLibSupport/Task_/GNUmakefile
branches/simplified-build/!OsLib/Source/OSLibSupport/Task_/Make,fd7
branches/simplified-build/!OsLib/Source/OSLibSupport/X_/AMUmakefile
branches/simplified-build/!OsLib/Source/OSLibSupport/X_/GNUmakefile
branches/simplified-build/!OsLib/Source/OSLibSupport/X_/Make,fd7
branches/simplified-build/!OsLib/Source/OSLibSupport/trace_/AMUmakefile
branches/simplified-build/!OsLib/Source/OSLibSupport/trace_/GNUmakefile
branches/simplified-build/!OsLib/Source/OSLibSupport/trace_/Make,fd7
branches/simplified-build/!OsLib/Source/SetVarsRO4,feb
Modified: branches/simplified-build/!OsLib/Makefile
===================================================================
--- branches/simplified-build/!OsLib/Makefile 2007-05-06 16:43:18 UTC (rev 267)
+++ branches/simplified-build/!OsLib/Makefile 2007-05-06 23:43:12 UTC (rev 268)
@@ -19,16 +19,20 @@
oslib-aof: Tools
$(MAKE) -C Source clean
$(MAKE) -C Source oslib BUILDTYPE=CROSSGCC_AOF
+ $(MAKE) -C Source oslibsupport BUILDTYPE=CROSSGCC_AOF
oslib-aof-n-release: oslib-aof
$(MAKE) -C Source release-oslib BUILDTYPE=CROSSGCC_AOF
+ $(MAKE) -C Source release-oslibsupport BUILDTYPE=CROSSGCC_AOF
oslib-elf: Tools
$(MAKE) -C Source clean
$(MAKE) -C Source oslib BUILDTYPE=CROSSGCC_ELF
+ $(MAKE) -C Source oslibsupport BUILDTYPE=CROSSGCC_ELF
oslib-elf-n-release: oslib-elf
$(MAKE) -C Source release-oslib BUILDTYPE=CROSSGCC_ELF
+ $(MAKE) -C Source release-oslibsupport BUILDTYPE=CROSSGCC_ELF
cstrong: Tools
$(MAKE) -C Source cstrong
Deleted: branches/simplified-build/!OsLib/Source/Clean,fd7
===================================================================
--- branches/simplified-build/!OsLib/Source/Clean,fd7 2007-05-06 16:43:18 UTC (rev 267)
+++ branches/simplified-build/!OsLib/Source/Clean,fd7 2007-05-06 23:43:12 UTC (rev 268)
@@ -1,3 +0,0 @@
-| OSLib.Source.Clean
-|
-AMU -f <Obey$Dir>.Makefile -desktop clean
Deleted: branches/simplified-build/!OsLib/Source/Make,fd7
===================================================================
--- branches/simplified-build/!OsLib/Source/Make,fd7 2007-05-06 16:43:18 UTC (rev 267)
+++ branches/simplified-build/!OsLib/Source/Make,fd7 2007-05-06 23:43:12 UTC (rev 268)
@@ -1,6 +0,0 @@
-Echo <sys$Time> !OSLib.Source.AMUmakefile %0
-|
-WIMPSlot -min 4096K
-if "<C$MODE>" = "32" then do AMU -f <Obey$Dir>.AMUmakefile -desktop %0 APCS=32
-if "<C$MODE>"<> "32" then do AMU -f <Obey$Dir>.AMUmakefile -desktop %0 APCS=26
-echo <Sys$Time> Done
\ No newline at end of file
Modified: branches/simplified-build/!OsLib/Source/Makefile
===================================================================
--- branches/simplified-build/!OsLib/Source/Makefile 2007-05-06 16:43:18 UTC (rev 267)
+++ branches/simplified-build/!OsLib/Source/Makefile 2007-05-06 23:43:12 UTC (rev 268)
@@ -10,33 +10,45 @@
endif
include Makefile.setup.$(BUILDTYPE)
-.PHONY: all install release-oslib release-cstrong clean oslib cstrong BuildRequirements
-all: oslib cstrong
+.PHONY: all install release-oslib release-oslibsupport release-cstrong clean oslib oslibsupport cstrong BuildRequirements
+all: oslib cstrong oslibsupport
test: oslib
$(MAKE) -C Test
-# Only for GCCSDK cross-compilation install purposes:
+# Only for GCCSDK Autobuilder cross-compilation install purposes:
install: oslib
cd $(BUILDDIR) && $(INSTALL) OSLib32.o $(GCCSDK_INSTALL_ENV)/lib/libOSLib32.o
cd $(HEADERDIR) && $(INSTALL) *.h *.Hdr $(GCCSDK_INSTALL_ENV)/include/oslib
-# Sanity test and if successful then zips the library & headers (Unix and RISC OS 'wide' distribution):
+# Sanity test and if successful then zips the OSLib library & its headers (Unix and RISC OS 'wide' distribution):
release-oslib: test
-$(MKDIR) $(RELEASEDIR)/$(BUILDTYPE)
-$(RM) $(RELEASEDIR)/$(BUILDTYPE)/OSLib-unix.zip
- cd $(HEADERDIR)/.. && $(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/$(BUILDTYPE)/OSLib-unix.zip oslib
+ cd $(TOPHEADERDIR) && $(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/$(BUILDTYPE)/OSLib-unix.zip oslib
cd $(BUILDDIR) && $(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/$(BUILDTYPE)/OSLib-unix.zip OSLib32.o
+ $(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/$(BUILDTYPE)/OSLib-unix.zip SetVars,feb
-$(RM) $(RELEASEDIR)/$(BUILDTYPE)/OSLib-wide.zip
- -$(MKDIR) $(HEADERDIR)/h $(HEADERDIR)/Hdr $(HEADERDIR)/../o
+ -$(MKDIR) $(HEADERDIR)/h $(HEADERDIR)/Hdr $(TOPHEADERDIR)/o
cd $(HEADERDIR) && find . -type f -exec rename 's/(.+)\.(.+)/$$2\/$$1/' {} \;
- $(CP) $(OSLIBLIB) $(HEADERDIR)/../o/OSLib32
- cd $(HEADERDIR)/.. && $(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/$(BUILDTYPE)/OSLib-wide.zip .
+ $(CP) $(OSLIBLIB) $(TOPHEADERDIR)/o/OSLib32
+ cd $(TOPHEADERDIR) && $(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/$(BUILDTYPE)/OSLib-wide.zip .
+ $(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/$(BUILDTYPE)/OSLib-wide.zip SetVars,feb
+# Zips the OSLibSupport library & its headers (Unix and RISC OS distribution):
+release-oslibsupport: oslibsupport
+ -$(MKDIR) $(RELEASEDIR)/$(BUILDTYPE)
+ -$(RM) $(RELEASEDIR)/$(BUILDTYPE)/OSLibSupport-unix.zip
+ cd $(OSLIBSUPPORTDIR) && $(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/$(BUILDTYPE)/OSLibSupport-unix.zip .
+ -$(RM) $(RELEASEDIR)/$(BUILDTYPE)/OSLibSupport.zip
+ -$(MKDIR) $(OSLIBSUPPORTDIR)/h $(OSLIBSUPPORTDIR)/o
+ cd $(OSLIBSUPPORTDIR) && find . -type f -exec rename 's/(.+)\.(.+)/$$2\/$$1/' {} \;
+ cd $(OSLIBSUPPORTDIR) && $(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/$(BUILDTYPE)/OSLibSupport.zip .
+
# Zips the StrongHelp file:
release-cstrong:
$(MKDIR) $(RELEASEDIR)/$(BUILDTYPE)
- cd $(BUILDDIR) && $(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/$(BUILDTYPE)/OSLibStrongHelp $(OSLIBCSTRONG)
+ cd $(BUILDDIR) && $(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/$(BUILDTYPE)/OSLibStrongHelp $(notdir $(OSLIBCSTRONG))
clean:
$(MAKE) -C Types/oslib $@
@@ -58,6 +70,9 @@
$(MAKE) -C User/oslib oslib
cd $(OBJDIR) && $(LIBFILE) $@ */*.o
+oslibsupport: $(OSLIBLIB)
+ $(MAKE) -C OSLibSupport
+
cstrong: $(OSLIBCSTRONG)
$(OSLIBCSTRONG): BuildRequirements
$(MAKE) -C Types/oslib cstrong
Modified: branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_AOF
===================================================================
--- branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_AOF 2007-05-06 16:43:18 UTC (rev 267)
+++ branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_AOF 2007-05-06 23:43:12 UTC (rev 268)
@@ -17,6 +17,7 @@
export CSTRONGDIR := $(BUILDDIR)/CStrong
export OBJDIR := $(BUILDDIR)/Objs
export OBJEXCEPTDIR := $(BUILDDIR)/Objs/Exceptions
+export OSLIBSUPPORTDIR := $(BUILDDIR)/OSLibSupport
export BYTEWIDE := $(SOURCEDIR)/ByteWide
export DEFMOD := $(BINDIR)/defmod -asmtype gccaof
Modified: branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_ELF
===================================================================
--- branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_ELF 2007-05-06 16:43:18 UTC (rev 267)
+++ branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_ELF 2007-05-06 23:43:12 UTC (rev 268)
@@ -17,6 +17,7 @@
export CSTRONGDIR := $(BUILDDIR)/CStrong
export OBJDIR := $(BUILDDIR)/Objs
export OBJEXCEPTDIR := $(BUILDDIR)/Objs/Exceptions
+export OSLIBSUPPORTDIR := $(BUILDDIR)/OSLibSupport
export BYTEWIDE := $(SOURCEDIR)/ByteWide
export DEFMOD := $(BINDIR)/defmod -asmtype gccelf
Copied: branches/simplified-build/!OsLib/Source/OSLibSupport (from rev 246, branches/simplified-build/!OsLib/OSLibSupport)
Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/AMUmakefile
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/AMUmakefile 2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/AMUmakefile 2007-05-06 23:43:12 UTC (rev 268)
@@ -1,93 +0,0 @@
-# OSLibSupport/AMUmakefile
-# build OSLibSupport under RISC OS
-#------------------------------------------------------
-MAKE = amu -desktop
-LIBFILE = libfile
-RM = rm -nq
-CP = copy
-COPYFLAGS = A~C~DFLN~P~Q~R~S~T~V
-MD = cdir
-#ECHO = @echo $@
-
-#------------------------------------------------------
-
-SOURCES = Choices_ Err_ Events_ Message_ Task_ trace_ X_
-LIBS = o.OSLibSupport o.OSLibSupport32
-FILES = $(addsuffix .Modules, ${SOURCES} )
-
-HEADERS = \
-Choices \
-Err \
-Event \
-Gadgettypes \
-Message \
-Systypes \
-Task \
-Toolboxtypes \
-trace \
-Wimptypes \
-X
-
-include ${FILES}
-
-#------------------------------------------------------
-.PHONY: all clean release ${SOURCES}
-
-all: ${LIBS}
-
-o.OSLibSupport: ${SOURCES}
- ${ECHO}
- ${MD} ${MAKEFILEDIR}.o
- ${LIBFILE} -co ${MAKEFILEDIR}.$@ $(addprefix ${MAKEFILEDIR}.,${AMUMODULES})
-
-o.OSLibSupport32: ${SOURCES}
- ${ECHO}
- ${MD} ${MAKEFILEDIR}.o
- ${LIBFILE} -co ${MAKEFILEDIR}.$@ $(addprefix ${MAKEFILEDIR}.,${AMUMODULES32})
-
-Choices_: ;${ECHO}
- ${MAKE} -f ${MAKEFILEDIR}.$@.AMUmakefile
-Err_: ;${ECHO}
- ${MAKE} -f ${MAKEFILEDIR}.$@.AMUmakefile
-Events_: ;${ECHO}
- ${MAKE} -f ${MAKEFILEDIR}.$@.AMUmakefile
-Message_: ;${ECHO}
- ${MAKE} -f ${MAKEFILEDIR}.$@.AMUmakefile
-Task_: ;${ECHO}
- ${MAKE} -f ${MAKEFILEDIR}.$@.AMUmakefile
-trace_: ;${ECHO}
- ${MAKE} -f ${MAKEFILEDIR}.$@.AMUmakefile
-X_: ;${ECHO}
- ${MAKE} -f ${MAKEFILEDIR}.$@.AMUmakefile
-
-clean: ;${ECHO}
- ${MAKE} -f ${MAKEFILEDIR}.Choices_.AMUmakefile clean
- ${MAKE} -f ${MAKEFILEDIR}.Err_.AMUmakefile clean
- ${MAKE} -f ${MAKEFILEDIR}.Events_.AMUmakefile clean
- ${MAKE} -f ${MAKEFILEDIR}.Message_.AMUmakefile clean
- ${MAKE} -f ${MAKEFILEDIR}.Task_.AMUmakefile clean
- ${MAKE} -f ${MAKEFILEDIR}.trace_.AMUmakefile clean
- ${MAKE} -f ${MAKEFILEDIR}.X_.AMUmakefile clean
- ${RM} $(addprefix ${MAKEFILEDIR}.,${LIBS} )
-
-distclean: ;${ECHO}
- ${MAKE} -f ${MAKEFILEDIR}.Choices_.AMUmakefile distclean
- ${MAKE} -f ${MAKEFILEDIR}.Err_.AMUmakefile distclean
- ${MAKE} -f ${MAKEFILEDIR}.Events_.AMUmakefile distclean
- ${MAKE} -f ${MAKEFILEDIR}.Message_.AMUmakefile distclean
- ${MAKE} -f ${MAKEFILEDIR}.Task_.AMUmakefile distclean
- ${MAKE} -f ${MAKEFILEDIR}.trace_.AMUmakefile distclean
- ${MAKE} -f ${MAKEFILEDIR}.X_.AMUmakefile distclean
- ${RM} $(addprefix ${MAKEFILEDIR}., ${LIBS} )
- ${RM} $(addprefix ${MAKEFILEDIR}., o )
-
-release: ;${ECHO}
-ifndef RELEASEDIR
- error RELEASEDIR not defined
-endif
- ${MD} ${RELEASEDIR}.OSLibSupport
- ${CP} SetVars ${RELEASEDIR}.OSLibSupport.* ${COPYFLAGS}
- ${CP} Doc ${RELEASEDIR}.OSLibSupport.Doc ${COPYFLAGS}
- ${CP} h ${RELEASEDIR}.OSLibSupport.h ${COPYFLAGS}
- ${CP} o ${RELEASEDIR}.OSLibSupport.o ${COPYFLAGS}
-
Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/AMUmakefile.source
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/AMUmakefile.source 2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/AMUmakefile.source 2007-05-06 23:43:12 UTC (rev 268)
@@ -1,46 +0,0 @@
-# OSLibSupport.AMUmakefile/source
-# common definitions for building OSLibSupport under RISC OS
-#------------------------------------------------------
-
-SOURCEDIR = <OSLib$SourceDir>
-SOURCES_0 = Computer Core Toolbox User
-SOURCES = ${SOURCES_0} Types Macros
-
-#------------------------------------------------------
-CCFLAGS =
-INCLUDES = ^ OSLib:
-
-#------------------------------------------------------
-#Tools
-LIBFILE = libfile
-CC = cc -c $(CCFLAGS) $(addprefix -I,${INCLUDES}) -throwback
-LINK = link
-MV =
-RM = rm -nq
-MD = cdir
-
-#------------------------------------------------------
-# targets
-OBJS = $(addprefix o.,${TARGET})
-OBJS32 = $(addprefix o32.,${TARGET})
-
-.PHONY: all clean distclean
-
-all: ${OBJS} ${OBJS32}
-
-clean: ;${RM} ${OBJS} ${OBJS32}
-
-distclean: clean
- ${RM} o o32
-
-#------------------------------------------------------
-# internal targets:
-.SUFFIXES:
-.SUFFIXES: .o .o32 .c
-
-.c.o: ;@${MD} o
- ${CC} -APCS3/26 -o $@ $<
-
-.c.o32: ;@${MD} o32
- ${CC} -APCS3/32 -o $@ $<
-
Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/Choices_/AMUmakefile
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Choices_/AMUmakefile 2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Choices_/AMUmakefile 2007-05-06 23:43:12 UTC (rev 268)
@@ -1,6 +0,0 @@
-# OSLibSupport/Choices_/AMUmakefile
-# build OSLibSupport/Choices_ under RISC OS
-#------------------------------------------------------
-include Modules
-include ^.AMUmakefile/source
-#------------------------------------------------------
\ No newline at end of file
Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/Choices_/GNUmakefile
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Choices_/GNUmakefile 2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Choices_/GNUmakefile 2007-05-06 23:43:12 UTC (rev 268)
@@ -1,6 +0,0 @@
-# OSLibSupport/Choices_/GNUmakefile
-# build OSLibSupport/Choices_ under UNIX
-#------------------------------------------------------
-include Modules
-include ../GNUmakefile.source
-#------------------------------------------------------
\ No newline at end of file
Modified: branches/simplified-build/!OsLib/Source/OSLibSupport/Choices_/Modules
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Choices_/Modules 2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Choices_/Modules 2007-05-06 23:43:12 UTC (rev 268)
@@ -1,11 +1 @@
-# OSLibSupport/Choices_/Modules
-#------------------------------------------------------
-TARGET := Choices
-DIR := Choices_
-
-CHOICES_TARGET := ${TARGET}
-CHOICES_DIR := ${DIR}
-GNUMODULES += $(addsuffix .o, $(addprefix ${_DIR}/, ${_TARGET}))
-GNUMODULES32 += $(addsuffix .o32, $(addprefix ${CHOICES_DIR}/, ${CHOICES_TARGET}))
-AMUMODULES += $(addprefix ${CHOICES_DIR}.o., ${CHOICES_TARGET})
-AMUMODULES32 += $(addprefix ${CHOICES_DIR}.o32., ${CHOICES_TARGET})
+OBJS += Choices_/Choices.o
Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/Err_/AMUmakefile
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Err_/AMUmakefile 2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Err_/AMUmakefile 2007-05-06 23:43:12 UTC (rev 268)
@@ -1,6 +0,0 @@
-# OSLibSupport.Err_.AMUmakefile
-# build OSLibSupport/Err_ under RISC OS
-#------------------------------------------------------
-include Modules
-include ^.AMUmakefile/source
-#------------------------------------------------------
\ No newline at end of file
Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/Err_/GNUmakefile
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Err_/GNUmakefile 2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Err_/GNUmakefile 2007-05-06 23:43:12 UTC (rev 268)
@@ -1,6 +0,0 @@
-# OSLibSupport/Err_/GNUmakefile
-# build OSLibSupport/Err_ under UNIX
-#------------------------------------------------------
-include Modules
-include ../GNUmakefile.source
-#------------------------------------------------------
\ No newline at end of file
Modified: branches/simplified-build/!OsLib/Source/OSLibSupport/Err_/Modules
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Err_/Modules 2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Err_/Modules 2007-05-06 23:43:12 UTC (rev 268)
@@ -1,12 +1 @@
-# OSLibSupport/Err_/Modules
-#------------------------------------------------------
-TARGET := Nomem Oserror Reporterr
-DIR := Err_
-
-ERR_TARGET := ${TARGET}
-ERR_DIR := ${DIR}
-GNUMODULES += $(addsuffix .o, $(addprefix ${ERR_DIR}/, ${ERR_TARGET}))
-GNUMODULES32 += $(addsuffix .o32, $(addprefix ${ERR_DIR}/, ${ERR_TARGET}))
-AMUMODULES += $(addprefix ${ERR_DIR}.o., ${ERR_TARGET})
-AMUMODULES32 += $(addprefix ${ERR_DIR}.o32., ${ERR_TARGET})
-#------------------------------------------------------
+OBJS += Err_/Nomem.o Err_/Oserror.o Err_/Reporterr.o
Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/Events_/AMUmakefile
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Events_/AMUmakefile 2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Events_/AMUmakefile 2007-05-06 23:43:12 UTC (rev 268)
@@ -1,6 +0,0 @@
-# OSLibSupport.Events_.GNUmakefile
-# build OSLibSupport/Events_ under RISC OS
-#------------------------------------------------------
-include Modules
-include ^.AMUmakefile/source
-#------------------------------------------------------
\ No newline at end of file
Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/Events_/GNUmakefile
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Events_/GNUmakefile 2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Events_/GNUmakefile 2007-05-06 23:43:12 UTC (rev 268)
@@ -1,6 +0,0 @@
-# OSLibSupport/Events_/GNUmakefile
-# build OSLibSupport/Events_ under UNIX
-#------------------------------------------------------
-include Modules
-include ../GNUmakefile.source
-#------------------------------------------------------
\ No newline at end of file
Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/Events_/Make,fd7
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Events_/Make,fd7 2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Events_/Make,fd7 2007-05-06 23:43:12 UTC (rev 268)
@@ -1,3 +0,0 @@
-echo <sys$time>
-AMU -f <Obey$Dir>.AMUmakefile -desktop %0
-echo <sys$time>
Modified: branches/simplified-build/!OsLib/Source/OSLibSupport/Events_/Modules
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Events_/Modules 2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Events_/Modules 2007-05-06 23:43:12 UTC (rev 268)
@@ -1,12 +1 @@
-# OSLibSupport/Events_/Modules
-#------------------------------------------------------
-TARGET := Tbevent Wimpevent Wimpmsg Event
-DIR := Events_
-
-EVENTS_TARGET := ${TARGET}
-EVENTS_DIR := ${DIR}
-GNUMODULES += $(addsuffix .o, $(addprefix ${EVENTS_DIR}/, ${EVENTS_TARGET}))
-GNUMODULES32 += $(addsuffix .o32, $(addprefix ${EVENTS_DIR}/, ${EVENTS_TARGET}))
-AMUMODULES += $(addprefix ${EVENTS_DIR}.o., ${EVENTS_TARGET})
-AMUMODULES32 += $(addprefix ${EVENTS_DIR}.o32., ${EVENTS_TARGET})
-#------------------------------------------------------
+OBJS += Events_/Tbevent.o Events_/Wimpevent.o Events_/Wimpmsg.o Events_/Event.o
Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/GNUmakefile
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/GNUmakefile 2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/GNUmakefile 2007-05-06 23:43:12 UTC (rev 268)
@@ -1,85 +0,0 @@
-# OSLibSupport/GNUmakefile
-# build OSLibSupport under UNIX
-
-#------------------------------------------------------
-include ../GNUmakefile.settings
-
-#------------------------------------------------------
-LIBFILE = ${GCCSDK_INSTALL_CROSSBIN}/libfile
-RM = rm -f
-CP = cp -pr
-
-#------------------------------------------------------
-
-SOURCES = Choices_ Err_ Events_ Message_ Task_ trace_ X_
-#LIBS = OSLibSupport.o OSLibSupport32.o
-LIBS = OSLibSupport32.o
-FILES = $(addsuffix /Modules, ${SOURCES} )
-
-HEADERS = \
-Choices \
-Err \
-Event \
-Gadgettypes \
-Message \
-Systypes \
-Task \
-Toolboxtypes \
-trace \
-Wimptypes \
-X
-
-include ${FILES}
-
-#------------------------------------------------------
-.PHONY: ${SOURCES} all clean release
-
-all: ${LIBS}
-
-# we no longer biild the 26 bit library, as GCCSDK won't support it
-#OSLibSupport.o: ${SOURCES}
-# @if [ ! -a $@ ]; then ${LIBFILE} -c $@; fi;
-# ${LIBFILE} -i $@ ${GNUMODULES}
-
-OSLibSupport32.o: ${SOURCES}
- @if [ ! -a $@ ]; then ${LIBFILE} -c $@; fi;
- ${LIBFILE} -i $@ ${GNUMODULES32}
-
-#Choices_: ;${MAKE} -C $@
-#Err_: ;${MAKE} -C $@
-#Events_: ;${MAKE} -C $@
-#Message_: ;${MAKE} -C $@
-#Task_: ;${MAKE} -C $@
-#trace_: ;${MAKE} -C $@
-#X_: ;${MAKE} -C $@
-
-${SOURCES}: ;${MAKE} -C $@
-
-clean: ;$(foreach dir, ${SOURCES}, ${MAKE} -C ${dir} clean; )
- -${RM} ${LIBS}
-
-release: ${LIBS}
-ifndef RELEASEDIR
- error RELEASEDIR not defined
-endif
- @if [ ! -d ${RELEASEDIR} ]; then mkdir -p ${RELEASEDIR}; fi
- ${CP} SetVars,feb ${RELEASEDIR}/
- @if [ ! -d ${RELEASEDIR}/Doc ]; then mkdir -p ${RELEASEDIR}/Doc; fi
- ${CP} Doc/X ${RELEASEDIR}/Doc/X
- @if [ ! -d ${RELEASEDIR}/h ]; then mkdir -p ${RELEASEDIR}/h; fi
- $(foreach file, ${HEADERS}, ${CP} ${file}.h \
- ${RELEASEDIR}/h/${file};)
- @if [ ! -d ${RELEASEDIR}/o ]; then mkdir -p ${RELEASEDIR}/o; fi
- $(foreach file, ${LIBS}, ${CP} ${file} \
- ${RELEASEDIR}/o/$(basename ${file});)
-
-release_unix: ${LIBS}
-ifndef RELEASEDIR
- error RELEASEDIR not defined
-endif
- @if [ ! -d ${RELEASEDIR} ]; then mkdir -p ${RELEASEDIR}; fi
- ${CP} SetVars,feb ${RELEASEDIR}/
- @if [ ! -d ${RELEASEDIR}/Doc ]; then mkdir -p ${RELEASEDIR}/Doc; fi
- ${CP} Doc/X ${RELEASEDIR}/Doc/X
- $(foreach file, ${HEADERS}, ${CP} ${file}.h ${RELEASEDIR};)
- $(foreach file, ${LIBS}, ${CP} ${file} ${RELEASEDIR};)
Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/GNUmakefile.source
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/GNUmakefile.source 2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/GNUmakefile.source 2007-05-06 23:43:12 UTC (rev 268)
@@ -1,44 +0,0 @@
-# OSLibSupport/GNUmakefile.source
-# common definitions for builsing OSLibSupport under UNIX
-#------------------------------------------------------
-
-SOURCEDIR = ../../Source
-SOURCES_0 = Computer Core Toolbox User
-SOURCES = ${SOURCES_0} Types Macros
-
-#------------------------------------------------------
-CCFLAGS =
-INCLUDES = -I ./ -I../ $(addprefix -I${SOURCEDIR}/, ${SOURCES} )
-
-#------------------------------------------------------
-#Tools
-LIBFILE = ${GCCSDK_INSTALL_CROSSBIN}/libfile
-GCC = ${GCCSDK_INSTALL_CROSSBIN}/gcc -c $(CCFLAGS) ${INCLUDES}
-LINK = ${GCCSDK_INSTALL_CROSSBIN}/gcc
-MV = mv -f
-RM = rm -f
-
-#------------------------------------------------------
-# targets
-#OBJS = $(addsuffix .o,${TARGET})
-OBJS32 = $(addsuffix .o32,${TARGET})
-
-.PHONY: all clean
-
-#all: ${OBJS} ${OBJS32}
-all: ${OBJS32}
-
-clean: ;-${RM} ${OBJS} ${OBJS32}
-
-#------------------------------------------------------
-# internal targets:
-.SUFFIXES:
-.SUFFIXES: .o .o32 .c
-
-# GCC no longer supports 26 bit model
-#.c.o:
-# ${GCC} -mapcs-26 -o $@ $<
-
-%o32 : %c
- ${GCC} -o $@ $<
-
Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/Make,fd7
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Make,fd7 2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Make,fd7 2007-05-06 23:43:12 UTC (rev 268)
@@ -1,7 +0,0 @@
-| OSLibSupport.!MakeLib 20031228
-|
-wimpslot -min 1024k
-
-echo <sys$time> OSLibSupport.Make %0
-AMU -f <Obey$Dir>.AMUmakefile -desktop %0
-echo <sys$time>
Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/Message_/AMUmakefile
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Message_/AMUmakefile 2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Message_/AMUmakefile 2007-05-06 23:43:12 UTC (rev 268)
@@ -1,8 +0,0 @@
-# OSLibSupport.Message_.GNUmakefile
-# build OSLibSupport.Message_ under RISC OS
-
-#------------------------------------------------------
-TARGET = Message
-
-#------------------------------------------------------
-include ^.AMUmakefile/source
Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/Message_/GNUmakefile
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Message_/GNUmakefile 2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Message_/GNUmakefile 2007-05-06 23:43:12 UTC (rev 268)
@@ -1,8 +0,0 @@
-# OSLibSupport/Message_/GNUmakefile
-# build OSLibSupport/Message_ under UNIX
-
-#------------------------------------------------------
-TARGET = Message
-
-#------------------------------------------------------
-include ../GNUmakefile.source
Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/Message_/Make,fd7
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Message_/Make,fd7 2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Message_/Make,fd7 2007-05-06 23:43:12 UTC (rev 268)
@@ -1,3 +0,0 @@
-echo <sys$time>
-AMU -f <Obey$Dir>.AMUmakefile -desktop %0
-echo <sys$time>
Modified: branches/simplified-build/!OsLib/Source/OSLibSupport/Message_/Modules
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Message_/Modules 2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Message_/Modules 2007-05-06 23:43:12 UTC (rev 268)
@@ -1,12 +1 @@
-# OSLibSupport/Message_/Modules
-#------------------------------------------------------
-TARGET := Message
-DIR := Message_
-
-MESSAGE_TARGET := ${TARGET}
-MESSAGE_DIR := ${DIR}
-GNUMODULES += $(addsuffix .o, $(addprefix ${MESSAGE_DIR}/, ${MESSAGE_TARGET}))
-GNUMODULES32 += $(addsuffix .o32, $(addprefix ${MESSAGE_DIR}/, ${MESSAGE_TARGET}))
-AMUMODULES += $(addprefix ${MESSAGE_DIR}.o., ${MESSAGE_TARGET})
-AMUMODULES32 += $(addprefix ${MESSAGE_DIR}.o32., ${MESSAGE_TARGET})
-#------------------------------------------------------
+OBJS += Message_/Message.o
Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/Task_/AMUmakefile
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Task_/AMUmakefile 2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Task_/AMUmakefile 2007-05-06 23:43:12 UTC (rev 268)
@@ -1,6 +0,0 @@
-# OSLibSupport.Task_.AMUmakefile
-# build OSLibSupport.Task under RISC OS
-
-#------------------------------------------------------
-include Modules
-include ^.AMUmakefile/source
Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/Task_/GNUmakefile
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Task_/GNUmakefile 2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Task_/GNUmakefile 2007-05-06 23:43:12 UTC (rev 268)
@@ -1,6 +0,0 @@
-# OSLibSupport/Task_/GNUmakefile
-# build OSLibSupport/Task under UNIX
-
-#------------------------------------------------------
-include Modules
-include ../GNUmakefile.source
Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/Task_/Make,fd7
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Task_/Make,fd7 2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Task_/Make,fd7 2007-05-06 23:43:12 UTC (rev 268)
@@ -1,3 +0,0 @@
-echo <sys$time>
-AMU -f <Obey$Dir>.AMUmakefile -desktop %0
-echo <sys$time>
Modified: branches/simplified-build/!OsLib/Source/OSLibSupport/Task_/Modules
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Task_/Modules 2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Task_/Modules 2007-05-06 23:43:12 UTC (rev 268)
@@ -1,12 +1 @@
-# OSLibSupport/Task_/Modules
-#------------------------------------------------------
-TARGET := Taskgetname
-DIR := Task_
-
-TASK_TARGET := ${TARGET}
-TASK_DIR := ${DIR}
-GNUMODULES += $(addsuffix .o, $(addprefix ${TASK_DIR}/, ${TASK_TARGET}))
-GNUMODULES32 += $(addsuffix .o32, $(addprefix ${TASK_DIR}/, ${TASK_TARGET}))
-AMUMODULES += $(addprefix ${TASK_DIR}.o., ${TASK_TARGET})
-AMUMODULES32 += $(addprefix ${TASK_DIR}.o32., ${TASK_TARGET})
-#------------------------------------------------------
+OBJS += Task_/Taskgetname.o
Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/X_/AMUmakefile
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/X_/AMUmakefile 2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/X_/AMUmakefile 2007-05-06 23:43:12 UTC (rev 268)
@@ -1,5 +0,0 @@
-# OSLibSupport.X_.GNUmakefile
-# build OSLibSupport.X_ under RISC OS
-#------------------------------------------------------
-include Modules
-include ^.AMUmakefile/source
Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/X_/GNUmakefile
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/X_/GNUmakefile 2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/X_/GNUmakefile 2007-05-06 23:43:12 UTC (rev 268)
@@ -1,5 +0,0 @@
-# OSLibSupport/X_/GNUmakefile
-# build OSLibSupport/X_ under UNIX
-#------------------------------------------------------
-include Modules
-include ../GNUmakefile.source
Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/X_/Make,fd7
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/X_/Make,fd7 2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/X_/Make,fd7 2007-05-06 23:43:12 UTC (rev 268)
@@ -1,3 +0,0 @@
-echo <sys$time>
-AMU -D -f <Obey$Dir>.AMUmakefile -desktop %0
-echo <sys$time>
Modified: branches/simplified-build/!OsLib/Source/OSLibSupport/X_/Modules
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/X_/Modules 2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/X_/Modules 2007-05-06 23:43:12 UTC (rev 268)
@@ -1,12 +1 @@
-# OSLibSupport/X_/Modules
-#------------------------------------------------------
-TARGET := X
-DIR := X_
-
-X_TARGET := ${TARGET}
-X_DIR := ${DIR}
-GNUMODULES += $(addsuffix .o, $(addprefix ${X_DIR}/, ${X_TARGET}))
-GNUMODULES32 += $(addsuffix .o32, $(addprefix ${X_DIR}/, ${X_TARGET}))
-AMUMODULES += $(addprefix ${X_DIR}.o., ${X_TARGET})
-AMUMODULES32 += $(addprefix ${X_DIR}.o32., ${X_TARGET})
-#------------------------------------------------------
+OBJS += X_/X.o
Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/trace_/AMUmakefile
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/trace_/AMUmakefile 2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/trace_/AMUmakefile 2007-05-06 23:43:12 UTC (rev 268)
@@ -1,5 +0,0 @@
-# OSLibSupport.trace_.AMUmakefile
-# build OSLibSupport.trace_ under RISC OS
-#------------------------------------------------------
-include Modules
-include ^.AMUmakefile/source
Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/trace_/GNUmakefile
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/trace_/GNUmakefile 2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/trace_/GNUmakefile 2007-05-06 23:43:12 UTC (rev 268)
@@ -1,5 +0,0 @@
-# OSLibSupport/trace_/GNUmakefile
-# build OSLibSupport/trace_ under UNIX
-#------------------------------------------------------
-include Modules
-include ../GNUmakefile.source
Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/trace_/Make,fd7
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/trace_/Make,fd7 2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/trace_/Make,fd7 2007-05-06 23:43:12 UTC (rev 268)
@@ -1,3 +0,0 @@
-echo <sys$time>
-AMU -D -f <Obey$Dir>.AMUmakefile -desktop %0
-echo <sys$time>
Modified: branches/simplified-build/!OsLib/Source/OSLibSupport/trace_/Modules
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/trace_/Modules 2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/trace_/Modules 2007-05-06 23:43:12 UTC (rev 268)
@@ -1,12 +1 @@
-# OSLibSupport/trace_/Modules
-#------------------------------------------------------
-TARGET := trace
-DIR := trace_
-
-TRACE_TARGET := ${TARGET}
-TRACE_DIR := ${DIR}
-GNUMODULES += $(addsuffix .o, $(addprefix ${TRACE_DIR}/, ${TRACE_TARGET}))
-GNUMODULES32 += $(addsuffix .o32, $(addprefix ${TRACE_DIR}/, ${TRACE_TARGET}))
-AMUMODULES += $(addprefix ${TRACE_DIR}.o., ${TRACE_TARGET})
-AMUMODULES32 += $(addprefix ${TRACE_DIR}.o32., ${TRACE_TARGET})
-#------------------------------------------------------
+OBJS += trace_/trace.o
Copied: branches/simplified-build/!OsLib/Source/SetVars,feb (from rev 246, branches/simplified-build/!OsLib/Source/SetVarsRO4,feb)
===================================================================
--- branches/simplified-build/!OsLib/Source/SetVars,feb (rev 0)
+++ branches/simplified-build/!OsLib/Source/SetVars,feb 2007-05-06 23:43:12 UTC (rev 268)
@@ -0,0 +1,7 @@
+| OSLib's SetVars
+| Sets the directory and path variables for OSLib.
+Set OSLib$Dir <Obey$Dir>
+
+| The OSLib: path is the presently preferred style for include files;
+| You always need to use this as the link path.
+Set OSLib$Path <OSLib$Dir>.
Deleted: branches/simplified-build/!OsLib/Source/SetVarsRO4,feb
===================================================================
--- branches/simplified-build/!OsLib/Source/SetVarsRO4,feb 2007-05-06 16:43:18 UTC (rev 267)
+++ branches/simplified-build/!OsLib/Source/SetVarsRO4,feb 2007-05-06 23:43:12 UTC (rev 268)
@@ -1,11 +0,0 @@
-| OSLib.SetVarsRO4 20040215
-| Sets the directory and path variables for OSLib when using the 'wide' directory structure
-| This need not actually be RO4, but could be held by any FS with > 77 files per directory.
-Set OSLib$Dir <Obey$Dir>
-
-| The OSLib: path is the presently preferred style for include files;\xA0
-| You always need to use this as the link path.
-Set OSLib$Path <OSLib$Dir>.
-
-| The OSLibInclude: path is provided for backwards compatibility.
-Set OSLibInclude$Path <OSLib$Dir>.oslib.
Modified: branches/simplified-build/!OsLib/Source/Test/Test/Makefile
===================================================================
--- branches/simplified-build/!OsLib/Source/Test/Test/Makefile 2007-05-06 16:43:18 UTC (rev 267)
+++ branches/simplified-build/!OsLib/Source/Test/Test/Makefile 2007-05-06 23:43:12 UTC (rev 268)
@@ -8,7 +8,7 @@
all: test_c test_cpp test_s
clean:
- -$(RM) test_c test_cpp test_s all_oslib.h all_oslib.Hdr
+ -$(RM) test_c test_cpp test_s small_test.o all_oslib.h all_oslib.Hdr
test_c: test.c small_test.o all_oslib.h
$(CC) -o $@ -I$(TOPHEADERDIR) test.c small_test.o $(OSLIBLIB)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2007-05-06 16:43:28
|
Revision: 267
http://ro-oslib.svn.sourceforge.net/ro-oslib/?rev=267&view=rev
Author: jtytgat
Date: 2007-05-06 09:43:18 -0700 (Sun, 06 May 2007)
Log Message:
-----------
Do the basic testing before making a release kit.
Modified Paths:
--------------
branches/simplified-build/!OsLib/Source/Makefile
Modified: branches/simplified-build/!OsLib/Source/Makefile
===================================================================
--- branches/simplified-build/!OsLib/Source/Makefile 2007-05-06 16:12:16 UTC (rev 266)
+++ branches/simplified-build/!OsLib/Source/Makefile 2007-05-06 16:43:18 UTC (rev 267)
@@ -21,8 +21,8 @@
cd $(BUILDDIR) && $(INSTALL) OSLib32.o $(GCCSDK_INSTALL_ENV)/lib/libOSLib32.o
cd $(HEADERDIR) && $(INSTALL) *.h *.Hdr $(GCCSDK_INSTALL_ENV)/include/oslib
-# Zips the library & headers (Unix and RISC OS 'wide' distribution):
-release-oslib:
+# Sanity test and if successful then zips the library & headers (Unix and RISC OS 'wide' distribution):
+release-oslib: test
-$(MKDIR) $(RELEASEDIR)/$(BUILDTYPE)
-$(RM) $(RELEASEDIR)/$(BUILDTYPE)/OSLib-unix.zip
cd $(HEADERDIR)/.. && $(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/$(BUILDTYPE)/OSLib-unix.zip oslib
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2007-05-06 16:12:17
|
Revision: 266
http://ro-oslib.svn.sourceforge.net/ro-oslib/?rev=266&view=rev
Author: jtytgat
Date: 2007-05-06 09:12:16 -0700 (Sun, 06 May 2007)
Log Message:
-----------
ELF fixes: avoid .skip 0 warning; surious wrong label definition fix
Modified Paths:
--------------
branches/simplified-build/!OsLib/Tools/DefMod2/hdr.c
Modified: branches/simplified-build/!OsLib/Tools/DefMod2/hdr.c
===================================================================
--- branches/simplified-build/!OsLib/Tools/DefMod2/hdr.c 2007-05-06 16:02:51 UTC (rev 265)
+++ branches/simplified-build/!OsLib/Tools/DefMod2/hdr.c 2007-05-06 16:12:16 UTC (rev 266)
@@ -49,7 +49,7 @@
#define UNLABELLED_INST_COL 1
#define UNLABELLED_ARG_COL 2
-static const char *Op [] = {":OR:", ":AND:", "+", ":EOR:"};
+static const char * const Op [] = {":OR:", ":AND:", "+", ":EOR:"};
/* This gives the condition when to use the ':' for marking the end of an
ELF label. */
@@ -267,7 +267,7 @@
case def_TYPE_VOID:
if ((rc =
(DoELF) ?
- EmitS (file, v, top_level ? "" : ".skip", "Skip")
+ Emit (file, v, "")
:
EmitS (file, v, top_level ? "*" : "#", "Skip")) < 0)
goto finish;
@@ -357,7 +357,7 @@
if (DoELF)
{
sprintf (v1, "%s_MEMBERS \\label", t->data AS list.base->data AS id);
- Emit (file, "\\label", v1);
+ Emit (file, NULL, v1);
}
else
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2007-05-06 16:02:53
|
Revision: 265
http://ro-oslib.svn.sourceforge.net/ro-oslib/?rev=265&view=rev
Author: jtytgat
Date: 2007-05-06 09:02:51 -0700 (Sun, 06 May 2007)
Log Message:
-----------
- Defined TOPHEADERDIR.
- Defined CXX
- Exported ASMEXT, OSLIBLIB and OSLIBCSTRONG.
- Use the CPP preprocessor for assembler targets.
- Makefile.setup.CROSSGCC_ELF: removed -mapcs32 assembler option (non existing option).
Modified Paths:
--------------
branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_AOF
branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_ELF
Modified: branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_AOF
===================================================================
--- branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_AOF 2007-05-06 15:59:17 UTC (rev 264)
+++ branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_AOF 2007-05-06 16:02:51 UTC (rev 265)
@@ -12,7 +12,8 @@
export BUILDDIR := $(SOURCEDIR)/Build
export RELEASEDIR := $(SOURCEDIR)/../Release
-export HEADERDIR := $(BUILDDIR)/Header/oslib
+export TOPHEADERDIR := $(BUILDDIR)/Header
+export HEADERDIR := $(TOPHEADERDIR)/oslib
export CSTRONGDIR := $(BUILDDIR)/CStrong
export OBJDIR := $(BUILDDIR)/Objs
export OBJEXCEPTDIR := $(BUILDDIR)/Objs/Exceptions
@@ -25,14 +26,15 @@
export PATH := $(GCCSDK_INSTALL_CROSSBIN):$(PATH)
export CC := gcc
-export AS := gcc -c -xassembler -I.. -I$(SOURCEDIR)/Types -mapcs-32 -Wa,-apcs32
+export CXX := g++
+export AS := gcc -c -xassembler-with-cpp -I.. -I$(SOURCEDIR)/Types -mapcs-32 -Wa,-apcs32
export LIBFILE := libfile -c
export MKDIR := mkdir -p
export RM := rm -rf
export CP := cp -r
export INSTALL := $(GCCSDK_INSTALL_ENV)/ro-install
-ASMEXT = .asm
+export ASMEXT := .asm
-OSLIBLIB = $(BUILDDIR)/OSLib32.o
-OSLIBCSTRONG = $(BUILDDIR)/OSLib,3d6
+export OSLIBLIB := $(BUILDDIR)/OSLib32.o
+export OSLIBCSTRONG := $(BUILDDIR)/OSLib,3d6
Modified: branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_ELF
===================================================================
--- branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_ELF 2007-05-06 15:59:17 UTC (rev 264)
+++ branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_ELF 2007-05-06 16:02:51 UTC (rev 265)
@@ -12,7 +12,8 @@
export BUILDDIR := $(SOURCEDIR)/Build
export RELEASEDIR := $(SOURCEDIR)/../Release
-export HEADERDIR := $(BUILDDIR)/Header/oslib
+export TOPHEADERDIR := $(BUILDDIR)/Header
+export HEADERDIR := $(TOPHEADERDIR)/oslib
export CSTRONGDIR := $(BUILDDIR)/CStrong
export OBJDIR := $(BUILDDIR)/Objs
export OBJEXCEPTDIR := $(BUILDDIR)/Objs/Exceptions
@@ -25,14 +26,15 @@
export PATH := $(GCCSDK_INSTALL_CROSSBIN):$(PATH)
export CC := arm-unknown-riscos-gcc
-export AS := arm-unknown-riscos-gcc -c -xassembler -I.. -I$(SOURCEDIR)/Types -mapcs32
+export CXX := arm-unknown-riscos-g++
+export AS := arm-unknown-riscos-gcc -c -xassembler-with-cpp -I.. -I$(SOURCEDIR)/Types
export LIBFILE := arm-unknown-riscos-ar rs
export MKDIR := mkdir -p
export RM := rm -rf
export CP := cp -r
export INSTALL := $(GCCSDK_INSTALL_ENV)/ro-install
-ASMEXT = .gas
+export ASMEXT := .gas
-OSLIBLIB = $(BUILDDIR)/OSLib32.o
-OSLIBCSTRONG = $(BUILDDIR)/OSLib,3d6
+export OSLIBLIB := $(BUILDDIR)/OSLib32.o
+export OSLIBCSTRONG := $(BUILDDIR)/OSLib,3d6
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2007-05-06 15:59:18
|
Revision: 264
http://ro-oslib.svn.sourceforge.net/ro-oslib/?rev=264&view=rev
Author: jtytgat
Date: 2007-05-06 08:59:17 -0700 (Sun, 06 May 2007)
Log Message:
-----------
Go for GAS symbols iso #define's.
Modified Paths:
--------------
branches/simplified-build/!OsLib/Source/Types/oslib/Types.ELFHdr
Modified: branches/simplified-build/!OsLib/Source/Types/oslib/Types.ELFHdr
===================================================================
--- branches/simplified-build/!OsLib/Source/Types/oslib/Types.ELFHdr 2007-05-06 15:58:04 UTC (rev 263)
+++ branches/simplified-build/!OsLib/Source/Types/oslib/Types.ELFHdr 2007-05-06 15:59:17 UTC (rev 264)
@@ -3,31 +3,31 @@
R .req r0
-#define Int (4)
-#define Bits (4)
-#define Bool (4)
-#define Short (2)
-#define Char (1)
-#define Byte (1)
-#define Ptr (4)
+ .set Int, 4
+ .set Bits, 4
+ .set Bool, 4
+ .set Short, 2
+ .set Char, 1
+ .set Byte, 1
+ .set Ptr, 4
-#define Float (4)
-#define Double (8)
+ .set Float, 4
+ .set Double, 8
-#define Null (0)
-#define False (0)
-#define True (1)
-#define None (0)
-#define All (0xFFFFFFFF)
+ .set Null, 0
+ .set False, 0
+ .set True, 1
+ .set None, 0
+ .set All, 0xFFFFFFFF
@ may be used as a "don't care" value
-#define Skip (0)
+ .set Skip, 0
-#define V (1<<28)
-#define C (1<<29)
-#define Z (1<<30)
-#define N (1<<31)
+ .set V, 1<<28
+ .set C, 1<<29
+ .set Z, 1<<30
+ .set N, 1<<31
-#define Error (-2)
+ .set Error, -2
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
10 messages has been excluded from this view by a project administrator.
