Changeset 35702 for main/trunk/greenstone3/build.xml

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/greenstone3/build.xml (modified) (4 diffs)

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>