Changeset 35597 for main

Timestamp:

2021-10-14T17:59:09+13:00 (3 years ago)

Author:

davidb

Message:

Windows build scripts updated to unzip either iconv-PRE-VS14.zip or iconv-VS14-PLUS.zip as the 'iconv' source code to compile up, depending on the value of %VisualStudioVersion%

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
-    if NOT EXIST "iconv" unzip iconv.zip
+    set ICONVZIP=iconv-VS14-PLUS.zip    
+    if %VisualStudioVersion% LEQ 14.0 set ICONVZIP=iconv-PRE-VS14.zip
+    if NOT EXIST "iconv" unzip "%ICONVZIP%"
     cd iconv
     %MAKE% %MAKE_OPTIONS% Makefile.msvc %MAKE_VARS% NO_NLS=1

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

@@ -142 +142 @@
     cd "$(COMMONHOME)"
     cd indexers\packages\windows\iconv
-    if NOT EXIST "iconv" unzip iconv.zip
+    set ICONVZIP=iconv-VS14-PLUS.zip    
+    if %VisualStudioVersion% LEQ 14.0 set ICONVZIP=iconv-PRE-VS14.zip   
+    if NOT EXIST "iconv" unzip "%ICONVZIP%"
     cd "$(COMMONHOME)"