Merge pull request #33 from membraneframework/fix/path-escaping

Fix path escaping and bump version to v0.1.7

lib/bundlex/toolchain/gcc.ex

@@ -6,8 +6,6 @@ defmodule Bundlex.Toolchain.GCC do
   use Bundlex.Toolchain
 
   def compiler_commands(nif, app_name, nif_name) do
-    # FIXME escape quotes properly
-
     includes_part =
       nif.includes |> Enum.map(fn include -> "-I\"#{include}\"" end) |> Enum.join(" ")
 
@@ -23,19 +21,19 @@ defmodule Bundlex.Toolchain.GCC do
       |> Enum.map(fn source ->
         "gcc -fPIC -std=c11 -Wall -Wextra -O2 -g #{includes_part} #{libs_part} #{
           pkg_config_cflags_part
-        } \"#{source_path(source)}\" -c -o \"#{object_path(source)}\""
+        } #{source_path(source)} -c -o #{object_path(source)}"
       end)
 
     commands_linker = [
-      "gcc -rdynamic -undefined -shared #{objects} #{libs_part} #{pkg_config_libs_part} -o #{
+      "gcc -rdynamic -undefined -shared #{objects} #{libs_part} #{pkg_config_libs_part} -o \"#{
         Toolchain.output_path(app_name, nif_name)
-      }.so"
+      }.so\""
     ]
 
-    ["mkdir -p #{Toolchain.output_path(app_name)}"] ++ commands_sources ++ commands_linker
+    ["mkdir -p \"#{Toolchain.output_path(app_name)}\""] ++ commands_sources ++ commands_linker
   end
 
-  defp source_path(source), do: source
+  defp source_path(source), do: "\"#{source}\""
 
-  defp object_path(source), do: "#{source}.o" |> String.replace(~r(\.c\.o$), ".o")
+  defp object_path(source), do: "\"#{source}.o\"" |> String.replace(~r(\.c\.o"$), ".o\"")
 end

lib/bundlex/toolchain/xcode.ex

@@ -17,10 +17,10 @@ defmodule Bundlex.Toolchain.XCode do
     pkg_configs_part = Toolchain.pkg_config(nif, ["--cflags", "--libs"])
 
     [
-      "mkdir -p #{Toolchain.output_path(app_name)}",
-      "cc -fPIC -Wall -Wextra -dynamiclib -undefined dynamic_lookup -o #{
+      "mkdir -p \"#{Toolchain.output_path(app_name)}\"",
+      "cc -fPIC -Wall -Wextra -dynamiclib -undefined dynamic_lookup -o \"#{
         Toolchain.output_path(app_name, nif_name)
-      }.so #{includes_part} #{libs_part} #{pkg_configs_part} #{sources_part}"
+      }.so\" #{includes_part} #{libs_part} #{pkg_configs_part} #{sources_part}"
     ]
   end
 end

mix.exs

@@ -1,7 +1,7 @@
 defmodule Bundlex.Mixfile do
   use Mix.Project
 
-  @version "0.1.6"
+  @version "0.1.7"
 
   @github_url "https://github.com/membraneframework/bundlex"