Unverified Commit b3a03dae authored by Sébastien Villemot's avatar Sébastien Villemot
Browse files

Use preprocessor binaries compiled through Gitlab CI

Update preprocessor binary to commit e6194afd7ba64d053f167ad48502b36766f0c75c.
parent cd383511
[[dynare-preprocessor]]
os = "linux"
arch = "i686"
libc = "glibc"
git-tree-sha1 = "550ce289667f6c2d742207fa5ac2e942e80b532f"
[[dynare-preprocessor.download]]
sha256 = "35d314f51fdf538a8d3bb6e4464b686631feab1b18a46d163fcccd11799a2380"
url = "https://www.dynare.org/preprocessor/e6194afd7ba64d053f167ad48502b36766f0c75c/linux-i686/dynare-preprocessor.tar.gz"
[[dynare-preprocessor]]
os = "linux"
arch = "x86_64"
libc = "glibc"
git-tree-sha1 = "7531dc8c0a1a05d1d6a60cd23e8f4f0a7405f848"
[[dynare-preprocessor.download]]
sha256 = "f46a44c3acb1163a263304eb40e0c67fde2fd7f3089ec8a4867b159498a31c30"
url = "https://www.dynare.org/preprocessor/e6194afd7ba64d053f167ad48502b36766f0c75c/linux-x86_64/dynare-preprocessor.tar.gz"
[[dynare-preprocessor]]
os = "macos"
arch = "x86_64"
git-tree-sha1 = "ed6e53c24af65054a8864542ea6cbeefcd6643db"
[[dynare-preprocessor.download]]
sha256 = "5c96940063d63ef7c3559b7889164ee688169128e1deaddc8ab0b0960a267209"
url = "https://www.dynare.org/preprocessor/e6194afd7ba64d053f167ad48502b36766f0c75c/macos-x86_64/dynare-preprocessor.tar.gz"
[[dynare-preprocessor]]
os = "windows"
arch = "i686"
git-tree-sha1 = "2b868d5e28851834af0bb98878110369f4379f7f"
[[dynare-preprocessor.download]]
sha256 = "2a6c568f5fb30414a29c98049f77b371c26963386a4f584071992f4f2fa8ff13"
url = "https://www.dynare.org/preprocessor/e6194afd7ba64d053f167ad48502b36766f0c75c/windows-i686/dynare-preprocessor.tar.gz"
[[dynare-preprocessor]]
os = "windows"
arch = "x86_64"
git-tree-sha1 = "220187224ff6c329f8d311b1a3aeff7024ed67e3"
[[dynare-preprocessor.download]]
sha256 = "148455fb0a44b6579dfc6d5664d56c95cac28b14ee2932f97d6dc9e6cda0564c"
url = "https://www.dynare.org/preprocessor/e6194afd7ba64d053f167ad48502b36766f0c75c/windows-x86_64/dynare-preprocessor.tar.gz"
...@@ -180,14 +180,6 @@ git-tree-sha1 = "9d4f64f79012636741cf01133158a54b24924c32" ...@@ -180,14 +180,6 @@ git-tree-sha1 = "9d4f64f79012636741cf01133158a54b24924c32"
uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
version = "0.8.4" version = "0.8.4"
[[Dynare_preprocessor_jll]]
deps = ["Libdl", "Pkg"]
git-tree-sha1 = "0fd63d481f2d53f985fa7d0e41a745b9c8d7d48e"
repo-rev = "master"
repo-url = "https://github.com/MichelJuillard/Dynare_preprocessor_jll.jl.git"
uuid = "8bf4d177-eddb-5a20-998e-55ecc2283fe8"
version = "4.7.0-2+0"
[[EarCut_jll]] [[EarCut_jll]]
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
git-tree-sha1 = "92d8f9f208637e8d2d28c664051a00569c01493d" git-tree-sha1 = "92d8f9f208637e8d2d28c664051a00569c01493d"
......
...@@ -7,7 +7,6 @@ version = "0.1.2" ...@@ -7,7 +7,6 @@ version = "0.1.2"
CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b" CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a" Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
Dynare_preprocessor_jll = "8bf4d177-eddb-5a20-998e-55ecc2283fe8"
FastLapackInterface = "29a986be-02c6-4525-aec4-84b980013641" FastLapackInterface = "29a986be-02c6-4525-aec4-84b980013641"
GR = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71" GR = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71"
Gadfly = "c91e804a-d5a3-530f-b6f0-dfbca275c004" Gadfly = "c91e804a-d5a3-530f-b6f0-dfbca275c004"
...@@ -17,6 +16,7 @@ KalmanFilterTools = "ec016732-9331-11e9-305f-d53cb440b85a" ...@@ -17,6 +16,7 @@ KalmanFilterTools = "ec016732-9331-11e9-305f-d53cb440b85a"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
LinearRationalExpectations = "45f42fbc-210c-4ecc-9452-59ec793b9bfd" LinearRationalExpectations = "45f42fbc-210c-4ecc-9452-59ec793b9bfd"
Periods = "0c1d1a06-9168-427d-90e3-b4d73349562f" Periods = "0c1d1a06-9168-427d-90e3-b4d73349562f"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
PolynomialMatrixEquations = "4f9d485d-518f-41ed-81c8-372cd804c93b" PolynomialMatrixEquations = "4f9d485d-518f-41ed-81c8-372cd804c93b"
PrettyTables = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d" PrettyTables = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d"
......
...@@ -17,5 +17,3 @@ or, interactively, ...@@ -17,5 +17,3 @@ or, interactively,
]add https://git.dynare.org/julia-packages/linearrationalexpectations.jl.git ]add https://git.dynare.org/julia-packages/linearrationalexpectations.jl.git
]add https://git.dynare.org/julia-packages/dynare.jl.git ]add https://git.dynare.org/julia-packages/dynare.jl.git
``` ```
Until a proper ``build.jl`` is added, one must confiure DYNARE_ROOT in ``./src/parser/DynarePreporcessor.jl`` to point to the installation of a current unstable version of Dynare or Dynare preprocessor
using Dynare_preprocessor_jll using Pkg.Artifacts
function dynare_preprocess(modfilename, args) function dynare_preprocess(modfilename, args)
dynare_args = [basename(modfilename), "language=julia", "output=third", "json=compute"] dynare_args = [basename(modfilename), "language=julia", "output=third", "json=compute"]
...@@ -20,10 +20,11 @@ function run_dynare(modfilename, dynare_args) ...@@ -20,10 +20,11 @@ function run_dynare(modfilename, dynare_args)
current_directory = pwd() current_directory = pwd()
cd(directory) cd(directory)
end end
dynare_m() do dynare_m_path
run(`$dynare_m_path $dynare_args`) dynare_preprocessor_path = joinpath(artifact"dynare-preprocessor", "dynare-preprocessor")
end run(`$dynare_preprocessor_path $dynare_args`)
if length(directory) > 0 if length(directory) > 0
cd(current_directory) cd(current_directory)
end end
end end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment