From 8d23bcafb3bb9b3881c9ca18ddcd45bbd3ac9234 Mon Sep 17 00:00:00 2001 From: Mustafa Date: Thu, 14 Nov 2019 12:18:30 -0500 Subject: [PATCH 1/9] Add Base internal function LIBEXECDIR --- src/Compat.jl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Compat.jl b/src/Compat.jl index e4946a6d2..7e1077149 100644 --- a/src/Compat.jl +++ b/src/Compat.jl @@ -93,6 +93,11 @@ if VERSION < v"1.4.0-DEV.329" Base.:∘(f, g, h...) = ∘(f ∘ g, h...) end +# https://github.com/JuliaLang/julia/pull/33777 +if VERSION < v"1.4.0-DEV.445" + Base.LIBEXECDIR = "" +end + include("deprecated.jl") end # module Compat From 055e960bb28542d4a8ec161d8ebbe1fd19c1a9ed Mon Sep 17 00:00:00 2001 From: Mustafa M Date: Thu, 14 Nov 2019 20:50:35 -0500 Subject: [PATCH 2/9] Update Compat.jl --- src/Compat.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Compat.jl b/src/Compat.jl index 7e1077149..fcd0bb91d 100644 --- a/src/Compat.jl +++ b/src/Compat.jl @@ -95,7 +95,7 @@ end # https://github.com/JuliaLang/julia/pull/33777 if VERSION < v"1.4.0-DEV.445" - Base.LIBEXECDIR = "" + @eval Base LIBEXECDIR = "" end include("deprecated.jl") From 6f2e6540232bb9b8ba097f61533fe36d8c2747ac Mon Sep 17 00:00:00 2001 From: Mustafa M Date: Fri, 15 Nov 2019 11:02:46 -0500 Subject: [PATCH 3/9] Update Compat.jl --- src/Compat.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Compat.jl b/src/Compat.jl index fcd0bb91d..8ab23c8a1 100644 --- a/src/Compat.jl +++ b/src/Compat.jl @@ -94,8 +94,8 @@ if VERSION < v"1.4.0-DEV.329" end # https://github.com/JuliaLang/julia/pull/33777 -if VERSION < v"1.4.0-DEV.445" - @eval Base LIBEXECDIR = "" +if VERSION < v"1.3.0-rc5 || v"1.4" <= VERSION < v"1.4.0-DEV.445 + @eval(Base, const LIBEXECDIR = "") end include("deprecated.jl") From 280d5ddf93168927ca0c726948d0ba4b7644bac6 Mon Sep 17 00:00:00 2001 From: Mustafa M Date: Fri, 15 Nov 2019 11:47:16 -0500 Subject: [PATCH 4/9] typo --- src/Compat.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Compat.jl b/src/Compat.jl index 8ab23c8a1..5188e090e 100644 --- a/src/Compat.jl +++ b/src/Compat.jl @@ -94,7 +94,7 @@ if VERSION < v"1.4.0-DEV.329" end # https://github.com/JuliaLang/julia/pull/33777 -if VERSION < v"1.3.0-rc5 || v"1.4" <= VERSION < v"1.4.0-DEV.445 +if VERSION < v"1.3.0-rc5" || v"1.4" <= VERSION < v"1.4.0-DEV.445" @eval(Base, const LIBEXECDIR = "") end From 796cabf01ab7fc49e87340a594bdb579fa80ff98 Mon Sep 17 00:00:00 2001 From: Mustafa M Date: Sat, 16 Nov 2019 11:55:18 -0500 Subject: [PATCH 5/9] News --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 20b298212..0879d2b2b 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ Currently, the `@compat` macro supports the following syntaxes: ## Module Aliases -## New functions, macros, and methods +## New functions, macros, methods, and constants * `only(x)` returns the one-and-only element of a collection `x` ([#33129]). (since Compat 2.2.0) @@ -62,6 +62,8 @@ Currently, the `@compat` macro supports the following syntaxes: * `merge` methods with one and `n` `NamedTuple`s ([#29259]). (since Compat 2.0.0) +* `Base.LIBEXECDIR` constant which emulates the relative directory of the `libexecdir` path ([#33777]). (since Compat 2.3.0) + ## Renaming ## New macros @@ -111,3 +113,4 @@ Note that you should specify the correct minimum version for `Compat` in the [#32628]: https://github.com/JuliaLang/julia/issues/32628 [#33129]: https://github.com/JuliaLang/julia/issues/33129 [#33568]: https://github.com/JuliaLang/julia/pull/33568 +[#33777]: https://github.com/JuliaLang/julia/pull/33777 From 5c41f5de098ffb915b089dd79e6fb757228e7d5e Mon Sep 17 00:00:00 2001 From: Mustafa M Date: Sat, 16 Nov 2019 12:05:24 -0500 Subject: [PATCH 6/9] Update Compat.jl --- src/Compat.jl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Compat.jl b/src/Compat.jl index 5188e090e..f59c9e2f1 100644 --- a/src/Compat.jl +++ b/src/Compat.jl @@ -94,8 +94,11 @@ if VERSION < v"1.4.0-DEV.329" end # https://github.com/JuliaLang/julia/pull/33777 -if VERSION < v"1.3.0-rc5" || v"1.4" <= VERSION < v"1.4.0-DEV.445" +if VERSION < v"1.3.0-rc5" @eval(Base, const LIBEXECDIR = "") +elseif v"1.4" <= VERSION < v"1.4.0-DEV.445" + libexecdir = Sys.iswindows() ? "..\\libexec" : "../libexec" + @eval(Base, const LIBEXECDIR = $libexecdir) end include("deprecated.jl") From c4a978ebfd138f51f57f59bbb9570d4541e42a55 Mon Sep 17 00:00:00 2001 From: Mustafa M Date: Sat, 16 Nov 2019 12:19:04 -0500 Subject: [PATCH 7/9] Fix versioning --- src/Compat.jl | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Compat.jl b/src/Compat.jl index f59c9e2f1..ed17ac581 100644 --- a/src/Compat.jl +++ b/src/Compat.jl @@ -94,11 +94,16 @@ if VERSION < v"1.4.0-DEV.329" end # https://github.com/JuliaLang/julia/pull/33777 -if VERSION < v"1.3.0-rc5" +if v"1.4.0-DEV.172" <= VERSION < v"1.4.0-DEV.445" + libexecdir = Sys.iswindows() ? "..\\libexec" : "../libexec" + @eval(Base, const LIBEXECDIR = $libexecdir) +elseif v"1.4" <= VERSION < v"1.4.0-DEV.172" @eval(Base, const LIBEXECDIR = "") -elseif v"1.4" <= VERSION < v"1.4.0-DEV.445" +elseif v"1.3.0-rc3" <= VERSION <= v"1.3.0-rc5" libexecdir = Sys.iswindows() ? "..\\libexec" : "../libexec" @eval(Base, const LIBEXECDIR = $libexecdir) +elseif VERSION < v"1.3.0-rc3" + @eval(Base, const LIBEXECDIR = "") end include("deprecated.jl") From 5a01174dd768483a733e7ecc7d37283aca86dd73 Mon Sep 17 00:00:00 2001 From: Mustafa M Date: Sat, 16 Nov 2019 12:29:22 -0500 Subject: [PATCH 8/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0879d2b2b..b2897c2d9 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ Currently, the `@compat` macro supports the following syntaxes: * `merge` methods with one and `n` `NamedTuple`s ([#29259]). (since Compat 2.0.0) -* `Base.LIBEXECDIR` constant which emulates the relative directory of the `libexecdir` path ([#33777]). (since Compat 2.3.0) +* `Base.LIBEXECDIR` constant which emulates the relative directory of `libexec` path ([#33777]). (since Compat 2.3.0) ## Renaming From 99c17ac64eeb392c620576de91eb90187e46389d Mon Sep 17 00:00:00 2001 From: Mustafa M Date: Sat, 16 Nov 2019 14:27:15 -0500 Subject: [PATCH 9/9] Update Compat.jl --- src/Compat.jl | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Compat.jl b/src/Compat.jl index ed17ac581..29513b640 100644 --- a/src/Compat.jl +++ b/src/Compat.jl @@ -95,13 +95,11 @@ end # https://github.com/JuliaLang/julia/pull/33777 if v"1.4.0-DEV.172" <= VERSION < v"1.4.0-DEV.445" - libexecdir = Sys.iswindows() ? "..\\libexec" : "../libexec" - @eval(Base, const LIBEXECDIR = $libexecdir) + @eval(Base, const LIBEXECDIR = $(joinpath("..", "libexec"))) elseif v"1.4" <= VERSION < v"1.4.0-DEV.172" @eval(Base, const LIBEXECDIR = "") elseif v"1.3.0-rc3" <= VERSION <= v"1.3.0-rc5" - libexecdir = Sys.iswindows() ? "..\\libexec" : "../libexec" - @eval(Base, const LIBEXECDIR = $libexecdir) + @eval(Base, const LIBEXECDIR = $(joinpath("..", "libexec"))) elseif VERSION < v"1.3.0-rc3" @eval(Base, const LIBEXECDIR = "") end