r70 - in openbios-devel: . config/scripts

Author: stepan
Date: 2006-07-23 16:22:39 +0200 (Sun, 23 Jul 2006)
New Revision: 70

Removed:
   openbios-devel/config.xml
   openbios-devel/rules.xml
Modified:
   openbios-devel/Makefile
   openbios-devel/config/scripts/switch-arch
Log:
workaround for wrong viewvc permissions, Makefile bugfixes

Modified: openbios-devel/Makefile
===================================================================
--- openbios-devel/Makefile	2006-07-18 21:48:00 UTC (rev 69)
+++ openbios-devel/Makefile	2006-07-23 14:22:39 UTC (rev 70)
@@ -1,10 +1,18 @@
-ARCH= $(shell cat rules.xml |grep "^ARCH" |cut -d= -f2|tr -d \ )
+ARCH= $(shell test -r rules.xml && cat rules.xml |grep "^ARCH" |cut -d= -f2|tr -d \ )
 HOSTARCH=$(shell config/scripts/archname)
 CROSSCFLAGS=$(shell config/scripts/crosscflags $(HOSTARCH) $(ARCH))
 ODIR=obj-$(ARCH)

-all: info build
+all: archtest info build

+archtest: prepare
+	@test -r config.xml -a -r rules.xml || \
+		( echo ; echo "Please run the following command first:"; echo ; \
+		  echo "  $$ config/scripts/switch-arch <arch>"; \
+		  echo; echo "<arch> can be one out of x86, amd64, cross-ppc, ppc"; \
+		  echo "       cross-sparc32, sparc32, cross-sparc64, sparc64"; \
+		  echo; exit 1 )
+
 info:
    @echo "Building OpenBIOS on $(HOSTARCH) for $(ARCH)"

@@ -41,6 +49,14 @@
    @#ln -s $(PWD)/include/$(HOSTARCH) $(ODIR)/host/include/asm
    @echo "ok."

+# This is needed because viewvc messes with the permissions of executables:
+prepare:
+	@chmod 755 utils/dist/debian/rules
+	@chmod 755 config/scripts/switch-arch
+	@chmod 755 config/scripts/archname
+	@chmod 755 config/scripts/reldir
+	@chmod 755 config/scripts/crosscflags
+
 xml: directories
    @printf "Creating target Makefile..."
    @xsltproc config/xml/xinclude.xsl build.xml > $(ODIR)/build-full.xml
@@ -54,7 +70,7 @@

build: xml
    @printf "Building..."
-	@( $(MAKE) -f $(ODIR)/Makefile CROSSCFLAGS=$(CROSSCFLAGS) > $(ODIR)/build.log 2>&1 && echo "ok." ) || \
+	@( $(MAKE) -f $(ODIR)/Makefile "CROSSCFLAGS=$(CROSSCFLAGS)" > $(ODIR)/build.log 2>&1 && echo "ok." ) || \
    	( echo "error:"; tail -15 $(ODIR)/build.log )

build-verbose:

Modified: openbios-devel/config/scripts/switch-arch
===================================================================
--- openbios-devel/config/scripts/switch-arch	2006-07-18 21:48:00 UTC (rev 69)
+++ openbios-devel/config/scripts/switch-arch	2006-07-23 14:22:39 UTC (rev 70)
@@ -8,8 +8,8 @@

ARCH=$1

-rm rules.xml
-rm config.xml
+rm -f rules.xml
+rm -f config.xml
 ln -s config/examples/${ARCH}_rules.xml rules.xml
 ln -s config/examples/${ARCH}_config.xml config.xml

Deleted: openbios-devel/config.xml
===================================================================
--- openbios-devel/config.xml	2006-07-18 21:48:00 UTC (rev 69)
+++ openbios-devel/config.xml	2006-07-23 14:22:39 UTC (rev 70)
@@ -1 +0,0 @@
-link config/examples/x86_config.xml
\ No newline at end of file

Deleted: openbios-devel/rules.xml
===================================================================
--- openbios-devel/rules.xml	2006-07-18 21:48:00 UTC (rev 69)
+++ openbios-devel/rules.xml	2006-07-23 14:22:39 UTC (rev 70)
@@ -1 +0,0 @@
-link config/examples/x86_rules.xml
\ No newline at end of file