Changeset 35628 for main/trunk

Timestamp:

2021-10-17T14:15:57+13:00 (3 years ago)

Author:

davidb

Message:

Changed to more carefully set/check VisualStudioVersion. When not set, the way it was previously written it defaulted to passing on the literal characters '${env...}' which produced an nmake error

File:

• main/trunk/greenstone3/build.xml (modified) (3 diffs)

main/trunk/greenstone3/build.xml

@@ -1 +1 @@
 <?xml version="1.0"?>
 <!-- ====================================================================== 
-     March 2005                                                    
-
      Greenstone3 build and install script
                   
-     kjdon                                                                
+     kjdon, anu, davidb
      ====================================================================== -->
 <project name="greenstone3" default="usage" basedir=".">
@@ -133 +131 @@
   </if>
 
+
+  <if>
+    <bool><isset property="env.VisualStudioVersion"/></bool>
+    <property name="visualstudio.version" 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"/> 
+    </else>
+  </if>
+  
   <!-- Check for whether tomcat is to allow symlinks or not. This should always be false
        for Windows. And ideally also for any other OS with a case insensitive filesystem, but
@@ -3745 +3753 @@
       <arg value="/f"/>
       <arg value="win32.mak"/>
-      <arg value="VISUAL_STUDIO_VERSION=${env.VisualStudioVersion}"/>      
+      <arg value="VISUAL_STUDIO_VERSION=${visualstudio.version}"/>      
       <arg value="GSDLHOME=${gs2build.home}"/>
       <arg value="ENABLE_JNI=${gs2.windows.enablejni}"/>