Added environment configs. Added lib_path configuration

bryanjos · bryanjos · commit d013b5af1caf · 2016-03-28T20:38:41.000-05:00
diff --git a/config/config.exs b/config/config.exs
@@ -15,10 +15,12 @@ use Mix.Config
        format: "$date $time [$level] $metadata$message\n",
        metadata: [:user_id]
 
+       config :elixir_script,
+         lib_path: nil #The path to the elixirscript core and standard library JavaScript files
 # It is also possible to import configuration files, relative to this
 # directory. For example, you can emulate configuration per environment
 # by uncommenting the line below and defining dev.exs, test.exs and such.
 # Configuration from the imported file will override the ones defined
 # here (which is why it is important to import them last).
 #
-#     import_config "#{Mix.env}.exs"
+     import_config "#{Mix.env}.exs"
diff --git a/config/dev.exs b/config/dev.exs
@@ -0,0 +1 @@
+use Mix.Config
diff --git a/config/prod.exs b/config/prod.exs
@@ -0,0 +1 @@
+use Mix.Config
diff --git a/config/test.exs b/config/test.exs
@@ -0,0 +1 @@
+use Mix.Config
diff --git a/lib/elixir_script.ex b/lib/elixir_script.ex
@@ -45,6 +45,7 @@ defmodule ElixirScript do
   # This is the serialized state of the ElixirScript.State module containing references to the standard library
   @external_resource stdlib_state_path = Path.join([__DIR__, "elixir_script", "translator", "stdlib_state.bin"])
   @stdlib_state File.read!(stdlib_state_path)
+  @lib_path Application.get_env(:elixir_script, :lib_path)
 
   @doc """
   Compiles the given Elixir code string
@@ -71,6 +72,7 @@ defmodule ElixirScript do
   @spec compile_path(binary, Map.t) :: [binary | {binary, binary} | :ok]
   def compile_path(path, opts \\ %{}) do
     expanded_path = Path.wildcard(path)
+    opts = build_compiler_options(opts)
 
     compiler_cache = get_compiler_cache(path, opts)
 
@@ -335,14 +337,20 @@ end
   #Gets path to js files whether the mix project is available
   #or when used as an escript
   defp operating_path do
-    try do
-      Mix.Project.build_path <> "/lib/elixir_script/priv"
-    rescue
-      UndefinedFunctionError ->
-        split_path = Path.split(Application.app_dir(:elixirscript))
-        replaced_path = List.delete_at(split_path, length(split_path) - 1)
-        replaced_path = List.delete_at(replaced_path, length(replaced_path) - 1)
-        Path.join(replaced_path)
+    case @lib_path do
+      nil ->
+        try do
+          Mix.Project.build_path <> "/lib/elixir_script/priv"
+        rescue
+          UndefinedFunctionError ->
+            split_path = Path.split(Application.app_dir(:elixirscript))
+          replaced_path = List.delete_at(split_path, length(split_path) - 1)
+          replaced_path = List.delete_at(replaced_path, length(replaced_path) - 1)
+          Path.join(replaced_path)
+        end
+      lib_path ->
+        lib_path
     end
   end
+
 end
