Changeset 35703 for main

Timestamp:

2021-10-25T15:04:25+13:00 (2 years ago)

Author:

davidb

Message:

Introduction/Splicing in of VISUAL_STUDIO_MAJORVERSION to keep GS2 code base in line with recent changes in GS3. Principally related to which source code version of iconv.zip is unzipped by the compilation process, as < VS14 needs different version to >=VS14

Location:

main/trunk/greenstone2

Files:

• makegs2.bat (modified) (2 diffs)
• win32.mak (modified) (2 diffs)

main/trunk/greenstone2/makegs2.bat

@@ -75 +75 @@
 IF NOT EXIST .\common-src\packages\windows\stlport\stlport\nul IF NOT EXIST .\common-src\packages\windows\stlport\stlport.zip GOTO ENDNOWINPACK
 
-IF NOT EXIST .\common-src\indexers\packages\windows\iconv\iconv\nul IF NOT EXIST .\common-src\indexers\packages\windows\iconv\iconv.zip GOTO ENDNOICONV
+
+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 VISUAL_STUDIO_MAJORVERSION=%VisualStudioVersion:.=& set VSMinor=%
+echo VISUAL_STUDIO_MAJORVERSION = "%VISUAL_STUDIO_MAJORVERSION%"
+if %VISUAL_STUDIO_MAJORVERSION% LSS 14 set ICONVZIP=iconv-PRE-VS14.zip
+echo Selected iconv to unzip: %ICONVZIP%
+
+IF NOT EXIST .\common-src\indexers\packages\windows\iconv\iconv\nul IF NOT EXIST .\common-src\indexers\packages\windows\iconv\%ICONVZIP% GOTO ENDNOICONV
 
 IF NOT EXIST .\common-src\packages\sqlite\sqlite* IF NOT EXIST .\common-src\packages\sqlite\sqlite*.tar.gz GOTO ENDNOSQLITE
@@ -108 +117 @@
 IF EXIST .\common-src\packages\windows\stlport\stlport.zip .\bin\windows\unzip.exe -o .\common-src\packages\windows\stlport\stlport.zip -d .\common-src\packages\windows\stlport\
 
-IF EXIST .\common-src\indexers\packages\windows\iconv\iconv.zip .\bin\windows\unzip.exe -o .\common-src\indexers\packages\windows\iconv\iconv.zip -d .\common-src\indexers\packages\windows\iconv\
+IF EXIST .\common-src\indexers\packages\windows\iconv\%ICONVZIP% .\bin\windows\unzip.exe -o .\common-src\indexers\packages\windows\iconv\%ICONVZIP% -d .\common-src\indexers\packages\windows\iconv\
 
 IF EXIST .\common-src\packages\sqlite\sqlite*.tar.gz .\bin\windows\gunzip.exe -cd .\common-src\packages\sqlite\sqlite*.tar.gz | .\bin\windows\tar.exe xv --directory=./common-src/packages/sqlite

main/trunk/greenstone2/win32.mak

@@ -26 +26 @@
 
 GSDLHOME = $(MAKEDIR)
+
+!IF "$(VISUAL_STUDIO_MAJORVERSION)"==""
+# IF not specified, default to older version to trigger older iconv.zip source code compilation
+VISUAL_STUDIO_MAJORVERSION = 13
+!ELSE
+VISUAL_STUDIO_MAJORVERSION = $(VISUAL_STUDIO_MAJORVERSION)
+!ENDIF
+
 GSDL_VC4 = 0
 # It only ever makes sense for GS2 to turn on LOCAL_LIBRARY and APACHE_HTTPD if needed
@@ -59 +67 @@
 
 
-MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)"
+MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)" VISUAL_STUDIO_MAJORVERSION="$(VISUAL_STUDIO_MAJORVERSION)"
 
 !IF $(GSDL_VC4)