Changeset 35702 for main/trunk/greenstone2/common-src/win32.mak

Timestamp:

2021-10-25T14:14:46+13:00 (3 years ago)

Author:

davidb

Message:

Visual Studio *Major* version now set in build.xml as integer value to make subsequent testing in Windows nmake and bat files

File:

• main/trunk/greenstone2/common-src/win32.mak (modified) (6 diffs)

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

@@ -64 +64 @@
 JDBMEDIT_DIR = src\jdbmedit
 
-MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)" VISUAL_STUDIO_VERSION="$(VISUAL_STUDIO_VERSION)" BINDIR="$(GSDLHOME)\bin\windows" LIBDIR="$(GSDLHOME)\lib\windows"
+MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)" VISUAL_STUDIO_MAJORVERSION="$(VISUAL_STUDIO_MAJORVERSION)" BINDIR="$(GSDLHOME)\bin\windows" LIBDIR="$(GSDLHOME)\lib\windows"
 
 !IF $(GSDL_VC4)
@@ -142 +142 @@
     cd "$(COMMONHOME)"
     cd indexers\packages\windows\iconv
-    @ 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=%"
-    @ echo VSMajor = %VSMajor%
-    
-    @ if %VSMajor% LSS 14 set ICONVZIP=iconv-PRE-VS14.zip
+    @ set ICONVZIP=iconv-VS14-PLUS.zip  
+    @ if $(VISUAL_STUDIO_MAJORVERSION) LSS 14 set ICONVZIP=iconv-PRE-VS14.zip
     @ echo Selected iconv to unzip: %ICONVZIP%
     if NOT EXIST "iconv" unzip "%ICONVZIP%"
@@ -215 +209 @@
     cd indexers
     set DEBUG=$(DEBUG)
-    set VISUAL_STUDIO_VERSION=$(VISUAL_STUDIO_VERSION)
+    set VISUAL_STUDIO_MAJORVERSION=$(VISUAL_STUDIO_MAJORVERSION)
     set ENABLE_MG=$(ENABLE_MG)
     set ENABLE_MGPP=$(ENABLE_MGPP)
@@ -221 +215 @@
     call winMake.bat clean
     set DEBUG=
-    set VISUAL_STUDIO_VERSION=
+    set VISUAL_STUDIO_MAJORVERSION=
     set ENABLE_MG=
     set ENABLE_MGPP=
@@ -279 +273 @@
     cd "$@"
     set DEBUG=$(DEBUG)
-    set VISUAL_STUDIO_VERSION=$(VISUAL_STUDIO_VERSION)
+    set VISUAL_STUDIO_MAJORVERSION=$(VISUAL_STUDIO_MAJORVERSION)
     set ENABLE_MG=$(ENABLE_MG)
     set ENABLE_MGPP=$(ENABLE_MGPP)
@@ -293 +287 @@
 
     set DEBUG=
-    set VISUAL_STUDIO_VERSION=
+    set VISUAL_STUDIO_MAJORVERSION=
     set ENABLE_MG=
     set ENABLE_MGPP=