Changeset 35589 for local/greenstone3

Timestamp:

2021-10-14T15:33:07+13:00 (3 years ago)

Author:

davidb

Message:

Changes (and tidy up) based on recent testing under Windows 64-bit

File:

• local/greenstone3/windows-64bit/gs3-devel.bat (modified) (2 diffs)

local/greenstone3/windows-64bit/gs3-devel.bat

@@ -1 +1 @@
 @echo off
 
-rem pushd "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC"
-pushd "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC"
-call vcvarsall.bat amd64
+::::
+:: Visual Studio
+::::
+
+:: The Start-Menu way to get a VisualStudio terminal open is:
+::
+:: %comspec% /k "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
+::
+:: To work within an existing terminal window, use 'call' instead:
+::
+pushd "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\"
+call "VC\Auxiliary\Build\vcvars64.bat"
 popd
 
-echo Environment for Visual Studio set up
+echo "Environment for Visual Studio 64-bit Compiler setup"
 
-rem For ant prepare to work, now need wget (along with wgetrc file) on PATH
-rem These are just the GS3 wget
+:::
+:: Legacy code that used to do the above
+:::
+
+:: :: pushd "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC"
+:: pushd "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC"
+:: call vcvarsall.bat amd64
+:: popd
+
+:: The following looks like an attempt to work through a Cygwin terminal directly
+:: (as this provides 'svn').  Not recently tested, so unclear if this works
+::
+::/cygdrive/c/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Auxiliary/Build/vcvarsall.bat
+
+
+::::
+:: Ant
+::::
+
+:: For ant prepare to work, now need wget (along with wgetrc file) on PATH
+:: In 'local/bin' folder there is an appropriate binary for this (actually
+:: comes from a GS3 Windows compilation!)
+
 echo "Adding wget with its wgetrc to PATH for devel"
 pushd bin
@@ -18 +48 @@
 
 
-
-rem %comspec% /k ""C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcvarsall.bat"" amd64