This is an automated email from the ASF dual-hosted git repository.
davidb pushed a commit to branch flatcp
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
The following commit(s) were added to refs/heads/flatcp by this push:
new d721e6f4 build-native
d721e6f4 is described below
commit d721e6f43021d23dc61e50558d0d91fdd5f20dea
Author: David Bosschaert <[email protected]>
AuthorDate: Tue Sep 17 15:31:39 2024 +0200
build-native
---
sling-mini/{build_nodocker.sh => build_native copy.sh} | 5 +++--
sling-mini/{build_nodocker.sh => build_native.sh} | 11 ++++++-----
sling-mini/build_nativefullweb.sh | 3 +++
.../{launch-nativeoffline.sh => launch-nativefullweb.sh} | 2 +-
sling-mini/launch-nativeoffline.sh | 2 +-
sling-mini/pom.xml | 7 +++++++
sling-mini/src/main/features/addons/webconsole.json | 7 +++++++
7 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/sling-mini/build_nodocker.sh b/sling-mini/build_native copy.sh
similarity index 86%
copy from sling-mini/build_nodocker.sh
copy to sling-mini/build_native copy.sh
index 55db5076..fd9bdc1f 100755
--- a/sling-mini/build_nodocker.sh
+++ b/sling-mini/build_native copy.sh
@@ -15,15 +15,16 @@
artifacts/org/apache/sling/org.apache.sling.feature/1.3.0/org.apache.sling.featu
artifacts/org/apache/felix/org.apache.felix.cm.json/1.0.6/org.apache.felix.cm.json-1.0.6.jar:\
artifacts/commons-cli/commons-cli/1.4/commons-cli-1.4.jar:\
artifacts/org/apache/felix/org.apache.felix.framework/7.0.5/org.apache.felix.framework-7.0.5.jar:\
-/Users/david/.m2/repository/org/apache/sling/org.apache.sling.commons.johnzon/1.2.16/org.apache.sling.commons.johnzon-1.2.16.jar:\
+artifacts/org/apache/sling/org.apache.sling.commons.johnzon/1.2.16/org.apache.sling.commons.johnzon-1.2.16.jar:\
artifacts/org/apache/commons/commons-text/1.10.0/commons-text-1.10.0.jar:\
atomos-config/app.substrate.jar" \
org.apache.sling.feature.launcher.impl.Main \
--no-fallback --enable-https --enable-http \
--o aem_native "--gc=epsilon" "-march=native" \
+-o aem_native "--gc=epsilon" \
"$@"
popd
#--initialize-at-build-time=slingxss.com.google.common \
# --pgo=../default.iprof --no-fallback --enable-https --enable-http \
+# -o aem_native "--gc=epsilon" "-march=native" \
diff --git a/sling-mini/build_nodocker.sh b/sling-mini/build_native.sh
similarity index 79%
rename from sling-mini/build_nodocker.sh
rename to sling-mini/build_native.sh
index 55db5076..29438bf7 100755
--- a/sling-mini/build_nodocker.sh
+++ b/sling-mini/build_native.sh
@@ -4,26 +4,27 @@ pushd target
ATOMOS_CLASSPATH=""
ATOMOS_INIT=""
-# source ./atomos-config/atomos_init.sh
native-image --verbose \
-cp
"artifacts/org/apache/sling/org.apache.sling.feature.launcher.atomos/0.0.1-SNAPSHOT/org.apache.sling.feature.launcher.atomos-0.0.1-SNAPSHOT.jar:\
artifacts/org/apache/sling/org.apache.sling.feature.launcher/1.2.4/org.apache.sling.feature.launcher-1.2.4.jar:\
artifacts/org/apache/felix/org.apache.felix.atomos/1.0.1-SNAPSHOT/org.apache.felix.atomos-1.0.1-SNAPSHOT.jar:\
+artifacts/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar:\
artifacts/org/slf4j/slf4j-simple/1.7.25/slf4j-simple-1.7.25.jar:\
artifacts/org/apache/sling/org.apache.sling.feature/1.3.0/org.apache.sling.feature-1.3.0.jar:\
artifacts/org/apache/felix/org.apache.felix.cm.json/1.0.6/org.apache.felix.cm.json-1.0.6.jar:\
artifacts/commons-cli/commons-cli/1.4/commons-cli-1.4.jar:\
artifacts/org/apache/felix/org.apache.felix.framework/7.0.5/org.apache.felix.framework-7.0.5.jar:\
-/Users/david/.m2/repository/org/apache/sling/org.apache.sling.commons.johnzon/1.2.16/org.apache.sling.commons.johnzon-1.2.16.jar:\
+artifacts/org/apache/sling/org.apache.sling.commons.johnzon/1.2.16/org.apache.sling.commons.johnzon-1.2.16.jar:\
artifacts/org/apache/commons/commons-text/1.10.0/commons-text-1.10.0.jar:\
atomos-config/app.substrate.jar" \
org.apache.sling.feature.launcher.impl.Main \
---no-fallback --enable-https --enable-http \
+-O3 --no-fallback --enable-https --enable-http \
-o aem_native "--gc=epsilon" "-march=native" \
+--pgo=../default.iprof \
"$@"
-popd
-#--initialize-at-build-time=slingxss.com.google.common \
+popd
# --pgo=../default.iprof --no-fallback --enable-https --enable-http \
+# -o aem_native "--gc=epsilon" "-march=native" \
diff --git a/sling-mini/build_nativefullweb.sh
b/sling-mini/build_nativefullweb.sh
new file mode 100755
index 00000000..59f9216a
--- /dev/null
+++ b/sling-mini/build_nativefullweb.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+ ./build_native.sh
--initialize-at-run-time=org.apache.felix.webconsole.internal.NavigationRenderer
diff --git a/sling-mini/launch-nativeoffline.sh
b/sling-mini/launch-nativefullweb.sh
similarity index 63%
copy from sling-mini/launch-nativeoffline.sh
copy to sling-mini/launch-nativefullweb.sh
index 2f13fd53..9668c7b5 100755
--- a/sling-mini/launch-nativeoffline.sh
+++ b/sling-mini/launch-nativefullweb.sh
@@ -1,4 +1,4 @@
pushd target
rm -rf launcher
-./aem_native -f
file:///Users/david/clones/sling-whiteboard_2/sling-mini/target/slingfeature-tmp/feature-offlineapp.json
+./aem_native -f
file:///Users/david/clones/sling-whiteboard_2/sling-mini/target/slingfeature-tmp/feature-fullwebapp.json
popd
diff --git a/sling-mini/launch-nativeoffline.sh
b/sling-mini/launch-nativeoffline.sh
index 2f13fd53..049537ae 100755
--- a/sling-mini/launch-nativeoffline.sh
+++ b/sling-mini/launch-nativeoffline.sh
@@ -1,4 +1,4 @@
pushd target
rm -rf launcher
-./aem_native -f
file:///Users/david/clones/sling-whiteboard_2/sling-mini/target/slingfeature-tmp/feature-offlineapp.json
+time ./aem_native -f
file:///Users/david/clones/sling-whiteboard_2/sling-mini/target/slingfeature-tmp/feature-offlineapp.json
popd
diff --git a/sling-mini/pom.xml b/sling-mini/pom.xml
index 6e7852fe..2b1b47b2 100644
--- a/sling-mini/pom.xml
+++ b/sling-mini/pom.xml
@@ -177,6 +177,13 @@
<artifactId>commons-cli</artifactId>
<version>1.4</version>
</dependency>
+
+ <!-- TODO can we get rid of this one?
-->
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+
<artifactId>org.apache.sling.commons.johnzon</artifactId>
+ <version>1.2.16</version>
+ </dependency>
</embedArtifacts>
</repository>
</repositories>
diff --git a/sling-mini/src/main/features/addons/webconsole.json
b/sling-mini/src/main/features/addons/webconsole.json
index 77d628ad..7062fb0d 100644
--- a/sling-mini/src/main/features/addons/webconsole.json
+++ b/sling-mini/src/main/features/addons/webconsole.json
@@ -37,4 +37,11 @@
"start-order":"20"
}
]
+ /*
+ "atomos-config:JSON|false": {
+ "initialize-at-run-time": [
+ "org.apache.felix.webconsole.internal"
+ ]
+ }
+ */
}
\ No newline at end of file
