ro-oslib-commits

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

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

Revision: 257
          http://ro-oslib.svn.sourceforge.net/ro-oslib/?rev=257&view=rev
Author:   jtytgat
Date:     2007-04-29 15:50:19 -0700 (Sun, 29 Apr 2007)

Log Message:
-----------
RISC OS 'o' directory wasn't correctly created

Modified Paths:
--------------
    branches/simplified-build/!OsLib/Source/Makefile

Modified: branches/simplified-build/!OsLib/Source/Makefile
===================================================================
--- branches/simplified-build/!OsLib/Source/Makefile	2007-04-29 22:03:34 UTC (rev 256)
+++ branches/simplified-build/!OsLib/Source/Makefile	2007-04-29 22:50:19 UTC (rev 257)
@@ -27,7 +27,7 @@
 	-$(RM) $(RELEASEDIR)/$(BUILDTYPE)/OSLib-wide.zip
 	-$(MKDIR) $(HEADERDIR)/h $(HEADERDIR)/Hdr $(HEADERDIR)/../o
 	cd $(HEADERDIR) && find . -type f -exec rename 's/(.+)\.(.+)/$$2\/$$1/' {} \;
-	$(CP) $(OSLIBLIB) $(HEADERDIR)/o/OSLib32
+	$(CP) $(OSLIBLIB) $(HEADERDIR)/../o/OSLib32
 	cd $(HEADERDIR)/.. && $(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/$(BUILDTYPE)/OSLib-wide.zip .
 
 # Zips the StrongHelp file:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

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

Revision: 262
          http://ro-oslib.svn.sourceforge.net/ro-oslib/?rev=262&view=rev
Author:   jtytgat
Date:     2007-05-06 08:56:23 -0700 (Sun, 06 May 2007)

Log Message:
-----------
Adding 'test' target. Making CROSSGCC_ELF as default BUILDTYPE.

Modified Paths:
--------------
    branches/simplified-build/!OsLib/Source/Makefile

Modified: branches/simplified-build/!OsLib/Source/Makefile
===================================================================
--- branches/simplified-build/!OsLib/Source/Makefile	2007-05-06 15:55:08 UTC (rev 261)
+++ branches/simplified-build/!OsLib/Source/Makefile	2007-05-06 15:56:23 UTC (rev 262)
@@ -1,7 +1,7 @@
 # ...
 
-# Build type: CROSSGCC_AOF (default), CROSSGCC_ELF [NORCROFT_AOF: not supported yet]
-BUILDTYPE ?= CROSSGCC_AOF
+# Build type: CROSSGCC_AOF, CROSSGCC_ELF (default), [NORCROFT_AOF: not supported yet]
+export BUILDTYPE ?= CROSSGCC_ELF
 
 ifeq ($(BUILDTYPE),CROSSGCC_ELF)
 else ifeq ($(BUILDTYPE),CROSSGCC_AOF)
@@ -13,6 +13,9 @@
 .PHONY: all install release-oslib release-cstrong clean oslib cstrong BuildRequirements
 all:	oslib cstrong
 
+test:	oslib
+	$(MAKE) -C Test
+
 # Only for GCCSDK cross-compilation install purposes:
 install: oslib
 	cd $(BUILDDIR) && $(INSTALL) OSLib32.o $(GCCSDK_INSTALL_ENV)/lib/libOSLib32.o
@@ -43,6 +46,7 @@
 	$(MAKE) -C Toolbox/oslib $@
 	$(MAKE) -C User/oslib $@
 	-$(RM) $(BUILDDIR)
+	$(MAKE) -C Test $@
 
 oslib: $(OSLIBLIB)
 $(OSLIBLIB): BuildRequirements


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

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

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.

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

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

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.