Correct .gitignore

Important file for building were not commited especialy Atdgen and oasis ones

.gitignore

@@ -1,14 +1,5 @@
-oclaunch.byte
-# Atdgen
-settings_j.ml*
-settings_t.ml*
-settings_v.ml*
-tmp_biniou_b.ml*
-tmp_biniou_t.ml*
-tmp_biniou_v.ml*
 # Oasis
 _build
-_tags
 *.native
 *.byte
 *.docdir

VERSION

@@ -1 +1 @@
-0.2.2
+0.2.2-dev

_oasis

@@ -1,6 +1,6 @@
 OASISFormat: 0.4
 Name:        OcLaunch
-Version:     0.2.2
+Version:     0.2.2-dev
 Synopsis:    Launch commands automagically
 Authors:     Joly Clément <leowzukw@vmail.me>
 Maintainers: Joly Clément <leowzukw@vmail.me>

_tags

@@ -0,0 +1,26 @@
+# OASIS_START
+# DO NOT EDIT (digest: 02210ef353a898c316823ab4516d6163)
+# Ignore VCS directories, you can use the same kind of rule outside
+# OASIS_START/STOP if you want to exclude directories that contains
+# useless stuff for the build process
+true: annot, bin_annot
+<**/.svn>: -traverse
+<**/.svn>: not_hygienic
+".bzr": -traverse
+".bzr": not_hygienic
+".hg": -traverse
+".hg": not_hygienic
+".git": -traverse
+".git": not_hygienic
+"_darcs": -traverse
+"_darcs": not_hygienic
+# Executable oclaunch
+<src/oclaunch.{native,byte}>: pkg_atdgen
+<src/oclaunch.{native,byte}>: pkg_core
+<src/oclaunch.{native,byte}>: pkg_core_extended
+<src/oclaunch.{native,byte}>: pkg_threads
+<src/*.ml{,i,y}>: pkg_atdgen
+<src/*.ml{,i,y}>: pkg_core
+<src/*.ml{,i,y}>: pkg_core_extended
+<src/*.ml{,i,y}>: pkg_threads
+# OASIS_STOP

setup.data

@@ -0,0 +1,61 @@
+ocamlfind="/home/lwzukw/.opam/4.01.0/bin/ocamlfind"
+ocamlc="/home/lwzukw/.opam/4.01.0/bin/ocamlc.opt"
+ocamlopt="/home/lwzukw/.opam/4.01.0/bin/ocamlopt.opt"
+ocamlbuild="/home/lwzukw/.opam/4.01.0/bin/ocamlbuild"
+pkg_name="OcLaunch"
+pkg_version="0.1.2"
+os_type="Unix"
+system="linux_elf"
+architecture="i386"
+ccomp_type="cc"
+ocaml_version="4.01.0"
+standard_library_default="/home/lwzukw/.opam/4.01.0/lib/ocaml"
+standard_library="/home/lwzukw/.opam/4.01.0/lib/ocaml"
+standard_runtime="/home/lwzukw/.opam/4.01.0/bin/ocamlrun"
+bytecomp_c_compiler="gcc -fno-defer-pop -Wall -D_FILE_OFFSET_BITS=64 -D_REENTRANT -fPIC"
+native_c_compiler="gcc -Wall -D_FILE_OFFSET_BITS=64 -D_REENTRANT"
+model="default"
+ext_obj=".o"
+ext_asm=".s"
+ext_lib=".a"
+ext_dll=".so"
+default_executable_name="a.out"
+systhread_supported="true"
+prefix="/usr/local"
+exec_prefix="$prefix"
+bindir="$exec_prefix/bin"
+sbindir="$exec_prefix/sbin"
+libexecdir="$exec_prefix/libexec"
+sysconfdir="$prefix/etc"
+sharedstatedir="$prefix/com"
+localstatedir="$prefix/var"
+libdir="$exec_prefix/lib"
+datarootdir="$prefix/share"
+datadir="$datarootdir"
+infodir="$datarootdir/info"
+localedir="$datarootdir/locale"
+mandir="$datarootdir/man"
+docdir="$datarootdir/doc/$pkg_name"
+htmldir="$docdir"
+dvidir="$docdir"
+pdfdir="$docdir"
+psdir="$docdir"
+findlib_version="1.5.5"
+is_native="true"
+suffix_program=""
+rm="rm -f"
+rmdir="rm -rf"
+debug="false"
+profile="false"
+native_dynlink="true"
+ocamlbuildflags=""
+docs="false"
+tests="false"
+camlp4o="/home/lwzukw/.opam/4.01.0/bin/camlp4o"
+pkg_core="/home/lwzukw/.opam/4.01.0/lib/core"
+pkg_core_extended="/home/lwzukw/.opam/4.01.0/lib/core_extended"
+pkg_atdgen="/home/lwzukw/.opam/4.01.0/lib/atdgen"
+pkg_threads="/home/lwzukw/.opam/4.01.0/lib/ocaml"
+pkg_biniou="/home/lwzukw/.opam/4.01.0/lib/biniou"
+pkg_config_file="/home/lwzukw/.opam/4.01.0/lib/config-file"
+pkg_yojson="/home/lwzukw/.opam/4.01.0/lib/yojson"

setup.ml

@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.4.5 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: a6d875824b2b3643cd7b6ee0805653c9) *)
+(* DO NOT EDIT (digest: 222f72aedda36c0f8007ed5c735d6e4b) *)
 (*
    Regenerated by OASIS v0.4.5
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6673,7 +6673,7 @@ let setup_t =
           alpha_features = ["stdfiles_markdown"; "compiled_setup_ml"];
           beta_features = [];
           name = "OcLaunch";
-          version = "0.2.2";
+          version = "0.2.2-dev";
           license =
             OASISLicense.DEP5License
               (OASISLicense.DEP5Unit
@@ -6777,7 +6777,7 @@ let setup_t =
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.5";
-     oasis_digest = Some "\223\199\020P\007\005v]\132ep\239\218N\217\164";
+     oasis_digest = Some "\170\134\136a\241\018\026\"\180\230\139g\173\177&a";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false

src/oclaunch.ml

@@ -38,7 +38,7 @@ open Core.Std;;
 
 (* Variable to store version number *)
 (* TODO Get value from file *)
-let version_number = "0.2.2";;
+let version_number = "0.2.2-dev";;
 
 (* Variable store building information *)
 (* XXX This is fake value, it corresponds to the running

src/settings_j.ml

@@ -0,0 +1,175 @@
+(* Auto-generated from "settings.atd" *)
+
+
+type rc_file = Settings_t.rc_file = {
+  progs: string list;
+  settings: string list
+}
+
+let write__1 = (
+  Ag_oj_run.write_list (
+    Yojson.Safe.write_string
+  )
+)
+let string_of__1 ?(len = 1024) x =
+  let ob = Bi_outbuf.create len in
+  write__1 ob x;
+  Bi_outbuf.contents ob
+let read__1 = (
+  Ag_oj_run.read_list (
+    Ag_oj_run.read_string
+  )
+)
+let _1_of_string s =
+  read__1 (Yojson.Safe.init_lexer ()) (Lexing.from_string s)
+let write_rc_file : _ -> rc_file -> _ = (
+  fun ob x ->
+    Bi_outbuf.add_char ob '{';
+    let is_first = ref true in
+    if !is_first then
+      is_first := false
+    else
+      Bi_outbuf.add_char ob ',';
+    Bi_outbuf.add_string ob "\"progs\":";
+    (
+      write__1
+    )
+      ob x.progs;
+    if !is_first then
+      is_first := false
+    else
+      Bi_outbuf.add_char ob ',';
+    Bi_outbuf.add_string ob "\"settings\":";
+    (
+      write__1
+    )
+      ob x.settings;
+    Bi_outbuf.add_char ob '}';
+)
+let string_of_rc_file ?(len = 1024) x =
+  let ob = Bi_outbuf.create len in
+  write_rc_file ob x;
+  Bi_outbuf.contents ob
+let read_rc_file = (
+  fun p lb ->
+    Yojson.Safe.read_space p lb;
+    Yojson.Safe.read_lcurl p lb;
+    let field_progs = ref (Obj.magic 0.0) in
+    let field_settings = ref (Obj.magic 0.0) in
+    let bits0 = ref 0 in
+    try
+      Yojson.Safe.read_space p lb;
+      Yojson.Safe.read_object_end lb;
+      Yojson.Safe.read_space p lb;
+      let f =
+        fun s pos len ->
+          if pos < 0 || len < 0 || pos + len > String.length s then
+            invalid_arg "out-of-bounds substring position or length";
+          match len with
+            | 5 -> (
+                if String.unsafe_get s pos = 'p' && String.unsafe_get s (pos+1) = 'r' && String.unsafe_get s (pos+2) = 'o' && String.unsafe_get s (pos+3) = 'g' && String.unsafe_get s (pos+4) = 's' then (
+                  0
+                )
+                else (
+                  -1
+                )
+              )
+            | 8 -> (
+                if String.unsafe_get s pos = 's' && String.unsafe_get s (pos+1) = 'e' && String.unsafe_get s (pos+2) = 't' && String.unsafe_get s (pos+3) = 't' && String.unsafe_get s (pos+4) = 'i' && String.unsafe_get s (pos+5) = 'n' && String.unsafe_get s (pos+6) = 'g' && String.unsafe_get s (pos+7) = 's' then (
+                  1
+                )
+                else (
+                  -1
+                )
+              )
+            | _ -> (
+                -1
+              )
+      in
+      let i = Yojson.Safe.map_ident p f lb in
+      Ag_oj_run.read_until_field_value p lb;
+      (
+        match i with
+          | 0 ->
+            field_progs := (
+              (
+                read__1
+              ) p lb
+            );
+            bits0 := !bits0 lor 0x1;
+          | 1 ->
+            field_settings := (
+              (
+                read__1
+              ) p lb
+            );
+            bits0 := !bits0 lor 0x2;
+          | _ -> (
+              Yojson.Safe.skip_json p lb
+            )
+      );
+      while true do
+        Yojson.Safe.read_space p lb;
+        Yojson.Safe.read_object_sep p lb;
+        Yojson.Safe.read_space p lb;
+        let f =
+          fun s pos len ->
+            if pos < 0 || len < 0 || pos + len > String.length s then
+              invalid_arg "out-of-bounds substring position or length";
+            match len with
+              | 5 -> (
+                  if String.unsafe_get s pos = 'p' && String.unsafe_get s (pos+1) = 'r' && String.unsafe_get s (pos+2) = 'o' && String.unsafe_get s (pos+3) = 'g' && String.unsafe_get s (pos+4) = 's' then (
+                    0
+                  )
+                  else (
+                    -1
+                  )
+                )
+              | 8 -> (
+                  if String.unsafe_get s pos = 's' && String.unsafe_get s (pos+1) = 'e' && String.unsafe_get s (pos+2) = 't' && String.unsafe_get s (pos+3) = 't' && String.unsafe_get s (pos+4) = 'i' && String.unsafe_get s (pos+5) = 'n' && String.unsafe_get s (pos+6) = 'g' && String.unsafe_get s (pos+7) = 's' then (
+                    1
+                  )
+                  else (
+                    -1
+                  )
+                )
+              | _ -> (
+                  -1
+                )
+        in
+        let i = Yojson.Safe.map_ident p f lb in
+        Ag_oj_run.read_until_field_value p lb;
+        (
+          match i with
+            | 0 ->
+              field_progs := (
+                (
+                  read__1
+                ) p lb
+              );
+              bits0 := !bits0 lor 0x1;
+            | 1 ->
+              field_settings := (
+                (
+                  read__1
+                ) p lb
+              );
+              bits0 := !bits0 lor 0x2;
+            | _ -> (
+                Yojson.Safe.skip_json p lb
+              )
+        );
+      done;
+      assert false;
+    with Yojson.End_of_object -> (
+        if !bits0 <> 0x3 then Ag_oj_run.missing_fields p [| !bits0 |] [| "progs"; "settings" |];
+        (
+          {
+            progs = !field_progs;
+            settings = !field_settings;
+          }
+         : rc_file)
+      )
+)
+let rc_file_of_string s =
+  read_rc_file (Yojson.Safe.init_lexer ()) (Lexing.from_string s)

src/settings_j.mli

@@ -0,0 +1,28 @@
+(* Auto-generated from "settings.atd" *)
+
+
+type rc_file = Settings_t.rc_file = {
+  progs: string list;
+  settings: string list
+}
+
+val write_rc_file :
+  Bi_outbuf.t -> rc_file -> unit
+  (** Output a JSON value of type {!rc_file}. *)
+
+val string_of_rc_file :
+  ?len:int -> rc_file -> string
+  (** Serialize a value of type {!rc_file}
+      into a JSON string.
+      @param len specifies the initial length
+                 of the buffer used internally.
+                 Default: 1024. *)
+
+val read_rc_file :
+  Yojson.Safe.lexer_state -> Lexing.lexbuf -> rc_file
+  (** Input JSON data of type {!rc_file}. *)
+
+val rc_file_of_string :
+  string -> rc_file
+  (** Deserialize JSON data of type {!rc_file}. *)
+

src/settings_t.ml

@@ -0,0 +1,4 @@
+(* Auto-generated from "settings.atd" *)
+
+
+type rc_file = { progs: string list; settings: string list }

src/settings_t.mli

@@ -0,0 +1,4 @@
+(* Auto-generated from "settings.atd" *)
+
+
+type rc_file = { progs: string list; settings: string list }

src/settings_v.ml

@@ -0,0 +1,22 @@
+(* Auto-generated from "settings.atd" *)
+
+
+type rc_file = Settings_t.rc_file = {
+  progs: string list;
+  settings: string list
+}
+
+let validate__1 = (
+  fun _ _ -> None
+)
+let validate_rc_file : _ -> rc_file -> _ = (
+  fun _ _ -> None
+)
+let create_rc_file 
+  ~progs
+  ~settings
+  () : rc_file =
+  {
+    progs = progs;
+    settings = settings;
+  }

src/settings_v.mli

@@ -0,0 +1,18 @@
+(* Auto-generated from "settings.atd" *)
+
+
+type rc_file = Settings_t.rc_file = {
+  progs: string list;
+  settings: string list
+}
+
+val create_rc_file :
+  progs: string list ->
+  settings: string list ->
+  unit -> rc_file
+  (** Create a record of type {!rc_file}. *)
+
+val validate_rc_file :
+  Ag_util.Validation.path -> rc_file -> Ag_util.Validation.error option
+  (** Validate a value of type {!rc_file}. *)
+

src/tmp_biniou_b.ml

@@ -0,0 +1,121 @@
+(* Auto-generated from "tmp_biniou.atd" *)
+
+
+type tmp_file = Tmp_biniou_t.tmp_file = { command: string list; number: int }
+
+let _1_tag = Bi_io.array_tag
+let write_untagged__1 = (
+  Ag_ob_run.write_untagged_list
+    Bi_io.string_tag
+    (
+      Bi_io.write_untagged_string
+    )
+)
+let write__1 ob x =
+  Bi_io.write_tag ob Bi_io.array_tag;
+  write_untagged__1 ob x
+let string_of__1 ?(len = 1024) x =
+  let ob = Bi_outbuf.create len in
+  write__1 ob x;
+  Bi_outbuf.contents ob
+let get__1_reader = (
+  Ag_ob_run.get_list_reader (
+    Ag_ob_run.get_string_reader
+  )
+)
+let read__1 = (
+  Ag_ob_run.read_list (
+    Ag_ob_run.get_string_reader
+  )
+)
+let _1_of_string ?pos s =
+  read__1 (Bi_inbuf.from_string ?pos s)
+let tmp_file_tag = Bi_io.record_tag
+let write_untagged_tmp_file : Bi_outbuf.t -> tmp_file -> unit = (
+  fun ob x ->
+    Bi_vint.write_uvint ob 2;
+    Bi_outbuf.add_char4 ob '\129' 'm' 'q' 'K';
+    (
+      write__1
+    ) ob x.command;
+    Bi_outbuf.add_char4 ob '\161' 'z' '\134' '\201';
+    (
+      Bi_io.write_svint
+    ) ob x.number;
+)
+let write_tmp_file ob x =
+  Bi_io.write_tag ob Bi_io.record_tag;
+  write_untagged_tmp_file ob x
+let string_of_tmp_file ?(len = 1024) x =
+  let ob = Bi_outbuf.create len in
+  write_tmp_file ob x;
+  Bi_outbuf.contents ob
+let get_tmp_file_reader = (
+  fun tag ->
+    if tag <> 21 then Ag_ob_run.read_error () else
+      fun ib ->
+        let field_command = ref (Obj.magic 0.0) in
+        let field_number = ref (Obj.magic 0.0) in
+        let bits0 = ref 0 in
+        let len = Bi_vint.read_uvint ib in
+        for i = 1 to len do
+          match Bi_io.read_field_hashtag ib with
+            | 23949643 ->
+              field_command := (
+                (
+                  read__1
+                ) ib
+              );
+              bits0 := !bits0 lor 0x1;
+            | 561678025 ->
+              field_number := (
+                (
+                  Ag_ob_run.read_int
+                ) ib
+              );
+              bits0 := !bits0 lor 0x2;
+            | _ -> Bi_io.skip ib
+        done;
+        if !bits0 <> 0x3 then Ag_ob_run.missing_fields [| !bits0 |] [| "command"; "number" |];
+        (
+          {
+            command = !field_command;
+            number = !field_number;
+          }
+         : tmp_file)
+)
+let read_tmp_file = (
+  fun ib ->
+    if Bi_io.read_tag ib <> 21 then Ag_ob_run.read_error_at ib;
+    let field_command = ref (Obj.magic 0.0) in
+    let field_number = ref (Obj.magic 0.0) in
+    let bits0 = ref 0 in
+    let len = Bi_vint.read_uvint ib in
+    for i = 1 to len do
+      match Bi_io.read_field_hashtag ib with
+        | 23949643 ->
+          field_command := (
+            (
+              read__1
+            ) ib
+          );
+          bits0 := !bits0 lor 0x1;
+        | 561678025 ->
+          field_number := (
+            (
+              Ag_ob_run.read_int
+            ) ib
+          );
+          bits0 := !bits0 lor 0x2;
+        | _ -> Bi_io.skip ib
+    done;
+    if !bits0 <> 0x3 then Ag_ob_run.missing_fields [| !bits0 |] [| "command"; "number" |];
+    (
+      {
+        command = !field_command;
+        number = !field_number;
+      }
+     : tmp_file)
+)
+let tmp_file_of_string ?pos s =
+  read_tmp_file (Bi_inbuf.from_string ?pos s)

src/tmp_biniou_b.mli

@@ -0,0 +1,41 @@
+(* Auto-generated from "tmp_biniou.atd" *)
+
+
+type tmp_file = Tmp_biniou_t.tmp_file = { command: string list; number: int }
+
+(* Writers for type tmp_file *)
+
+val tmp_file_tag : Bi_io.node_tag
+  (** Tag used by the writers for type {!tmp_file}.
+      Readers may support more than just this tag. *)
+
+val write_untagged_tmp_file :
+  Bi_outbuf.t -> tmp_file -> unit
+  (** Output an untagged biniou value of type {!tmp_file}. *)
+
+val write_tmp_file :
+  Bi_outbuf.t -> tmp_file -> unit
+  (** Output a biniou value of type {!tmp_file}. *)
+
+val string_of_tmp_file :
+  ?len:int -> tmp_file -> string
+  (** Serialize a value of type {!tmp_file} into
+      a biniou string. *)
+
+(* Readers for type tmp_file *)
+
+val get_tmp_file_reader :
+  Bi_io.node_tag -> (Bi_inbuf.t -> tmp_file)
+  (** Return a function that reads an untagged
+      biniou value of type {!tmp_file}. *)
+
+val read_tmp_file :
+  Bi_inbuf.t -> tmp_file
+  (** Input a tagged biniou value of type {!tmp_file}. *)
+
+val tmp_file_of_string :
+  ?pos:int -> string -> tmp_file
+  (** Deserialize a biniou value of type {!tmp_file}.
+      @param pos specifies the position where
+                 reading starts. Default: 0. *)
+

src/tmp_biniou_t.ml

@@ -0,0 +1,4 @@
+(* Auto-generated from "tmp_biniou.atd" *)
+
+
+type tmp_file = { command: string list; number: int }

src/tmp_biniou_t.mli

@@ -0,0 +1,4 @@
+(* Auto-generated from "tmp_biniou.atd" *)
+
+
+type tmp_file = { command: string list; number: int }

src/tmp_biniou_v.ml

@@ -0,0 +1,19 @@
+(* Auto-generated from "tmp_biniou.atd" *)
+
+
+type tmp_file = Tmp_biniou_t.tmp_file = { command: string list; number: int }
+
+let validate__1 = (
+  fun _ _ -> None
+)
+let validate_tmp_file : _ -> tmp_file -> _ = (
+  fun _ _ -> None
+)
+let create_tmp_file 
+  ~command
+  ~number
+  () : tmp_file =
+  {
+    command = command;
+    number = number;
+  }

src/tmp_biniou_v.mli

@@ -0,0 +1,15 @@
+(* Auto-generated from "tmp_biniou.atd" *)
+
+
+type tmp_file = Tmp_biniou_t.tmp_file = { command: string list; number: int }
+
+val create_tmp_file :
+  command: string list ->
+  number: int ->
+  unit -> tmp_file
+  (** Create a record of type {!tmp_file}. *)
+
+val validate_tmp_file :
+  Ag_util.Validation.path -> tmp_file -> Ag_util.Validation.error option
+  (** Validate a value of type {!tmp_file}. *)
+

version_set.sh

@@ -18,6 +18,9 @@ echo $new_version > VERSION
 sed -i -e "s/Version:     .*/Version:     $new_version/" _oasis
 sed -i -e "s/\\(let version_number = \"\\).*\\(\";;\\)/\\1$new_version\\2/" src/oclaunch.ml
 
+# Update oasis
+oasis setup
+
 # Display the result
 echo "Result"
 git diff