common-lisp/roswell.roswell
1
0
Fork 0
mirror of https://github.com/roswell/roswell.git synced 2026-09-10 07:16:17 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #360 from tomrake/issue-359

Browse source 
Fix #359
This commit is contained in:
SANO,Masatoshi 2019-04-01 07:57:35 +02:00 committed by GitHub
parent d372ac9698 118fe72e7b
commit 4972e15281
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 39 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Makefile.am
View file

@ -1,5 +1,5 @@
roslispdir = $(sysconfdir)/$(PACKAGE)
roslisppatchdir = $(sysconfdir)/$(PACKAGE)/patch
roslispdir = @roslispdir@
roslisppatchdir = @roslisppatchdir@
SUBDIRS = src
if MANUAL_INSTALL
@ -92,19 +92,6 @@ roslisp_DATA = $(LISPS:%=lisp/%)
roslisppatch_DATA = patch/sbcl-1.3.11.patch patch/sbcl-posix-tests.patch
src/gend.h: FORCE
printf '#define ROS_COMPILE_ENVIRONMENT "%s"\n' "`$(CC) --version|head -n 1`" > $@.tmp
(printf "#define ROS_REVISION \"" && ((which git>/dev/null&&[ -e .git ]&& \
(git log -n 1 --oneline|cut -d' ' -f1| tr -d '\n'| tr -d '\r'))||printf "") && printf "\"\n") >> $@.tmp
printf '#define PATCH_PATH "%s"\n' "$(roslisppatchdir)" >> $@.tmp
if WITH_WINDOWS
printf '#define LISP_PATH "%s"\n' "`mkdir -p $(roslispdir);cd $(roslispdir); pwd -W 2>/dev/null`" >> $@.tmp
else
printf '#define LISP_PATH "%s"\n' "$(roslispdir)" >> $@.tmp
endif
cmp -s $@.tmp $@||cp $@.tmp $@
cat $@
rm -f $@.tmp
release-prepare:
ros scripts/release.ros prepare

23
configure.ac
View file

@ -4,6 +4,8 @@
AC_PREREQ([2.59])
AC_INIT([roswell],[19.4.10.98],snmsts@gmail.com)
AM_CONFIG_HEADER(config.h)
AC_CONFIG_FILES([Makefile src/Makefile])
AC_CONFIG_SRCDIR([Makefile.am])
@ -33,6 +35,27 @@ AM_CONDITIONAL([WITH_WINDOWS], [test "$with_windows" != ""])
AC_CHECK_TOOL([WINDRES], [windres], [])
AM_CONDITIONAL([WITH_WIN_ICON], [test "$WINDRES" != ""])
# Git is optional, so fail gracefully, build from tar may not have .git/
AC_CHECK_PROG(GIT_CHECK,git,yes)
AS_IF([test "x$GIT_CHECK" = xyes],
[AC_SUBST([git_version], `set -o pipefail ; { git describe | sed -n -e 's/^.*-g//p' ; } 2>/dev/null || echo 'NO-GIT-REVISION'
`,[git SHA1 for HEAD.])],
[AC_SUBST([git_version],[NO-GIT-REVISION])])
AS_IF([test "x$GIT_CHECK" = xyes],
[AC_SUBST([git_version_long], `set -e | git describe --abbrev=7 --dirty 2>/dev/null || echo 'NO-GIT-REVISION'`, [long version for git source])],
[AC_SUBST([git_version_long], [NO-GIT-REVISION])])
# Define rosdir and rospatchdir
# TODO: Make these ./configure line options.
# See https://www.gnu.org/prep/standards/html_node/Directory-Variables.html#Directory-Variables
# Especially 'lispdir' example for emacs.
roslispdir='${sysconfdir}/roswell'
AC_SUBST(roslispdir)
roslisppatchdir='${roslispdir}/patch'
AC_SUBST(roslisppatchdir)
# Change master uri for sbcl-bin
AC_ARG_WITH([sbcl_bin_base],
[AC_HELP_STRING([--with-sbcl-bin-base=URI],[set URI for sbcl-bin [default=https://github.com/roswell/sbcl_bin/releases/download/]])],

16
src/Makefile.am
View file

@ -7,8 +7,20 @@ html_sbcl_SOURCES = html.c html-sbcl-bin.c main.c opt.c $(ros_utils)
html_sbcl_CFLAGS = "-D ROSWELL_HTML_TEST"
gend.h: FORCE
make -C .. src/gend.h
cmd-internal.c: gend.h
printf '#define ROS_COMPILE_ENVIRONMENT "%s"\n' "`$(CC) --version|head -n 1`" > $@.tmp
printf '#define ROS_REVISION "@git_version@"\n' >> $@.tmp
printf '#define PATCH_PATH "@roslisppatchdir@"\n' >> $@.tmp
if WITH_WINDOWS
printf '#define LISP_PATH "%s"\n' "`mkdir -p @roslispdir@;cd @roslispdir@; pwd -W 2>/dev/null`" >> $@.tmp
else
printf '#define LISP_PATH "@roslispdir@"\n' >> $@.tmp
endif
cmp -s $@.tmp $@||cp $@.tmp $@
cat $@
rm -f $@.tmp
cmd-internal.o: gend.h
bin_PROGRAMS = ros
ros_SOURCES = main.c opt.c download.c download_windows.c archive.c archive_windows.c \
register-commands.c html.c html-sbcl-bin.c \