Quantcast

RFR: JDK-8180420 Set PATH for dot and pandoc in JIB

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

RFR: JDK-8180420 Set PATH for dot and pandoc in JIB

Magnus Ihse Bursie
We should set environment_path in jib-profiles.js to allow for "jib run"
to use pandoc and dot.

Bug: https://bugs.openjdk.java.net/browse/JDK-8180420
Patch inline:
diff --git a/common/conf/jib-profiles.js b/common/conf/jib-profiles.js
--- a/common/conf/jib-profiles.js
+++ b/common/conf/jib-profiles.js
@@ -997,7 +997,8 @@
              ext: "tar.gz",
              revision: "2.38.0-1+1.1",
              module: "graphviz-" + input.target_platform,
-            configure_args: "DOT=" + input.get("graphviz",
"install_path") + "/dot"
+            configure_args: "DOT=" + input.get("graphviz",
"install_path") + "/dot",
+            environment_path: input.get("graphviz", "install_path")
          },

          pandoc: {
@@ -1005,7 +1006,8 @@
              ext: "tar.gz",
              revision: "1.17.2+1.0",
              module: "pandoc-" + input.target_platform,
-            configure_args: "PANDOC=" + input.get("pandoc",
"install_path") + "/pandoc/pandoc"
+            configure_args: "PANDOC=" + input.get("pandoc",
"install_path") + "/pandoc/pandoc",
+            environment_path: input.get("pandoc", "install_path") +
"/pandoc"
          },
      };


/Magnus
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: RFR: JDK-8180420 Set PATH for dot and pandoc in JIB

Erik Joelsson
Looks good.

/Erik


On 2017-05-16 11:56, Magnus Ihse Bursie wrote:

> We should set environment_path in jib-profiles.js to allow for "jib
> run" to use pandoc and dot.
>
> Bug: https://bugs.openjdk.java.net/browse/JDK-8180420
> Patch inline:
> diff --git a/common/conf/jib-profiles.js b/common/conf/jib-profiles.js
> --- a/common/conf/jib-profiles.js
> +++ b/common/conf/jib-profiles.js
> @@ -997,7 +997,8 @@
>              ext: "tar.gz",
>              revision: "2.38.0-1+1.1",
>              module: "graphviz-" + input.target_platform,
> -            configure_args: "DOT=" + input.get("graphviz",
> "install_path") + "/dot"
> +            configure_args: "DOT=" + input.get("graphviz",
> "install_path") + "/dot",
> +            environment_path: input.get("graphviz", "install_path")
>          },
>
>          pandoc: {
> @@ -1005,7 +1006,8 @@
>              ext: "tar.gz",
>              revision: "1.17.2+1.0",
>              module: "pandoc-" + input.target_platform,
> -            configure_args: "PANDOC=" + input.get("pandoc",
> "install_path") + "/pandoc/pandoc"
> +            configure_args: "PANDOC=" + input.get("pandoc",
> "install_path") + "/pandoc/pandoc",
> +            environment_path: input.get("pandoc", "install_path") +
> "/pandoc"
>          },
>      };
>
>
> /Magnus

Loading...