diff --git a/.gitea/workflows/trigger/release b/.gitea/workflows/trigger/release index 1bdb4ae..f86e7a7 100644 --- a/.gitea/workflows/trigger/release +++ b/.gitea/workflows/trigger/release @@ -1,2 +1,2 @@ 30/1/2025................. -..lgnfjfggfg \ No newline at end of file +..lgnfjfggfgx \ No newline at end of file diff --git a/scripts/add-to-custom.xq b/scripts/add-to-custom.xq index b8c2e1a..60390a3 100644 --- a/scripts/add-to-custom.xq +++ b/scripts/add-to-custom.xq @@ -1,8 +1,9 @@ import module namespace build = 'urn:quodatum:build1' at 'build.xqm'; +declare variable $base:= file:resolve-path("../",static-base-uri())=>trace("base "); declare variable $custom:= "/usr/local/basex/lib/custom/"; -declare variable $base:=file:parent(db:system()/globaloptions/dbpath/string()); + " copy.. ", diff --git a/scripts/make-fat-jar.xq b/scripts/make-fat-jar.xq index 184c75b..f023043 100644 --- a/scripts/make-fat-jar.xq +++ b/scripts/make-fat-jar.xq @@ -1,6 +1,8 @@ import module namespace build = 'urn:quodatum:build1' at 'build.xqm'; +declare variable $base:= file:resolve-path("../",static-base-uri())=>trace("base "); + declare variable $maven-urls := ( "org/apache/pdfbox/pdfbox/3.0.4/pdfbox-3.0.4.jar", "org/apache/pdfbox/pdfbox-io/3.0.4/pdfbox-io-3.0.4.jar", @@ -9,21 +11,21 @@ declare variable $maven-urls := ( ); let $config :=map { - "base": file:resolve-path("../",static-base-uri()), "manifest-jar" : "pdfbox-3.0.4.jar", "input-dir" : "jars/", "output" : "dist/pdfbox-3.0.4.fat.jar", "main-class": "org.expkg_zone58.Pdfbox3" } -let $jar-path:=file:resolve-path($config?input-dir,$config?base=>trace("base "))=>trace("jar: ") + +let $jar-path:=file:resolve-path($config?input-dir,$base)=>trace("jar: ") let $_:=build:maven-download($maven-urls,$jar-path) let $fat-jar := build:fatjar-from-folder($jar-path,$config?manifest-jar) let $fat-jar:=build:update-manifest($fat-jar, $config?main-class) let $name:=replace($config?main-class,"\.","/") || ".xqm" -let $content:=file:read-binary($config?base || "src/Pdfbox3.xqm") +let $content:=file:read-binary($base || "src/Pdfbox3.xqm") let $fat-jar:=archive:update($fat-jar, $name,$content) -let $output-file := file:resolve-path($config?output,$config?base) +let $output-file := file:resolve-path($config?output,$base) return (build:write-binary($output-file, $fat-jar), trace($output-file,"fat jar: ")) \ No newline at end of file