Skip to content
Snippets Groups Projects
Commit 7ebe224d authored by david_williams's avatar david_williams
Browse files

no longer need to build war as a special case

parent dd38a203
No related branches found
No related tags found
No related merge requests found
......@@ -213,10 +213,30 @@
<!-- ===================================================================== -->
<!-- Steps to do before running assemble. -->
<!-- ===================================================================== -->
<target name="preAssemble">
<ant
antfile="${buildDirectory}/plugins/org.eclipse.wst.ws.explorer/build-war.xml">
<!-- Note: in version 2.0 (and previous) we need to build the
explorer war file by invoking script. In 3.0 forward, we do not,
so this simple existence check allows us to use the same script for
both streams -->
<!-- ===================================================================== -->
<property
name="buildwarfilename"
value="${buildDirectory}/plugins/org.eclipse.wst.ws.explorer/build-war.xml" />
<target
name="preAssemble"
depends="buildwar">
</target>
<target name="checkForBuildFile">
<condition property="buildFileExists">
<available file="${buildwarfilename}" />
</condition>
</target>
<target
name="buildwar"
depends="checkForBuildFile"
if="buildFileExists">
<ant antfile="${buildwarfilename}">
<property
name="baseLocation"
value="${baseLocation}" />
......
......@@ -217,8 +217,40 @@
<!-- ===================================================================== -->
<!-- Steps to do before running assemble. -->
<!-- ===================================================================== -->
<target name="preAssemble">
<!-- Note: in version 2.0 (and previous) we need to build the
explorer war file by invoking script. In 3.0 forward, we do not,
so this simple existence check allows us to use the same script for
both streams -->
<!-- ===================================================================== -->
<property
name="buildwarfilename"
value="${buildDirectory}/plugins/org.eclipse.wst.ws.explorer/build-war.xml" />
<target
name="preAssemble"
depends="buildwar">
</target>
<target name="checkForBuildFile">
<condition property="buildFileExists">
<available file="${buildwarfilename}" />
</condition>
</target>
<target
name="buildwar"
depends="checkForBuildFile"
if="buildFileExists">
<ant antfile="${buildwarfilename}">
<property
name="baseLocation"
value="${baseLocation}" />
<property
name="basedir"
value="${buildDirectory}/plugins/org.eclipse.wst.ws.explorer" />
<property
name="buildDirectory"
value="${buildDirectory}" />
</ant>
</target>
<!-- ===================================================================== -->
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment