[enhance] mlstate_platform: mlstate_platform.h is now build in root b…

…uild folder to avoid path related C source code
MLstate · Oct 26, 2012 · e41be99 · e41be99
1 parent 3ef445b
commit e41be99
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 13 deletions.
diff --git a/compiler/passes/pass_CompileTimeDirective.ml b/compiler/passes/pass_CompileTimeDirective.ml
@@ -1,5 +1,5 @@
 (*
-    Copyright © 2011 MLstate
+    Copyright © 2011, 2012 MLstate
 
     This file is part of Opa.
 

diff --git a/ocamllib/appruntime/io/binding_epoll.c b/ocamllib/appruntime/io/binding_epoll.c
@@ -31,7 +31,7 @@
 #include <caml/fail.h>
 #include <caml/threads.h>
 
-#include "ocamllib/libbase/mlstate_platform.h"
+#include "mlstate_platform.h"
 
 #define EXPORT(name,v)					\
   CAMLprim value ep_##name()                            \

diff --git a/ocamllib/appruntime/io/binding_iocp.c b/ocamllib/appruntime/io/binding_iocp.c
@@ -37,7 +37,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "ocamllib/libbase/mlstate_platform.h"
+#include "mlstate_platform.h"
 
 #ifdef MLSTATE_WINDOWS
 #include <Winsock2.h>

diff --git a/ocamllib/appruntime/io/dns.c b/ocamllib/appruntime/io/dns.c
@@ -1,5 +1,5 @@
 /*
-    Copyright © 2011 MLstate
+    Copyright © 2011, 2012 MLstate
 
     This file is part of Opa.
 
@@ -23,7 +23,7 @@
 #include <caml/fail.h>
 
 
-#include "../../libbase/mlstate_platform.h"
+#include "mlstate_platform.h"
 
 #ifdef MLSTATE_WINDOWS
 

diff --git a/ocamllib/libsecurity/binding_ssl_ext.c b/ocamllib/libsecurity/binding_ssl_ext.c
@@ -45,7 +45,7 @@
 #define SSL_val(v) (*((SSL**)Data_custom_val(v)))
 #define ONELINE_NAME(X) X509_NAME_oneline(X, 0, 0)
 
-#include "ocamllib/libbase/mlstate_platform.h"
+#include "mlstate_platform.h"
 
 #if defined (__APPLE__)
 /* Disable depricated-declarations on OS X */

diff --git a/tools/build/build_rules.ml b/tools/build/build_rules.ml
@@ -139,17 +139,15 @@ let generate_ocamldep_rule ml_or_mli =
 generate_ocamldep_rule "ml";
 generate_ocamldep_rule "mli";
 
-(* -- Macro-rules generating mlstate_platform.h files -- *)
-(* TODO BUG 2 : droits du script invalides *)
-(* TODO BUG 3 : path du fichier généré foireux *)
-rule "mlstate_platform: () -> ocamllib/libbase/mlstate_platform.h"
+(* -- Macro-rule generating mlstate_platform.h file -- *)
+rule "mlstate_platform: () -> mlstate_platform.h"
   ~deps:(tool_deps mlstate_platform)
-  ~prods:[libbase_dir/"mlstate_platform.h"]
+  ~prods:["mlstate_platform.h"]
   (fun env build ->
      Seq[
-       Cmd(S[Sh"chmod +x"; P (libbase_dir/"gen_platform")]);
+       (* TODO : we should not need to change mode manually *)
+       chmod (A"+x") (libbase_dir/"gen_platform");
        Cmd(S[get_tool mlstate_platform; A (if is_win32 then "WIN" else "")]);
-       Cmd(S[Sh"mv"; A"mlstate_platform.h"; P(libbase_dir/"mlstate_platform.h")])
      ]
   );