[Mirmince-commits] {mirmince} branch master updated. 7ad266b58efe4b5a0e9f8a8337bbe7d1af9cdbf5

[tg at freewrt.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main git repository for FreeWRT project mirmince".

The branch, master has been updated
       via  7ad266b58efe4b5a0e9f8a8337bbe7d1af9cdbf5 (commit)
      from  a4ce42c1e4ebf0051779b9fcb734c06c9837a921 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7ad266b58efe4b5a0e9f8a8337bbe7d1af9cdbf5
Author: Thorsten Glaser <tg at mirbsd.org>
Date:   Sun Jan 6 23:56:40 2013 +0000

    more normal BSD-ish build process

-----------------------------------------------------------------------

Summary of changes:
 BSDmakefile |    7 ++++---
 README      |   24 ++++++++++++++++++++++++
 do-install  |   15 +++++++++++----
 3 files changed, 39 insertions(+), 7 deletions(-)
 create mode 100644 README

diff --git a/BSDmakefile b/BSDmakefile
index 7cb8fca..de36218 100644
--- a/BSDmakefile
+++ b/BSDmakefile
@@ -48,8 +48,8 @@ clean:
 cleandir: clean
 	rm -f ${DCLEANFILES}
 
-install:
-	${SHELL} ${.CURDIR:Q}/do-install ${TG_CC:Q} ${DST:Q} \
+includes install:
+	${SHELL} ${.CURDIR:Q}/do-install $@ ${TG_CC:Q} ${DST:Q} \
 	    ${TG_ARCH:Q} ${TG_OS:Q} ${TG_CFLAGS:M*:Q}
 
 CPPFLAGS:=	-D_ALL_SOURCE
@@ -66,7 +66,7 @@ LDADD:=
 .include "${LIBCDIR}/md/${TG_ARCH}/Makefile.inc"
 .include "${LIBCDIR}/osdep/${TG_OS}/Makefile.inc"
 
-.if !make(obj) && !make(depend) && !make(clean)
+.if !make(obj) && !make(prereq) && !make(depend) && !make(clean)
 .include "${LIBCDIR}/obj/Makefile.gen"
 .endif
 
@@ -135,6 +135,7 @@ sys_${_n}.o: sys_${_n}.S
 .endfor
 
 depend: ${GENHDRS} Makefile.gen
+prereq: ${GENHDRS} Makefile.gen
 
 all: libminze.a
 
diff --git a/README b/README
new file mode 100644
index 0000000..59b4f6e
--- /dev/null
+++ b/README
@@ -0,0 +1,24 @@
+See file LICENCE for copyright and licencing information.
+
+To build:
+
+① adjust DST, CC, TG_ARCH, TG_OS in BSDmakefile
+② make obj		# creates ./obj/ (mandatory)
+③ make prereq		# creates some generated files
+④ sudo make includes	# installs them and the headers
+⑤ make depend		# currently, does nothing more…
+⑥ make			# builds mirₘᵢₙcⒺ CSU and CRT
+⑦ sudo make install	# installs everything to $DST
+
+You’ll need MirMake: a BSD make that automatically descends
+into ./obj/ and reads .depend if possible and supports several
+variable expansion manipulation operators like :M :Q :S etc.
+
+To use:
+
+$DST/bin/cc [-D_ALL_SOURCE] foo.c
+
+This is highly experimental and incomplete. New stuff is not
+added just so but only if needed and the code (users) cannot
+be rewritten to not need it. Even then, strcpy and things
+like that will never be added.
diff --git a/do-install b/do-install
index 850de82..33da54c 100644
--- a/do-install
+++ b/do-install
@@ -20,6 +20,15 @@
 #-
 # For now. This will change later (more flexible, etc).
 
+if [[ $1 = includes ]]; then
+	full=0
+elif [[ $1 = install ]]; then
+	full=1
+else
+	exit 1
+fi
+shift
+
 cc=$1
 dst=$2
 arch=$3
@@ -46,10 +55,8 @@ find include -name \*.h -print0 | pax -rw -0 "$dst"/
     pax -rw -0 "$dst"/include/mirmince/md/)
 (cd osdep/"$os" && find . -name \*.h -print0 | \
     pax -rw -0 "$dst"/include/mirmince/osdep/)
-for f in obj/syscall.h; do
-	[[ -s $f ]] || continue
-	cp "$f" "$dst"/include/mirmince/
-done
+cp obj/syscall.h "$dst"/include/mirmince/
+(( full )) || exit 0
 for f in obj/mince{beg,end}.o obj/*.a; do
 	[[ -s $f ]] || continue
 	cp "$f" "$dst"/lib/


hooks/post-receive
-- 
Main git repository for FreeWRT project mirmince
(FreeWRT project mirmince repository mirmince)