0030156: Visualization, TKV3d - Triangles outside of selection volume are selected

[occt.git] / genproj.bat

diff --git a/genproj.bat b/genproj.bat
index ab7d259..1e25640 100644 (file)
--- a/genproj.bat
+++ b/genproj.bat
@@ -2,24 +2,53 @@
 
 rem Helper script to run generation of VS projects on Windows.
 rem Running it requires that Tcl should be in the PATH
+rem Optional arguments: Format OS
+rem Format can be vc10, vc11, vc12, vc14, vc141, cbp, or xcd
+rem OS can be wnt, uwp, mac, or lin
 
 SET "OLD_PATH=%PATH%"
 
+rem run GUI configurator if custom.bat is missing
 if not exist "%~dp0custom.bat" (
-  tclsh.exe ./adm/genconf.tcl
+  call %~dp0genconf.bat
 )
 
 if not exist "%~dp0custom.bat" (
-  echo custom.bat is not created. Run the script again and generate custom.bat
+  echo Error: custom.bat is not present.
+  echo Run the script again to generate custom.bat, or create it manually
   goto :eof
-) else (
-  call "%~dp0custom.bat"
 )
 
 if exist "%~dp0env.bat" (
-  call "%~dp0env.bat"
+  call "%~dp0env.bat" %1
+)
+
+rem  find Tcl
+set "TCL_EXEC=tclsh.exe"
+for %%X in (%TCL_EXEC%) do (set TCL_FOUND=%%~$PATH:X)
+
+set "TCL_EXEC2=tclsh86.exe"
+if not defined TCL_FOUND (
+  for %%X in (%TCL_EXEC2%) do (
+    set TCL_FOUND=%%~$PATH:X
+    set TCL_EXEC=%TCL_EXEC2%
+  )
+)
+
+rem fail if Tcl is not found
+if not defined TCL_FOUND (
+  echo Error: "%TCL_EXEC%" is not found. Please update PATH variable ^(use custom.bat^)
+  goto :eof
+) 
+
+set aPlatform=%2
+if "%aPlatform%" == "" (
+  set aPlatform=wnt
+  if "%VCPROP%" == "Universal" (
+    set aPlatform=uwp
+  )
 )
 
 cd %~dp0
-tclsh.exe ./adm/genproj.tcl -path=. -target=%VCVER% 
+%TCL_EXEC% %~dp0adm/start.tcl genproj %VCFMT% %aPlatform% %3 %4 %5
 SET "PATH=%OLD_PATH%"