Skip to content
This repository has been archived by the owner on Jan 9, 2019. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
removed registration of last-revision in the source code
  • Loading branch information
Marco Maggi committed Mar 11, 2015
1 parent 05354d4 commit 6f4c4c5
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 49 deletions.
10 changes: 2 additions & 8 deletions Makefile.am
Expand Up @@ -3,7 +3,6 @@
ACLOCAL_AMFLAGS = -I meta/autotools
EXTRA_DIST = configure.sh configure32.sh configure64.sh \
bare-configure.sh cygwin-configure.sh \
scripts/make-last-revision \
meta/autotools/config.rpath

slsdir = $(srcdir)/lib
Expand Down Expand Up @@ -212,7 +211,7 @@ VICARE_NEW_EXECUTABLE = $(builddir)/vicare

AM_CPPFLAGS = -I $(srcdir)/src -I $(builddir)/src
AM_CFLAGS = -Wall
EXTRA_DIST += src/last-revision.h src/vicare-platform.h.in
EXTRA_DIST += src/vicare-platform.h.in

bin_PROGRAMS = vicare
vicare_SOURCES = \
Expand Down Expand Up @@ -241,7 +240,6 @@ vicare_SOURCES = \
src/ikarus-linux.c \
src/ikarus-readline.c \
src/ikarus-debugging.c \
src/last-revision.h \
src/internals.h

nodist_vicare_SOURCES = bootfileloc.h
Expand All @@ -250,20 +248,16 @@ include_HEADERS = src/vicare.h src/vicare-platform.h

ikarus.$(OBJEXT) ikarus-main.$(OBJEXT): bootfileloc.h

MAINTAINERCLEANFILES += $(srcdir)/src/last-revision.h
CLEANFILES += bootfileloc.h

BUILT_SOURCES += $(srcdir)/src/last-revision.h bootfileloc.h
BUILT_SOURCES += bootfileloc.h

# Strictly speaking: this target should depend on Makfile, but doing
# it that way causes a lot of unnecessary rebuilds.
bootfileloc.h:
echo '#define BOOTFILE "$(pkglibdir)/vicare.boot"' >$@
echo '#define EXEFILE "$(bindir)/vicare"' >>$@

$(srcdir)/src/last-revision.h:
echo '#define LAST_REVISION "no-branch/no-commit"' >$@

# List of flags to link libraries with the "vicare" executable.
vicare_LDADD =

Expand Down
2 changes: 0 additions & 2 deletions meta/git/hooks/post-commit
Expand Up @@ -7,7 +7,5 @@ PATH=~/bin:${PATH}
git my-backup-push-local
git my-log-commit-dir

./scripts/make-last-revision

### end of file

10 changes: 0 additions & 10 deletions meta/git/hooks/post-merge

This file was deleted.

8 changes: 1 addition & 7 deletions scheme/ikarus.main.sls
Expand Up @@ -700,12 +700,6 @@
((64)
(%display ", 64-bit")))
(%newline)
;;Print the git branch and HEAD commit checksum.
(let ((rev (foreign-call "ikrt_get_last_revision")))
(unless (zero? (bytevector-length rev))
(%display "Revision ")
(%display (ascii->string rev))
(%newline)))
(%display "Build ")
;;This LET-SYNTAX looks weird, but it is to take the DATE-STRING
;;result at expansion-time rather than run-time.
Expand All @@ -714,7 +708,7 @@
(%newline)
(%display "
Copyright (c) 2006-2010 Abdulaziz Ghuloum and contributors
Copyright (c) 2011-2015 Marco Maggi\n\n"))
Copyright (c) 2011-2015 Marco Maggi and contributors\n\n"))

(define (print-version-screen)
;;Print the version screen.
Expand Down
20 changes: 0 additions & 20 deletions scripts/make-last-revision

This file was deleted.

5 changes: 3 additions & 2 deletions src/ikarus-main.c
Expand Up @@ -116,11 +116,12 @@ ikrt_get_argv0_string (ikpcb * pcb)
{
return ika_string_from_cstring(pcb, pcb->argv0);
}
/* FIXME To be removed at the next boot image rotation. (Marco Maggi;
Wed Mar 11, 2015) */
ikptr
ikrt_get_last_revision (ikpcb * pcb)
{
#include "last-revision.h"
return ika_bytevector_from_cstring(pcb, LAST_REVISION);
return ika_string_from_cstring(pcb, "unknown-revision");
}


Expand Down

0 comments on commit 6f4c4c5

Please sign in to comment.