Skip to content

Commit

Permalink
Removing internal JVM for the linux release
Browse files Browse the repository at this point in the history
  • Loading branch information
marigostra committed Feb 20, 2024
1 parent e26b6e5 commit 66081cd
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 37 deletions.
9 changes: 1 addition & 8 deletions scripts/config.sh
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
# Copyright 2012-2024 Michael Pozhidaev <[email protected]>
# The LUWRAIN Project, GPL v.3

VERSION=2.0.0
VERSION=2.0.0-rc2
REGISTRY_VERSION=2.0

GITS='base browser extensions grammar i18n io interaction-javafx linux luwrain pim player reader registry studio windows'
APPS='commander contacts mail news notepad telegram viewer vk'
LANGS='en ru'
EXTENSIONS='cmdtts emacspeak mssapi plmp3 rhvoice speechd voiceman'


WIN_ARCH=64
LINUX_ARCH='64'

JUNIT_COMPONENTS='base luwrain linux browser io pim app-notepad'
SRC_DEST_DIR=/tmp/luwrain-src
22 changes: 16 additions & 6 deletions scripts/lwr-dist-linux
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# Copyright 2012-2024 Michael Pozhidaev <[email protected]>
# The LUWRAIN Project, GPL v.3

JRE=jre18-linux-x64
ARCH=x64

. init.sh
Expand All @@ -14,12 +13,23 @@ rm -rf "$DEST_DIR"
mkdir -p "$DEST_DIR"
cd "$DEST_DIR"

wget -q https://download.luwrain.org/compilation/$JRE.tar.xz
tar xf $JRE.tar.xz
mv $JRE $ARCH
rm -f $JRE.tar.xz
lwr-basedirs-linux "$DEST_DIR/$ARCH/"
mv $ARCH/jar/luwrain-base*.jar $ARCH/lib/app/luwrain-base.jar
mv $ARCH/jar "$ARCH/lib"

mkdir "$ARCH"/bin
cat <<EOF > "$ARCH/bin/luwrain"
#!/bin/bash -e
# Copyright $(date +%Y) Michael Pozhidaev <[email protected]>
THIS="\${0##*/}"
cd "\$(dirname "\$0")"/..
if [ -n "\$JAVA_HOME" ] && [ -x "\$JAVA_HOME/bin/java" ]; then
exec "\$JAVA_HOME/bin/java" -cp "lib/*" org.luwrain.core.Init "\$@"
fi
EOF
chmod 755 "$ARCH/bin/luwrain"

wget -q https://download.luwrain.org/compilation/rhvoice-data.tar.xz
tar xf rhvoice-data.tar.xz
Expand Down
23 changes: 0 additions & 23 deletions scripts/lwr-junit-report

This file was deleted.

0 comments on commit 66081cd

Please sign in to comment.