You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2022/02/01 21:17:58 UTC
[hop] branch master updated: HOP-3708: add arm swt for linux
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hop.git
The following commit(s) were added to refs/heads/master by this push:
new 58dcae0 HOP-3708: add arm swt for linux
new 4af90f4 Merge pull request #1320 from hansva/master
58dcae0 is described below
commit 58dcae01c9f57f8a425616bbcc0ef74e4966e90c
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Tue Feb 1 22:17:22 2022 +0100
HOP-3708: add arm swt for linux
---
assemblies/client/pom.xml | 13 +++++++++++++
assemblies/client/src/assembly/assembly.xml | 9 +++++++++
assemblies/static/src/main/resources/hop-conf.sh | 8 ++++++--
assemblies/static/src/main/resources/hop-gui.sh | 8 ++++++--
assemblies/static/src/main/resources/hop-import.sh | 8 ++++++--
assemblies/static/src/main/resources/hop-run.sh | 8 ++++++--
assemblies/static/src/main/resources/hop-search.sh | 8 ++++++--
assemblies/static/src/main/resources/hop-server.sh | 8 ++++++--
assemblies/static/src/main/resources/hop-translator.sh | 8 ++++++--
9 files changed, 64 insertions(+), 14 deletions(-)
diff --git a/assemblies/client/pom.xml b/assemblies/client/pom.xml
index 3c92ce7..1c6736e 100644
--- a/assemblies/client/pom.xml
+++ b/assemblies/client/pom.xml
@@ -36,6 +36,8 @@
<!-- swt -->
<org.eclipse.swt.gtk.linux.x86_64.version>${org.eclipse.platform.version}
</org.eclipse.swt.gtk.linux.x86_64.version>
+ <org.eclipse.swt.gtk.linux.aarch64.version>${org.eclipse.platform.version}
+ </org.eclipse.swt.gtk.linux.aarch64.version>
<org.eclipse.swt.win32.win32.x86_64.version>${org.eclipse.platform.version}
</org.eclipse.swt.win32.win32.x86_64.version>
<org.eclipse.swt.cocoa.macosx.x86_64.version>${org.eclipse.platform.version}
@@ -216,6 +218,17 @@
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.swt.gtk.linux.aarch64</artifactId>
+ <version>${org.eclipse.swt.gtk.linux.aarch64.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.swt.win32.win32.x86_64</artifactId>
<version>${org.eclipse.swt.win32.win32.x86_64.version}</version>
<exclusions>
diff --git a/assemblies/client/src/assembly/assembly.xml b/assemblies/client/src/assembly/assembly.xml
index 61b1df6..d40b5b7 100644
--- a/assemblies/client/src/assembly/assembly.xml
+++ b/assemblies/client/src/assembly/assembly.xml
@@ -56,6 +56,15 @@
</dependencySet>
<dependencySet>
<includes>
+ <include>org.eclipse.platform:*.gtk.linux.aarch64</include>
+ </includes>
+ <outputDirectory>libswt/linux/arm64</outputDirectory>
+ <outputFileNameMapping>swt.jar</outputFileNameMapping>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ <dependencySet>
+ <includes>
<include>org.eclipse.platform:*.win32.x86_64</include>
</includes>
<outputDirectory>libswt/win64</outputDirectory>
diff --git a/assemblies/static/src/main/resources/hop-conf.sh b/assemblies/static/src/main/resources/hop-conf.sh
index 7ebeeae..76e0c37 100755
--- a/assemblies/static/src/main/resources/hop-conf.sh
+++ b/assemblies/static/src/main/resources/hop-conf.sh
@@ -65,13 +65,17 @@ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_PLATFORM_RUNTIME=Conf -DHOP_AUTO_CREATE_CONFIG
case $(uname -s) in
Linux)
- CLASSPATH="lib/*:libswt/linux/$(uname -m)/*"
+ if [[ $(java -XshowSettings:properties -version 2>&1| grep "os.arch = ") == *"aarch64"* ]]; then
+ CLASSPATH="lib/*:libswt/linux/arm64/*"
+ else
+ CLASSPATH="lib/*:libswt/linux/$(uname -m)/*"
+ fi
;;
Darwin)
if [[ $(java -XshowSettings:properties -version 2>&1| grep "os.arch = ") == *"aarch64"* ]]; then
CLASSPATH="lib/*:libswt/osx/arm64/*"
else
- CLASSPATH="lib/*:libswt/osx/x86_64/*"
+ CLASSPATH="lib/*:libswt/osx/x86_64/*"
fi
HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
;;
diff --git a/assemblies/static/src/main/resources/hop-gui.sh b/assemblies/static/src/main/resources/hop-gui.sh
index 40ee016..845b98f 100755
--- a/assemblies/static/src/main/resources/hop-gui.sh
+++ b/assemblies/static/src/main/resources/hop-gui.sh
@@ -65,13 +65,17 @@ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_PLATFORM_RUNTIME=GUI -DHOP_AUTO_CREATE_CONFIG=
case $(uname -s) in
Linux)
- CLASSPATH="lib/*:libswt/linux/$(uname -m)/*"
+ if [[ $(java -XshowSettings:properties -version 2>&1| grep "os.arch = ") == *"aarch64"* ]]; then
+ CLASSPATH="lib/*:libswt/linux/arm64/*"
+ else
+ CLASSPATH="lib/*:libswt/linux/$(uname -m)/*"
+ fi
;;
Darwin)
if [[ $(java -XshowSettings:properties -version 2>&1| grep "os.arch = ") == *"aarch64"* ]]; then
CLASSPATH="lib/*:libswt/osx/arm64/*"
else
- CLASSPATH="lib/*:libswt/osx/x86_64/*"
+ CLASSPATH="lib/*:libswt/osx/x86_64/*"
fi
HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
;;
diff --git a/assemblies/static/src/main/resources/hop-import.sh b/assemblies/static/src/main/resources/hop-import.sh
index 01d6e21..0d265d8 100755
--- a/assemblies/static/src/main/resources/hop-import.sh
+++ b/assemblies/static/src/main/resources/hop-import.sh
@@ -64,13 +64,17 @@ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_PLATFORM_RUNTIME=Import -DHOP_AUTO_CREATE_CONF
case $(uname -s) in
Linux)
- CLASSPATH="lib/*:libswt/linux/$(uname -m)/*"
+ if [[ $(java -XshowSettings:properties -version 2>&1| grep "os.arch = ") == *"aarch64"* ]]; then
+ CLASSPATH="lib/*:libswt/linux/arm64/*"
+ else
+ CLASSPATH="lib/*:libswt/linux/$(uname -m)/*"
+ fi
;;
Darwin)
if [[ $(java -XshowSettings:properties -version 2>&1| grep "os.arch = ") == *"aarch64"* ]]; then
CLASSPATH="lib/*:libswt/osx/arm64/*"
else
- CLASSPATH="lib/*:libswt/osx/x86_64/*"
+ CLASSPATH="lib/*:libswt/osx/x86_64/*"
fi
HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
;;
diff --git a/assemblies/static/src/main/resources/hop-run.sh b/assemblies/static/src/main/resources/hop-run.sh
index 5abaf6d..1480089 100755
--- a/assemblies/static/src/main/resources/hop-run.sh
+++ b/assemblies/static/src/main/resources/hop-run.sh
@@ -65,13 +65,17 @@ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_PLATFORM_RUNTIME=Run -DHOP_AUTO_CREATE_CONFIG=
case $(uname -s) in
Linux)
- CLASSPATH="lib/*:libswt/linux/$(uname -m)/*"
+ if [[ $(java -XshowSettings:properties -version 2>&1| grep "os.arch = ") == *"aarch64"* ]]; then
+ CLASSPATH="lib/*:libswt/linux/arm64/*"
+ else
+ CLASSPATH="lib/*:libswt/linux/$(uname -m)/*"
+ fi
;;
Darwin)
if [[ $(java -XshowSettings:properties -version 2>&1| grep "os.arch = ") == *"aarch64"* ]]; then
CLASSPATH="lib/*:libswt/osx/arm64/*"
else
- CLASSPATH="lib/*:libswt/osx/x86_64/*"
+ CLASSPATH="lib/*:libswt/osx/x86_64/*"
fi
HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
;;
diff --git a/assemblies/static/src/main/resources/hop-search.sh b/assemblies/static/src/main/resources/hop-search.sh
index fb039f7..12eb2cf 100755
--- a/assemblies/static/src/main/resources/hop-search.sh
+++ b/assemblies/static/src/main/resources/hop-search.sh
@@ -65,13 +65,17 @@ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_PLATFORM_RUNTIME=Search -DHOP_AUTO_CREATE_CONF
case $(uname -s) in
Linux)
- CLASSPATH="lib/*:libswt/linux/$(uname -m)/*"
+ if [[ $(java -XshowSettings:properties -version 2>&1| grep "os.arch = ") == *"aarch64"* ]]; then
+ CLASSPATH="lib/*:libswt/linux/arm64/*"
+ else
+ CLASSPATH="lib/*:libswt/linux/$(uname -m)/*"
+ fi
;;
Darwin)
if [[ $(java -XshowSettings:properties -version 2>&1| grep "os.arch = ") == *"aarch64"* ]]; then
CLASSPATH="lib/*:libswt/osx/arm64/*"
else
- CLASSPATH="lib/*:libswt/osx/x86_64/*"
+ CLASSPATH="lib/*:libswt/osx/x86_64/*"
fi
HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
;;
diff --git a/assemblies/static/src/main/resources/hop-server.sh b/assemblies/static/src/main/resources/hop-server.sh
index e6c5e65..b27ca10 100755
--- a/assemblies/static/src/main/resources/hop-server.sh
+++ b/assemblies/static/src/main/resources/hop-server.sh
@@ -65,13 +65,17 @@ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_PLATFORM_RUNTIME=Server -DHOP_AUTO_CREATE_CONF
case $(uname -s) in
Linux)
- CLASSPATH="lib/*:libswt/linux/$(uname -m)/*"
+ if [[ $(java -XshowSettings:properties -version 2>&1| grep "os.arch = ") == *"aarch64"* ]]; then
+ CLASSPATH="lib/*:libswt/linux/arm64/*"
+ else
+ CLASSPATH="lib/*:libswt/linux/$(uname -m)/*"
+ fi
;;
Darwin)
if [[ $(java -XshowSettings:properties -version 2>&1| grep "os.arch = ") == *"aarch64"* ]]; then
CLASSPATH="lib/*:libswt/osx/arm64/*"
else
- CLASSPATH="lib/*:libswt/osx/x86_64/*"
+ CLASSPATH="lib/*:libswt/osx/x86_64/*"
fi
HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
;;
diff --git a/assemblies/static/src/main/resources/hop-translator.sh b/assemblies/static/src/main/resources/hop-translator.sh
index 0f298a3..f54303d 100755
--- a/assemblies/static/src/main/resources/hop-translator.sh
+++ b/assemblies/static/src/main/resources/hop-translator.sh
@@ -55,13 +55,17 @@ HOP_OPTIONS="${HOP_OPTIONS} -DHOP_PLATFORM_RUNTIME=Translator -DHOP_AUTO_CREATE_
case $(uname -s) in
Linux)
- CLASSPATH="lib/*:libswt/linux/$(uname -m)/*"
+ if [[ $(java -XshowSettings:properties -version 2>&1| grep "os.arch = ") == *"aarch64"* ]]; then
+ CLASSPATH="lib/*:libswt/linux/arm64/*"
+ else
+ CLASSPATH="lib/*:libswt/linux/$(uname -m)/*"
+ fi
;;
Darwin)
if [[ $(java -XshowSettings:properties -version 2>&1| grep "os.arch = ") == *"aarch64"* ]]; then
CLASSPATH="lib/*:libswt/osx/arm64/*"
else
- CLASSPATH="lib/*:libswt/osx/x86_64/*"
+ CLASSPATH="lib/*:libswt/osx/x86_64/*"
fi
HOP_OPTIONS="${HOP_OPTIONS} -XstartOnFirstThread"
;;