Browse Source

Remove atdgen dependency when building binary

 + It has been removed from opam, but configure script was requiring it, leading
 to error.
 + Atdgen is used only when changing the structure of tmp file, to regenerate
 some file (Tmp_biniou_*.ml). We keep it as a dependency for tests, but user
 don’t need it just to build the user executable.
Leo 8 years ago
parent
commit
e9b76315c0
4 changed files with 8 additions and 23 deletions
  1. 2 2
      INSTALL.md
  2. 1 10
      _oasis
  3. 1 2
      _tags
  4. 4 9
      setup.ml

+ 2 - 2
INSTALL.md

@@ -1,5 +1,5 @@
 <!--- OASIS_START --->
 <!--- OASIS_START --->
-<!--- DO NOT EDIT (digest: 66ae045c13d05b88691d4262e6b6e66e) --->
+<!--- DO NOT EDIT (digest: dfc12b53a03502f7cab918171a5b3584) --->
 
 
 This is the INSTALL file for the OcLaunch distribution.
 This is the INSTALL file for the OcLaunch distribution.
 
 
@@ -15,10 +15,10 @@ In order to compile this package, you will need:
 * findlib
 * findlib
 * core
 * core
 * textutils
 * textutils
-* atdgen
 * re2
 * re2
 * alcotest for executable run_test
 * alcotest for executable run_test
 * oUnit for executable run_test
 * oUnit for executable run_test
+* atdgen for executable run_test
 
 
 Installing
 Installing
 ==========
 ==========

File diff suppressed because it is too large
+ 1 - 10
_oasis


+ 1 - 2
_tags

@@ -1,5 +1,5 @@
 # OASIS_START
 # OASIS_START
-# DO NOT EDIT (digest: db4bdd27155ce9d25c2a54aac4c69750)
+# DO NOT EDIT (digest: ab4397cf4812957f99ba92865bd49716)
 # Ignore VCS directories, you can use the same kind of rule outside
 # Ignore VCS directories, you can use the same kind of rule outside
 # OASIS_START/STOP if you want to exclude directories that contains
 # OASIS_START/STOP if you want to exclude directories that contains
 # useless stuff for the build process
 # useless stuff for the build process
@@ -15,7 +15,6 @@ true: annot, bin_annot
 "_darcs": -traverse
 "_darcs": -traverse
 "_darcs": not_hygienic
 "_darcs": not_hygienic
 # Executable oclaunch
 # Executable oclaunch
-<src/oclaunch.{native,byte}>: pkg_atdgen
 <src/oclaunch.{native,byte}>: pkg_core
 <src/oclaunch.{native,byte}>: pkg_core
 <src/oclaunch.{native,byte}>: pkg_re2
 <src/oclaunch.{native,byte}>: pkg_re2
 <src/oclaunch.{native,byte}>: pkg_textutils
 <src/oclaunch.{native,byte}>: pkg_textutils

+ 4 - 9
setup.ml

@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.4.5 *)
 (* setup.ml generated for the first time by OASIS v0.4.5 *)
 
 
 (* OASIS_START *)
 (* OASIS_START *)
-(* DO NOT EDIT (digest: a8502e94ba054daf78bdc42e8717ca4f) *)
+(* DO NOT EDIT (digest: 1ca6c0252665417f28aaddffe571b385) *)
 (*
 (*
    Regenerated by OASIS v0.4.6
    Regenerated by OASIS v0.4.6
    Visit http://oasis.forge.ocamlcore.org for more information and
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6927,11 +6927,7 @@ let setup_t =
           build_type = (`Build, "ocamlbuild", Some "0.4");
           build_type = (`Build, "ocamlbuild", Some "0.4");
           build_custom =
           build_custom =
             {
             {
-               pre_command =
-                 [
-                    (OASISExpr.EBool true,
-                      Some (("echo", ["\"Atdgen"; "executed\""])))
-                 ];
+               pre_command = [(OASISExpr.EBool true, None)];
                post_command = [(OASISExpr.EBool true, None)]
                post_command = [(OASISExpr.EBool true, None)]
             };
             };
           install_type = (`Install, "internal", Some "0.4");
           install_type = (`Install, "internal", Some "0.4");
@@ -6973,7 +6969,6 @@ let setup_t =
                         [
                         [
                            FindlibPackage ("core", None);
                            FindlibPackage ("core", None);
                            FindlibPackage ("textutils", None);
                            FindlibPackage ("textutils", None);
-                           FindlibPackage ("atdgen", None);
                            FindlibPackage ("threads", None);
                            FindlibPackage ("threads", None);
                            FindlibPackage ("re2", None)
                            FindlibPackage ("re2", None)
                         ];
                         ];
@@ -7066,7 +7061,7 @@ let setup_t =
        };
        };
      oasis_fn = Some "_oasis";
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.6";
      oasis_version = "0.4.6";
-     oasis_digest = Some "\253\178\n\133\134y\176\209\139\026\026zP\021f0";
+     oasis_digest = Some "M\242\023\236\1677[5P\200\134\219\015\016\005\173";
      oasis_exec = None;
      oasis_exec = None;
      oasis_setup_args = [];
      oasis_setup_args = [];
      setup_update = false
      setup_update = false
@@ -7074,6 +7069,6 @@ let setup_t =
 
 
 let setup () = BaseSetup.setup setup_t;;
 let setup () = BaseSetup.setup setup_t;;
 
 
-# 7078 "setup.ml"
+# 7073 "setup.ml"
 (* OASIS_STOP *)
 (* OASIS_STOP *)
 let () = setup ();;
 let () = setup ();;