From 9ba36e463b814c37dfd45530355c25859420b9e6 Mon Sep 17 00:00:00 2001 From: Anders Blomdell <anders.blomdell@control.lth.se> Date: Mon, 24 Aug 2020 18:59:09 +0200 Subject: [PATCH] Add julia .toml template --- adaptors/julia/Project.toml.template | 4 +++ moberg.spec.template | 37 +++++++++++++++++++++++++--- 2 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 adaptors/julia/Project.toml.template diff --git a/adaptors/julia/Project.toml.template b/adaptors/julia/Project.toml.template new file mode 100644 index 0000000..5876c36 --- /dev/null +++ b/adaptors/julia/Project.toml.template @@ -0,0 +1,4 @@ +name = "MobergIO" +uuid = "9bdc2bb6-e40d-4944-bd5f-2bf890d3f651" +authors = ["Anders Blomdell <anders.blomdell@control.lth.se>"] +version = "<<<VERSION>>>" diff --git a/moberg.spec.template b/moberg.spec.template index 2934b29..a23250d 100644 --- a/moberg.spec.template +++ b/moberg.spec.template @@ -17,6 +17,7 @@ BuildRequires: java-devel BuildRequires: python2-devel BuildRequires: python3-devel BuildRequires: julia +BuildRequires: git %description @@ -70,6 +71,7 @@ Python3 support files for %{name} %package julia Summary: Julia support files for %{name} Requires: %{name} = %{version}-%{release} +Requires: julia %description julia Julia support files for %{name} @@ -136,8 +138,37 @@ cp adaptors/matlab/Makefile.mex ${RPM_BUILD_ROOT}/opt/matlab/src/moberg/Makefile ) # Julia -mkdir -p ${RPM_BUILD_ROOT}/opt/julia/packages/MobergIO/src -cp adaptors/julia/*.jl ${RPM_BUILD_ROOT}/opt/julia/packages/MobergIO/src +mkdir -p ${RPM_BUILD_ROOT}/opt/julia/local/MobergIO/src +cp adaptors/julia/*.jl ${RPM_BUILD_ROOT}/opt/julia/local/MobergIO/src +cat adaptors/julia/Project.toml.template \ +| sed -e 's/<<<VERSION>>>/%{version}/' \ +> ${RPM_BUILD_ROOT}/opt/julia/local/MobergIO/Project.toml +( + cd ${RPM_BUILD_ROOT}/opt/julia/local/MobergIO + git init + git add Project.toml src/*.jl + git commit -m 'Local version of moberg __MOBERG_VERSION__' + git tag __MOBERG_VERSION__ +) + +%post julia +set -x +export JULIA_LOAD_PATH=/opt/julia: +export JULIA_DEPOT_PATH=/opt/julia: +cat<<EOF|julia +import Pkg +Pkg.add(path="/opt/julia/local/MobergIO/") +Pkg.precompile() +EOF + +%postun julia +set -x +export JULIA_LOAD_PATH=/opt/julia: +export JULIA_DEPOT_PATH=/opt/julia: +cat<<EOF|julia +import Pkg +Pkg.rm("MobergIO") +EOF %files @@ -178,4 +209,4 @@ cp adaptors/julia/*.jl ${RPM_BUILD_ROOT}/opt/julia/packages/MobergIO/src %files julia %defattr(-,root,root,-) -/opt/julia/packages/MobergIO \ No newline at end of file +/opt/julia/local/MobergIO -- GitLab