forked from pool/tomcat
45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
|
Index: build.xml
|
||
|
|
IDEA additional info:
|
||
|
|
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
||
|
|
<+>UTF-8
|
||
|
|
===================================================================
|
||
|
|
--- build.xml (date 1529515764000)
|
||
|
|
+++ build.xml (date 1534335916000)
|
||
|
|
@@ -15,7 +15,8 @@
|
||
|
|
See the License for the specific language governing permissions and
|
||
|
|
limitations under the License.
|
||
|
|
-->
|
||
|
|
-<project name="Tomcat 9.0" default="deploy" basedir=".">
|
||
|
|
+<project name="Tomcat 9.0" default="deploy" basedir="."
|
||
|
|
+ xmlns:if="ant:if" xmlns:unless="ant:unless">
|
||
|
|
|
||
|
|
<!-- ===================== Initialize Property Values ==================== -->
|
||
|
|
|
||
|
|
@@ -728,7 +729,7 @@
|
||
|
|
</target>
|
||
|
|
|
||
|
|
<target name="build-bnd" unless="bnd.uptodate"
|
||
|
|
- depends="setup-bnd,build-prepare">
|
||
|
|
+ depends="setup-bnd,build-prepare" if="add.osgi.jar.metadata">
|
||
|
|
|
||
|
|
<mkdir dir="${tomcat.bnd}" />
|
||
|
|
<copy todir="${tomcat.bnd}" overwrite="yes" filtering="yes"
|
||
|
|
@@ -2970,7 +2971,7 @@
|
||
|
|
|
||
|
|
<!-- ======================= Macros, Taskdefs etc ======================== -->
|
||
|
|
|
||
|
|
- <target name="setup-bnd" >
|
||
|
|
+ <target name="setup-bnd" if="add.osgi.jar.metadata">
|
||
|
|
<!-- Download bnd -->
|
||
|
|
<antcall target="downloadfile">
|
||
|
|
<param name="sourcefile" value="${bnd.loc}"/>
|
||
|
|
@@ -3025,7 +3026,7 @@
|
||
|
|
<zipfileset file="@{notice}" fullpath="META-INF/NOTICE" />
|
||
|
|
<zipfileset file="@{license}" fullpath="META-INF/LICENSE" />
|
||
|
|
</jar>
|
||
|
|
- <antcall target="add-osgi" >
|
||
|
|
+ <antcall target="add-osgi" if:set="add.osgi.jar.metadata">
|
||
|
|
<param name="jarfile" value="@{jarfile}" />
|
||
|
|
<param name="addOSGi" value="@{addOSGi}" />
|
||
|
|
</antcall>
|