Changeset 36125

Timestamp:

2022-03-30T10:56:26+13:00 (2 years ago)

Author:

kjdon

Message:

the test for visual studio version was using environment variables before they had been loaded as properties. So I have moved this code to below the property environment='env' line

File:

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

main/trunk/greenstone3/build.xml

@@ -129 +129 @@
   <if><bool><available file="${user.home}/build.properties"/></bool>
     <property file="${user.home}/build.properties"/>
-  </if>
-
-
-  <if>
-    <bool><isset property="env.VisualStudioVersion"/></bool>
-    <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.majorversion" value="13"/> 
-    </else>
   </if>
 
@@ -361 +351 @@
   <import file="resources/xml/executables.xml"/>
     
+  <if>
+    <bool><isset property="env.VisualStudioVersion"/></bool>
+    <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.majorversion" value="13"/> 
+    </else>
+  </if>
+
   <!-- version properties for external packages -->
   <!-- for Java versions < 1.4, we print out the message that Java is too old.