Mercurial > hgrepos > hgweb.cgi > yatex

changeset 81:dacfb49eec6e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 wrap: on
line diff
--- a/00readme	Sun Dec 24 06:16:52 2006 +0000
+++ b/00readme	Sun Dec 24 06:21:09 2006 +0000
@@ -1,12 +1,19 @@
-$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
-  $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
-  $B$/$@$5$$!#>\$7$/$O(B docs/qanda $B%U%!%$%k!"$^$?$O(B
-  http://www.comp.ae.keio.ac.jp/~yuuji/yatex/
-  $B$r8fMw$/$@$5$$!#(B
+・yatex-1.69 よりバイトコンパイルしないのをデフォルトとしました。
+  動作速度が(認識できない程度に)遅くなりますが、インストールしてある全ての
+  Emacsで利用できます。ほんの少し速くなるだけでもいい、Emacsの種類毎に
+  何回もインストールしてもいい、と思う場合は make elc してから
+  make install を行なって下さい。
 
-$B!&(Bmakefile $B$N@hF,ItJ,$rJT=8$7!"(B
-	mule2(emacs-19) $B$r;H$&>l9g$O(B make install
-	$B$=$l0J30$N>l9g$O(B make install-nw
-  $B$K$F%P%$%H%3%s%Q%$%k$H(BLisp$B%G%#%l%/%H%j$X$N%$%s%9%H!<%k$,(B
-  $B9T$o$l$^$9(B($B$?$V$s(B... Nemacs$B$O$J$<$+$&$^$/$$$+$J$$(B)$B!#(B
-  $B>\:Y$O!"(Binstall $B%U%!%$%k$r8fMw2<$5$$!#(B
+・makefile の先頭部分を編集し、
+	mule2(emacs-19), emacs20, XEmacs を使う場合は make install
+	それ以外の場合は make install-nw
+  にてLispディレクトリへのインストールが行われます。
+  詳細は、install ファイルを御覧下さい。
+  Meadow を使う人は readme.meadow.j も御覧下さい。
+
+・「野鳥」およびその Vz への移植版である「雷鳥」、Wzへの移植版である「白
+  鳥」、Hidemaruへの移植版である「飛鳥」、xyzzyへの移植版である「花鳥」
+  に関する情報交換のためのメイリングリスト「fj野鳥の会」に是非御参加ください。
+  詳しくは docs/qanda ファイル、または
+  http://www.yatex.org/
+  を御覧ください。
--- a/makefile	Sun Dec 24 06:16:52 2006 +0000
+++ b/makefile	Sun Dec 24 06:21:09 2006 +0000
@@ -1,19 +1,41 @@
 #
-# Makefile for YaTeX.
+# Makefile for YaTeX
 #
 
 # Edit these variables to be suitable for your site
-LIBDIR	= /usr/local/lib
+PREFIX	= /usr/local
 
-EMACSDIR= ${LIBDIR}/mule
+## mule2
+EMACS	= mule
+EMACSDIR= ${PREFIX}/lib/${EMACS}
+## emacs20
+#EMACS	= emacs
+#EMACSDIR= ${PREFIX}/share/${EMACS}
+## XEmacs
+#EMACS	= xemacs
+#EMACSDIR= ${PREFIX}/lib/${EMACS}
+## Meadow (Sample)
+#EMACS	= meadow
+#EMACSDIR = c:/usr/local/meadow
+## CarbonEmacs on Darwin (Sample)
+#EMACS	= /Applications/Emacs.app/Contents/MacOS/Emacs
+#PREFIX	= /Applications/Emacs.app/Contents/Resources
+#EMACSDIR = ${PREFIX}
+
 LISPDIR	= ${EMACSDIR}/site-lisp/yatex
+# LISPDIR	= ${EMACSDIR}/site-packages/lisp/yatex
 DOCDIR	= ${LISPDIR}/docs
 HELPDIR	= ${EMACSDIR}/site-lisp
-INFODIR	= ${EMACSDIR}/info
-EMACS	= mule
+INFODIR	= ${PREFIX}/info
 
-TAR	= gtar
+TAR	= tar
 INSTALL	= install -c -m 444
+MKDIR	= mkdir -p
+INSTINFO= install-info
+
+
+# Comment out below if you are using Emacs Windows(meadow, etc)
+GEO	= -geometry 80x20+0+0
 
 ###################
 # Do not edit below
@@ -26,32 +48,32 @@
 # make yahtmlpack	to create package for relase
 # make clean		to delete all producted files
 # make ci		to check in all
-# make co		to for check out all
-MVER	= 1.61
+# make co		to check out all
+MVER	= 1.72
 LISP	= ${LISP18} ${LISP19}
 YAHTML	= yahtml.el
 COMMON	= yatexlib.el yatexprc.el
 LISP18	= comment.el yatex.el yatexadd.el yatexgen.el yatexenv.el \
 	  ${COMMON} \
 	  yatexmth.el yatexhks.el yatexhlp.el \
-	  yatexm-o.el yatexsec.el  yatexhie.el ${YAHTML}
+	  yatexm-o.el yatexsec.el  yatexhie.el yatexpkg.el ${YAHTML}
 LISP19	= yatex19.el
 DOCS	= ${DOCSRC} ${DOCOBJ} ${NEWS}
 NEWS	= yatex.new
-DOCHTML	= docs/htmlqa
+DOCHTML	= docs/htmlqa docs/htmlqa.eng docs/yahtmlj.tex docs/yahtmle.tex
 DOCSRC	= docs/yatexj.tex docs/yatexe.tex \
 	  docs/yatex.ref docs/yatexref.eng \
 	  docs/yatexadd.doc docs/yatexgen.doc \
 	  docs/qanda docs/qanda.eng ${DOCHTML}
-DOCOBJ	= docs/yatexj docs/yatexe
+DOCOBJ	= docs/yatexj docs/yatexe docs/yahtmlj docs/yahtmle
 HELP	= help/YATEXHLP.jp help/YATEXHLP.eng
 MANIFEST= manifest
-EXTRA	= dir install 00readme makefile
+EXTRA	= dir install 00readme makefile readme.meadow.j
 DISTRIB = ${EXTRA} ${LISP} ${DOCS} ${MANIFEST} ${HELP}
 RCSFILE	= ${LISP} ${NEWS} ${DOCSRC} ${HELP}
 YAHTMLLISP = ${YAHTML} ${COMMON}
 YAHTMLDIST = ${YAHTMLLISP} install 00readme makefile
-PACK	= `echo ${DISTRIB}|xargs ls`
+PACK	= `ls ${DISTRIB}`
 TMPDIR	= /tmp
 VERSION = `head yatex.el|awk '/rev\./{print $$4}'`
 PACKDIR	= ${TMPDIR}/yatex${VERSION}
@@ -60,44 +82,65 @@
 	@echo "Edit this makefile first."
 	@echo 'Type "make install" to install YaTeX.'
 	@echo 'Type "make install-yahtml" to install yahtml.'
-	@echo "If you don't use X-clinet of Emacs,"
-	@echo 'type "make install-nw" instead.'
+	@echo 'If you cling to elc files. type "make elc" before make install'
+#	@echo "If you don't use X-clinet of Emacs,"
+#	@echo 'type "make install-nw" instead.'
 
-install: bytecompile install-real
-install-yahtml: bytecompile-yahtml
-	if [ ! -d ${LISPDIR} ]; then mkdir ${LISPDIR}; fi
-	${INSTALL} *.elc ${LISPDIR}
+install: install-real
+#install-yahtml: bytecompile-yahtml
+install-yahtml:
+	[ -d ${LISPDIR} ] || mkdir ${LISPDIR}
+	for f in *.el; do \
+	 rm -f ${LISPDIR}/$${f}c; \
+	done
+
+	${INSTALL} *.el* ${LISPDIR}
 
 install-real:
-	if [ ! -d ${LISPDIR} ]; then mkdir ${LISPDIR}; fi
-	if [ ! -d ${DOCDIR} ]; then mkdir ${DOCDIR}; fi
-	${INSTALL} *.elc ${NEWS} ${LISPDIR}
+	if [ ! -d ${LISPDIR} ]; then ${MKDIR} ${LISPDIR}; fi
+	if [ ! -d ${DOCDIR} ]; then ${MKDIR} ${DOCDIR}; fi
+	if [ ! -d ${INFODIR} ]; then ${MKDIR} ${INFODIR}; fi
+	for f in *.el; do \
+	 rm -f ${LISPDIR}/$${f}c; \
+	done
+	${INSTALL} *.el* ${NEWS} ${LISPDIR}
 	${INSTALL} ${DOCSRC} ${DOCDIR}
 	${INSTALL} ${DOCOBJ} ${INFODIR}
 	${INSTALL} ${HELP} ${HELPDIR}
-	@echo "Add next two lines into your site's info dir manually please!"
+	@echo "--------------------------------"
+	@echo "If you have install-info command, type 'make install-info'."
+	@echo "If not, add next lines into your site's info dir manually."
 	@cat dir
 
+install-info:
+	for f in ${DOCOBJ}; do \
+	  b=`basename $$f | sed 's,/.*,,'`; \
+	  ${INSTINFO} --entry="`grep $$b dir`" --section=TeX \
+		--section=Emacs $${f} ${INFODIR}/dir; \
+	done
+
 install-nw: bytecompile-nw install-real
 
+elc:	bytecompile
+
 bytecompile: lp
 	if [ "$$DISPLAY"x = ""x ]; then \
 		echo "Set DISPLAY environment variable!!"; exit 1; fi
-	${EMACS} -q -geometry 80x20+0+0 -l ./lp.el -e bcf-and-exit ${LISP}
+	${EMACS} -q ${GEO} -l ./yatexlib.el -e bcf-and-exit ${LISP}
 
-bytecompile-nw: lp lp1
-	${EMACS} -batch -l ./lp.el -e batch-byte-compile ${LISP18}
+bytecompile-nw: lp1
+	${EMACS} -batch -l ./yatexlib.el -e batch-byte-compile ${LISP18}
 
-bytecompile-yahtml: lp
+bytecompile-yahtml:
 	if [ "$$DISPLAY"x = ""x ]; then \
 		echo "Set DISPLAY environment variable!!"; exit 1; fi
-	${EMACS} -q -g 80x20+0+0 -l ./lp.el -e bcf-and-exit ${YAHTMLLISP}
+	${EMACS} -q -g 80x20+0+0 -l ./yatexlib.el -e bcf-and-exit ${YAHTMLLISP}
 
 lp:
 	echo '(setq load-path (cons "." load-path))'	> lp.el
 	echo '(load-file "./yatexlib.el")'		>>lp.el
 
-lp1:
+lp1:	lp
 	echo '(load-file "./yatex.el")'			>>lp.el
 	echo '(load-file "./comment.el")'		>>lp.el
 
@@ -116,20 +159,23 @@
 clean:
 	rm -f *.elc *~ lp.el
 
-info: docs/yatexj docs/yatexe
+info: docs/yatexj docs/yatexe docs/yahtmlj docs/yahtmle
 
 docs/yatexj: docs/yatexj.tex
-	(cd docs; ${EMACS} -batch yatexj.tex -e texinfo-format-buffer \
-	 -e basic-save-buffer)
+	(cd docs; ${EMACS} -batch -l ../yatexlib.el -e tfb-and-exit yatexj.tex)
 
 docs/yatexe: docs/yatexe.tex
-	(cd docs; ${EMACS} -batch yatexe.tex -e texinfo-format-buffer \
-	 -e basic-save-buffer)
+	(cd docs; ${EMACS} -batch -l ../yatexlib.el -e tfb-and-exit yatexe.tex)
+
+docs/yahtmlj: docs/yahtmlj.tex
+	(cd docs;${EMACS} -batch -l ../yatexlib.el -e tfb-and-exit yahtmlj.tex)
+
+docs/yahtmle: docs/yahtmle.tex
+	(cd docs;${EMACS} -batch -l ../yatexlib.el -e tfb-and-exit yahtmle.tex)
 
 package: info
 	@-mkdir ${PACKDIR}
 	@tar cf - ${PACK} | (cd ${PACKDIR}; tar xf -)
-	find ${PACKDIR} -type f -exec chmod -x '{}' \;
 	( version=${VERSION}; cd ${TMPDIR}; \
 	     ${TAR} vzcf ${TMPDIR}/yatex$$version.tar.gz yatex$$version)
 
@@ -158,3 +204,11 @@
 gohome:
 	zip -u -r /com/okoma/yuuji/tmp/dosconv/yatex.zip . \
 	-x '*RCS/*' -x 'texinfo/*'
+
+RSYNCDIR	= ${HOME}/http/yatex/rsync/yatex
+sync:	
+	@-mkdir ${PACKDIR}
+	@tar cf - ${PACK} | (cd ${PACKDIR}; tar xf -)
+	syncdir -A -x CVS ${PACKDIR} ${RSYNCDIR}
+	(cd ${RSYNCDIR}; cvs ci -m '')
+	rm -rf ${PACKDIR}

yatex.org