Changeset 35666 for main

Timestamp:

2021-10-22T09:52:16+13:00 (3 years ago)

Author:

davidb

Message:

Still having an issue on the Window Release Kit machine failing to run the compile scripts. It looks like VisualStudioVersion as an environment variable isn't being set there, however due to current Covid Lockdown, not able to access the machine to check. An earlier test in the compile sequence sets VISUAL_STUDIO_VERSION to 13.0 if it is not set (reasonable default to trigger working with older iconv.zip, and so use this variable here also now

File:

• main/trunk/greenstone2/common-src/indexers/winMake.bat (modified) (1 diff)

main/trunk/greenstone2/common-src/indexers/winMake.bat

@@ -53 +53 @@
     cd packages\windows\iconv
     set ICONVZIP=iconv-VS14-PLUS.zip    
-    if %VisualStudioVersion% LEQ 14.0 set ICONVZIP=iconv-PRE-VS14.zip
+    if %VISUAL_STUDIO_VERSION% LEQ 14.0 set ICONVZIP=iconv-PRE-VS14.zip
     if NOT EXIST "iconv" unzip "%ICONVZIP%"
     cd iconv