From a134c6f731a4a8282a04781211323d989941265a Mon Sep 17 00:00:00 2001 From: thigg Date: Wed, 24 Aug 2022 11:43:34 +0200 Subject: [PATCH] changed library name --- java-part/compile.sh | 4 ++-- java-part/pom.xml | 4 ++-- qt-part/flood-java.pro | 12 ++++-------- qt-part/src/flood-java.cpp | 2 +- qt-part/src/jgateway.cpp | 2 +- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/java-part/compile.sh b/java-part/compile.sh index d644443..b010e36 100755 --- a/java-part/compile.sh +++ b/java-part/compile.sh @@ -5,6 +5,6 @@ COMPILEHOST_GRAAL=/home/defaultuser/dev/graalvm-ce-java17-22.2.0 echo "transfering data" rsync . $COMPILEHOST:$COMPILEHOST_WORKSPACE -r echo "starting compilation" -ssh $COMPILEHOST "cd $COMPILEHOST_WORKSPACE; GRAALVM_HOME=$COMPILEHOST_GRAAL JAVA_HOME=$COMPILEHOST_GRAAL ./mvnw install -Pnative" +ssh $COMPILEHOST "cd $COMPILEHOST_WORKSPACE; GRAALVM_HOME=$COMPILEHOST_GRAAL JAVA_HOME=$COMPILEHOST_GRAAL ./mvnw clean install -Pnative" scp $COMPILEHOST:"$COMPILEHOST_WORKSPACE/target/*.h" ../qt-part/lib/ -scp $COMPILEHOST:"$COMPILEHOST_WORKSPACE/target/sailfishjava.so" ../qt-part/lib/libsailfishjava.so \ No newline at end of file +scp $COMPILEHOST:"$COMPILEHOST_WORKSPACE/target/javafloodjava.so" ../qt-part/lib/libjavafloodjava.so \ No newline at end of file diff --git a/java-part/pom.xml b/java-part/pom.xml index 893968b..693b40f 100644 --- a/java-part/pom.xml +++ b/java-part/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.example - sailfishjava + de.thigg + javafloodjava 1.0-SNAPSHOT diff --git a/qt-part/flood-java.pro b/qt-part/flood-java.pro index 749f52c..7d3b18d 100644 --- a/qt-part/flood-java.pro +++ b/qt-part/flood-java.pro @@ -22,7 +22,7 @@ SOURCES += \ DISTFILES += \ flood-java.desktop \ - lib/libsailfishjava.so \ + lib/libjavafloodjava.so \ qml/cover/CoverPage.qml \ qml/flood-java.qml \ qml/pages/GamePage.qml \ @@ -45,27 +45,23 @@ CONFIG += sailfishapp_i18n OTHER_FILES += rpm/flood-java.changes\ rpm/flood-java.spec -# German translation is enabled as an example. If you aren't -# planning to localize your app, remember to comment out the -# following TRANSLATIONS line. And also do not forget to -# modify the localized app name in the the .desktop file. TRANSLATIONS += translations/flood-java-de.ts translations/flood-java-en.ts HEADERS += \ lib/graal_isolate.h \ - lib/sailfishjava.h \ lib/flatbuffers/*.h \ lib/flatbuffers/pch/*.h \ + lib/javafloodjava.h \ src/gamestate_generated.h \ src/gamepanel.h \ src/gamestate.h \ src/jgateway.h -javalib.files = $$PWD/lib/libsailfishjava.so +javalib.files = $$PWD/lib/libjavafloodjava.so javalib.path = $$[QT_INSTALL_LIBS] INSTALLS += javalib -LIBS += -L$$PWD/lib/ -lsailfishjava +LIBS += -L$$PWD/lib/ -ljavafloodjava #win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../target/release/ -lnativeimpl #else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../target/debug/ -lnativeimpl diff --git a/qt-part/src/flood-java.cpp b/qt-part/src/flood-java.cpp index 03deb6f..8604c6d 100644 --- a/qt-part/src/flood-java.cpp +++ b/qt-part/src/flood-java.cpp @@ -3,7 +3,7 @@ #include #include #include "../lib/graal_isolate.h" -#include "../lib/sailfishjava.h" +#include "../lib/javafloodjava.h" #include "gamepanel.h" #include "src/jgateway.h" diff --git a/qt-part/src/jgateway.cpp b/qt-part/src/jgateway.cpp index 9f3e0ae..7665af0 100644 --- a/qt-part/src/jgateway.cpp +++ b/qt-part/src/jgateway.cpp @@ -5,7 +5,7 @@ #endif #include -#include "../lib/sailfishjava.h" +#include "../lib/javafloodjava.h" #include #include