[Golok-commit] SF.net SVN: golok:[29] trunk

[<sr...@us...>]

Revision: 29
          http://golok.svn.sourceforge.net/golok/?rev=29&view=rev
Author:   sralmai
Date:     2010-06-18 16:49:41 +0000 (Fri, 18 Jun 2010)

Log Message:
-----------
[BUGFIX]: finished solving bug from previous release, added script for packaging binaries

Modified Paths:
--------------
    trunk/datatypes.scm
    trunk/examples/dme-mult.amf
    trunk/find-k.scm
    trunk/model-builder.scm

Added Paths:
-----------
    trunk/package.sh

Modified: trunk/datatypes.scm
===================================================================
--- trunk/datatypes.scm	2010-06-15 22:12:17 UTC (rev 28)
+++ trunk/datatypes.scm	2010-06-18 16:49:41 UTC (rev 29)
@@ -9,6 +9,9 @@
 
 #lang scheme
 
+;; for docs
+(require scribble/base scribble/srcdoc)
+
 (provide 
         ; behavioral automaton
         (struct-out automaton)
@@ -34,7 +37,7 @@
         ot_pt2zi
          
          ;; utility functions
-         display-ln
+	display-ln
          list-of-lists->list 
          los->string 
          lostrings->string

Modified: trunk/examples/dme-mult.amf
===================================================================
--- trunk/examples/dme-mult.amf	2010-06-15 22:12:17 UTC (rev 28)
+++ trunk/examples/dme-mult.amf	2010-06-18 16:49:41 UTC (rev 29)
@@ -5,17 +5,16 @@
 # "normal" nodes and pass nodes (as in "Automating Cut-off..")
 #
 #
-process critical {
-ENTER:	[ Idle,  token2 ] -> [ Cs , in ]
-LEAVE:	[ Cs , in ] -> [ Idle , token ]
-
-}
-
 process forward {
 IDLE: [ Idle, token ] -> [ Idle, token2 ]
 SND: [ Start, epsilon ] -> [ Idle, token2 ]
 }
 
+process critical {
+ENTER:	[ Idle,  token2 ] -> [ Cs , in ]
+LEAVE:	[ Cs , in ] -> [ Idle , token ]
+}
+
 topology {
   connectivity {
     critical 0 -- forward 0

Modified: trunk/find-k.scm
===================================================================
--- trunk/find-k.scm	2010-06-15 22:12:17 UTC (rev 28)
+++ trunk/find-k.scm	2010-06-18 16:49:41 UTC (rev 29)
@@ -194,7 +194,7 @@
                                ; (void))
                       (dump-sys
                           (model2dot (find-solution (item-index (automaton-proc-type x) processes) x)
-				                    (string-append output-directory "/" (symbol->string proc-type) "-sys.dot") npp))
+				                    (build-path output-directory (string-append (symbol->string proc-type) "-sys.dot")) npp))
                       (#t
                         (find-solution (item-index (automaton-proc-type x) processes) x)))))
           eps-auts))
@@ -221,7 +221,7 @@
              [mask (remove name names)])
         (let-values ([(tt oneE-builder) (build-oneEmodel-builder prot)])
           (let ([dummy0 (if dump-1E (model2dot (oneE-builder name start-aut (map (lambda (x) (item-index x names)) npp))
-                      (string-append output-directory "/" (symbol->string name) "-1e.dot") #:show-buf #f) (void))])
+                      (build-path output-directory (string-append (symbol->string name) "-1e.dot")) #:show-buf #f) (void))])
         (let-values ([(soln data) (search prot k name dfs start-aut
                                                          #:pruning pruning
                                                          #:npp npp

Modified: trunk/model-builder.scm
===================================================================
--- trunk/model-builder.scm	2010-06-15 22:12:17 UTC (rev 28)
+++ trunk/model-builder.scm	2010-06-18 16:49:41 UTC (rev 29)
@@ -658,7 +658,6 @@
                                         [to-id (get-id (state->representative (todo->next-state z) sp) db)])
                                    (add-trans-to-set! (todo-state z) (todo->label to-id z) db)))
                                (filter (lambda (g) (and (hash-has-key? db (state->representative (todo->next-state g) sp)) (hash-has-key? db (state->representative (todo-state g) sp)))) todos)))))
-
         (let ([vect (make-vector (hash-count db))])
           (begin
             (hash-for-each db (lambda (x y)

Added: trunk/package.sh
===================================================================
--- trunk/package.sh	                        (rev 0)
+++ trunk/package.sh	2010-06-18 16:49:41 UTC (rev 29)
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# pack up for a binary distribution
+
+NAME=""
+
+if [[ -z $1 ]]
+then
+  NAME="support";
+else
+NAME=golok-bin-v$1;
+fi
+
+make
+
+mzc --exe-dir $NAME golok
+
+mkdir $NAME/examples
+cp examples/*.amf $NAME/examples/
+cp README $NAME/
+
+tar cjvf $NAME.tar.bz2 $NAME
+
+rm -rf $NAME
\ No newline at end of file


Property changes on: trunk/package.sh
___________________________________________________________________
Added: svn:executable
   + *


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.