namazu-ml(ring)
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: namazu-1.3.0.3-beta-1 (Re: namazu-1.3.1.0-pre-2)
- From: Ken-ichi Hirose <hirose@xxxxxxxxxxxxxxxxxxxx>
- Date: Thu, 04 Feb 1999 16:32:48 +0900
広瀬と申します。
<ccsatoru@xxxxxxxxxxxxxxxxxx> wrote.
/~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>># 今日、明日中にでも v1.3.0.3 をリリースする予定です。
>v1.3.0.3-beta-1 を作りました。問題がないようであればそのまま
>v1.3.0.3 としてリリースします。
> <ftp://ring.aist.go.jp/openlab/namazu/proto/namazu-1.3.0.3-beta-1.tar.gz>
>動作確認をお願いします (できれば今日中に v1.3.0.3 をリリースしたい
>です)。変更点は
すみませんが、Win分の patch をお願い致します。
＃win95 の件も修正してあります。
---8<------8<------8<------8<------8<------8<------8<------8<------8<------8<------8<------8<---
diff -rcN namazu-1.3.0.3-beta-1.org/src/Makefile.W32 namazu-1.3.0.3-beta-1/src/Makefile.W32
*** namazu-1.3.0.3-beta-1.org/src/Makefile.W32 Thu Feb 04 16:02:36 1999
--- namazu-1.3.0.3-beta-1/src/Makefile.W32 Thu Feb 04 16:19:41 1999
***************
*** 39,48 ****
## if you intend to use Namazu with Win32, you should describe
## path by using \\\\ string for path separator.
! OPT_PATH_PERL = /usr/local/bin/perl
OPT_PATH_NKF = nkf32
OPT_PATH_KAKASI = kakasi
! OPT_PATH_CHASEN = no
## Example for Win32
#OPT_PATH_NKF = c:\\\\usr\\\\local\\\\bin\\\\nkf32
--- 39,48 ----
## if you intend to use Namazu with Win32, you should describe
## path by using \\\\ string for path separator.
! OPT_PATH_PERL = /perl/bin/perl
OPT_PATH_NKF = nkf32
OPT_PATH_KAKASI = kakasi
! OPT_PATH_CHASEN = chasen
## Example for Win32
#OPT_PATH_NKF = c:\\\\usr\\\\local\\\\bin\\\\nkf32
***************
*** 51,61 ****
##################################################################
## Administrator's email address
! OPT_ADMIN_EMAIL = webmaster@xxxxxxxxxx
##################################################################
## CGI-BIN directory
! ## (relative URL)
OPT_URL_CGIBIN = /cgi-bin
--- 51,61 ----
##################################################################
## Administrator's email address
! OPT_ADMIN_EMAIL = webmaster@xxxxxxxxx
##################################################################
## CGI-BIN directory
! ## unimportant
OPT_URL_CGIBIN = /cgi-bin
***************
*** 83,102 ****
## * clnmz : Program to convert URL in NMZ.f
## * vfnmz : Program to view NMZ.f as HTML with lynx
## * gcnmz : Program to collect garbage in NMZ.*
## * mailutime : Program to modify file time stamp
## * documents : same as left description :-)
## * namazu.cgi : CGI executable (copy of namazu)
## * namazu : UNIX executable
## * namazu.exe : Win32 executable (copy of namazu)
! TARGET = mknmz wdnmz rvnmz clnmz vfnmz mailutime gcnmz \
! namazu.exe
##################################################################
## Target Files
## target file for indexing (case insensitive)
## ("_default" is a file httpdown would generate.)
! ## do *not* use '$' and '^' regular expression meta charactor.
## that will be automatically appended by mknmz.pl.
##
## *CAUTION*: '\' -> '\\', '$' -> '$$'
--- 83,103 ----
## * clnmz : Program to convert URL in NMZ.f
## * vfnmz : Program to view NMZ.f as HTML with lynx
## * gcnmz : Program to collect garbage in NMZ.*
+ ## * gtnmz : Program to check the number of total indexed files
## * mailutime : Program to modify file time stamp
## * documents : same as left description :-)
## * namazu.cgi : CGI executable (copy of namazu)
## * namazu : UNIX executable
## * namazu.exe : Win32 executable (copy of namazu)
! TARGET = mknmz wdnmz rvnmz clnmz vfnmz mailutime gcnmz gtnmz\
! namazu.exe namazu.cgi
##################################################################
## Target Files
## target file for indexing (case insensitive)
## ("_default" is a file httpdown would generate.)
! ## do *not* use '$' and '^' regular expression meta charactors.
## that will be automatically appended by mknmz.pl.
##
## *CAUTION*: '\' -> '\\', '$' -> '$$'
***************
*** 140,145 ****
--- 141,152 ----
OPT_FILE_SIZE_LIMIT = 600000
##################################################################
+ ## Robots.txt
+ OPT_HTDOCUMENT_ROOT = /usr/local/apache/share/htdocs
+ OPT_HTDOCUMENT_ROOT_URL_PREFIX = http://www.foo.domain.jp/
+ OPT_ROBOTS_EXCLUDE_URLS = ''
+
+ ##################################################################
## Japanese Processor
## * KAKASI : use KAKASI
## * CHASEN : use ChaSen
***************
*** 158,164 ****
##################################################################
## General Set-up
! CC = gcc
DEFS = -DHAVE_LIBM=1 -DSTDC_HEADERS=1 -DHAVE_SYS_WAIT_H=1 -DHAVE_FCNTL_H=1 -DHAVE_UNISTD_H=1
-DHAVE_ALLOCA=1 -DHAVE_MEMMOVE=1
AR = ar cq
DEPEND = makedepend
--- 165,171 ----
##################################################################
## General Set-up
! CC = gcc -mno-cygwin
DEFS = -DHAVE_LIBM=1 -DSTDC_HEADERS=1 -DHAVE_SYS_WAIT_H=1 -DHAVE_FCNTL_H=1 -DHAVE_UNISTD_H=1
-DHAVE_ALLOCA=1 -DHAVE_MEMMOVE=1
AR = ar cq
DEPEND = makedepend
***************
*** 168,191 ****
##################################################################
## Flags
! ## optimize option and etc.
CFLAGS = -O2 $(DEFINES) $(DEFS) -Wall $(INCLUDES)
! LDFLAGS = -lm
INCLUDES =
##################################################################
## Object Files
! OBJ = namazu.o codeconv.o messages.o parser.o cgi.o \
! wakati.o conf.o hlist.o output.o search.o \
! values.o form.o re_match.o regex.o util.o seed.o
##################################################################
.c.o:
! $(CC) $(CFLAGS) -c $*.c
all: $(TARGET)
--- 175,201 ----
##################################################################
## Flags
! ## optimization option and etc.
CFLAGS = -O2 $(DEFINES) $(DEFS) -Wall $(INCLUDES)
! LDFLAGS = # -lm
! EXTRA_CFLAGS =
! EXTRA_LDFLAGS =
INCLUDES =
##################################################################
## Object Files
! SRCS = namazu.c codeconv.c messages.c parser.c cgi.c \
! wakati.c conf.c hlist.c output.c search.c \
! values.c form.c re_match.c regex.c util.c seed.c
+ OBJS = ${SRCS:.c=.o}
##################################################################
.c.o:
! $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c $*.c
all: $(TARGET)
***************
*** 209,214 ****
--- 219,227 ----
-e 's!%OPT_FILE_SIZE_LIMIT%!$(OPT_FILE_SIZE_LIMIT)!g' \
-e 's!%OPT_LIBDIR%!$(LIBDIR)!g' \
-e 's!%OPT_LANGUAGE%!$(LANGUAGE)!g' \
+ -e 's!%OPT_HTDOCUMENT_ROOT%!$(OPT_HTDOCUMENT_ROOT)!g' \
+ -e 's!%OPT_HTDOCUMENT_ROOT_URL_PREFIX%!$(OPT_HTDOCUMENT_ROOT_URL_PREFIX)!g' \
+ -e 's!%OPT_ROBOTS_EXCLUDE_URLS%!$(OPT_ROBOTS_EXCLUDE_URLS)!g' \
-e 's!namazu.cgi!namazu.exe!g' \
mknmz.pl > $@
chmod +x $@
***************
*** 235,240 ****
--- 248,259 ----
gcnmz.pl > $@
chmod +x $@
+ gtnmz: gtnmz.pl
+ rm -f $@
+ sed -e 's!%OPT_PATH_PERL%!$(OPT_PATH_PERL)!g' \
+ gtnmz.pl > $@
+ chmod +x $@
+
mailutime: mailutime.pl
rm -f $@
sed -e 's!%OPT_PATH_PERL%!$(OPT_PATH_PERL)!g' \
***************
*** 257,267 ****
rvnmz.pl > $@
chmod +x $@
! namazu: $(OBJ)
! $(CC) $(OBJ) $(LDFLAGS) -o $@
namazu.cgi: namazu
! cp namazu namazu.cgi
namazu.exe: namazu
## cp namazu namazu.exe
--- 276,286 ----
rvnmz.pl > $@
chmod +x $@
! namazu: $(OBJS)
! $(CC) $(OBJS) $(LDFLAGS) $(EXTRA_LDFLAGS)-o $@
namazu.cgi: namazu
! cp namazu.exe namazu.cgi
namazu.exe: namazu
## cp namazu namazu.exe
***************
*** 294,307 ****
if [ ! -d $(BINDIR_SYS) ]; then \
mkdir -p $(BINDIR_SYS); \
fi
! cp mknmz wdnmz rvnmz clnmz namazu.exe vfnmz mailutime gcnmz $(BINDIR)
! cp ../COPYING $(DOCDIR)
! cp ../README.ja ../ToDo.ja ../ChangeLog.ja ../doc/ja/* "$(DOCDIR)/ja"
! cp ../README.en ../ToDo.en ../ChangeLog.en ../doc/en/* "$(DOCDIR)/en"
! nkf32 -O -c ../lib/namazu.conf-dist
mv nkf.out ../lib/namazu.conf-dist
cp ../lib/* $(LIBDIR)
! nkf32 -O -d ../lib/namazu.conf-dist
mv nkf.out ../lib/namazu.conf-dist
cp ../contrib/* $(CONTRIBDIR)
cp namazu.exe mknmz $(BINDIR_SYS)
--- 313,326 ----
if [ ! -d $(BINDIR_SYS) ]; then \
mkdir -p $(BINDIR_SYS); \
fi
! cp mknmz wdnmz rvnmz clnmz namazu.exe vfnmz mailutime gcnmz gtnmz $(BINDIR)
! cp ../COPYING ../ToDo ../ChangeLog $(DOCDIR)
! cp ../README.ja ../doc/ja/* "$(DOCDIR)/ja"
! cp ../README.en ../doc/en/* "$(DOCDIR)/en"
! nkf32 -O -c -s ../lib/namazu.conf-dist
mv nkf.out ../lib/namazu.conf-dist
cp ../lib/* $(LIBDIR)
! nkf32 -O -d -e ../lib/namazu.conf-dist
mv nkf.out ../lib/namazu.conf-dist
cp ../contrib/* $(CONTRIBDIR)
cp namazu.exe mknmz $(BINDIR_SYS)
diff -rcN namazu-1.3.0.3-beta-1.org/src/mknmz.pl namazu-1.3.0.3-beta-1/src/mknmz.pl
*** namazu-1.3.0.3-beta-1.org/src/mknmz.pl Thu Feb 04 15:19:33 1999
--- namazu-1.3.0.3-beta-1/src/mknmz.pl Thu Feb 04 16:08:38 1999
***************
*** 1443,1448 ****
--- 1443,1452 ----
$output_dir = cwd() if $output_dir eq "";
die "$output_dir: invalid output directory\n"
unless (-d $output_dir && -w $output_dir);
+ if ($SYSTEM eq "MSWin32") {
+ $target_dir =~ s/\//\\/g;
+ $output_dir =~ s/\//\\/g;
+ }
($output_dir, $target_dir);
}
diff -rcN namazu-1.3.0.3-beta-1.org/src/search.c namazu-1.3.0.3-beta-1/src/search.c
*** namazu-1.3.0.3-beta-1.org/src/search.c Thu Feb 04 15:19:33 1999
--- namazu-1.3.0.3-beta-1/src/search.c Thu Feb 04 16:18:27 1999
***************
*** 53,59 ****
}
}
! /* read index and return with value */
long get_index_pointer(FILE * fp, long p)
{
int val;
--- 53,59 ----
}
}
! /* read index and return with value */
long get_index_pointer(FILE * fp, long p)
{
int val;
***************
*** 579,585 ****
--- 579,589 ----
void get_expr(uchar *expr, uchar *str)
{
+ #if defined(WIN32)
+ str = strchr(str, (int)':') + 1;
+ #else
str = index(str, (int)':') + 1;
+ #endif
strcpy(expr, str);
}
Best regards,
--
Ken-ichi Hirose (^^)k!
e-mail: hirose@xxxxxxxxxxxxxxxxxxxx