Changeset cfdf333


Ignore:
Timestamp:
02/09/12 20:34:02 (13 years ago)
Author:
Tomasz Obrebski <to@…>
Branches:
master
Children:
ac25afd
Parents:
2ff1f65
git-author:
Tomasz Obrebski <to@…> (02/09/12 20:34:02)
git-committer:
Tomasz Obrebski <to@…> (02/09/12 20:34:02)
Message:

Naprawy dotyczace oblugi plikow konfiguracyjnych.

Files:
2 added
2 deleted
7 edited
10 moved

Legend:

Unmodified
Added
Removed

  • Makefile

    r5f4d9c3 rcfdf333  
    1919components: 
    2020        cd $(SRC_DIR)/lib && make; cd $(CUR_DIR) 
    21          
    2221        @for cmp in $(COMPONENTS); do\ 
    2322                cd $(SRC_DIR)/$$cmp && make; cd $(CUR_DIR); \ 
    … …  
    3029.PHONY: configuration 
    3130configuration: 
     31        cd $(CUR_DIR)/conf && make; cd $(CUR_DIR) 
    3232 
    3333.PHONY: libraries 
    … …  
    4141# ------------------------------------------------------------------ 
    4242.PHONY: clean 
    43 clean: clean_components clean_documentation 
     43clean: clean_components clean_documentation clean_config 
    4444        @echo "All files cleaned successfully!" 
    4545 
    … …  
    5555        cd $(CUR_DIR)/doc && make clean; cd $(CUR_DIR) 
    5656 
     57.PHONY: clean_config 
     58clean_config: 
     59        cd $(CUR_DIR)/conf && make clean; cd $(CUR_DIR) 
     60 
    5761# ------------------------------------------------------------------ 
    5862# install section 
    … …  
    6064.PHONY: install 
    6165install: all install_dirs install_components install_configuration install_libraries install_documentation install_share 
    62          
     66 
    6367.PHONY: install_dirs 
    6468install_dirs: 

  • conf/Makefile

    r5f4d9c3 rcfdf333  
    11include ../config.mak 
     2 
     3.PHONY: all 
     4all: compiledic.conf cor.conf dgc.conf dgp.conf gph.conf grp.conf gue.conf kor.conf lem.conf mar.conf ser.conf utt.conf 
     5 
     6%.conf: %.conf.m4 
     7        m4 --define=LANG_DIR=${LANG_DIR} --define=LIB_DIR=${LIB_DIR} $< > $@ 
     8 
     9 
     10.PHONY: clean 
     11clean: 
     12        rm *.conf 
    213 
    314.PHONY: install 

  • conf/cor.conf.m4

    rf712e16 rcfdf333  
    1111# parameter_name [=] value 
    1212# 
    13 dictionary-home = PATH_PREFIX/share/utt 
     13dictionary-home = LANG_DIR 
    1414process = W 

  • conf/dgc.conf.m4

    rf712e16 rcfdf333  
    1111# parameter_name [=] value 
    1212# 
    13 symbols = PATH_PREFIX/share/utt/pl_PL.ISO-8859-2/pl_PL.ISO-8859-2.sym 
     13categories = LANG_DIR/cats.dgc 
     14grammar = LANG_DIR/gram.dgc 
     15outputfile = LANG_DIR/gram.dgp 

  • conf/dgp.conf.m4

    rf712e16 rcfdf333  
    1212# 
    1313 
    14 grammar = PATH_PREFIX/share/utt/gram.dgp 
     14grammar = LANG_DIR/gram.dgp 
    1515process = W 
    1616process = BOS 

  • conf/grp.conf.m4

    rf712e16 rcfdf333  
    1111# parameter_name [=] value 
    1212# 
    13 macros = PATH_PREFIX/lib/utt/terms.m4 
     13macros = LIB_DIR/terms.m4 
    1414tags=uam 
    1515 

  • conf/gue.conf.m4

    rf712e16 rcfdf333  
    1111# parameter_name [=] value 
    1212# 
    13 dictionary-home = PATH_PREFIX/share/utt 
     13dictionary-home = LANG_DIR 
    1414process = W 

  • conf/kor.conf.m4

    rf712e16 rcfdf333  
    1111# parameter_name [=] value 
    1212# 
    13 dictionary-home = PATH_PREFIX/share/utt 
    14 weights = PATH_PREFIX/share/utt/weights.kor 
     13dictionary-home = LANG_DIR 
     14weights = LANG_DIR/weights.kor 
    1515threshold = 1.0 
    1616process=W 

  • conf/lem.conf.m4

    rf712e16 rcfdf333  
    1111# parameter_name [=] value 
    1212# 
    13 dictionary-home = PATH_PREFIX/share/utt 
     13dictionary-home = LANG_DIR 
    1414process = W 

  • conf/mar.conf.m4

    rf712e16 rcfdf333  
    1111# parameter_name [=] value 
    1212# 
    13 macros = PATH_PREFIX/lib/utt/terms.m4 
     13macros = LIB_DIR/terms.m4 
    1414tags=uam 
    1515 

  • src/common/common.cc

    r5f4d9c3 rcfdf333  
    109109  // obsluga systemowego pliku konfiguracyjnego dla programu 
    110110  sprintf(config_file, "%s/%s.conf", SYSTEM_CONFIG_DIR, program_name); 
     111 
    111112  if (file_accessible(config_file) == 0) { 
    112113    if (cmdline_parser_configfile(config_file, 

  • src/common/common.d

    r5f4d9c3 rcfdf333  
     1common.o: ../common/common.cc ../common/common.h ../common/../lib/const.h \ 
     2 ../common/../dgp/cmdline.h 

  • src/lem/Makefile

    r5f4d9c3 rcfdf333  
     1include ../../config.mak 
     2 
    13LDFLAGS += -static 
    24CXXFLAGS += -O2 -fpermissive 
    … …  
    4042        rm cmdline.* || true 
    4143 
    42 copy: 
    43 ifdef UTT_BIN_DIR 
    44         cp lem $(UTT_BIN_DIR) 
     44.PHONY: install 
     45install: 
     46ifdef BIN_DIR 
     47        install -m 0755 lem $(BIN_DIR) 
    4548endif 
     49 
     50.PHONY: uninstall 
     51uninstall: 
     52ifdef BIN_DIR 
     53        rm $(BIN_DIR)/lem 
     54endif 

  • src/lem/main.cc

    r5f4d9c3 rcfdf333  
    3333    lem = new AuxLem(dictionary); 
    3434  else 
    35     fprintf(stderr,"lem: Invalid dictionary file extension.\n"); 
     35    fprintf(stderr,"lem: Dictionary file not found.\n"); 
    3636 
    3737  Words tab; 

  • src/lib/const.h

    r5f4d9c3 rcfdf333  
    2121 
    2222// katalogi z plikami konfiguracyjnymi 
    23 #define SYSTEM_CONFIG_DIR "/usr/local/etc/utt" 
     23#define SYSTEM_CONFIG_DIR "/etc/utt" 
    2424#define USER_CONFIG_DIR "~/.utt"  
Note: See TracChangeset for help on using the changeset viewer.