Browse Source

Merge branch '0.1' into basic-cli

Conflicts:
	src/oclaunch.ml

Some modification was applied to file ./src/default.ml because
code was moved from oclaunch.ml to this file
Leo 10 years ago
parent
commit
de3b170890
4 changed files with 10 additions and 6 deletions
  1. 8 4
      .gitignore
  2. 1 1
      TODO.md
  3. 1 0
      VERSION
  4. 0 1
      src/default.ml

+ 8 - 4
.gitignore

@@ -1,14 +1,18 @@
 oclaunch.byte
 oclaunch.byte
 # Atdgen
 # Atdgen
-settings_j.ml
-settings_j.mli
-settings_t.ml
-settings_t.mli
+settings_j.ml*
+settings_t.ml*
+settings_v.ml*
 # Oasis
 # Oasis
 _build
 _build
+_tags
 *.native
 *.native
 *.byte
 *.byte
 *.docdir
 *.docdir
+setup.ml
+Makefile
+configure
+myocamlbuild.ml
 setup.data
 setup.data
 setup.log
 setup.log
 # Misc
 # Misc

+ 1 - 1
TODO.md

@@ -1,6 +1,6 @@
 # Things to do
 # Things to do
 
 
-## Contributors
+## Users ides
     Feel free to add things here
     Feel free to add things here
 
 
 ## Short term
 ## Short term

+ 1 - 0
VERSION

@@ -0,0 +1 @@
+0.1

+ 0 - 1
src/default.ml

@@ -47,7 +47,6 @@ let run () =
   (* Obtain data from tmp file *)
   (* Obtain data from tmp file *)
   let tmp_content = Tmp_file.init ~tmp:Const.tmp_file in
   let tmp_content = Tmp_file.init ~tmp:Const.tmp_file in
 
 
-  (*List.iter rc_content.progs ~f:print_endline*)
   (* Execute each item (one by one)in config file *)
   (* Execute each item (one by one)in config file *)
   let open Settings_t in (* This prevent warning 40 for ~cmd_list:rc_content.progs *)
   let open Settings_t in (* This prevent warning 40 for ~cmd_list:rc_content.progs *)
   let cmd_to_exec = Exec_cmd.what_next ~cmd_list:rc_content.progs ~tmp:tmp_content in
   let cmd_to_exec = Exec_cmd.what_next ~cmd_list:rc_content.progs ~tmp:tmp_content in