Hi Martin, hello Waldek,
I've added a few commands to make Martin's fricas.el, fricas-cpl.el and
efricas available.
After
./configure && make && make install
there will be a script "efricas" in bindir (the same place where the
fricas script is). Furthermore there will be
${prefix}/lib/fricas/emacs/fricas.el
${prefix}/lib/fricas/emacs/fricas-cpl.el
Martin, could you check whether everything works fine? I seem to have
problems to work with your mode. ENTER does not work as I would expect.
If everything works fine then, I'd like to get authorization to commit
that patch to trunk.
After that I would like to get rid of fricas-cpl.el in the SVN
repository since it should be generated.
Ralf
PS: Note that this patch should remove trunk/contrib/emacs/efricas from
the repository. efricas will be generated at compile time to get the
load-path for fricas.el right.
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"FriCAS - computer algebra system" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/fricas-devel?hl=en
-~----------~----~----~----~------~----~------~--~---
==== Patch <emacs> level 1
Source: [No source]
Target: b0c55286-4f34-0410-a049-a1e7e93b0762:/trunk:413
(https://fricas.svn.sourceforge.net/svnroot/fricas)
Log:
Installation procedure for efricas
=== Makefile.in
==================================================================
--- Makefile.in (revision 413)
+++ Makefile.in (patch emacs level 1)
@@ -26,8 +26,11 @@
all-lib all-lisp all-sman all-src
.PHONY: all install $(AXIOM_SRC_TARGETS)
-all: all-ax
+all: all-ax all-contrib
+all-contrib:
+ cd contrib/emacs && ${MAKE}
+
all-ax: all-src
@echo finished system build on `date` | tee >lastBuildDate
@@ -159,6 +162,8 @@
if test -n "@BUILD_ALDOR_INTERFACE@"; then \
cd src/aldor && $(MAKE) install; \
fi
+ $(mkinstalldirs) '$(DESTDIR)@emacsdatadir@'
+ cd contrib/emacs && $(MAKE) install;
@echo 79 FriCAS installation finished.
=== configure
==================================================================
--- configure (revision 413)
+++ configure (patch emacs level 1)
@@ -728,6 +728,7 @@
ALDOR
SVN
BUILD_ALDOR_INTERFACE
+emacsdatadir
LIBOBJS
LTLIBOBJS'
ac_subst_files=''
@@ -8869,6 +8870,22 @@
###################################################################
+###################################################################
+## The following section deals with running fricas inside emacs.
+## The sources are expected in ${srcdir}/contrib/emacs.
+## The shell script efricas will be copied to ${bindir}.
+## The files fricas*.el should probably go to
+# emacsdatadir=$pkgdatadir/emacs/site-lisp
+## but will currently be put into
+emacsdatadir=$libdir/fricas/emacs
+
+ac_config_files="$ac_config_files contrib/emacs/Makefile:config/var-def.mk:contrib/emacs/Makefile.in:config/setup-dep.mk"
+
+###################################################################
+
+
+
+
## We now generate the "document" script and support files at configure time.
## We put them in the build directory because they are intended to be
## build support utils only.
@@ -9451,6 +9468,7 @@
"src/etc/Makefile") CONFIG_FILES="$CONFIG_FILES src/etc/Makefile:config/var-def.mk:src/etc/Makefile.in:config/setup-dep.mk" ;;
"src/aldor/Makefile") CONFIG_FILES="$CONFIG_FILES src/aldor/Makefile:config/var-def.mk:src/aldor/Makefile.in:config/setup-dep.mk" ;;
"src/aldor/Makefile2") CONFIG_FILES="$CONFIG_FILES src/aldor/Makefile2:config/var-def.mk:src/aldor/Makefile2.in:config/setup-dep.mk" ;;
+ "contrib/emacs/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/emacs/Makefile:config/var-def.mk:contrib/emacs/Makefile.in:config/setup-dep.mk" ;;
"build/scripts/document") CONFIG_FILES="$CONFIG_FILES build/scripts/document:$srcdir/src/scripts/document.in" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
@@ -9667,11 +9685,12 @@
ALDOR!$ALDOR$ac_delim
SVN!$SVN$ac_delim
BUILD_ALDOR_INTERFACE!$BUILD_ALDOR_INTERFACE$ac_delim
+emacsdatadir!$emacsdatadir$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 18; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 19; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
=== configure.ac
==================================================================
--- configure.ac (revision 413)
+++ configure.ac (patch emacs level 1)
@@ -698,6 +698,21 @@
###################################################################
+###################################################################
+## The following section deals with running fricas inside emacs.
+## The sources are expected in ${srcdir}/contrib/emacs.
+## The shell script efricas will be copied to ${bindir}.
+## The files fricas*.el should probably go to
+# emacsdatadir=$pkgdatadir/emacs/site-lisp
+## but will currently be put into
+emacsdatadir=$libdir/fricas/emacs
+AC_SUBST(emacsdatadir)
+AXIOM_MAKEFILE([contrib/emacs/Makefile])
+###################################################################
+
+
+
+
## We now generate the "document" script and support files at configure time.
## We put them in the build directory because they are intended to be
## build support utils only.
=== contrib/emacs/efricas
==================================================================
--- contrib/emacs/efricas (revision 413)
+++ contrib/emacs/efricas (patch emacs level 1)
@@ -1,6 +0,0 @@
-#!/bin/sh -
-# this is a minimalistic script to start axiom in gnu emacs, using its axiom
-# mode. To make it work, you have to move axiom.el to a place where emacs can
-# find it. For example, /usr/share/emacs/site-lisp/ should work.
-export AXIOMEDITOR='emacsclient +$line $name >/dev/null 2>&1'
-emacs --eval='(progn (server-start) (setq load-path (cons (quote "~/emacs") load-path)) (setq auto-mode-alist (cons (quote ("\\.fri" . fricas-mode)) auto-mode-alist)) (require (quote fricas)))' -f fricas
=== contrib/emacs/Makefile.in
==================================================================
--- contrib/emacs/Makefile.in (revision 413)
+++ contrib/emacs/Makefile.in (patch emacs level 1)
@@ -0,0 +1,38 @@
[EMAIL PROTECTED]@
+
+default: efricas fricas.el fricas-cpl.el
+
+clean:
+ -rm efricas
+
+install_emacs_dir = @emacsdatadir@
+EMACSCMDS = \
+ (progn \
+ (server-start) \
+ (setq load-path (cons (quote \"${install_emacs_dir}\") load-path)) \
+ (setq auto-mode-alist \
+ (cons (quote (\"\\\\.fri\" . fricas-mode)) auto-mode-alist)) \
+ (require (quote fricas)))
+
+efricas:
+ echo "#!/bin/sh -" > $@
+ echo "AXIOMEDITOR='emacsclient +$$line $$name >/dev/null 2>&1'" >> $@
+ echo "export AXIOMEDITOR" >> $@
+ echo "if which emacs; then \\" >> $@
+ echo "emacs --eval '${EMACSCMDS}' -f fricas; \\" >> $@
+ echo "else \\" >> $@
+ echo "echo You must have installed emacs to run efricas.; fi" >> $@
+
+
+
+###################################################################
+# We need libaxiom.al and the .o (runtime support) files in the lib
+# subdirectory.
+install: install-emacs
+
+# Destination directory for the algebra files and aldor libraries.
+install_target_dir = $(DESTDIR)${install_emacs_dir}
+install-emacs:
+ $(INSTALL_DATA) ${srcdir}/fricas.el $(install_emacs_dir)/fricas.el
+ $(INSTALL_DATA) ${srcdir}/fricas-cpl.el $(install_emacs_dir)/fricas-cpl.el
+ $(INSTALL_SCRIPT) efricas '$(DESTDIR)$(bindir)/efricas'
==== BEGIN SVK PATCH BLOCK ====
Version: svk 1.08 (linux)
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
VEErKDL/L+qKXBM=
==== END SVK PATCH BLOCK ====
