s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

moving to doRun (to avoid Appveyor workarounds)

Browse Source
This commit is contained in:
Thad Guidry 2018-01-04 14:25:17 -06:00 committed by GitHub
parent 9d6251b721
commit 9a17e1f599
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
refine.bat
View File

@ -70,24 +70,6 @@ for /f "tokens=1,* delims==" %%a in (refine.ini) do (
set %%a=%%b set %%a=%%b
) )
rem --- Log for troubleshooting ------------------------------------------
echo Getting Java Version...
java -version 2^>^&1
ECHO.=====================================================
for /f "tokens=*" %%a in ('java -version 2^>^&1 ^| find "version"') do (set JVERSION=%%a)
ECHO Getting Free Ram...
wmic os get FreePhysicalMemory
for /f "usebackq skip=1 tokens=*" %%i in (`wmic os get FreePhysicalMemory ^| findstr /r /v "^$"`) do @set /A freeRam=%%i/1024
(
echo -----------------------
echo PROCESSOR_ARCHITECTURE = %PROCESSOR_ARCHITECTURE%
echo JAVA_HOME = %JAVA_HOME%
echo java -version = %JVERSION%
echo freeRam = %freeRam%M
echo REFINE_MEMORY = %REFINE_MEMORY%
echo -----------------------
) > support.log
rem --- Check JAVA_HOME --------------------------------------------- rem --- Check JAVA_HOME ---------------------------------------------
if not "%JAVA_HOME%" == "" goto gotJavaHome if not "%JAVA_HOME%" == "" goto gotJavaHome
@ -210,6 +192,24 @@ if ""%ACTION%"" == ""distclean"" goto doAnt
if ""%ACTION%"" == ""run"" goto doRun if ""%ACTION%"" == ""run"" goto doRun
:doRun :doRun
rem --- Log for troubleshooting ------------------------------------------
echo Getting Java Version...
java -version 2^>^&1
echo.=====================================================
for /f "tokens=*" %%a in ('java -version 2^>^&1 ^| find "version"') do (set JVERSION=%%a)
echo Getting Free Ram...
wmic os get FreePhysicalMemory
for /f "usebackq skip=1 tokens=*" %%i in (`wmic os get FreePhysicalMemory ^| findstr /r /v "^$"`) do @set /A freeRam=%%i/1024
(
echo -----------------------
echo PROCESSOR_ARCHITECTURE = %PROCESSOR_ARCHITECTURE%
echo JAVA_HOME = %JAVA_HOME%
echo java -version = %JVERSION%
echo freeRam = %freeRam%M
echo REFINE_MEMORY = %REFINE_MEMORY%
echo -----------------------
) > support.log
set CLASSPATH="%REFINE_CLASSES_DIR%;%REFINE_LIB_DIR%\*" set CLASSPATH="%REFINE_CLASSES_DIR%;%REFINE_LIB_DIR%\*"
"%JAVA_HOME%\bin\java.exe" -cp %CLASSPATH% %OPTS% -Djava.library.path=%REFINE_LIB_DIR%/native/windows com.google.refine.Refine "%JAVA_HOME%\bin\java.exe" -cp %CLASSPATH% %OPTS% -Djava.library.path=%REFINE_LIB_DIR%/native/windows com.google.refine.Refine
goto end goto end