Skip to content
This repository has been archived by the owner on Aug 28, 2024. It is now read-only.

Commit

Permalink
Changes to allow building on multiple versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@csmoore
csmoore committed Sep 13, 2013
1 parent ef26331 commit 33644ee
Show file tree
Hide file tree
Showing 5 changed files with 179 additions and 17 deletions.
29 changes: 20 additions & 9 deletions test/TestExportSymbol/build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,27 @@

<project name="ExportSymbol" basedir="." default="build">

<property name="version" value="0.1"/>
<import file="./versions.xml"/>



<target name="set_variables" depends="set_version_variables">



<!-- IMPORTANT: Change property below if your AGS Runtime install is not at default location -->
<!-- -or- you need to change the version, e.g. : C:\Program Files (x86)\ArcGIS SDKs\java10.2 -->
<property name="dir.arcgis.jars" value="C:\Program Files (x86)\ArcGIS SDKs\java10.1.1\sdk\jars"/>
<!-- IMPORTANT: Check path above -->
<!-- NOTE: these are set in versions.xml -->

<!-- ${dir.agsruntimejavasdk} and ${version.runtime}" -->



<property name="dir.arcgis.jars" value="${dir.agsruntimejavasdk}/sdk/jars"/>

<property name="version" value="0.1"/>

<property name="dir.src" value="src"/>
<property name="dir.build" value="bin"/>
<property name="dir.dist" value="dist"/>
<property name="version.runtime" value="10.1.1" />

<path id="project.classpath">
<pathelement location="${dir.dist}\ExportSymbol.jar"/>
Expand All @@ -32,8 +42,9 @@
<pathelement location="${dir.arcgis.jars}\jogl-all-natives-windows-i586.jar"/>
<pathelement location="${dir.arcgis.jars}\json.jar"/>
</path>
</target>

<target name="build" depends="create,compile,jar,dist-files">
<target name="build" depends="set_variables,create,compile,jar,dist-files">
</target>

<target name="dist-files" depends="jar">
Expand Down Expand Up @@ -72,14 +83,14 @@
</java>
</target>

<target name="create">
<target name="create" depends="set_variables">
<mkdir dir="${dir.build}"/>
<mkdir dir="${dir.dist}"/>
<echo message="Creating: ${dir.build}" />
<echo message="Creating: ${dir.dist}" />
</target>

<target name="clean">
<target name="clean" depends="set_variables">
<delete>
<fileset dir="." includes="*png"/>
</delete>
Expand Down
70 changes: 70 additions & 0 deletions test/TestExportSymbol/versions.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
<project name="ArcGIS Versions" default="set_version_variables" basedir=".">
<description>
OUTPUTS: ${version.runtime}, ${dir.agsruntimejavasdk}
Checks filesystem and sets the correct values depending on version detected.
Checks based on the default SDK folder locations and verifies that the folder exists
If 2 versions are installed, it uses the current version first
</description>

<property environment="env"/>
<echo message="ARCGISRUNTIMESDKJAVA_10_2 is set to = ${env.ARCGISRUNTIMESDKJAVA_10_2}"/>
<echo message="ARCGISRUNTIMESDKJAVA_10_1_1 is set to = ${env.ARCGISRUNTIMESDKJAVA_10_1_1}"/>

<!-- Set these to the default locations of ArcGIS/ArcPy for the current version (ex. 10.2): -->
<property name="version.runtime_current_release" value="10.2"/>

<!-- Set these to the default locations for the previous release (ex. 10.1.1): -->
<property name="version.runtime_previous_release" value="10.1.1"/>

<!-- Check for version installed -->

<target name="checkCurrentVersion">
<condition property="PresentCurrentVersion">
<isset property="env.ARCGISRUNTIMESDKJAVA_10_2"/>
</condition>
<property name="dir_agsruntimejava_current_release" value="${env.ARCGISRUNTIMESDKJAVA_10_2}"/>
</target>

<target name="checkPreviousVersion">
<condition property="PresentPreviousVersion">
<isset property="env.ARCGISRUNTIMESDKJAVA_10_1_1"/>
</condition>
<property name="dir_agsruntimejava_previous_release" value="${env.ARCGISRUNTIMESDKJAVA_10_1_1}"/>
</target>

<target name="setvariablesCurrentVersion" depends="checkCurrentVersion" if="PresentCurrentVersion">
<echo message="Current version of ArcGIS detected."/>
<property name="dir.agsruntimejavasdk" value="${dir_agsruntimejava_current_release}"/>
<property name="version.runtime" value="${version.runtime_current_release}"/>
</target>

<target name="setvariablesPreviousVersion" depends="checkPreviousVersion" if="PresentPreviousVersion">
<echo message="Previous version of ArcGIS detected."/>
<property name="dir.agsruntimejavasdk" value="${dir_agsruntimejava_previous_release}"/>
<property name="version.runtime" value="${version.runtime_previous_release}"/>
</target>

<!-- Check that expected variables exists -->

<target name="check_agsruntime_sdk_exists" depends="setvariablesCurrentVersion,setvariablesPreviousVersion">
<echo message="Checking for ArcGIS Runtime SDK at these Locations: ${dir.agsruntimejavasdk}"/>
<condition property="agsnotfound">
<or>
<not>
<isset property="dir.agsruntimejavasdk"/>
</not>
<not>
<available file="${dir.agsruntimejavasdk}" type="dir"/>
</not>
</or>
</condition>
<fail message="**** COULD NOT FIND VALID ArcGIS Runtime SDK INSTALLATION FOLDER ****" if="agsnotfound"/>
</target>

<target name="set_version_variables" depends="check_agsruntime_sdk_exists">
<echo message="ArcGIS Runtime SDK found at this locations: ${dir.agsruntimejavasdk}" />
<echo message="ArcGIS Runtime Version: ${version.runtime}" />
</target>

</project>

1 change: 1 addition & 0 deletions test/TestExportSymbolsAll/CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Esri welcomes contributions from anyone and everyone. Please see our [guidelines for contributing](https://github.com/esri/contributing).
26 changes: 18 additions & 8 deletions test/TestExportSymbolsAll/build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,28 @@

<project name="ExportSymbols" basedir="." default="build">

<property name="version" value="0.1"/>
<import file="./versions.xml"/>



<target name="set_variables" depends="set_version_variables">



<!-- IMPORTANT: Change property below if your AGS Runtime install is not at default location -->
<!-- -or- you need to change the version, e.g. : C:\Program Files (x86)\ArcGIS SDKs\java10.2 -->
<property name="dir.arcgis.jars" value="C:\Program Files (x86)\ArcGIS SDKs\java10.1.1\sdk\jars"/>
<!-- NOTE: these are set in versions.xml -->
<!-- ${dir.agsruntimejavasdk} and ${version.runtime}" -->

<!-- IMPORTANT: Check path above -->


<property name="dir.arcgis.jars" value="${dir.agsruntimejavasdk}/sdk/jars"/>

<property name="version" value="0.1"/>

<property name="dir.src" value="src"/>
<property name="dir.build" value="bin"/>
<property name="dir.dist" value="dist"/>
<property name="dir.lib3rdParty" value="lib"/>
<property name="version.runtime" value="10.1.1" />

<path id="project.classpath">
<pathelement location="${dir.dist}\ExportSymbols.jar"/>
Expand All @@ -35,6 +44,7 @@
<pathelement location="${dir.arcgis.jars}\jogl-all-natives-windows-i586.jar"/>
<pathelement location="${dir.arcgis.jars}\json.jar"/>
</path>
</target>

<target name="build" depends="create,compile,jar,dist-files">
</target>
Expand Down Expand Up @@ -76,14 +86,14 @@
</java>
</target>

<target name="create">
<target name="create" depends="set_variables">
<mkdir dir="${dir.build}"/>
<mkdir dir="${dir.dist}"/>
<echo message="Creating: ${dir.build}" />
<echo message="Creating: ${dir.dist}" />
</target>

<target name="clean">
<target name="clean" depends="set_variables">
<delete>
<fileset dir="." includes="*png"/>
</delete>
Expand Down
70 changes: 70 additions & 0 deletions test/TestExportSymbolsAll/versions.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
<project name="ArcGIS Versions" default="set_version_variables" basedir=".">
<description>
OUTPUTS: ${version.runtime}, ${dir.agsruntimejavasdk}
Checks filesystem and sets the correct values depending on version detected.
Checks based on the default SDK folder locations and verifies that the folder exists
If 2 versions are installed, it uses the current version first
</description>

<property environment="env"/>
<echo message="ARCGISRUNTIMESDKJAVA_10_2 is set to = ${env.ARCGISRUNTIMESDKJAVA_10_2}"/>
<echo message="ARCGISRUNTIMESDKJAVA_10_1_1 is set to = ${env.ARCGISRUNTIMESDKJAVA_10_1_1}"/>

<!-- Set these to the default locations of ArcGIS/ArcPy for the current version (ex. 10.2): -->
<property name="version.runtime_current_release" value="10.2"/>

<!-- Set these to the default locations for the previous release (ex. 10.1.1): -->
<property name="version.runtime_previous_release" value="10.1.1"/>

<!-- Check for version installed -->

<target name="checkCurrentVersion">
<condition property="PresentCurrentVersion">
<isset property="env.ARCGISRUNTIMESDKJAVA_10_2"/>
</condition>
<property name="dir_agsruntimejava_current_release" value="${env.ARCGISRUNTIMESDKJAVA_10_2}"/>
</target>

<target name="checkPreviousVersion">
<condition property="PresentPreviousVersion">
<isset property="env.ARCGISRUNTIMESDKJAVA_10_1_1"/>
</condition>
<property name="dir_agsruntimejava_previous_release" value="${env.ARCGISRUNTIMESDKJAVA_10_1_1}"/>
</target>

<target name="setvariablesCurrentVersion" depends="checkCurrentVersion" if="PresentCurrentVersion">
<echo message="Current version of ArcGIS detected."/>
<property name="dir.agsruntimejavasdk" value="${dir_agsruntimejava_current_release}"/>
<property name="version.runtime" value="${version.runtime_current_release}"/>
</target>

<target name="setvariablesPreviousVersion" depends="checkPreviousVersion" if="PresentPreviousVersion">
<echo message="Previous version of ArcGIS detected."/>
<property name="dir.agsruntimejavasdk" value="${dir_agsruntimejava_previous_release}"/>
<property name="version.runtime" value="${version.runtime_previous_release}"/>
</target>

<!-- Check that expected variables exists -->

<target name="check_agsruntime_sdk_exists" depends="setvariablesCurrentVersion,setvariablesPreviousVersion">
<echo message="Checking for ArcGIS Runtime SDK at these Locations: ${dir.agsruntimejavasdk}"/>
<condition property="agsnotfound">
<or>
<not>
<isset property="dir.agsruntimejavasdk"/>
</not>
<not>
<available file="${dir.agsruntimejavasdk}" type="dir"/>
</not>
</or>
</condition>
<fail message="**** COULD NOT FIND VALID ArcGIS Runtime SDK INSTALLATION FOLDER ****" if="agsnotfound"/>
</target>

<target name="set_version_variables" depends="check_agsruntime_sdk_exists">
<echo message="ArcGIS Runtime SDK found at this locations: ${dir.agsruntimejavasdk}" />
<echo message="ArcGIS Runtime Version: ${version.runtime}" />
</target>

</project>

0 comments on commit 33644ee

Please sign in to comment.