[ro-oslib-commits] SF.net SVN: ro-oslib: [272] branches/simplified-build/!OsLib

[<jt...@us...>]

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.