verbless mothers

dirkroorda · Nov 10, 2015 · d7257c8 · d7257c8
1 parent 5f857d0
commit d7257c8
Show file tree

Hide file tree

Showing 76 changed files with 49 additions and 41 deletions.
diff --git a/dist/laf-fabric-4.5.4.tar.gz b/dist/laf-fabric-4.5.4.tar.gz
diff --git a/emdros2laf/etcbc.py b/emdros2laf/etcbc.py
@@ -268,7 +268,7 @@ def run_mql(self, query_file, result_file):
                 source = self.settings.env['source_data'],
                 query = query_file,
                 result = result_file,
-            ))
+            ), dyld=True)
 
     def make_mql(self, name, query):
         query_file = '{}/{}'.format(self.settings.env['query_dst_dir'], name)

diff --git a/emdros2laf/mylib.py b/emdros2laf/mylib.py
@@ -1,4 +1,4 @@
-import sys
+import sys,os
 import datetime
 import time
 import subprocess
@@ -12,9 +12,25 @@ def camel(text):
     return ''.join(words[x].capitalize() if x > 0 else words[x] for x in range(len(words)))
 def fillup(size, val, lst): return tuple(lst[x] if x < len(lst) else val for x in range(size)) 
 def today(): return datetime.date.today()
-def run(cmd): subprocess.check_call(cmd + ' 2>&1', shell = True)
-def runx(cmd):
-    return subprocess.call(cmd + ' 2>&1', shell = True)
+def run(cmd, dyld=False):
+    if dyld:
+        result = subprocess.check_call(
+            'export DYLD_LIBRARY_PATH=$DYLDLIBRARYPATH; '+cmd+' 2>&1', shell=True, env=dict(os.environ, DYLDLIBRARYPATH=os.environ.get('DYLD_LIBRARY_PATH', '')),
+        )
+    else:
+        result = subprocess.check_call(cmd+' 2>&1', shell=True)
+    return result
+    # subprocess.check_call(cmd + ' 2>&1', shell = True)
+
+def runx(cmd, dyld=False):
+    if dyld:
+        result = subprocess.call(
+            'export DYLD_LIBRARY_PATH=$DYLDLIBRARYPATH; '+cmd+' 2>&1', shell=True, env=dict(os.environ, DYLDLIBRARYPATH=os.environ.get('DYLD_LIBRARY_PATH', '')),
+        )
+    else:
+        result = subprocess.call(cmd+' 2>&1', shell=True)
+    return result
+    # subprocess.call(cmd + ' 2>&1', shell = True)
 
 class Timestamp():
     timestamp = None

diff --git a/example-data/etcbc4/bin/A/px/C0b(dirk,part,sectioning) b/example-data/etcbc4/bin/A/px/C0b(dirk,part,sectioning)
diff --git a/example-data/etcbc4/bin/A/px/C0b(laf,,y) b/example-data/etcbc4/bin/A/px/C0b(laf,,y)
diff --git a/example-data/etcbc4/bin/A/px/C0f(dirk,part,sectioning) b/example-data/etcbc4/bin/A/px/C0f(dirk,part,sectioning)
diff --git a/example-data/etcbc4/bin/A/px/C0f(laf,,y) b/example-data/etcbc4/bin/A/px/C0f(laf,,y)
diff --git a/example-data/etcbc4/bin/A/px/Fe0(dirk,part,sectioning) b/example-data/etcbc4/bin/A/px/Fe0(dirk,part,sectioning)
diff --git a/example-data/etcbc4/bin/A/px/Fn0(dirk,db,otype) b/example-data/etcbc4/bin/A/px/Fn0(dirk,db,otype)
diff --git a/example-data/etcbc4/bin/A/px/Fn0(dirk,dbs,otype) b/example-data/etcbc4/bin/A/px/Fn0(dirk,dbs,otype)
diff --git a/example-data/etcbc4/bin/A/px/Fn0(etcbc4,px,instruction) b/example-data/etcbc4/bin/A/px/Fn0(etcbc4,px,instruction)
diff --git a/example-data/etcbc4/bin/A/px/Fn0(etcbc4,px,number_in_ch) b/example-data/etcbc4/bin/A/px/Fn0(etcbc4,px,number_in_ch)
diff --git a/example-data/etcbc4/bin/A/px/Fn0(etcbc4,px,pargr) b/example-data/etcbc4/bin/A/px/Fn0(etcbc4,px,pargr)
diff --git a/example-data/etcbc4/bin/A/px/__log__compile__.txt b/example-data/etcbc4/bin/A/px/__log__compile__.txt
@@ -1,3 +1,3 @@
-OPENED AT:2014-07-15T11-31-16
+OPENED AT:2015-10-02T18-02-32
 
-CLOSED AT:2014-07-15T11-31-16
+CLOSED AT:2015-10-02T18-02-32
diff --git a/example-data/etcbc4/bin/C0b(etcbc4,ft,functional_parent) b/example-data/etcbc4/bin/C0b(etcbc4,ft,functional_parent)
diff --git a/example-data/etcbc4/bin/C0b(etcbc4,ft,mother) b/example-data/etcbc4/bin/C0b(etcbc4,ft,mother)
diff --git a/example-data/etcbc4/bin/C0b(laf,,x) b/example-data/etcbc4/bin/C0b(laf,,x)
diff --git a/example-data/etcbc4/bin/C0f(etcbc4,ft,functional_parent) b/example-data/etcbc4/bin/C0f(etcbc4,ft,functional_parent)
diff --git a/example-data/etcbc4/bin/C0f(etcbc4,ft,mother) b/example-data/etcbc4/bin/C0f(etcbc4,ft,mother)
diff --git a/example-data/etcbc4/bin/C0f(laf,,x) b/example-data/etcbc4/bin/C0f(laf,,x)
diff --git a/example-data/etcbc4/bin/Fe0(etcbc4,ft,functional_parent) b/example-data/etcbc4/bin/Fe0(etcbc4,ft,functional_parent)
diff --git a/example-data/etcbc4/bin/Fe0(etcbc4,ft,mother) b/example-data/etcbc4/bin/Fe0(etcbc4,ft,mother)
diff --git a/example-data/etcbc4/bin/Fn0(etcbc4,db,maxmonad) b/example-data/etcbc4/bin/Fn0(etcbc4,db,maxmonad)
diff --git a/example-data/etcbc4/bin/Fn0(etcbc4,db,minmonad) b/example-data/etcbc4/bin/Fn0(etcbc4,db,minmonad)
diff --git a/example-data/etcbc4/bin/Fn0(etcbc4,db,monads) b/example-data/etcbc4/bin/Fn0(etcbc4,db,monads)
diff --git a/example-data/etcbc4/bin/Fn0(etcbc4,db,oid) b/example-data/etcbc4/bin/Fn0(etcbc4,db,oid)
diff --git a/example-data/etcbc4/bin/Fn0(etcbc4,db,otype) b/example-data/etcbc4/bin/Fn0(etcbc4,db,otype)
diff --git a/example-data/etcbc4/bin/Fn0(etcbc4,ft,code) b/example-data/etcbc4/bin/Fn0(etcbc4,ft,code)
diff --git a/example-data/etcbc4/bin/Fn0(etcbc4,ft,det) b/example-data/etcbc4/bin/Fn0(etcbc4,ft,det)
diff --git a/example-data/etcbc4/bin/Fn0(etcbc4,ft,function) b/example-data/etcbc4/bin/Fn0(etcbc4,ft,function)
diff --git a/example-data/etcbc4/bin/Fn0(etcbc4,ft,g_word_utf8) b/example-data/etcbc4/bin/Fn0(etcbc4,ft,g_word_utf8)
diff --git a/example-data/etcbc4/bin/Fn0(etcbc4,ft,number) b/example-data/etcbc4/bin/Fn0(etcbc4,ft,number)
diff --git a/example-data/etcbc4/bin/Fn0(etcbc4,ft,rela) b/example-data/etcbc4/bin/Fn0(etcbc4,ft,rela)
diff --git a/example-data/etcbc4/bin/Fn0(etcbc4,ft,trailer_utf8) b/example-data/etcbc4/bin/Fn0(etcbc4,ft,trailer_utf8)
diff --git a/example-data/etcbc4/bin/Fn0(etcbc4,ft,txt) b/example-data/etcbc4/bin/Fn0(etcbc4,ft,txt)
diff --git a/example-data/etcbc4/bin/Fn0(etcbc4,ft,typ) b/example-data/etcbc4/bin/Fn0(etcbc4,ft,typ)
diff --git a/example-data/etcbc4/bin/Fn0(etcbc4,sft,book) b/example-data/etcbc4/bin/Fn0(etcbc4,sft,book)
diff --git a/example-data/etcbc4/bin/Fn0(etcbc4,sft,chapter) b/example-data/etcbc4/bin/Fn0(etcbc4,sft,chapter)
diff --git a/example-data/etcbc4/bin/Fn0(etcbc4,sft,half_verse) b/example-data/etcbc4/bin/Fn0(etcbc4,sft,half_verse)
diff --git a/example-data/etcbc4/bin/Fn0(etcbc4,sft,label) b/example-data/etcbc4/bin/Fn0(etcbc4,sft,label)
diff --git a/example-data/etcbc4/bin/Fn0(etcbc4,sft,verse) b/example-data/etcbc4/bin/Fn0(etcbc4,sft,verse)
diff --git a/example-data/etcbc4/bin/G00(edges_from) b/example-data/etcbc4/bin/G00(edges_from)
diff --git a/example-data/etcbc4/bin/G00(edges_to) b/example-data/etcbc4/bin/G00(edges_to)
diff --git a/example-data/etcbc4/bin/G00(node_anchor_max) b/example-data/etcbc4/bin/G00(node_anchor_max)
diff --git a/example-data/etcbc4/bin/G00(node_anchor_min) b/example-data/etcbc4/bin/G00(node_anchor_min)
diff --git a/example-data/etcbc4/bin/G00(node_sort) b/example-data/etcbc4/bin/G00(node_sort)
diff --git a/example-data/etcbc4/bin/G00(node_sort_inv) b/example-data/etcbc4/bin/G00(node_sort_inv)
diff --git a/example-data/etcbc4/bin/P00(node_anchor) b/example-data/etcbc4/bin/P00(node_anchor)
diff --git a/example-data/etcbc4/bin/P00(node_anchor_items) b/example-data/etcbc4/bin/P00(node_anchor_items)
diff --git a/example-data/etcbc4/bin/P00(node_events) b/example-data/etcbc4/bin/P00(node_events)
diff --git a/example-data/etcbc4/bin/P00(node_events_items) b/example-data/etcbc4/bin/P00(node_events_items)
diff --git a/example-data/etcbc4/bin/P00(node_events_k) b/example-data/etcbc4/bin/P00(node_events_k)
diff --git a/example-data/etcbc4/bin/P00(node_events_n) b/example-data/etcbc4/bin/P00(node_events_n)
diff --git a/example-data/etcbc4/bin/P00(primary_data) b/example-data/etcbc4/bin/P00(primary_data)
diff --git a/example-data/etcbc4/bin/Xeb() b/example-data/etcbc4/bin/Xeb()
diff --git a/example-data/etcbc4/bin/Xef() b/example-data/etcbc4/bin/Xef()
diff --git a/example-data/etcbc4/bin/Xnb() b/example-data/etcbc4/bin/Xnb()
diff --git a/example-data/etcbc4/bin/Xnf() b/example-data/etcbc4/bin/Xnf()
diff --git a/example-data/etcbc4/bin/Z/etcbc/G00(node_sort) b/example-data/etcbc4/bin/Z/etcbc/G00(node_sort)
diff --git a/example-data/etcbc4/bin/Z/etcbc/G00(node_sort_inv) b/example-data/etcbc4/bin/Z/etcbc/G00(node_sort_inv)
diff --git a/example-data/etcbc4/bin/Z/etcbc/L00(node_down) b/example-data/etcbc4/bin/Z/etcbc/L00(node_down)
diff --git a/example-data/etcbc4/bin/Z/etcbc/L00(node_up) b/example-data/etcbc4/bin/Z/etcbc/L00(node_up)
diff --git a/example-data/etcbc4/bin/__log__compile__.txt b/example-data/etcbc4/bin/__log__compile__.txt
@@ -1,3 +1,3 @@
-OPENED AT:2014-07-15T11-31-08
+OPENED AT:2015-10-02T18-02-23
 
-CLOSED AT:2014-07-15T11-31-15
+CLOSED AT:2015-10-02T18-02-31
diff --git a/example-output/etcbc4/before/__log__before.txt b/example-output/etcbc4/before/__log__before.txt
@@ -1,3 +1,3 @@
-OPENED AT:2014-07-15T11-31-19
+OPENED AT:2015-10-02T18-02-34
 
-CLOSED AT:2014-07-15T11-31-19
+CLOSED AT:2015-10-02T18-02-34
diff --git a/example-output/etcbc4/compile/__log__compile.txt b/example-output/etcbc4/compile/__log__compile.txt
@@ -1,3 +1,3 @@
-OPENED AT:2014-07-15T11-31-16
+OPENED AT:2015-10-02T18-02-32
 
-CLOSED AT:2014-07-15T11-31-16
+CLOSED AT:2015-10-02T18-02-32
diff --git a/example-output/etcbc4/connectivity/__log__connectivity.txt b/example-output/etcbc4/connectivity/__log__connectivity.txt
@@ -1,3 +1,3 @@
-OPENED AT:2014-07-15T11-31-18
+OPENED AT:2015-10-02T18-02-34
 
-CLOSED AT:2014-07-15T11-31-18
+CLOSED AT:2015-10-02T18-02-34
diff --git a/example-output/etcbc4/edges/__log__edges.txt b/example-output/etcbc4/edges/__log__edges.txt
@@ -1,3 +1,3 @@
-OPENED AT:2014-07-15T11-31-18
+OPENED AT:2015-10-02T18-02-34
 
-CLOSED AT:2014-07-15T11-31-18
+CLOSED AT:2015-10-02T18-02-34
diff --git a/example-output/etcbc4/lingo/__log__lingo.txt b/example-output/etcbc4/lingo/__log__lingo.txt
@@ -1,3 +1,3 @@
-OPENED AT:2014-07-15T11-31-17
+OPENED AT:2015-10-02T18-02-33
 
-CLOSED AT:2014-07-15T11-31-18
+CLOSED AT:2015-10-02T18-02-34
diff --git a/example-output/etcbc4/load/__log__load.txt b/example-output/etcbc4/load/__log__load.txt
@@ -1,3 +1,3 @@
-OPENED AT:2014-07-15T11-31-16
+OPENED AT:2015-10-02T18-02-32
 
-CLOSED AT:2014-07-15T11-31-16
+CLOSED AT:2015-10-02T18-02-32
diff --git a/example-output/etcbc4/load2/__log__load2.txt b/example-output/etcbc4/load2/__log__load2.txt
@@ -1,3 +1,3 @@
-OPENED AT:2014-07-15T11-31-17
+OPENED AT:2015-10-02T18-02-32
 
-CLOSED AT:2014-07-15T11-31-17
+CLOSED AT:2015-10-02T18-02-32
diff --git a/example-output/etcbc4/monads/__log__monads.txt b/example-output/etcbc4/monads/__log__monads.txt
@@ -1,3 +1,3 @@
-OPENED AT:2014-07-15T11-31-17
+OPENED AT:2015-10-02T18-02-32
 
-CLOSED AT:2014-07-15T11-31-17
+CLOSED AT:2015-10-02T18-02-32
diff --git a/example-output/etcbc4/n_prep/__log__n_prep.txt b/example-output/etcbc4/n_prep/__log__n_prep.txt
@@ -1,3 +1,3 @@
-OPENED AT:2014-07-15T11-31-18
+OPENED AT:2015-10-02T18-02-34
 
-CLOSED AT:2014-07-15T11-31-18
+CLOSED AT:2015-10-02T18-02-34
diff --git a/example-output/etcbc4/plain/__log__plain.txt b/example-output/etcbc4/plain/__log__plain.txt
@@ -1,11 +1,3 @@
-OPENED AT:2015-06-05T08-46-41
-  0.01s LOGFILE=/Users/dirk/SURFdrive/current/demos/github/laf-fabric/example-output/etcbc4/plain/__log__plain.txt
-  0.02s INFO: DATA LOADED FROM SOURCE etcbc4 AND ANNOX -- FOR TASK plain AT 2015-06-05T08-46-41
-  0.00s Get the words ... 
-  0.00s Results directory:
-/Users/dirk/SURFdrive/current/demos/github/laf-fabric/example-output/etcbc4/plain
+OPENED AT:2015-10-02T18-02-34
 
-__log__plain.txt                        268 Fri Jun  5 10:46:41 2015
-unicode_utf8.txt                        366 Fri Jun  5 10:46:41 2015
-
-CLOSED AT:2015-06-05T08-46-41
+CLOSED AT:2015-10-02T18-02-34
diff --git a/example-output/etcbc4/resolve/__log__resolve.txt b/example-output/etcbc4/resolve/__log__resolve.txt
@@ -1 +1 @@
-OPENED AT:2014-07-15T11-31-17
+OPENED AT:2015-10-02T18-02-32
diff --git a/example-output/etcbc4/u_edges/__log__u_edges.txt b/example-output/etcbc4/u_edges/__log__u_edges.txt
@@ -1,3 +1,3 @@
-OPENED AT:2014-07-15T11-31-18
+OPENED AT:2015-10-02T18-02-34
 
-CLOSED AT:2014-07-15T11-31-18
+CLOSED AT:2015-10-02T18-02-34
diff --git a/laf/settings.py b/laf/settings.py
@@ -5,7 +5,7 @@
 NAME = 'LAF-Fabric'
 VERSION = '4.5.4'
 APIREF = 'http://laf-fabric.readthedocs.org/en/latest/texts/API-reference.html'
-FEATDOC = 'http://shebanq-doc.readthedocs.org/en/latest/texts/welcome.html'
+FEATDOC = 'https://shebanq.ancient-data.org/static/docs/featuredoc/texts/welcome.html'
 MAIN_CFG = 'laf-fabric.cfg'
 DEFAULT_DATA_DIR = 'laf-fabric-data'