diff --git a/code/datastudio/src/copyExternalsToBuild.bat b/code/datastudio/src/copyExternalsToBuild.bat index b6b8bc23cecdfb242edf6fd0a83753a963c352c8..6bcb3511455f0a3e636a6a487456a73ca45e503c 100644 --- a/code/datastudio/src/copyExternalsToBuild.bat +++ b/code/datastudio/src/copyExternalsToBuild.bat @@ -49,6 +49,7 @@ xcopy %SOURCE%\3rd_src\target\dependency\javafx-base-18-ea+2-win.jar %DEST%\org. xcopy %SOURCE%\3rd_src\target\dependency\javafx-controls-18-ea+2-win.jar %DEST%\org.opengauss.mppdbide.view\. /Y /S /E xcopy %SOURCE%\3rd_src\target\dependency\javafx-graphics-18-ea+2-win.jar %DEST%\org.opengauss.mppdbide.view\. /Y /S /E xcopy %SOURCE%\platform\Gauss200\gs_jdbc\gsjdbc4.jar %DEST%\org.opengauss.dbdriver.jdbc.gauss\. /Y /S /E +xcopy %SOURCE%\platform\Gauss200\gs_jdbc\javafx-swt.jar %DEST%\org.opengauss.mppdbide.view\. /Y /S /E rmdir /Q /S %TEST%\org.opengauss.mppdbide.adapter.test.fragment\lib mkdir %TEST%\org.opengauss.mppdbide.adapter.test.fragment\lib diff --git a/code/datastudio/src/copyExternalsToBuild.sh b/code/datastudio/src/copyExternalsToBuild.sh index 9c2d20c883895edcb0e20838729024cbc16d52b1..842f7d5e7b3e53a7e9f91f4939447cf333a92f68 100755 --- a/code/datastudio/src/copyExternalsToBuild.sh +++ b/code/datastudio/src/copyExternalsToBuild.sh @@ -49,6 +49,7 @@ cp $SOURCE/3rd_src/target/dependency/guava-30.1.1-jre.jar $DEST/org.opengauss.mp cp $SOURCE/3rd_src/target/dependency/javafx-base-18-ea+2-win.jar $DEST/org.opengauss.mppdbide.view/. cp $SOURCE/3rd_src/target/dependency/javafx-controls-18-ea+2-win.jar $DEST/org.opengauss.mppdbide.view/. cp $SOURCE/3rd_src/target/dependency/javafx-graphics-18-ea+2-win.jar $DEST/org.opengauss.mppdbide.view/. +cp $SOURCE/platform/Gauss200/gs_jdbc/javafx-swt.jar $DEST/org.opengauss.mppdbide.view/. cp $SOURCE/platform/Gauss200/gs_jdbc/gsjdbc4.jar $DEST/org.opengauss.dbdriver.jdbc.gauss/. rm -rf $TEST/org.opengauss.mppdbide.adapter.test.fragment/lib diff --git a/code/datastudio/src/pom.xml b/code/datastudio/src/pom.xml index 401a4936628d3fb49edcc2b91cd0b2703b73cc90..fd8049f29f68c41dc679d0897e2891e94010f3bd 100644 --- a/code/datastudio/src/pom.xml +++ b/code/datastudio/src/pom.xml @@ -27,8 +27,7 @@ 2.6.0 11 - ${env.JAVA8_HOME} - ${env.openjfx_home} + https://downloads.efxclipse.bestsolution.at/p2-repos/openjfx-17.0.1/ 11 @@ -174,7 +173,7 @@ com.oracle javafx 8.0.0-SNAPSHOT - ${java8.home}/jre/lib/jfxswt.jar + ../../../platform/Gauss200/gs_jdbc/javafx-swt.jar system diff --git a/platform/Gauss200/gs_jdbc/javafx-swt.jar b/platform/Gauss200/gs_jdbc/javafx-swt.jar new file mode 100644 index 0000000000000000000000000000000000000000..ec237d4512440ffa4b4c70dde79bb8fad48df43f Binary files /dev/null and b/platform/Gauss200/gs_jdbc/javafx-swt.jar differ