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

app/TODO

@@ -1,13 +1,11 @@
 BARDZO WAZNE:
 
+* w dystrybucji tarball umieszczac pliki w określonych miejscach
 * gue SIE NIE KOMPILUJE !!!
 
 WAZNE:
 * 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
 * generowanie i sprawdzanie zaleznosci dla tarballa [PK]
@@ -16,3 +14,5 @@ WAZNE:
 * Zadania zwiazane z rozbudowa ser (src/ser/TODO).
 * 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

@@ -19,6 +19,7 @@ conf_compiledic(catfile($usr_home, 'compiledic.conf'), $sys_home);
 conf_grp(catfile($usr_home, 'grp.conf'), $sys_home);
 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);
 
@@ -85,6 +86,7 @@ sub conf_grp() {
 
   print FILE makeConfigHeader();
   print FILE "macros=", abs_path("$utthome/lib/utt/terms.m4"), "\n";
+  print FILE "tags=uam\n";
 
   close FILE;
 }
@@ -145,6 +147,17 @@ sub conf_lem() {
   close FILE;
 }
 
+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;
 	my $utthome = shift;
@@ -153,6 +166,7 @@ sub conf_ser() {
   print FILE makeConfigHeader();
   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

@@ -9,7 +9,6 @@
 /usr/local/bin/fsm2aut
 /usr/local/bin/go		?
 /usr/local/bin/Makefile.go	?
-/usr/local/bin/attr.pm
 /usr/local/bin/gph
 /usr/local/bin/grp
 /usr/local/bin/gue
@@ -45,6 +44,13 @@
 /usr/local/etc/utt/unfla.conf
 /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
 /usr/local/share/utt/pl_PL.ISO-8859-2/gue.bin
@@ -56,10 +62,10 @@
 
 /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
-/usr/local/lib/utt/seg.rb # lok. ~/.local/lib/utt/seg.rb
+# lokalnie: ~/.local/lib/utt/seg.rb   <-- tego nie trzeba tak
-/usr/local/lib/utt/cats.dgc # -> share
+/usr/local/lib/attr.pm
-/usr/local/lib/utt/gram.dgc # -> share
+# lokalnie: ~/.local/lib/utt/attr.pm
 
 /usr/local/share/doc/utt/FAQ
 /usr/local/share/doc/utt/COPYRIGHT

app/src/dgp/canonize

@@ -5,11 +5,13 @@
 #version:	1.0
 #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

@@ -6,12 +6,12 @@
 #author:	Tomasz Obrebski
 
 # 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,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/ruby -I /usr/local/lib/utt -I ~/.local/lib/utt
 
 require 'getoptlong'
 
@@ -60,7 +60,8 @@ if $INFO=='DEFAULT'
   end
 end
 
-load 'seg.rb'
+require File.expand_path(File.dirname(__FILE__) + "../lib/utt/seg.rb")
+#require 'seg.rb'
 
 $dgpsep=';'
 

app/src/grp/grp

@@ -13,7 +13,6 @@ use File::HomeDir;
 my $LIB_DIR="/usr/local/lib/utt";
 
 my $systemconfigfile="/usr/local/etc/utt/grp.conf";
-#my $userconfigfile="$ENV{'HOME'}/.utt/grp.conf";
 my $userconfigfile=home()."/.utt/grp.conf";
 
 Getopt::Long::Configure('no_ignore_case_always');

app/src/mar/mar

@@ -10,6 +10,9 @@
 #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;
 use Getopt::Long;
 use File::HomeDir;

app/src/ser/ser

@@ -12,7 +12,6 @@ use File::HomeDir;
 
 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";
 
 Getopt::Long::Configure('no_ignore_case_always');