You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2020/06/16 11:14:09 UTC
[incubator-iotdb] branch iotdb-722 created (now 7350490)
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a change to branch iotdb-722
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
at 7350490 remove detail classpath in Win bat scripts
This branch includes the following new commits:
new 7350490 remove detail classpath in Win bat scripts
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-iotdb] 01/01: remove detail classpath in Win bat scripts
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch iotdb-722
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 735049012cda3a4b5aa6979a143692333ffddf5a
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Tue Jun 16 19:13:29 2020 +0800
remove detail classpath in Win bat scripts
---
server/src/assembly/resources/sbin/start-server.bat | 5 +----
server/src/assembly/resources/tools/detect-watermark.bat | 4 +---
.../src/assembly/resources/tools/logVisualize/log-visualizer-cmd.bat | 4 +---
.../src/assembly/resources/tools/logVisualize/log-visualizer-gui.bat | 4 +---
server/src/assembly/resources/tools/memory-tool.bat | 4 +---
server/src/assembly/resources/tools/start-WalChecker.bat | 5 +----
server/src/assembly/resources/tools/start-sync-client.bat | 5 +----
.../assembly/resources/tools/tsfileToolSet/print-iotdb-data-dir.bat | 4 +---
.../resources/tools/tsfileToolSet/print-tsfile-resource-files.bat | 4 +---
.../assembly/resources/tools/tsfileToolSet/print-tsfile-sketch.bat | 4 +---
server/src/assembly/resources/tools/upgrade/offline-upgrade.bat | 2 +-
11 files changed, 11 insertions(+), 34 deletions(-)
diff --git a/server/src/assembly/resources/sbin/start-server.bat b/server/src/assembly/resources/sbin/start-server.bat
index 2564480..0cf8a07 100755
--- a/server/src/assembly/resources/sbin/start-server.bat
+++ b/server/src/assembly/resources/sbin/start-server.bat
@@ -94,11 +94,8 @@ set JAVA_OPTS=-ea^
@REM ***** CLASSPATH library setting *****
@REM Ensure that any user defined CLASSPATH variables are not used on startup
-set CLASSPATH="%IOTDB_HOME%\lib"
+set CLASSPATH="%IOTDB_HOME%\lib\*"
-@REM For each jar in the IOTDB_HOME lib directory call append to build the CLASSPATH variable.
-for %%i in ("%IOTDB_HOME%\lib\*.jar") do call :append "%%i"
-set CLASSPATH=%CLASSPATH%;iotdb.IoTDB
goto okClasspath
:append
diff --git a/server/src/assembly/resources/tools/detect-watermark.bat b/server/src/assembly/resources/tools/detect-watermark.bat
index 85e394e..f428aac 100644
--- a/server/src/assembly/resources/tools/detect-watermark.bat
+++ b/server/src/assembly/resources/tools/detect-watermark.bat
@@ -38,10 +38,8 @@ set JAVA_OPTS=-ea^
@REM ***** CLASSPATH library setting *****
@REM Ensure that any user defined CLASSPATH variables are not used on startup
-set CLASSPATH="%IOTDB_HOME%\lib"
+set CLASSPATH="%IOTDB_HOME%\lib\*"
-@REM For each jar in the IOTDB_HOME lib directory call append to build the CLASSPATH variable.
-for %%i in ("%IOTDB_HOME%\lib\*.jar") do call :append "%%i"
goto okClasspath
:append
diff --git a/server/src/assembly/resources/tools/logVisualize/log-visualizer-cmd.bat b/server/src/assembly/resources/tools/logVisualize/log-visualizer-cmd.bat
index da67366..0e78ce2 100644
--- a/server/src/assembly/resources/tools/logVisualize/log-visualizer-cmd.bat
+++ b/server/src/assembly/resources/tools/logVisualize/log-visualizer-cmd.bat
@@ -38,10 +38,8 @@ set JAVA_OPTS=-ea^
@REM ***** CLASSPATH library setting *****
@REM Ensure that any user defined CLASSPATH variables are not used on startup
-set CLASSPATH="%IOTDB_HOME%\lib"
+set CLASSPATH="%IOTDB_HOME%\lib\*"
-@REM For each jar in the IOTDB_HOME lib directory call append to build the CLASSPATH variable.
-for %%i in ("%IOTDB_HOME%\lib\*.jar") do call :append "%%i"
goto okClasspath
:append
diff --git a/server/src/assembly/resources/tools/logVisualize/log-visualizer-gui.bat b/server/src/assembly/resources/tools/logVisualize/log-visualizer-gui.bat
index 1f29a1d..acc3d31 100644
--- a/server/src/assembly/resources/tools/logVisualize/log-visualizer-gui.bat
+++ b/server/src/assembly/resources/tools/logVisualize/log-visualizer-gui.bat
@@ -38,10 +38,8 @@ set JAVA_OPTS=-ea^
@REM ***** CLASSPATH library setting *****
@REM Ensure that any user defined CLASSPATH variables are not used on startup
-set CLASSPATH="%IOTDB_HOME%\lib"
+set CLASSPATH="%IOTDB_HOME%\lib\*"
-@REM For each jar in the IOTDB_HOME lib directory call append to build the CLASSPATH variable.
-for %%i in ("%IOTDB_HOME%\lib\*.jar") do call :append "%%i"
goto okClasspath
:append
diff --git a/server/src/assembly/resources/tools/memory-tool.bat b/server/src/assembly/resources/tools/memory-tool.bat
index e9129a8..ff6aa7d 100755
--- a/server/src/assembly/resources/tools/memory-tool.bat
+++ b/server/src/assembly/resources/tools/memory-tool.bat
@@ -38,10 +38,8 @@ set JAVA_OPTS=-ea^
@REM ***** CLASSPATH library setting *****
@REM Ensure that any user defined CLASSPATH variables are not used on startup
-set CLASSPATH="%IOTDB_HOME%\lib"
+set CLASSPATH="%IOTDB_HOME%\lib\*"
-@REM For each jar in the IOTDB_HOME lib directory call append to build the CLASSPATH variable.
-for %%i in ("%IOTDB_HOME%\lib\*.jar") do call :append "%%i"
goto okClasspath
:append
diff --git a/server/src/assembly/resources/tools/start-WalChecker.bat b/server/src/assembly/resources/tools/start-WalChecker.bat
index 08189ce..4218efc 100644
--- a/server/src/assembly/resources/tools/start-WalChecker.bat
+++ b/server/src/assembly/resources/tools/start-WalChecker.bat
@@ -70,11 +70,8 @@ set JAVA_OPTS=-ea^
@REM ***** CLASSPATH library setting *****
@REM Ensure that any user defined CLASSPATH variables are not used on startup
-set CLASSPATH="%IOTDB_HOME%\lib"
+set CLASSPATH="%IOTDB_HOME%\lib\*"
-REM For each jar in the IOTDB_HOME lib directory call append to build the CLASSPATH variable.
-for %%i in ("%IOTDB_HOME%\lib\*.jar") do call :append "%%i"
-set CLASSPATH=%CLASSPATH%;WalChecker
goto okClasspath
:append
diff --git a/server/src/assembly/resources/tools/start-sync-client.bat b/server/src/assembly/resources/tools/start-sync-client.bat
index 6ddfbec..abe85f3 100755
--- a/server/src/assembly/resources/tools/start-sync-client.bat
+++ b/server/src/assembly/resources/tools/start-sync-client.bat
@@ -42,11 +42,8 @@ set JAVA_OPTS=-ea^
@REM ***** CLASSPATH library setting *****
@REM Ensure that any user defined CLASSPATH variables are not used on startup
-set CLASSPATH="%IOTDB_HOME%\lib"
+set CLASSPATH="%IOTDB_HOME%\lib\*"
-@REM For each jar in the IOTDB_HOME lib directory call append to build the CLASSPATH variable.
-for %%i in ("%IOTDB_HOME%\lib\*.jar") do call :append "%%i"
-set CLASSPATH=%CLASSPATH%;SyncClient
goto okClasspath
:append
diff --git a/server/src/assembly/resources/tools/tsfileToolSet/print-iotdb-data-dir.bat b/server/src/assembly/resources/tools/tsfileToolSet/print-iotdb-data-dir.bat
index 04c81fa..45c34f2 100644
--- a/server/src/assembly/resources/tools/tsfileToolSet/print-iotdb-data-dir.bat
+++ b/server/src/assembly/resources/tools/tsfileToolSet/print-iotdb-data-dir.bat
@@ -35,10 +35,8 @@ if NOT DEFINED JAVA_HOME goto :err
@REM -----------------------------------------------------------------------------
@REM ***** CLASSPATH library setting *****
@REM Ensure that any user defined CLASSPATH variables are not used on startup
-set CLASSPATH="%IOTDB_HOME%\lib"
+set CLASSPATH="%IOTDB_HOME%\lib\*"
-@REM For each jar in the IOTDB_HOME lib directory call append to build the CLASSPATH variable.
-for %%i in ("%IOTDB_HOME%\lib\*.jar") do call :append "%%i"
goto okClasspath
:append
diff --git a/server/src/assembly/resources/tools/tsfileToolSet/print-tsfile-resource-files.bat b/server/src/assembly/resources/tools/tsfileToolSet/print-tsfile-resource-files.bat
index 2474bb7..0f72152 100644
--- a/server/src/assembly/resources/tools/tsfileToolSet/print-tsfile-resource-files.bat
+++ b/server/src/assembly/resources/tools/tsfileToolSet/print-tsfile-resource-files.bat
@@ -34,10 +34,8 @@ if NOT DEFINED JAVA_HOME goto :err
@REM -----------------------------------------------------------------------------
@REM ***** CLASSPATH library setting *****
@REM Ensure that any user defined CLASSPATH variables are not used on startup
-set CLASSPATH="%IOTDB_HOME%\lib"
+set CLASSPATH="%IOTDB_HOME%\lib\*"
-@REM For each jar in the IOTDB_HOME lib directory call append to build the CLASSPATH variable.
-for %%i in ("%IOTDB_HOME%\lib\*.jar") do call :append "%%i"
goto okClasspath
:append
diff --git a/server/src/assembly/resources/tools/tsfileToolSet/print-tsfile-sketch.bat b/server/src/assembly/resources/tools/tsfileToolSet/print-tsfile-sketch.bat
index 4e184fd..b25bcfe 100644
--- a/server/src/assembly/resources/tools/tsfileToolSet/print-tsfile-sketch.bat
+++ b/server/src/assembly/resources/tools/tsfileToolSet/print-tsfile-sketch.bat
@@ -35,10 +35,8 @@ if NOT DEFINED JAVA_HOME goto :err
@REM -----------------------------------------------------------------------------
@REM ***** CLASSPATH library setting *****
@REM Ensure that any user defined CLASSPATH variables are not used on startup
-set CLASSPATH="%IOTDB_HOME%\lib"
+set CLASSPATH="%IOTDB_HOME%\lib\*"
-@REM For each jar in the IOTDB_HOME lib directory call append to build the CLASSPATH variable.
-for %%i in ("%IOTDB_HOME%\lib\*.jar") do call :append "%%i"
goto okClasspath
:append
diff --git a/server/src/assembly/resources/tools/upgrade/offline-upgrade.bat b/server/src/assembly/resources/tools/upgrade/offline-upgrade.bat
index 6315fa3..1561e5d 100644
--- a/server/src/assembly/resources/tools/upgrade/offline-upgrade.bat
+++ b/server/src/assembly/resources/tools/upgrade/offline-upgrade.bat
@@ -41,7 +41,7 @@ set JAVA_OPTS=-ea^
set CLASSPATH="%IOTDB_HOME%\lib"
@REM For each jar in the IOTDB_HOME lib directory call append to build the CLASSPATH variable.
-for %%i in ("%IOTDB_HOME%\lib\*.jar") do call :append "%%i"
+for %%i in ("%IOTDB_HOME%\lib\iotdb-*.jar") do call :append "%%i"
goto okClasspath
:append