obrebski/utt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Naprawy dotyczace oblugi plikow konfiguracyjnych.

Browse Source
This commit is contained in:
Tomasz Obrebski 2012-02-09 20:34:02 +01:00
parent 2ff1f65f9b
commit cfdf333a51
21 changed files with 74 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -18,7 +18,6 @@ all: $(TARGETS)
.PHONY: components .PHONY: components
components: components:
cd $(SRC_DIR)/lib && make; cd $(CUR_DIR) cd $(SRC_DIR)/lib && make; cd $(CUR_DIR)
@for cmp in $(COMPONENTS); do\ @for cmp in $(COMPONENTS); do\
cd $(SRC_DIR)/$$cmp && make; cd $(CUR_DIR); \ cd $(SRC_DIR)/$$cmp && make; cd $(CUR_DIR); \
done done
@ -29,6 +28,7 @@ documentation:
.PHONY: configuration .PHONY: configuration
configuration: configuration:
cd $(CUR_DIR)/conf && make; cd $(CUR_DIR)
.PHONY: libraries .PHONY: libraries
libraries: libraries:
@ -40,7 +40,7 @@ share:
# cleanup section # cleanup section
# ------------------------------------------------------------------ # ------------------------------------------------------------------
.PHONY: clean .PHONY: clean
clean: clean_components clean_documentation clean: clean_components clean_documentation clean_config
@echo "All files cleaned successfully!" @echo "All files cleaned successfully!"
.PHONY: clean_components .PHONY: clean_components
@ -54,12 +54,16 @@ clean_components:
clean_documentation: clean_documentation:
cd $(CUR_DIR)/doc && make clean; cd $(CUR_DIR) cd $(CUR_DIR)/doc && make clean; cd $(CUR_DIR)
.PHONY: clean_config
clean_config:
cd $(CUR_DIR)/conf && make clean; cd $(CUR_DIR)
# ------------------------------------------------------------------ # ------------------------------------------------------------------
# install section # install section
# ------------------------------------------------------------------ # ------------------------------------------------------------------
.PHONY: install .PHONY: install
install: all install_dirs install_components install_configuration install_libraries install_documentation install_share install: all install_dirs install_components install_configuration install_libraries install_documentation install_share
.PHONY: install_dirs .PHONY: install_dirs
install_dirs: install_dirs:
install -d $(PREFIX) \ install -d $(PREFIX) \

11
conf/Makefile
View File

@ -1,5 +1,16 @@
include ../config.mak include ../config.mak
.PHONY: all
all: compiledic.conf cor.conf dgc.conf dgp.conf gph.conf grp.conf gue.conf kor.conf lem.conf mar.conf ser.conf utt.conf
%.conf: %.conf.m4
m4 --define=LANG_DIR=${LANG_DIR} --define=LIB_DIR=${LIB_DIR} $< > $@
.PHONY: clean
clean:
rm *.conf
.PHONY: install .PHONY: install
install: install:
ifdef CONF_DIR ifdef CONF_DIR

13
conf/compiledic.conf.m4 Normal file
View File

@ -0,0 +1,13 @@
# ************************************************************
# * This file was created automatically during installation. *
# * If you don't need do not change it. *
# * *
# * UAM Text Tools *
# * Adam Mickiewicz University, Poland *
# * http://utt.amu.edu.pl *
# ************************************************************
#
# All lines must looks like:
# parameter_name [=] value
#
symbols = LANG_DIR/pl_PL.ISO-8859-2/pl_PL.ISO-8859-2.sym

2
conf/gue.conf → conf/cor.conf.m4
View File

@ -10,5 +10,5 @@
# All lines must looks like: # All lines must looks like:
# parameter_name [=] value # parameter_name [=] value
# #
dictionary-home = PATH_PREFIX/share/utt dictionary-home = LANG_DIR
process = W process = W

15
conf/dgc.conf
View File

@ -1,15 +0,0 @@
# ************************************************************
# * This file was created automatically during installation. *
# * If you don't need do not change it. *
# * *
# * UAM Text Tools *
# * Adam Mickiewicz University, Poland *
# * http://utt.amu.edu.pl *
# ************************************************************
#
# All lines must looks like:
# parameter_name [=] value
#
categories = PATH_PREFIX/share/utt/cats.dgc
grammar = PATH_PREFIX/share/utt/gram.dgc
outputfile = PATH_PREFIX/share/utt/gram.dgp

4
conf/compiledic.conf → conf/dgc.conf.m4
View File

@ -10,4 +10,6 @@
# All lines must looks like: # All lines must looks like:
# parameter_name [=] value # parameter_name [=] value
# #
symbols = PATH_PREFIX/share/utt/pl_PL.ISO-8859-2/pl_PL.ISO-8859-2.sym categories = LANG_DIR/cats.dgc
grammar = LANG_DIR/gram.dgc
outputfile = LANG_DIR/gram.dgp

2
conf/dgp.conf → conf/dgp.conf.m4
View File

@ -11,7 +11,7 @@
# parameter_name [=] value # parameter_name [=] value
# #
grammar = PATH_PREFIX/share/utt/gram.dgp grammar = LANG_DIR/gram.dgp
process = W process = W
process = BOS process = BOS
process = EOS process = EOS

0
conf/gph.conf → conf/gph.conf.m4
View File

2
conf/mar.conf → conf/grp.conf.m4
View File

@ -10,6 +10,6 @@
# All lines must looks like: # All lines must looks like:
# parameter_name [=] value # parameter_name [=] value
# #
macros = PATH_PREFIX/lib/utt/terms.m4 macros = LIB_DIR/terms.m4
tags=uam tags=uam

2
conf/cor.conf → conf/gue.conf.m4
View File

@ -10,5 +10,5 @@
# All lines must looks like: # All lines must looks like:
# parameter_name [=] value # parameter_name [=] value
# #
dictionary-home = PATH_PREFIX/share/utt dictionary-home = LANG_DIR
process = W process = W

4
conf/kor.conf → conf/kor.conf.m4
View File

@ -10,7 +10,7 @@
# All lines must looks like: # All lines must looks like:
# parameter_name [=] value # parameter_name [=] value
# #
dictionary-home = PATH_PREFIX/share/utt dictionary-home = LANG_DIR
weights = PATH_PREFIX/share/utt/weights.kor weights = LANG_DIR/weights.kor
threshold = 1.0 threshold = 1.0
process=W process=W

2
conf/lem.conf → conf/lem.conf.m4
View File

@ -10,5 +10,5 @@
# All lines must looks like: # All lines must looks like:
# parameter_name [=] value # parameter_name [=] value
# #
dictionary-home = PATH_PREFIX/share/utt dictionary-home = LANG_DIR
process = W process = W

2
conf/grp.conf → conf/mar.conf.m4
View File

@ -10,6 +10,6 @@
# All lines must looks like: # All lines must looks like:
# parameter_name [=] value # parameter_name [=] value
# #
macros = PATH_PREFIX/lib/utt/terms.m4 macros = LIB_DIR/terms.m4
tags=uam tags=uam

15
conf/ser.conf
View File

@ -1,15 +0,0 @@
# ************************************************************
# * This file was created automatically during installation. *
# * If you don't need do not change it. *
# * *
# * UAM Text Tools *
# * Adam Mickiewicz University, Poland *
# * http://utt.amu.edu.pl *
# ************************************************************
#
# All lines must looks like:
# parameter_name [=] value
#
macros = PATH_PREFIX/lib/utt/terms.m4
flex-template = PATH_PREFIX/lib/utt/ser.l.template
tags=uam

15
conf/ser.conf.m4 Normal file
View File

@ -0,0 +1,15 @@
# ************************************************************
# * This file was created automatically during installation. *
# * If you don't need do not change it. *
# * *
# * UAM Text Tools *
# * Adam Mickiewicz University, Poland *
# * http://utt.amu.edu.pl *
# ************************************************************
#
# All lines must looks like:
# parameter_name [=] value
#
macros = LIB_DIR/terms.m4
flex-template = LIB_DIR/ser.l.template
tags=uam

0
conf/utt.conf → conf/utt.conf.m4
View File

1
src/common/common.cc
View File

@ -108,6 +108,7 @@ extern void process_config_files(gengetopt_args_info* args, char* argv0)
// obsluga systemowego pliku konfiguracyjnego dla programu // obsluga systemowego pliku konfiguracyjnego dla programu
sprintf(config_file, "%s/%s.conf", SYSTEM_CONFIG_DIR, program_name); sprintf(config_file, "%s/%s.conf", SYSTEM_CONFIG_DIR, program_name);
if (file_accessible(config_file) == 0) { if (file_accessible(config_file) == 0) {
if (cmdline_parser_configfile(config_file, if (cmdline_parser_configfile(config_file,
args, args,

2
src/common/common.d
View File

@ -0,0 +1,2 @@
common.o: ../common/common.cc ../common/common.h ../common/../lib/const.h \
../common/../dgp/cmdline.h

15
src/lem/Makefile
View File

@ -1,3 +1,5 @@
include ../../config.mak
LDFLAGS += -static LDFLAGS += -static
CXXFLAGS += -O2 -fpermissive CXXFLAGS += -O2 -fpermissive
@ -39,7 +41,14 @@ clean: clean.cmdline
clean.cmdline: clean.cmdline:
rm cmdline.* || true rm cmdline.* || true
copy: .PHONY: install
ifdef UTT_BIN_DIR install:
cp lem $(UTT_BIN_DIR) ifdef BIN_DIR
install -m 0755 lem $(BIN_DIR)
endif
.PHONY: uninstall
uninstall:
ifdef BIN_DIR
rm $(BIN_DIR)/lem
endif endif

2
src/lem/main.cc
View File

@ -32,7 +32,7 @@ int main(int argc, char** argv) {
else if(strcmp(dictionary+strlen(dictionary)-4,".dic")==0) else if(strcmp(dictionary+strlen(dictionary)-4,".dic")==0)
lem = new AuxLem(dictionary); lem = new AuxLem(dictionary);
else else
fprintf(stderr,"lem: Invalid dictionary file extension.\n"); fprintf(stderr,"lem: Dictionary file not found.\n");
Words tab; Words tab;
// Segment seg; // Segment seg;

2
src/lib/const.h
View File

@ -20,5 +20,5 @@
#define GUESS_DICT_FILE "slownik.fsa" #define GUESS_DICT_FILE "slownik.fsa"
// katalogi z plikami konfiguracyjnymi // katalogi z plikami konfiguracyjnymi
#define SYSTEM_CONFIG_DIR "/usr/local/etc/utt" #define SYSTEM_CONFIG_DIR "/etc/utt"
#define USER_CONFIG_DIR "~/.utt" #define USER_CONFIG_DIR "~/.utt"