yatex
changeset 81:dacfb49eec6e
1.73
| author | yuuji |
|---|---|
| date | Sun, 24 Dec 2006 06:21:09 +0000 |
| parents | 9b4354af748c |
| children | d84447b92eca |
| files | 00readme makefile |
| diffstat | 2 files changed, 107 insertions(+), 46 deletions(-) [+] |
line diff
1.1 --- a/00readme Sun Dec 24 06:16:52 2006 +0000 1.2 +++ b/00readme Sun Dec 24 06:21:09 2006 +0000 1.3 @@ -1,12 +1,19 @@ 1.4 -$B!&!VLnD;!W$*$h$S$=$N(B Vz $B$X$N0\?"HG$G$"$k!VMkD;!W!"(BWz$B$X$N0\?"HG$G$"$k!VGr(B 1.5 - $BD;!W$K4X$9$k>pJs8r49$N$?$a$N%a%$%j%s%0%j%9%H!V(Bfj$BLnD;$N2q!W$K@'Hs8f;22C(B 1.6 - $B$/$@$5$$!#>\$7$/$O(B docs/qanda $B%U%!%$%k!"$^$?$O(B 1.7 - http://www.comp.ae.keio.ac.jp/~yuuji/yatex/ 1.8 - $B$r8fMw$/$@$5$$!#(B 1.9 +・yatex-1.69 よりバイトコンパイルしないのをデフォルトとしました。 1.10 + 動作速度が(認識できない程度に)遅くなりますが、インストールしてある全ての 1.11 + Emacsで利用できます。ほんの少し速くなるだけでもいい、Emacsの種類毎に 1.12 + 何回もインストールしてもいい、と思う場合は make elc してから 1.13 + make install を行なって下さい。 1.14 1.15 -$B!&(Bmakefile $B$N@hF,ItJ,$rJT=8$7!"(B 1.16 - mule2(emacs-19) $B$r;H$&>l9g$O(B make install 1.17 - $B$=$l0J30$N>l9g$O(B make install-nw 1.18 - $B$K$F%P%$%H%3%s%Q%$%k$H(BLisp$B%G%#%l%/%H%j$X$N%$%s%9%H!<%k$,(B 1.19 - $B9T$o$l$^$9(B($B$?$V$s(B... Nemacs$B$O$J$<$+$&$^$/$$$+$J$$(B)$B!#(B 1.20 - $B>\:Y$O!"(Binstall $B%U%!%$%k$r8fMw2<$5$$!#(B 1.21 +・makefile の先頭部分を編集し、 1.22 + mule2(emacs-19), emacs20, XEmacs を使う場合は make install 1.23 + それ以外の場合は make install-nw 1.24 + にてLispディレクトリへのインストールが行われます。 1.25 + 詳細は、install ファイルを御覧下さい。 1.26 + Meadow を使う人は readme.meadow.j も御覧下さい。 1.27 + 1.28 +・「野鳥」およびその Vz への移植版である「雷鳥」、Wzへの移植版である「白 1.29 + 鳥」、Hidemaruへの移植版である「飛鳥」、xyzzyへの移植版である「花鳥」 1.30 + に関する情報交換のためのメイリングリスト「fj野鳥の会」に是非御参加ください。 1.31 + 詳しくは docs/qanda ファイル、または 1.32 + http://www.yatex.org/ 1.33 + を御覧ください。
2.1 --- a/makefile Sun Dec 24 06:16:52 2006 +0000 2.2 +++ b/makefile Sun Dec 24 06:21:09 2006 +0000 2.3 @@ -1,19 +1,41 @@ 2.4 # 2.5 -# Makefile for YaTeX. 2.6 +# Makefile for YaTeX 2.7 # 2.8 2.9 # Edit these variables to be suitable for your site 2.10 -LIBDIR = /usr/local/lib 2.11 +PREFIX = /usr/local 2.12 2.13 -EMACSDIR= ${LIBDIR}/mule 2.14 +## mule2 2.15 +EMACS = mule 2.16 +EMACSDIR= ${PREFIX}/lib/${EMACS} 2.17 +## emacs20 2.18 +#EMACS = emacs 2.19 +#EMACSDIR= ${PREFIX}/share/${EMACS} 2.20 +## XEmacs 2.21 +#EMACS = xemacs 2.22 +#EMACSDIR= ${PREFIX}/lib/${EMACS} 2.23 +## Meadow (Sample) 2.24 +#EMACS = meadow 2.25 +#EMACSDIR = c:/usr/local/meadow 2.26 +## CarbonEmacs on Darwin (Sample) 2.27 +#EMACS = /Applications/Emacs.app/Contents/MacOS/Emacs 2.28 +#PREFIX = /Applications/Emacs.app/Contents/Resources 2.29 +#EMACSDIR = ${PREFIX} 2.30 + 2.31 LISPDIR = ${EMACSDIR}/site-lisp/yatex 2.32 +# LISPDIR = ${EMACSDIR}/site-packages/lisp/yatex 2.33 DOCDIR = ${LISPDIR}/docs 2.34 HELPDIR = ${EMACSDIR}/site-lisp 2.35 -INFODIR = ${EMACSDIR}/info 2.36 -EMACS = mule 2.37 +INFODIR = ${PREFIX}/info 2.38 2.39 -TAR = gtar 2.40 +TAR = tar 2.41 INSTALL = install -c -m 444 2.42 +MKDIR = mkdir -p 2.43 +INSTINFO= install-info 2.44 + 2.45 + 2.46 +# Comment out below if you are using Emacs Windows(meadow, etc) 2.47 +GEO = -geometry 80x20+0+0 2.48 2.49 ################### 2.50 # Do not edit below 2.51 @@ -26,32 +48,32 @@ 2.52 # make yahtmlpack to create package for relase 2.53 # make clean to delete all producted files 2.54 # make ci to check in all 2.55 -# make co to for check out all 2.56 -MVER = 1.61 2.57 +# make co to check out all 2.58 +MVER = 1.72 2.59 LISP = ${LISP18} ${LISP19} 2.60 YAHTML = yahtml.el 2.61 COMMON = yatexlib.el yatexprc.el 2.62 LISP18 = comment.el yatex.el yatexadd.el yatexgen.el yatexenv.el \ 2.63 ${COMMON} \ 2.64 yatexmth.el yatexhks.el yatexhlp.el \ 2.65 - yatexm-o.el yatexsec.el yatexhie.el ${YAHTML} 2.66 + yatexm-o.el yatexsec.el yatexhie.el yatexpkg.el ${YAHTML} 2.67 LISP19 = yatex19.el 2.68 DOCS = ${DOCSRC} ${DOCOBJ} ${NEWS} 2.69 NEWS = yatex.new 2.70 -DOCHTML = docs/htmlqa 2.71 +DOCHTML = docs/htmlqa docs/htmlqa.eng docs/yahtmlj.tex docs/yahtmle.tex 2.72 DOCSRC = docs/yatexj.tex docs/yatexe.tex \ 2.73 docs/yatex.ref docs/yatexref.eng \ 2.74 docs/yatexadd.doc docs/yatexgen.doc \ 2.75 docs/qanda docs/qanda.eng ${DOCHTML} 2.76 -DOCOBJ = docs/yatexj docs/yatexe 2.77 +DOCOBJ = docs/yatexj docs/yatexe docs/yahtmlj docs/yahtmle 2.78 HELP = help/YATEXHLP.jp help/YATEXHLP.eng 2.79 MANIFEST= manifest 2.80 -EXTRA = dir install 00readme makefile 2.81 +EXTRA = dir install 00readme makefile readme.meadow.j 2.82 DISTRIB = ${EXTRA} ${LISP} ${DOCS} ${MANIFEST} ${HELP} 2.83 RCSFILE = ${LISP} ${NEWS} ${DOCSRC} ${HELP} 2.84 YAHTMLLISP = ${YAHTML} ${COMMON} 2.85 YAHTMLDIST = ${YAHTMLLISP} install 00readme makefile 2.86 -PACK = `echo ${DISTRIB}|xargs ls` 2.87 +PACK = `ls ${DISTRIB}` 2.88 TMPDIR = /tmp 2.89 VERSION = `head yatex.el|awk '/rev\./{print $$4}'` 2.90 PACKDIR = ${TMPDIR}/yatex${VERSION} 2.91 @@ -60,44 +82,65 @@ 2.92 @echo "Edit this makefile first." 2.93 @echo 'Type "make install" to install YaTeX.' 2.94 @echo 'Type "make install-yahtml" to install yahtml.' 2.95 - @echo "If you don't use X-clinet of Emacs," 2.96 - @echo 'type "make install-nw" instead.' 2.97 + @echo 'If you cling to elc files. type "make elc" before make install' 2.98 +# @echo "If you don't use X-clinet of Emacs," 2.99 +# @echo 'type "make install-nw" instead.' 2.100 2.101 -install: bytecompile install-real 2.102 -install-yahtml: bytecompile-yahtml 2.103 - if [ ! -d ${LISPDIR} ]; then mkdir ${LISPDIR}; fi 2.104 - ${INSTALL} *.elc ${LISPDIR} 2.105 +install: install-real 2.106 +#install-yahtml: bytecompile-yahtml 2.107 +install-yahtml: 2.108 + [ -d ${LISPDIR} ] || mkdir ${LISPDIR} 2.109 + for f in *.el; do \ 2.110 + rm -f ${LISPDIR}/$${f}c; \ 2.111 + done 2.112 + 2.113 + ${INSTALL} *.el* ${LISPDIR} 2.114 2.115 install-real: 2.116 - if [ ! -d ${LISPDIR} ]; then mkdir ${LISPDIR}; fi 2.117 - if [ ! -d ${DOCDIR} ]; then mkdir ${DOCDIR}; fi 2.118 - ${INSTALL} *.elc ${NEWS} ${LISPDIR} 2.119 + if [ ! -d ${LISPDIR} ]; then ${MKDIR} ${LISPDIR}; fi 2.120 + if [ ! -d ${DOCDIR} ]; then ${MKDIR} ${DOCDIR}; fi 2.121 + if [ ! -d ${INFODIR} ]; then ${MKDIR} ${INFODIR}; fi 2.122 + for f in *.el; do \ 2.123 + rm -f ${LISPDIR}/$${f}c; \ 2.124 + done 2.125 + ${INSTALL} *.el* ${NEWS} ${LISPDIR} 2.126 ${INSTALL} ${DOCSRC} ${DOCDIR} 2.127 ${INSTALL} ${DOCOBJ} ${INFODIR} 2.128 ${INSTALL} ${HELP} ${HELPDIR} 2.129 - @echo "Add next two lines into your site's info dir manually please!" 2.130 + @echo "--------------------------------" 2.131 + @echo "If you have install-info command, type 'make install-info'." 2.132 + @echo "If not, add next lines into your site's info dir manually." 2.133 @cat dir 2.134 2.135 +install-info: 2.136 + for f in ${DOCOBJ}; do \ 2.137 + b=`basename $$f | sed 's,/.*,,'`; \ 2.138 + ${INSTINFO} --entry="`grep $$b dir`" --section=TeX \ 2.139 + --section=Emacs $${f} ${INFODIR}/dir; \ 2.140 + done 2.141 + 2.142 install-nw: bytecompile-nw install-real 2.143 2.144 +elc: bytecompile 2.145 + 2.146 bytecompile: lp 2.147 if [ "$$DISPLAY"x = ""x ]; then \ 2.148 echo "Set DISPLAY environment variable!!"; exit 1; fi 2.149 - ${EMACS} -q -geometry 80x20+0+0 -l ./lp.el -e bcf-and-exit ${LISP} 2.150 + ${EMACS} -q ${GEO} -l ./yatexlib.el -e bcf-and-exit ${LISP} 2.151 2.152 -bytecompile-nw: lp lp1 2.153 - ${EMACS} -batch -l ./lp.el -e batch-byte-compile ${LISP18} 2.154 +bytecompile-nw: lp1 2.155 + ${EMACS} -batch -l ./yatexlib.el -e batch-byte-compile ${LISP18} 2.156 2.157 -bytecompile-yahtml: lp 2.158 +bytecompile-yahtml: 2.159 if [ "$$DISPLAY"x = ""x ]; then \ 2.160 echo "Set DISPLAY environment variable!!"; exit 1; fi 2.161 - ${EMACS} -q -g 80x20+0+0 -l ./lp.el -e bcf-and-exit ${YAHTMLLISP} 2.162 + ${EMACS} -q -g 80x20+0+0 -l ./yatexlib.el -e bcf-and-exit ${YAHTMLLISP} 2.163 2.164 lp: 2.165 echo '(setq load-path (cons "." load-path))' > lp.el 2.166 echo '(load-file "./yatexlib.el")' >>lp.el 2.167 2.168 -lp1: 2.169 +lp1: lp 2.170 echo '(load-file "./yatex.el")' >>lp.el 2.171 echo '(load-file "./comment.el")' >>lp.el 2.172 2.173 @@ -116,20 +159,23 @@ 2.174 clean: 2.175 rm -f *.elc *~ lp.el 2.176 2.177 -info: docs/yatexj docs/yatexe 2.178 +info: docs/yatexj docs/yatexe docs/yahtmlj docs/yahtmle 2.179 2.180 docs/yatexj: docs/yatexj.tex 2.181 - (cd docs; ${EMACS} -batch yatexj.tex -e texinfo-format-buffer \ 2.182 - -e basic-save-buffer) 2.183 + (cd docs; ${EMACS} -batch -l ../yatexlib.el -e tfb-and-exit yatexj.tex) 2.184 2.185 docs/yatexe: docs/yatexe.tex 2.186 - (cd docs; ${EMACS} -batch yatexe.tex -e texinfo-format-buffer \ 2.187 - -e basic-save-buffer) 2.188 + (cd docs; ${EMACS} -batch -l ../yatexlib.el -e tfb-and-exit yatexe.tex) 2.189 + 2.190 +docs/yahtmlj: docs/yahtmlj.tex 2.191 + (cd docs;${EMACS} -batch -l ../yatexlib.el -e tfb-and-exit yahtmlj.tex) 2.192 + 2.193 +docs/yahtmle: docs/yahtmle.tex 2.194 + (cd docs;${EMACS} -batch -l ../yatexlib.el -e tfb-and-exit yahtmle.tex) 2.195 2.196 package: info 2.197 @-mkdir ${PACKDIR} 2.198 @tar cf - ${PACK} | (cd ${PACKDIR}; tar xf -) 2.199 - find ${PACKDIR} -type f -exec chmod -x '{}' \; 2.200 ( version=${VERSION}; cd ${TMPDIR}; \ 2.201 ${TAR} vzcf ${TMPDIR}/yatex$$version.tar.gz yatex$$version) 2.202 2.203 @@ -158,3 +204,11 @@ 2.204 gohome: 2.205 zip -u -r /com/okoma/yuuji/tmp/dosconv/yatex.zip . \ 2.206 -x '*RCS/*' -x 'texinfo/*' 2.207 + 2.208 +RSYNCDIR = ${HOME}/http/yatex/rsync/yatex 2.209 +sync: 2.210 + @-mkdir ${PACKDIR} 2.211 + @tar cf - ${PACK} | (cd ${PACKDIR}; tar xf -) 2.212 + syncdir -A -x CVS ${PACKDIR} ${RSYNCDIR} 2.213 + (cd ${RSYNCDIR}; cvs ci -m '') 2.214 + rm -rf ${PACKDIR}