Skip to content

Commit

Permalink
Added the contents of the "readline" module back. This is
Browse files Browse the repository at this point in the history
generally unused, as it is incompatible with the Tcl/Tk build of
magic.  However, I had not intended to remove it, only move the
name from "readline-4.3" to "readline".  But "readline/readline"
was in .gitignore, which caused the contents to be removed from
the repository.  This commit restores those files, and also
prevents the readline directory Makefile from making a symbolic
link called "readline" to itself, which was causing compile-time
issues.  The readline code is only kept for backwards compatibility
with ancient versions of magic not using the Tcl/Tk interpreter.
  • Loading branch information
RTimothyEdwards committed Jan 10, 2025
1 parent 82a1dc9 commit 1cec414
Show file tree
Hide file tree
Showing 107 changed files with 64,969 additions and 7 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ database/database.h
install.log
magic/proto.magicrc
make.log
readline/readline
scmos/gdsquery.tech
scmos/minimum.tech
scmos/scmos-sub.tech
Expand All @@ -32,4 +31,4 @@ magic/tclmagic.dylib
tcltk/magicdnull.dSYM/
tcltk/magicexec.dSYM/
reconfigure.sh
pfx/
pfx/
8 changes: 5 additions & 3 deletions readline/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@ module: readline readline/libreadline.a readline/libhistory.a

depend:

# NOTE: Previously, source code was in a directory readline-4.3 and
# recipe "readline" created a symbolic link to it. This symbolic
# link has been removed, and code is now just in real directory
# "readline".

readline:
@if ( ! test -f readline/readline ) ; then \
ln -s `ls | grep readline` readline ; \
fi

readline/libhistory.a: readline/libreadline.a

Expand Down
Loading

0 comments on commit 1cec414

Please sign in to comment.