Changeset 35702 for main

Timestamp:

2021-10-25T14:14:46+13:00 (2 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

Location:

main/trunk

Files:

• greenstone2/common-src/indexers/winMake.bat (modified) (1 diff)
• greenstone2/common-src/win32.mak (modified) (6 diffs)
• greenstone3/build.xml (modified) (4 diffs)
• gs2build/win32.mak (modified) (1 diff)

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

@@ -53 +53 @@
     cd 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=%"
-    
-    if %VSMajor% LSS 14 set ICONVZIP=iconv-PRE-VS14.zip
+    if %VISUAL_STUDIO_MAJORVERSION% 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

@@ -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=

main/trunk/greenstone3/build.xml

@@ -134 +134 @@
   <if>
     <bool><isset property="env.VisualStudioVersion"/></bool>
-    <property name="visualstudio.version" value="${env.VisualStudioVersion}"/>
+    <property name="visualstudio.majorversion" value="${env.VisualStudioVersion}"/>
     <else>
       <!-- possible that earlier versions of VS don't set this, so default to VS13 to trigger iconv-PRE-VS14.zip -->
-      <property name="visualstudio.version" value="13.0"/> 
+      <property name="visualstudio.majorversion" value="13"/> 
     </else>
   </if>
@@ -3755 +3755 @@
       <arg value="/f"/>
       <arg value="win32.mak"/>
-      <arg value="VISUAL_STUDIO_VERSION=${visualstudio.version}"/>      
+      <arg value="VISUAL_STUDIO_MAJORVERSION=${visualstudio.majorversion}"/>      
       <arg value="GSDLHOME=${gs2build.home}"/>
       <arg value="ENABLE_JNI=${gs2.windows.enablejni}"/>
@@ -3803 +3803 @@
       <arg value="win32.mak"/>
       <arg value="install"/>
-      <arg value="VISUAL_STUDIO_VERSION=${env.VisualStudioVersion}"/>
+      <arg value="VISUAL_STUDIO_MAJORVERSION=${visualstudio.majorversion}"/>
       <arg value="GSDLHOME=${gs2build.home}"/>
       <arg value="ENABLE_JNI=${gs2.windows.enablejni}"/>
@@ -4253 +4253 @@
       src="${common.src.home}/packages/sqlite/${sqlite.targz.version}"
       dest="${common.src.home}/packages/sqlite"/>
-    <!-- VisualStudioVersion = 16.0 -->
-    <!-- diff unzip when >=14 -->
 
     <if>
       <bool>
-    <and>
-      <isset property="env.VisualStudioVersion"/>
-      <islessthan arg1="${env.VisualStudioVersion}" arg2="14.0"/>
-    </and>
+        <islessthan arg1="${visualstudio.majorversion}" arg2="14"/>
       </bool>
-      <echo>Unzipping Pre VS14.0 compatible version of iconv</echo>
+      <echo>Unzipping Pre-VS14.0 compatible version of iconv</echo>
       <unzip src="${common.src.home}/indexers/packages/windows/iconv/iconv-PRE-VS14.zip"
-         dest="${common.src.home}/indexers/packages/windows/iconv"/>
+             dest="${common.src.home}/indexers/packages/windows/iconv"/>
       <else>
-    <echo>Unzipping VS14.0 Plus compatible version of iconv</echo>
-    <unzip src="${common.src.home}/indexers/packages/windows/iconv/iconv-VS14-PLUS.zip"
-           dest="${common.src.home}/indexers/packages/windows/iconv"/>
+        <echo>Unzipping VS14.0-Plus compatible version of iconv</echo>
+        <unzip src="${common.src.home}/indexers/packages/windows/iconv/iconv-VS14-PLUS.zip"
+               dest="${common.src.home}/indexers/packages/windows/iconv"/>
       </else>
     </if>
-    <!--
-    <unzip src="${common.src.home}/indexers/packages/windows/iconv/iconv.zip"
-       dest="${common.src.home}/indexers/packages/windows/iconv"/>
-    -->
+   
   </target>
     

main/trunk/gs2build/win32.mak

@@ -54 +54 @@
 
 
-MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)" VISUAL_STUDIO_VERSION="$(VISUAL_STUDIO_VERSION)"
+MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)" VISUAL_STUDIO_MAJORVERSION="$(VISUAL_STUDIO_MAJORVERSION)"
 
 !IF $(GSDL_VC4)