update package script

diff --git a/OMakefile b/OMakefile
index e58134d..30394af 100644 (file)
--- a/OMakefile
+++ b/OMakefile
@@ -14,7 +14,7 @@ Shell. +=
       rm -f *.cm[iox] *.o *.omc *.opt *.run *~ $(argv) *.cmxa *.a *.spot *.annot
 
 
-.PHONY: clean all install install-win32 config
+.PHONY: clean all install install-win32 config config-clean
 .SUBDIRS: scm xml driver base
 
 habc-scm$(EXE): scm/src/habc-scm$(EXE)
@@ -28,14 +28,22 @@ habc$(EXE) : driver/habc$(EXE)
 
 PROGRAM = habc$(EXE) habc-xml$(EXE) habc-scm$(EXE)
 
-clean:
-       ocaml-clean *.abc $(PROGRAM) OMakefile.config base/config.ml
 
-all: $(PROGRAM)
+
+all: config $(PROGRAM)
 
 .DEFAULT: all
 
 # ------------------------------
+# clean
+# ------------------------------
+clean:
+       ocaml-clean *.abc $(PROGRAM) OMakefile.config base/config.ml
+
+config-clean:
+       rm -rf OMakefile.config base/config.ml
+
+# ------------------------------
 # config
 # ------------------------------
 config: OMakefile.config base/config.ml
@@ -55,7 +63,7 @@ config: OMakefile.config base/config.ml
                                echo SHARE_DIR=$(PREFIX)/share/habc >> $@
                        else
                                echo SHARE_DIR=$(SHARE_DIR) >> $@
-                       if $(not $(defined BIR_DIR))
+                       if $(not $(defined BIN_DIR))
                                echo BIN_DIR=$(PREFIX)/bin >> $@
                        else
                                echo BIN_DIR=$(BIN_DIR) >> $@
@@ -70,7 +78,11 @@ base/config.ml:
                else
                        @echo 'let default_includes = ["$(LIB_DIR)";"."]' >> $@
                        @echo 'let default_template = "$(SHARE_DIR)/template.xml"' >> $@
+                       @echo 'let bin_dir = "$(BIN_DIR)"' >> $@
+                       @echo 'let share_dir = "$(SHARE_DIR)"' >> $@
+                       @echo 'let lib_dir = "$(LIB_DIR)"' >> $@
                @echo 'let path_sep="$(PATHSEP)"' >> $@
+               @echo 'let exe="$(EXE)"' >> $@
 
 
 # ------------------------------
@@ -84,7 +96,7 @@ install: $(PROGRAM)
        $(INSTALL) share/habc/* $(SHARE_DIR)
        $(INSTALL) lib/habc/*   $(LIB_DIR)
 
-install-win32: $(PROGRAM)
+install-win32: $(PROGRAM) install
        mkdir -p $(PREFIX)/
-       cp -rv win32/swfmill/* $(PREFIX)/
-       cp -v README.mkdn $(PREFIX)/
\ No newline at end of file
+       $(INSTALL) win32/swfmill/* $(PREFIX)/
+       $(INSTALL) README.mkdn $(PREFIX)/
\ No newline at end of file

diff --git a/capistrano/package.rb b/capistrano/package.rb
index 9d8a06d..3113b4d 100644 (file)
--- a/capistrano/package.rb
+++ b/capistrano/package.rb
@@ -40,7 +40,7 @@ namespace :package do
   task 'win',:roles=>[:win] do
     on_rollback { run "rm -rf #{package_path}-win32; true" }
     run "rm -rf #{package_path}-win32"
-    run "cd #{package_path} && #{omake} install-win32 PREFIX=$(cygpath -w #{package_path}-win32)"
+    run "cd #{package_path} && #{omake} install-win32 RELAVITE=true PREFIX=$(cygpath -w #{package_path}-win32)"
     run "cd #{build_path}   && zip -rq #{package_name}-win32.zip #{package_name}-win32"
   end
 

diff --git a/driver/cmdOpt.ml b/driver/cmdOpt.ml
index d240aca..e0ea9ea 100644 (file)
--- a/driver/cmdOpt.ml
+++ b/driver/cmdOpt.ml
@@ -74,7 +74,7 @@ let bool_option ~default ?short_name ?long_name ~help () =
 let scm =
   let cmd =
     str_option
-      ~default:"habc-scm"
+      ~default:(Config.bin_dir ^ "/habc-scm" ^ Config.exe)
       ~metavar:"<cmd>"
       ~long_name:"scm"
       ~help:"Use <cmd> to compile scm to abc" () in
@@ -94,7 +94,7 @@ let scm =
 let abc =
   let cmd =
     str_option
-      ~default:"habc-xml"
+      ~default:(Config.bin_dir ^ "/habc-xml" ^ Config.exe)
       ~metavar:"<cmd>"
       ~long_name:"abcx"
       ~help:"Use <cmd> to compile abc to abcx" () in
@@ -111,14 +111,14 @@ let abcx =
       ~help:"Use <cmd> to compile abcx to swfx" () in
   let width =
     int_option
-      ~default:300
+      ~default:2048
       ~metavar:"<width>"
       ~short_name:'W'
       ~long_name:"width"
       ~help:"stage width" () in
   let height =
     int_option
-      ~default:300
+      ~default:800
       ~metavar:"<height>"
       ~short_name:'H'
       ~long_name:"height"

diff --git a/driver/rule.ml b/driver/rule.ml
index f810c09..bbf591c 100644 (file)
--- a/driver/rule.ml
+++ b/driver/rule.ml
@@ -64,14 +64,6 @@ let rec route rs src dest =
          else
            Some (minimum_by (fun a b -> List.length a < List.length b) routes)
 
-let rules = [
-  {src=One ".c";dest=".o";cmd=fun _ _ _ -> []};
-  {src=Many [".c"];dest=".s";cmd=fun _ _ _ -> []};
-  {src=Many [".o"];dest=".s";cmd=fun _ _ _-> []};
-  {src=Many [".c";".o"];dest=".s";cmd=fun _ _ _-> []};
-  {src=One ".s";dest=".exe";cmd=fun _ _ _-> []};
-]
-
 let suffix x =
   let regexp =
     Str.regexp ".*\\.\\(.*\\)$" in