[enhance] compiler, bsl: added --no-absolute-plugin needed for buildi…

…ng opx without absolute reference to opp
alokmenghrajani · Jan 25, 2012 · cadf7ec · cadf7ec
1 parent fb992fe
commit cadf7ec
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 2 deletions.
diff --git a/libbsl.mllib b/libbsl.mllib
@@ -25,3 +25,4 @@ libbsl/BslDirectives
 libbsl/BslIncludeFormats
 libbsl/BslRegisterParserState
 libbsl/BslError
+libbsl/BslArgs
diff --git a/libbsl/bslArgs.ml b/libbsl/bslArgs.ml
@@ -0,0 +1,34 @@
+(*
+    Copyright © 2012 MLstate
+
+    This file is part of OPA.
+
+    OPA is free software: you can redistribute it and/or modify it under the
+    terms of the GNU Affero General Public License, version 3, as published by
+    the Free Software Foundation.
+
+    OPA is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for
+    more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with OPA. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+type t = {
+  no_absolute : bool;
+}
+
+let default = {
+  no_absolute = false;
+}
+
+let x = ref default
+
+let get () = !x
+
+let options = [
+  ("--no-absolute-plugin", Base.Arg.Unit (fun () -> x := {no_absolute = true})
+     , "Plugin paths should not be considered as absolute path (package will not refers to plugin with an absolute path)")
+]
diff --git a/libbsl/bslArgs.mli b/libbsl/bslArgs.mli
@@ -0,0 +1,25 @@
+(*
+    Copyright © 2012 MLstate
+
+    This file is part of OPA.
+
+    OPA is free software: you can redistribute it and/or modify it under the
+    terms of the GNU Affero General Public License, version 3, as published by
+    the Free Software Foundation.
+
+    OPA is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for
+    more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with OPA. If not, see <http://www.gnu.org/licenses/>.
+*)
+
+type t = {
+  no_absolute : bool;
+}
+
+val get : unit -> t
+
+val options : (string * Base.Arg.spec * string) list
diff --git a/libbsl/bslConvention.ml b/libbsl/bslConvention.ml
@@ -1,5 +1,5 @@
 (*
-    Copyright © 2011 MLstate
+    Copyright © 2012 MLstate
 
     This file is part of OPA.
 

diff --git a/opa/pass_BslLoading.ml b/opa/pass_BslLoading.ml
@@ -393,7 +393,12 @@ let process
         Hashtbl.add extralib_plugin basename extralib ;
         Hashtbl.add extrapath_plugin basename extrapath ;
         BslDynlink.load_bypass_plugin (BslDynlink.MarshalPlugin plugin) ;
-        let inclusion = BslConvention.inclusion ~cwd:"" bypass_plugin in
+        let inclusion =
+          let bypass_plugin =
+            if (BslArgs.get ()).BslArgs.no_absolute then Filename.basename bypass_plugin
+            else bypass_plugin
+          in
+          BslConvention.inclusion ~cwd:"" bypass_plugin in
         let extralib = inclusion.BslConvention.extralib in
         let extrapath = inclusion.BslConvention.extrapath in
         let plugin = inclusion.BslConvention.plugin in

diff --git a/opalib/opaEnv.ml b/opalib/opaEnv.ml
@@ -442,6 +442,7 @@ struct
         ObjectFiles.Arg.public_options @
         I18n.options @
         OpaSyntax.Args.options @
+        BslArgs.options @
         QmlDbGen.Args.options @
         [
           (* a *)