Changeset 35701

Timestamp:

2021-10-25T12:09:20+13:00 (2 years ago)

Author:

davidb

Message:

LSS only works on integer nums, so need to extract Major version from VISUAL_STUDIO_VERSION first

Location:

main/trunk/greenstone2/common-src

Files:

• indexers/winMake.bat (modified) (1 diff)
• win32.mak (modified) (1 diff)

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

@@ -52 +52 @@
 
     cd packages\windows\iconv
-    set ICONVZIP=iconv-VS14-PLUS.zip    
-    if %VISUAL_STUDIO_VERSION% LSS 14.0 set ICONVZIP=iconv-PRE-VS14.zip
+    set ICONVZIP=iconv-VS14-PLUS.zip
+    :: Following line loosely based on
+    ::   https://stackoverflow.com/questions/32578014/how-to-extract-version-number-in-a-windows-batch-file/32578368
+    set "VSMajor=%VISUAL_STUDIO_VERSION:.= & set VSMinor=%"
+    
+    if %VSMajor% LSS 14 set ICONVZIP=iconv-PRE-VS14.zip
     echo Selected iconvzip: %ICONVZIP%
     if NOT EXIST "iconv" unzip "%ICONVZIP%"

main/trunk/greenstone2/common-src/win32.mak

@@ -143 +143 @@
     cd indexers\packages\windows\iconv
     @ set ICONVZIP=iconv-VS14-PLUS.zip
-    @ if $(VISUAL_STUDIO_VERSION) LSS 14.0 set ICONVZIP=iconv-PRE-VS14.zip
+
+# Following line loosely based on
+#   https://stackoverflow.com/questions/32578014/how-to-extract-version-number-in-a-windows-batch-file/32578368
+    @ set "VSMajor=$(VISUAL_STUDIO_VERSION):.= & set VSMinor=%"
+    @ echo VSMajor = %VSMajor%
+    
+    @ if %VSMajor% LSS 14 set ICONVZIP=iconv-PRE-VS14.zip
     @ echo Selected iconv to unzip: %ICONVZIP%
     if NOT EXIST "iconv" unzip "%ICONVZIP%"