Changeset 6b3be72 for app

Timestamp:

05/07/08 20:30:20 (16 years ago)

Author:

pawelk <pawelk@…>

Branches:

master, help

Children:

10c74af

Parents:

a7b254c

git-author:

pawelk <pawelk@…> (05/07/08 20:30:20)

git-committer:

pawelk <pawelk@…> (05/07/08 20:30:20)

Message:

Pierwsza przymiarka do umieszczenia plikow w ~/.local/utt. Obsługa nowych opcji domyslnych. Nieskonczona dystrybucja tarball.

git-svn-id: ​svn://atos.wmid.amu.edu.pl/utt@41 e293616e-ec6a-49c2-aa92-f4a8b91c5d16

Location:

app

Files:

• TODO (modified) (3 diffs)
• dist/common/utt_make_config.pl (modified) (4 diffs)
• dist/struktura.txt (modified) (4 diffs)
• lib/attr.pm (moved) (moved from app/src/dgp/attr.pm)
• lib/seg.rb (moved) (moved from app/src/dgp/seg.rb)
• share/cats.dgc (moved) (moved from app/lib/cats.dgc)
• share/gram.dgc (moved) (moved from app/lib/gram.dgc)
• share/weights.kor (moved) (moved from app/lib/weights.kor)
• src/dgp/canonize (modified) (1 diff)
• src/dgp/dgc (modified) (1 diff)
• src/dgp/tre.rb (modified) (2 diffs)
• src/grp/grp (modified) (1 diff)
• src/mar/mar (modified) (1 diff)
• src/ser/ser (modified) (1 diff)

app/TODO

@@ -1 +1 @@
 BARDZO WAZNE:
 
+* w dystrybucji tarball umieszczac pliki w okreœlonych miejscach
 * gue SIE NIE KOMPILUJE !!!
 
@@ -6 +7 @@
 * zamienic kota na lepszego (Kubis) [TO]
 * sen - unikać dwukrotnego wstawiania BOSów i EOSów
-* uniezaleznic mar od attr.pm (ew. wcielic attr.pm) [TO]
-* mar nie obsluguje plikow konfiguracyjnych [JW]
-* ser i grp - parametr tags (zeby bral wskazany program tag2re) [TO]
 * polaczyc sen'y [TO]
 * programy z atrybutyem input-field: funkcja process_seg zwraca false, gdy nie ma pola podanego po -I
@@ -15 +13 @@
 * (zrobione dla ser?) Nazwy pmdb2re -> pmdb.tag2re (grp, ser).
 * Zadania zwiazane z rozbudowa ser (src/ser/TODO).
-* Nowa funkcjonalność dla kot? con? - kaÅŒde zdanie w nowym wierszu 
+* Nowa funkcjonalność dla kot? con? - kaÅŒde zdanie w nowym wierszu
 * opcja info w dgp powinna miec domyslna wartosc d lub h
+
+

app/dist/common/utt_make_config.pl

@@ -20 +20 @@
 conf_gue(catfile($usr_home, 'gue.conf'), $sys_home);
 conf_lem(catfile($usr_home, 'lem.conf'), $sys_home);
+conf_mar(catfile($usr_home, 'mar.conf'), $sys_home);
 conf_ser(catfile($usr_home, 'ser.conf'), $sys_home);
 conf_dgc(catfile($usr_home, 'dgc.conf'), $sys_home);
@@ -86 +87 @@
   print FILE makeConfigHeader();
   print FILE "macros=", abs_path("$utthome/lib/utt/terms.m4"), "\n";
+  print FILE "tags=uam\n";
 
   close FILE;
@@ -146 +148 @@
 }
 
+sub conf_mar() {
+        my $mar_file = shift;
+        my $utthome = shift;
+  open(FILE, ">$mar_file");
+
+  print FILE makeConfigHeader();
+  print FILE "tags=uam\n";
+
+  close FILE;
+}
+
 sub conf_ser() {
         my $ser_file = shift;
@@ -154 +167 @@
   print FILE "macros=", abs_path("$utthome/lib/utt/terms.m4"), "\n";
   print FILE "flex-template=", abs_path("$utthome/lib/utt/ser.l.template"), "\n";
+  print FILE "tags=uam\n";
 
   close FILE;

app/dist/struktura.txt

@@ -10 +10 @@
 /usr/local/bin/go               ?
 /usr/local/bin/Makefile.go      ?
-/usr/local/bin/attr.pm
 /usr/local/bin/gph
 /usr/local/bin/grp
@@ -29 +28 @@
 
 # R.D. sugeruje /etc/utt
-# lokalnie: ~/.utt lub (trendy) ~/.config/utt 
+# lokalnie: ~/.utt lub (trendy) ~/.config/utt
 /usr/local/etc/utt/con.conf
 /usr/local/etc/utt/cor.conf
@@ -46 +45 @@
 /usr/local/etc/utt/utt.conf
 
+/usr/local/share/utt/weights.kor
+# lokalnie: ~/.local/share/utt/weights.kor
+/usr/local/share/utt/cats.dgc
+# lokalnie: ~/.local/share/utt/cats.dgc
+/usr/local/share/utt/gram.dgc
+# lokalnie: ~/.local/share/utt/gram.dgc
+
 /usr/local/share/utt/pl_PL.ISO-8859-2/pl_PL.ISO-8859-2.sym
 /usr/local/share/utt/pl_PL.ISO-8859-2/cor.bin
@@ -57 +63 @@
 /usr/local/lib/utt/ser.l.template
 /usr/local/lib/utt/terms.m4
-/usr/local/lib/utt/weights.kor # -> share
-/usr/local/lib/utt/seg.rb # lok. ~/.local/lib/utt/seg.rb
-/usr/local/lib/utt/cats.dgc # -> share
-/usr/local/lib/utt/gram.dgc # -> share
+/usr/local/lib/utt/seg.rb
+# lokalnie: ~/.local/lib/utt/seg.rb   <-- tego nie trzeba tak
+/usr/local/lib/attr.pm
+# lokalnie: ~/.local/lib/utt/attr.pm
 
 /usr/local/share/doc/utt/FAQ

app/src/dgp/canonize

@@ -6 +6 @@
 #author:        Tomasz Obrebski
 
+use lib "/usr/local/lib/utt";
+use lib "ENV{HOME}/.local/lib/utt";
+
 use strict;
 use Getopt::Long;
 use attr;
-#use File::HomeDir;
-#use lib "$ENV{HOME}/.utt/lib/perl";
+
 
 my $help;

app/src/dgp/dgc

@@ -7 +7 @@
 
 # wymaga niejawnie programu canonize!!!!
-#use lib "ENV{HOME}/.utt/lib/perl";
+use lib "/usr/local/lib/utt";
+use lib "ENV{HOME}/.local/lib/utt";
 
 use strict;
 use Getopt::Long;
 use Data::Dumper;
-
 use attr;
 use File::HomeDir;

app/src/dgp/tre.rb

@@ -1 @@
-#!/usr/bin/ruby
+#!/usr/bin/ruby -I /usr/local/lib/utt -I ~/.local/lib/utt
 
 require 'getoptlong'
@@ -61 +61 @@
 end
 
-load 'seg.rb'
+require File.expand_path(File.dirname(__FILE__) + "../lib/utt/seg.rb")
+#require 'seg.rb'
 
 $dgpsep=';'

app/src/grp/grp

@@ -14 +14 @@
 
 my $systemconfigfile="/usr/local/etc/utt/grp.conf";
-#my $userconfigfile="$ENV{'HOME'}/.utt/grp.conf";
 my $userconfigfile=home()."/.utt/grp.conf";
 

app/src/mar/mar

@@ -6 +6 @@
 #author:        Marcin Walas
 
-#this program tags the tokenized file with given tags 
+#this program tags the tokenized file with given tags
 #tags can be given in any order and configuration through the expression
 #which is one of the parametres of the script
 #contact: d287572@atos.wmid.amu.edu.pl, walasiek@gmail.com
+
+use lib "/usr/local/lib/utt";
+use lib "ENV{HOME}/.local/lib/utt";
 
 use strict;

app/src/ser/ser

@@ -13 +13 @@
 my $LIB_DIR="/usr/local/lib/utt";
 my $systemconfigfile='/usr/local/etc/utt/ser.conf';
-#my $userconfigfile="$ENV{'HOME'}/.utt/ser.conf";
 my $userconfigfile=home()."/.utt/ser.conf";