From cc5d3581fb45ff03bf9e3c572e1f76fdd6b79fbb Mon Sep 17 00:00:00 2001 From: wangchao Date: Tue, 26 Apr 2022 20:47:13 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0README=20=E6=BA=90?= =?UTF-8?q?=E7=A0=81=E7=BC=96=E8=AF=91=E6=8C=87=E5=AF=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 19 ++++++++++++++++--- README.md | 19 ++++++++++++++++--- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/README.en.md b/README.en.md index 3365a5d1..e72fa12c 100644 --- a/README.en.md +++ b/README.en.md @@ -61,9 +61,22 @@ Specific steps of Building Data Studio binary package through source code - ## Preconditions - 1. Download and install jdk11 and configure ` JAVA_HOME ` environment variable - 2. Download and install Apache Maven 3.0 x. And configure ` M2_HOME ` environment variable - 3. Through ` https://download2.gluonhq.com/openjfx/11.0.2/openjfx-11.0.2_windows-x64_bin-sdk.zip ` Download the JavaFX SDK dependency package and configure `javafx_ Home`environment variable with value of ${javafx-sdk-11.0.2} + 1. Download and install jdk11 and configure ` Java_ Home ` environment variable. JDK recommended version 11.0.2 + + 2. Download and install maven x. And configure ` M2_ Home ` environment variable. Maven recommends version 3.8.3 + + 3. Adoption https://gluonhq.com/products/javafx/ Download SDK 17.0.2 to any local directory and unzip it to javafx-17.0.2 + + 4. Adoption https://downloads.efxclipse.bestsolution.at/p2-repos/openjfx.p2-17.0.2.zip Download openjfx p2-17.0.2. Zip and unzip to any local directory. + + 5. Configure POM file properties configuration information javafx.home and url.openjfx information . + + ``` + local_directory\javafx-sdk-17.0.2 + file:\\\local_directory\openjfx.p2-17.0.2 + ``` + + - ## Source Compilation diff --git a/README.md b/README.md index 7e1afdee..35a32727 100644 --- a/README.md +++ b/README.md @@ -61,9 +61,22 @@ - ## 前置条件 - 1. 下载安装JDK11，并配置`JAVA_HOME`环境变量 - 2. 下载安装apache maven3.x，并配置`M2_HOME`环境变量 - 3. 通过`https://download2.gluonhq.com/openjfx/11.0.2/openjfx-11.0.2_windows-x64_bin-sdk.zip`下载javafx sdk依赖包，并配置`javafx_home`环境变量，值为${javafx-sdk-11.0.2} + 1. 下载安装JDK11，并配置`JAVA_HOME`环境变量。JDK推荐11.0.2版本 + + 2. 下载安装apache maven3.x，并配置`M2_HOME`环境变量。Maven推荐3.8.3版本 + + 3. 通过https://gluonhq.com/products/javafx/ 下载 javafx SDK 17.0.2版本SDK到本地并解压至任意目录。 + + 4. 通过https://downloads.efxclipse.bestsolution.at/p2-repos/openjfx.p2-17.0.2.zip下载 openjfx.p2-17.0.2.zip并解压到本地任意目录。 + + 5. 配置pom文件properties配置信息 javafx.home 和 url.openjfx信息。 + + ```xml + 本地路径\javafx-sdk-17.0.2 + file:\\\本地路径\openjfx.p2-17.0.2 + ``` + + - ## 源码编译 -- Gitee From 824868fdf4aabc04868269a0fdafe6301e2aede1 Mon Sep 17 00:00:00 2001 From: wangchao Date: Tue, 26 Apr 2022 21:12:57 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0README=20=E6=BA=90?= =?UTF-8?q?=E7=A0=81=E7=BC=96=E8=AF=91=E6=8C=87=E5=AF=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 41 ++++++++++++++++++++++++++++------------- README.md | 39 ++++++++++++++++++++++++++------------- 2 files changed, 54 insertions(+), 26 deletions(-) diff --git a/README.en.md b/README.en.md index e72fa12c..20729a9b 100644 --- a/README.en.md +++ b/README.en.md @@ -80,19 +80,34 @@ Specific steps of Building Data Studio binary package through source code - ## Source Compilation - Enter the Data Studio source ` src ` directory from the command line and run the script file - - ```shell - cd ${Data_Studio_code}\code\datastudio\src - .\copyExternalsToBuild.bat(windows) or sh copyExternalsToBuild.sh(linux) - mvn clean package -Dmaven.test.skip=true - ``` - - The resulting installation package locations ： - - ```shell - ${Data_Studio_code}\code\datastudio\build - ``` + 1. Enter the src directory of Data Studio source code through git bash command line: + + 2. Use mvn - version command to check and confirm Maven and JDK version information. + + ```shell + $ mvn -version + Apache Maven 3.8.4 (9b656c72d54e5bacbed989b64718c159fe39b537) + Maven home: D:\tool\apache-maven-3.8.3 + Java version: 11, vendor: Oracle Corporation, runtime: D:\tool\openjdk-11\jdk-11 + Default locale: zh_CN, platform encoding: GBK + OS name: "windows server 2016", version: "10.0", arch: "amd64", family: "windows" + ``` + + 3. Run compiled script + + ```shell + cd ${Data_Studio_code}\code\datastudio\src + sh copyExternalsToBuild.sh + mvn clean package -Dmaven.test.skip=true + ``` + + 4. The location of the generated installation package is: + + ```shell + ${Data_Studio_code}\code\datastudio\build + ``` + + # Participating Contributions diff --git a/README.md b/README.md index 35a32727..eb3be23c 100644 --- a/README.md +++ b/README.md @@ -80,19 +80,32 @@ - ## 源码编译 - 通过命令行进入Data Studio源码src目录，并运行脚本文件 - - ```shell - cd ${Data_Studio_code}\code\datastudio\src - .\copyExternalsToBuild.bat(windows) 或者 sh copyExternalsToBuild.sh(linux) - mvn clean package -Dmaven.test.skip=true - ``` - - 生成的安装包位置为： - - ```shell - ${Data_Studio_code}\code\datastudio\build - ``` + 1. 通过 git bash 命令行进入Data Studio源码src目录: + + 2. 使用mvn -version命令 检查并确认 maven和JDK版本信息。 + + ```shell + $ mvn -version + Apache Maven 3.8.4 (9b656c72d54e5bacbed989b64718c159fe39b537) + Maven home: D:\tool\apache-maven-3.8.3 + Java version: 11, vendor: Oracle Corporation, runtime: D:\tool\openjdk-11\jdk-11 + Default locale: zh_CN, platform encoding: GBK + OS name: "windows server 2016", version: "10.0", arch: "amd64", family: "windows" + ``` + + 3. 运行编译脚本 + + ```shell + cd ${Data_Studio_code}\code\datastudio\src + sh copyExternalsToBuild.sh + mvn clean package -Dmaven.test.skip=true + ``` + + 4. 生成的安装包位置为： + + ```shell + ${Data_Studio_code}\code\datastudio\build + ``` # 参与贡献 -- Gitee From 8dbc576a2010c3d2400eafbbde1b84b13600927e Mon Sep 17 00:00:00 2001 From: mystarry-sky Date: Tue, 26 Apr 2022 20:47:13 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0README=20=E6=BA=90?= =?UTF-8?q?=E7=A0=81=E7=BC=96=E8=AF=91=E6=8C=87=E5=AF=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 56 +++++++++++++++++++++++++++++++++++++++------------- README.md | 54 +++++++++++++++++++++++++++++++++++++------------- 2 files changed, 82 insertions(+), 28 deletions(-) diff --git a/README.en.md b/README.en.md index 3365a5d1..20729a9b 100644 --- a/README.en.md +++ b/README.en.md @@ -61,25 +61,53 @@ Specific steps of Building Data Studio binary package through source code - ## Preconditions - 1. Download and install jdk11 and configure ` JAVA_HOME ` environment variable - 2. Download and install Apache Maven 3.0 x. And configure ` M2_HOME ` environment variable - 3. Through ` https://download2.gluonhq.com/openjfx/11.0.2/openjfx-11.0.2_windows-x64_bin-sdk.zip ` Download the JavaFX SDK dependency package and configure `javafx_ Home`environment variable with value of ${javafx-sdk-11.0.2} + 1. Download and install jdk11 and configure ` Java_ Home ` environment variable. JDK recommended version 11.0.2 -- ## Source Compilation + 2. Download and install maven x. And configure ` M2_ Home ` environment variable. Maven recommends version 3.8.3 + + 3. Adoption https://gluonhq.com/products/javafx/ Download SDK 17.0.2 to any local directory and unzip it to javafx-17.0.2 + + 4. Adoption https://downloads.efxclipse.bestsolution.at/p2-repos/openjfx.p2-17.0.2.zip Download openjfx p2-17.0.2. Zip and unzip to any local directory. - Enter the Data Studio source ` src ` directory from the command line and run the script file + 5. Configure POM file properties configuration information javafx.home and url.openjfx information . - ```shell - cd ${Data_Studio_code}\code\datastudio\src - .\copyExternalsToBuild.bat(windows) or sh copyExternalsToBuild.sh(linux) - mvn clean package -Dmaven.test.skip=true - ``` + ``` + local_directory\javafx-sdk-17.0.2 + file:\\\local_directory\openjfx.p2-17.0.2 + ``` - The resulting installation package locations ： + + +- ## Source Compilation - ```shell - ${Data_Studio_code}\code\datastudio\build - ``` + 1. Enter the src directory of Data Studio source code through git bash command line: + + 2. Use mvn - version command to check and confirm Maven and JDK version information. + + ```shell + $ mvn -version + Apache Maven 3.8.4 (9b656c72d54e5bacbed989b64718c159fe39b537) + Maven home: D:\tool\apache-maven-3.8.3 + Java version: 11, vendor: Oracle Corporation, runtime: D:\tool\openjdk-11\jdk-11 + Default locale: zh_CN, platform encoding: GBK + OS name: "windows server 2016", version: "10.0", arch: "amd64", family: "windows" + ``` + + 3. Run compiled script + + ```shell + cd ${Data_Studio_code}\code\datastudio\src + sh copyExternalsToBuild.sh + mvn clean package -Dmaven.test.skip=true + ``` + + 4. The location of the generated installation package is: + + ```shell + ${Data_Studio_code}\code\datastudio\build + ``` + + # Participating Contributions diff --git a/README.md b/README.md index 7e1afdee..eb3be23c 100644 --- a/README.md +++ b/README.md @@ -61,25 +61,51 @@ - ## 前置条件 - 1. 下载安装JDK11，并配置`JAVA_HOME`环境变量 - 2. 下载安装apache maven3.x，并配置`M2_HOME`环境变量 - 3. 通过`https://download2.gluonhq.com/openjfx/11.0.2/openjfx-11.0.2_windows-x64_bin-sdk.zip`下载javafx sdk依赖包，并配置`javafx_home`环境变量，值为${javafx-sdk-11.0.2} + 1. 下载安装JDK11，并配置`JAVA_HOME`环境变量。JDK推荐11.0.2版本 -- ## 源码编译 + 2. 下载安装apache maven3.x，并配置`M2_HOME`环境变量。Maven推荐3.8.3版本 + + 3. 通过https://gluonhq.com/products/javafx/ 下载 javafx SDK 17.0.2版本SDK到本地并解压至任意目录。 + + 4. 通过https://downloads.efxclipse.bestsolution.at/p2-repos/openjfx.p2-17.0.2.zip下载 openjfx.p2-17.0.2.zip并解压到本地任意目录。 - 通过命令行进入Data Studio源码src目录，并运行脚本文件 + 5. 配置pom文件properties配置信息 javafx.home 和 url.openjfx信息。 - ```shell - cd ${Data_Studio_code}\code\datastudio\src - .\copyExternalsToBuild.bat(windows) 或者 sh copyExternalsToBuild.sh(linux) - mvn clean package -Dmaven.test.skip=true - ``` + ```xml + 本地路径\javafx-sdk-17.0.2 + file:\\\本地路径\openjfx.p2-17.0.2 + ``` - 生成的安装包位置为： + + +- ## 源码编译 - ```shell - ${Data_Studio_code}\code\datastudio\build - ``` + 1. 通过 git bash 命令行进入Data Studio源码src目录: + + 2. 使用mvn -version命令 检查并确认 maven和JDK版本信息。 + + ```shell + $ mvn -version + Apache Maven 3.8.4 (9b656c72d54e5bacbed989b64718c159fe39b537) + Maven home: D:\tool\apache-maven-3.8.3 + Java version: 11, vendor: Oracle Corporation, runtime: D:\tool\openjdk-11\jdk-11 + Default locale: zh_CN, platform encoding: GBK + OS name: "windows server 2016", version: "10.0", arch: "amd64", family: "windows" + ``` + + 3. 运行编译脚本 + + ```shell + cd ${Data_Studio_code}\code\datastudio\src + sh copyExternalsToBuild.sh + mvn clean package -Dmaven.test.skip=true + ``` + + 4. 生成的安装包位置为： + + ```shell + ${Data_Studio_code}\code\datastudio\build + ``` # 参与贡献 -- Gitee From 84533ab25493f0b2e9d9ea04996e732c4b6bddcf Mon Sep 17 00:00:00 2001 From: mystarry-sky Date: Tue, 26 Apr 2022 20:47:13 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0README=20=E6=BA=90?= =?UTF-8?q?=E7=A0=81=E7=BC=96=E8=AF=91=E6=8C=87=E5=AF=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 156 ++++++++++++++++++++++++++++++++++++++++++++++----- README.md | 150 ++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 280 insertions(+), 26 deletions(-) diff --git a/README.en.md b/README.en.md index 3365a5d1..b6ae993b 100644 --- a/README.en.md +++ b/README.en.md @@ -61,25 +61,155 @@ Specific steps of Building Data Studio binary package through source code - ## Preconditions - 1. Download and install jdk11 and configure ` JAVA_HOME ` environment variable - 2. Download and install Apache Maven 3.0 x. And configure ` M2_HOME ` environment variable - 3. Through ` https://download2.gluonhq.com/openjfx/11.0.2/openjfx-11.0.2_windows-x64_bin-sdk.zip ` Download the JavaFX SDK dependency package and configure `javafx_ Home`environment variable with value of ${javafx-sdk-11.0.2} + 1. Download and install jdk11 and configure ` Java_ Home ` environment variable. JDK recommended version 11.0.2 + +<<<<<<< .mine + 2. Download and install maven x. And configure ` M2_ Home ` environment variable. Maven recommends version 3.8.3 + + + + + + + + + + + + + + + +======= + 2. Download and install maven x. And configure ` M2_ Home ` environment variable. Maven recommends version 3.8.3 + + 3. Adoption https://gluonhq.com/products/javafx/ Download SDK 17.0.2 to any local directory and unzip it to javafx-17.0.2 + + 4. Adoption https://downloads.efxclipse.bestsolution.at/p2-repos/openjfx.p2-17.0.2.zip Download openjfx p2-17.0.2. Zip and unzip to any local directory. + + 5. Configure POM file properties configuration information javafx.home and url.openjfx information . + + ``` + local_directory\javafx-sdk-17.0.2 + file:\\\local_directory\openjfx.p2-17.0.2 + ``` + + - ## Source Compilation +>>>>>>> .theirs + +<<<<<<< .mine + 3. Adoption https://gluonhq.com/products/javafx/ Download SDK 17.0.2 to any local directory and unzip it to javafx-17.0.2 +======= + 1. Enter the src directory of Data Studio source code through git bash command line: +>>>>>>> .theirs + +<<<<<<< .mine + 4. Adoption https://downloads.efxclipse.bestsolution.at/p2-repos/openjfx.p2-17.0.2.zip Download openjfx p2-17.0.2. Zip and unzip to any local directory. + + + + + + - Enter the Data Studio source ` src ` directory from the command line and run the script file - ```shell - cd ${Data_Studio_code}\code\datastudio\src - .\copyExternalsToBuild.bat(windows) or sh copyExternalsToBuild.sh(linux) - mvn clean package -Dmaven.test.skip=true - ``` - The resulting installation package locations ： - ```shell - ${Data_Studio_code}\code\datastudio\build - ``` + + + + + + + + + + + + + + + +======= + 2. Use mvn - version command to check and confirm Maven and JDK version information. + + ```shell + $ mvn -version + Apache Maven 3.8.4 (9b656c72d54e5bacbed989b64718c159fe39b537) + Maven home: D:\tool\apache-maven-3.8.3 + Java version: 11, vendor: Oracle Corporation, runtime: D:\tool\openjdk-11\jdk-11 + Default locale: zh_CN, platform encoding: GBK + OS name: "windows server 2016", version: "10.0", arch: "amd64", family: "windows" + ``` + + 3. Run compiled script + + ```shell + cd ${Data_Studio_code}\code\datastudio\src + sh copyExternalsToBuild.sh + mvn clean package -Dmaven.test.skip=true + ``` + + 4. The location of the generated installation package is: + + ```shell + ${Data_Studio_code}\code\datastudio\build + ``` + + +>>>>>>> .theirs + +<<<<<<< .mine + 5. Configure POM file properties configuration information javafx.home and url.openjfx information . + + ``` + local_directory\javafx-sdk-17.0.2 + file:\\\local_directory\openjfx.p2-17.0.2 + ``` + +======= + + + + + + + +>>>>>>> .theirs + + +- ## Source Compilation + + 1. Enter the src directory of Data Studio source code through git bash command line: + + 2. Use mvn - version command to check and confirm Maven and JDK version information. + + ```shell + $ mvn -version + Apache Maven 3.8.4 (9b656c72d54e5bacbed989b64718c159fe39b537) + Maven home: D:\tool\apache-maven-3.8.3 + Java version: 11, vendor: Oracle Corporation, runtime: D:\tool\openjdk-11\jdk-11 + Default locale: zh_CN, platform encoding: GBK + OS name: "windows server 2016", version: "10.0", arch: "amd64", family: "windows" + ``` + + 3. Run compiled script + + ```shell + cd ${Data_Studio_code}\code\datastudio\src + sh copyExternalsToBuild.sh + mvn clean package -Dmaven.test.skip=true + ``` + + 4. The location of the generated installation package is: + + ```shell + ${Data_Studio_code}\code\datastudio\build + ``` + + # Participating Contributions diff --git a/README.md b/README.md index 7e1afdee..e4254a72 100644 --- a/README.md +++ b/README.md @@ -61,25 +61,149 @@ - ## 前置条件 - 1. 下载安装JDK11，并配置`JAVA_HOME`环境变量 - 2. 下载安装apache maven3.x，并配置`M2_HOME`环境变量 - 3. 通过`https://download2.gluonhq.com/openjfx/11.0.2/openjfx-11.0.2_windows-x64_bin-sdk.zip`下载javafx sdk依赖包，并配置`javafx_home`环境变量，值为${javafx-sdk-11.0.2} + 1. 下载安装JDK11，并配置`JAVA_HOME`环境变量。JDK推荐11.0.2版本 + +<<<<<<< .mine + 2. 下载安装apache maven3.x，并配置`M2_HOME`环境变量。Maven推荐3.8.3版本 + + + + + + + + + + + + + + + +======= + 2. 下载安装apache maven3.x，并配置`M2_HOME`环境变量。Maven推荐3.8.3版本 + + 3. 通过https://gluonhq.com/products/javafx/ 下载 javafx SDK 17.0.2版本SDK到本地并解压至任意目录。 + + 4. 通过https://downloads.efxclipse.bestsolution.at/p2-repos/openjfx.p2-17.0.2.zip下载 openjfx.p2-17.0.2.zip并解压到本地任意目录。 + + 5. 配置pom文件properties配置信息 javafx.home 和 url.openjfx信息。 + + ```xml + 本地路径\javafx-sdk-17.0.2 + file:\\\本地路径\openjfx.p2-17.0.2 + ``` + + - ## 源码编译 +>>>>>>> .theirs + +<<<<<<< .mine + 3. 通过https://gluonhq.com/products/javafx/ 下载 javafx SDK 17.0.2版本SDK到本地并解压至任意目录。 +======= + 1. 通过 git bash 命令行进入Data Studio源码src目录: +>>>>>>> .theirs + +<<<<<<< .mine + 4. 通过https://downloads.efxclipse.bestsolution.at/p2-repos/openjfx.p2-17.0.2.zip下载 openjfx.p2-17.0.2.zip并解压到本地任意目录。 + + + + + - 通过命令行进入Data Studio源码src目录，并运行脚本文件 - ```shell - cd ${Data_Studio_code}\code\datastudio\src - .\copyExternalsToBuild.bat(windows) 或者 sh copyExternalsToBuild.sh(linux) - mvn clean package -Dmaven.test.skip=true - ``` - 生成的安装包位置为： - ```shell - ${Data_Studio_code}\code\datastudio\build - ``` + + + + + + + + + + + + + + +======= + 2. 使用mvn -version命令 检查并确认 maven和JDK版本信息。 + + ```shell + $ mvn -version + Apache Maven 3.8.4 (9b656c72d54e5bacbed989b64718c159fe39b537) + Maven home: D:\tool\apache-maven-3.8.3 + Java version: 11, vendor: Oracle Corporation, runtime: D:\tool\openjdk-11\jdk-11 + Default locale: zh_CN, platform encoding: GBK + OS name: "windows server 2016", version: "10.0", arch: "amd64", family: "windows" + ``` + + 3. 运行编译脚本 + + ```shell + cd ${Data_Studio_code}\code\datastudio\src + sh copyExternalsToBuild.sh + mvn clean package -Dmaven.test.skip=true + ``` + + 4. 生成的安装包位置为： + + ```shell + ${Data_Studio_code}\code\datastudio\build + ``` +>>>>>>> .theirs + +<<<<<<< .mine + 5. 配置pom文件properties配置信息 javafx.home 和 url.openjfx信息。 + + ```xml + 本地路径\javafx-sdk-17.0.2 + file:\\\本地路径\openjfx.p2-17.0.2 + ``` + +======= + + + + + + + +>>>>>>> .theirs + + +- ## 源码编译 + + 1. 通过 git bash 命令行进入Data Studio源码src目录: + + 2. 使用mvn -version命令 检查并确认 maven和JDK版本信息。 + + ```shell + $ mvn -version + Apache Maven 3.8.4 (9b656c72d54e5bacbed989b64718c159fe39b537) + Maven home: D:\tool\apache-maven-3.8.3 + Java version: 11, vendor: Oracle Corporation, runtime: D:\tool\openjdk-11\jdk-11 + Default locale: zh_CN, platform encoding: GBK + OS name: "windows server 2016", version: "10.0", arch: "amd64", family: "windows" + ``` + + 3. 运行编译脚本 + + ```shell + cd ${Data_Studio_code}\code\datastudio\src + sh copyExternalsToBuild.sh + mvn clean package -Dmaven.test.skip=true + ``` + + 4. 生成的安装包位置为： + + ```shell + ${Data_Studio_code}\code\datastudio\build + ``` # 参与贡献 -- Gitee From 609c085b44bef04d96c54cc742418574ac0414fe Mon Sep 17 00:00:00 2001 From: mystarry-sky Date: Thu, 28 Apr 2022 14:34:41 +0800 Subject: [PATCH 5/6] =?UTF-8?q?Revert=20"=E6=9B=B4=E6=96=B0README=20?= =?UTF-8?q?=E6=BA=90=E7=A0=81=E7=BC=96=E8=AF=91=E6=8C=87=E5=AF=BC"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 268 +----------------------------------------------------- 1 file changed, 2 insertions(+), 266 deletions(-) diff --git a/README.md b/README.md index 0824c226..6dcace14 100644 --- a/README.md +++ b/README.md @@ -63,186 +63,19 @@ 1. 下载安装JDK11，并配置`JAVA_HOME`环境变量。JDK推荐11.0.2版本 -<<<<<<< .mine -<<<<<<< .mine - 2. 下载安装apache maven3.x，并配置`M2_HOME`环境变量。Maven推荐3.8.3版本 +2. 下载安装apache maven3.x，并配置`M2_HOME`环境变量。Maven推荐3.8.3版本 - - - - - - - - - - - - - - -======= - 2. 下载安装apache maven3.x，并配置`M2_HOME`环境变量。Maven推荐3.8.3版本 - - 3. 通过https://gluonhq.com/products/javafx/ 下载 javafx SDK 17.0.2版本SDK到本地并解压至任意目录。 - - 4. 通过https://downloads.efxclipse.bestsolution.at/p2-repos/openjfx.p2-17.0.2.zip下载 openjfx.p2-17.0.2.zip并解压到本地任意目录。 - - 5. 配置pom文件properties配置信息 javafx.home 和 url.openjfx信息。 - - ```xml - 本地路径\javafx-sdk-17.0.2 - file:\\\本地路径\openjfx.p2-17.0.2 - ``` - - - -- ## 源码编译 -======= - 2. 下载安装apache maven3.x，并配置`M2_HOME`环境变量。Maven推荐3.8.3版本 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ->>>>>>> .theirs ->>>>>>> .theirs - -<<<<<<< .mine -<<<<<<< .mine 3. 通过https://gluonhq.com/products/javafx/ 下载 javafx SDK 17.0.2版本SDK到本地并解压至任意目录。 -======= - 1. 通过 git bash 命令行进入Data Studio源码src目录: ->>>>>>> .theirs -======= - 3. 通过https://gluonhq.com/products/javafx/ 下载 javafx SDK 17.0.2版本SDK到本地并解压至任意目录。 - - - ->>>>>>> .theirs - -<<<<<<< .mine -<<<<<<< .mine 4. 通过https://downloads.efxclipse.bestsolution.at/p2-repos/openjfx.p2-17.0.2.zip下载 openjfx.p2-17.0.2.zip并解压到本地任意目录。 -======= - 4. 通过https://downloads.efxclipse.bestsolution.at/p2-repos/openjfx.p2-17.0.2.zip下载 openjfx.p2-17.0.2.zip并解压到本地任意目录。 - ->>>>>>> .theirs -<<<<<<< .mine - -======= 5. 配置pom文件properties配置信息 javafx.home 和 url.openjfx信息。 ->>>>>>> .theirs - -<<<<<<< .mine - - - -======= ```xml - 本地路径\javafx-sdk-17.0.2 + 本地路径\javafx-sdk-17.0.2 file:\\\本地路径\openjfx.p2-17.0.2 ``` ->>>>>>> .theirs - -<<<<<<< .mine - - - - - - - - - - - - - - - - - - - - -======= - 2. 使用mvn -version命令 检查并确认 maven和JDK版本信息。 - - ```shell - $ mvn -version - Apache Maven 3.8.4 (9b656c72d54e5bacbed989b64718c159fe39b537) - Maven home: D:\tool\apache-maven-3.8.3 - Java version: 11, vendor: Oracle Corporation, runtime: D:\tool\openjdk-11\jdk-11 - Default locale: zh_CN, platform encoding: GBK - OS name: "windows server 2016", version: "10.0", arch: "amd64", family: "windows" - ``` - - 3. 运行编译脚本 - ```shell - cd ${Data_Studio_code}\code\datastudio\src - sh copyExternalsToBuild.sh - mvn clean package -Dmaven.test.skip=true - ``` - - 4. 生成的安装包位置为： - - ```shell - ${Data_Studio_code}\code\datastudio\build - ``` ->>>>>>> .theirs - -<<<<<<< .mine - 5. 配置pom文件properties配置信息 javafx.home 和 url.openjfx信息。 - - ```xml - 本地路径\javafx-sdk-17.0.2 - file:\\\本地路径\openjfx.p2-17.0.2 - ``` - -======= - - - - - - - ->>>>>>> .theirs - - - ## 源码编译 1. 通过 git bash 命令行进入Data Studio源码src目录: @@ -272,103 +105,6 @@ ${Data_Studio_code}\code\datastudio\build ``` -======= - - -- ## 源码编译 - - 1. 通过 git bash 命令行进入Data Studio源码src目录: - - 2. 使用mvn -version命令 检查并确认 maven和JDK版本信息。 - - ```shell - $ mvn -version - Apache Maven 3.8.4 (9b656c72d54e5bacbed989b64718c159fe39b537) - Maven home: D:\tool\apache-maven-3.8.3 - Java version: 11, vendor: Oracle Corporation, runtime: D:\tool\openjdk-11\jdk-11 - Default locale: zh_CN, platform encoding: GBK - OS name: "windows server 2016", version: "10.0", arch: "amd64", family: "windows" - ``` - - 3. 运行编译脚本 - - ```shell - cd ${Data_Studio_code}\code\datastudio\src - sh copyExternalsToBuild.sh - mvn clean package -Dmaven.test.skip=true - ``` - - 4. 生成的安装包位置为： - - ```shell - ${Data_Studio_code}\code\datastudio\build - ``` - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ->>>>>>> .theirs # 参与贡献 **参与贡献** -- Gitee From de8187f506cb3ef95760ea922f27d17de22d2b81 Mon Sep 17 00:00:00 2001 From: mystarry-sky Date: Thu, 28 Apr 2022 14:49:47 +0800 Subject: [PATCH 6/6] =?UTF-8?q?Revert=20"=E6=9B=B4=E6=96=B0README=20?= =?UTF-8?q?=E6=BA=90=E7=A0=81=E7=BC=96=E8=AF=91=E6=8C=87=E5=AF=BC"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 49 ++++++++++++++++++++++++++----------------------- README.md | 26 ++++++++++++++------------ 2 files changed, 40 insertions(+), 35 deletions(-) diff --git a/README.en.md b/README.en.md index 15473ee3..5c2ff5e2 100644 --- a/README.en.md +++ b/README.en.md @@ -61,48 +61,51 @@ Specific steps of Building Data Studio binary package through source code - ## Preconditions - 2. Download and install maven x. And configure ` M2_ Home ` environment variable. Maven recommends version 3.8.3 + 1. Download and install jdk11 and configure `Java_ Home` environment variable. JDK recommended version 11.0.2 -3. Adoption https://gluonhq.com/products/javafx/ Download SDK 17.0.2 to any local directory and unzip it to javafx-17.0.2 + 2. Download and install maven x. And configure `M2_ Home` environment variable. Maven recommends version 3.8.3 - 4. Adoption https://downloads.efxclipse.bestsolution.at/p2-repos/openjfx.p2-17.0.2.zip Download openjfx p2-17.0.2. Zip and unzip to any local directory. + 3. Adoption [https://gluonhq.com/products/javafx/](https://gitee.com/link?target=https%3A%2F%2Fgluonhq.com%2Fproducts%2Fjavafx%2F) Download SDK 17.0.2 to any local directory and unzip it to javafx-17.0.2 + + 4. Adoption [https://downloads.efxclipse.bestsolution.at/p2-repos/openjfx.p2-17.0.2.zip](https://gitee.com/link?target=https%3A%2F%2Fdownloads.efxclipse.bestsolution.at%2Fp2-repos%2Fopenjfx.p2-17.0.2.zip) Download openjfx p2-17.0.2. Zip and unzip to any local directory. 5. Configure POM file properties configuration information javafx.home and url.openjfx information . ``` - local_directory\javafx-sdk-17.0.2 + local_directory\javafx-sdk-17.0.2 file:\\\local_directory\openjfx.p2-17.0.2 - ``` - + ``` + - ## Source Compilation 1. Enter the src directory of Data Studio source code through git bash command line: - 2. Use mvn - version command to check and confirm Maven and JDK version information. - - ```shell + 2. Use mvn - version command to check and confirm Maven and JDK version information. + + ``` $ mvn -version Apache Maven 3.8.4 (9b656c72d54e5bacbed989b64718c159fe39b537) - Maven home: D:\tool\apache-maven-3.8.3 - Java version: 11, vendor: Oracle Corporation, runtime: D:\tool\openjdk-11\jdk-11 - Default locale: zh_CN, platform encoding: GBK - OS name: "windows server 2016", version: "10.0", arch: "amd64", family: "windows" + Maven home: D:\tool\apache-maven-3.8.3 Java version: 11, vendor: Oracle Corporation, runtime: D:\tool\openjdk-11\jdk-11 Default locale: zh_CN, platform encoding: GBK OS name: "windows server 2016", version: "10.0", arch: "amd64", family: "windows" ``` - + 3. Run compiled script - - ```shell + + ``` cd ${Data_Studio_code}\code\datastudio\src sh copyExternalsToBuild.sh mvn clean package -Dmaven.test.skip=true ``` - - 4. The location of the generated installation package is: - - ```shell - ${Data_Studio_code}\code\datastudio\build - ``` - + + 4. The location of the generated installation package is: + + ``` + ${Data_Studio_code}\code\datastudio\build + ``` + + + + + # Participating Contributions diff --git a/README.md b/README.md index 6dcace14..547a31fe 100644 --- a/README.md +++ b/README.md @@ -62,26 +62,28 @@ - ## 前置条件 1. 下载安装JDK11，并配置`JAVA_HOME`环境变量。JDK推荐11.0.2版本 - -2. 下载安装apache maven3.x，并配置`M2_HOME`环境变量。Maven推荐3.8.3版本 - + + 2. 下载安装apache maven3.x，并配置`M2_HOME`环境变量。Maven推荐3.8.3版本 + 3. 通过https://gluonhq.com/products/javafx/ 下载 javafx SDK 17.0.2版本SDK到本地并解压至任意目录。 - + 4. 通过https://downloads.efxclipse.bestsolution.at/p2-repos/openjfx.p2-17.0.2.zip下载 openjfx.p2-17.0.2.zip并解压到本地任意目录。 - + 5. 配置pom文件properties配置信息 javafx.home 和 url.openjfx信息。 - + ```xml - 本地路径\javafx-sdk-17.0.2 + 本地路径\javafx-sdk-17.0.2 file:\\\本地路径\openjfx.p2-17.0.2 ``` + + - ## 源码编译 1. 通过 git bash 命令行进入Data Studio源码src目录: 2. 使用mvn -version命令 检查并确认 maven和JDK版本信息。 - + ```shell $ mvn -version Apache Maven 3.8.4 (9b656c72d54e5bacbed989b64718c159fe39b537) @@ -90,17 +92,17 @@ Default locale: zh_CN, platform encoding: GBK OS name: "windows server 2016", version: "10.0", arch: "amd64", family: "windows" ``` - + 3. 运行编译脚本 - + ```shell cd ${Data_Studio_code}\code\datastudio\src sh copyExternalsToBuild.sh mvn clean package -Dmaven.test.skip=true ``` - + 4. 生成的安装包位置为： - + ```shell ${Data_Studio_code}\code\datastudio\build ``` -- Gitee