From 287e75f8e145ba6df758798c872b09c48be54456 Mon Sep 17 00:00:00 2001 From: Johanni Brea Date: Thu, 1 Sep 2022 14:46:04 +0200 Subject: [PATCH 1/3] make relocatable --- Project.toml | 16 +++++++++------- src/HTML_Entities.jl | 4 ++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Project.toml b/Project.toml index 2fb1508..083d666 100644 --- a/Project.toml +++ b/Project.toml @@ -1,20 +1,22 @@ name = "HTML_Entities" -desc = "Entities from HTML data tables" -authors = ["ScottPJones "] +uuid = "7693890a-d069-55fe-a829-b4a6d304f0ee" keywords = ["Entities", "HTML"] license = "MIT" -uuid = "7693890a-d069-55fe-a829-b4a6d304f0ee" +desc = "Entities from HTML data tables" +authors = ["ScottPJones "] version = "1.0.1" [deps] +RelocatableFolders = "05181044-ff0b-4ac5-8273-598c1e38db00" StrTables = "9700d1a9-a7c8-5760-9816-a99fda30bb8f" +[compat] +RelocatableFolders = "0.3" +StrTables = "1" +julia = "1" + [extras] Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [targets] test = ["Test"] - -[compat] -julia = "1" -StrTables = "1" diff --git a/src/HTML_Entities.jl b/src/HTML_Entities.jl index af13a09..a1866f4 100644 --- a/src/HTML_Entities.jl +++ b/src/HTML_Entities.jl @@ -8,7 +8,7 @@ __precompile__() * completions(str) """ module HTML_Entities -using StrTables +using StrTables, RelocatableFolders VER = UInt32(1) @@ -30,7 +30,7 @@ end function __init__() global default = - HTML_Table(StrTables.load(joinpath(@__DIR__, "../data", "html.dat"))...) + HTML_Table(StrTables.load(@path(joinpath(@__DIR__, "../data", "html.dat")))...) nothing end end # module HTML_Entities From a2630756688e07d584696d226e929c3815a71cf1 Mon Sep 17 00:00:00 2001 From: Johanni Brea Date: Thu, 1 Sep 2022 23:42:04 +0200 Subject: [PATCH 2/3] fix? --- src/HTML_Entities.jl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/HTML_Entities.jl b/src/HTML_Entities.jl index a1866f4..7da96dd 100644 --- a/src/HTML_Entities.jl +++ b/src/HTML_Entities.jl @@ -28,9 +28,10 @@ struct HTML_Table{T} <: AbstractEntityTable ind2c::Vector{UInt16} end +const DATA_PATH = @path joinpath(@__DIR__, "../data", "html.dat") + function __init__() - global default = - HTML_Table(StrTables.load(@path(joinpath(@__DIR__, "../data", "html.dat")))...) + global default = HTML_Table(StrTables.load(DATA_PATH)...) nothing end end # module HTML_Entities From 00a1ef5c543065ec4205b055c5187563a34b4282 Mon Sep 17 00:00:00 2001 From: jbrea Date: Wed, 14 Dec 2022 16:13:06 +0100 Subject: [PATCH 3/3] Update Project.toml Co-authored-by: Michael Hatherly --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 083d666..6256512 100644 --- a/Project.toml +++ b/Project.toml @@ -11,7 +11,7 @@ RelocatableFolders = "05181044-ff0b-4ac5-8273-598c1e38db00" StrTables = "9700d1a9-a7c8-5760-9816-a99fda30bb8f" [compat] -RelocatableFolders = "0.3" +RelocatableFolders = "1" StrTables = "1" julia = "1"