Bug 574007 part2 - [win32] Re-work the SWT Windows native build script

to run even without W: drive
- Added reference to SWT Windows native setup page wiki in case of
missing or incomplete setup.

Change-Id: I36662bebfa6fdc12be09eecd4ee0ee8799ca30a7
Signed-off-by: Niraj Modi <niraj.modi@in.ibm.com>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.swt/+/181745
Tested-by: Platform Bot <platform-bot@eclipse.org>

1 files changed, 4 insertions, 1 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat
index 97db23bb78..b294af2a1b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat
@@ -36,6 +36,7 @@ IF EXIST "%MSVC_HOME%" (
 	echo "Microsoft Visual Studio %MSVC_VERSION% dir: %MSVC_HOME%"
 ) ELSE (
 	echo "WARNING: Microsoft Visual Studio %MSVC_VERSION% was not found."
+    echo "     Refer steps for SWT Windows native setup: https://www.eclipse.org/swt/swt_win_native.php"
 )
 
 IF "x.%1"=="x.x86" GOTO X86
@@ -67,8 +68,9 @@ IF "x.%SWT_JAVA_HOME%"=="x." (
         )
     )
 )
-IF "x.%SWT_JAVA_HOME%"=="x." (
+IF NOT EXIST %SWT_JAVA_HOME% (
     echo "WARNING: x64 Java JDK not found. Please set SWT_JAVA_HOME to your JDK directory."
+    echo "     Refer steps for SWT Windows native setup: https://www.eclipse.org/swt/swt_win_native.php"
 ) ELSE (
     echo "SWT_JAVA_HOME x64: %SWT_JAVA_HOME%"
 )
@@ -91,5 +93,6 @@ WHERE cl
 if %ERRORLEVEL% NEQ 0 (
     echo "WARNING: cl (Microsoft C compiler) not found on path. Please install Microsoft Visual Studio."
     echo "     If already installed, try launching eclipse from the 'Developer Command Prompt for VS' "
+    echo "     Refer steps for SWT Windows native setup: https://www.eclipse.org/swt/swt_win_native.php"
 )
 nmake -f make_win32.mak %1 %2 %3 %4 %5 %6 %7 %8 %9
\ No newline at end of file