From 5f4a314e38abf6954528822ab503af16afe8fd64 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 11 Jul 2025 20:27:48 +0200 Subject: [PATCH] Add woodstox and stax2-api to dola-generator realm --- ...e-unique-namespace-for-bootstrapping.patch | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/patches/dola/0001-Use-unique-namespace-for-bootstrapping.patch b/patches/dola/0001-Use-unique-namespace-for-bootstrapping.patch index f1d593e3..8bb1fc5f 100644 --- a/patches/dola/0001-Use-unique-namespace-for-bootstrapping.patch +++ b/patches/dola/0001-Use-unique-namespace-for-bootstrapping.patch @@ -1,4 +1,4 @@ -From 1848d8360cbd5affef98fa7619f1c5499b791034 Mon Sep 17 00:00:00 2001 +From 317e281e2fc5331c24ebf412f23372ce18c5fe75 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 13 Jun 2025 15:49:34 +0200 Subject: [PATCH] Use unique namespace for bootstrapping @@ -10,20 +10,20 @@ Forwarded: not-needed --- dola-bsx-api/src/main/conf/dola-bsx-api.conf | 2 +- dola-bsx/src/main/conf/dola-bsx.conf | 2 +- - dola-bsx/src/main/lua/dola-bsx.lua | 6 ++--- + dola-bsx/src/main/lua/dola-bsx.lua | 6 ++-- dola-bsx/src/main/rpm/macros.dola-bsx | 4 +-- - dola-dbs/src/main/conf/dola-dbs.conf | 6 ++--- - .../io/kojan/dola/imperator/Imperator.java | 12 ++++----- + dola-dbs/src/main/conf/dola-dbs.conf | 6 ++-- + .../io/kojan/dola/imperator/Imperator.java | 12 ++++---- dola-dbs/src/main/lua/dola-dbs.lua | 2 +- dola-dbs/src/main/rpm/macros.dola-dbs | 8 +++--- - .../src/main/conf/dola-generator.conf | 26 +++++++++---------- + .../src/main/conf/dola-generator.conf | 28 ++++++++++--------- .../generator/stub/CompoundGenerator.java | 8 +++--- .../dola/generator/stub/CompoundHook.java | 4 +-- .../src/main/lua/dola-generator.lua | 2 +- dola-generator/src/main/rpm/dolagen.attr | 8 +++--- .../src/main/rpm/macros.dola-generator | 8 +++--- .../src/main/rpm/macros.dola-generator-etc | 2 +- - 15 files changed, 50 insertions(+), 50 deletions(-) + 15 files changed, 52 insertions(+), 50 deletions(-) diff --git a/dola-bsx-api/src/main/conf/dola-bsx-api.conf b/dola-bsx-api/src/main/conf/dola-bsx-api.conf index c4c3159..603aa83 100644 @@ -155,10 +155,10 @@ index f0331de..d389903 100644 +%buildsystem_maven_build(-) %{lua:(require "javapackages-bootstrap-dola-dbs").build()} +%buildsystem_maven_install(-) %{lua:(require "javapackages-bootstrap-dola-dbs").install()} diff --git a/dola-generator/src/main/conf/dola-generator.conf b/dola-generator/src/main/conf/dola-generator.conf -index 1f3c286..505a40e 100644 +index 1f3c286..0f114b4 100644 --- a/dola-generator/src/main/conf/dola-generator.conf +++ b/dola-generator/src/main/conf/dola-generator.conf -@@ -1,15 +1,15 @@ +@@ -1,15 +1,17 @@ [Realm:generator] import io.kojan.dola.rpm from Realm:bsx-api -load /usr/share/java/dola/dola-generator.jar @@ -174,7 +174,6 @@ index 1f3c286..505a40e 100644 -load /usr/share/java/maven4/maven-xml-4.0.0-rc-3.jar -load /usr/share/java/maven4/maven-support-4.0.0-rc-3.jar -load /usr/share/java/plexus-utils4/plexus-utils-4.0.2.jar -+load /usr/share/javapackages-bootstrap/dola-generator.jar +load /usr/share/javapackages-bootstrap/asm.jar +load /usr/share/javapackages-bootstrap/commons-compress.jar +load /usr/share/javapackages-bootstrap/commons-io.jar @@ -187,6 +186,9 @@ index 1f3c286..505a40e 100644 +load /usr/share/javapackages-bootstrap/maven-xml-4.0.0-rc-4.jar +load /usr/share/javapackages-bootstrap/maven-support-4.0.0-rc-4.jar +load /usr/share/javapackages-bootstrap/plexus-utils-4.0.2.jar ++load /usr/share/javapackages-bootstrap/woodstox-core.jar ++load /usr/share/javapackages-bootstrap/stax2-api.jar ++load /usr/share/javapackages-bootstrap/dola-generator.jar diff --git a/dola-generator/src/main/java/io/kojan/dola/generator/stub/CompoundGenerator.java b/dola-generator/src/main/java/io/kojan/dola/generator/stub/CompoundGenerator.java index 04641da..1f47f7c 100644 --- a/dola-generator/src/main/java/io/kojan/dola/generator/stub/CompoundGenerator.java