← Back to branch summary

~ubuntu-branches/ubuntu/vivid/tomcat6/vivid-proposed

« back to all changes in this revision

Viewing changes to .pc/0004-split-deploy-webapps-target-from-deploy-target.patch/build.xml

  • Committer: Package Import Robot
  • Author(s): Emmanuel Bourg
  • Date: 2014-02-17 00:02:00 UTC
  • mfrom: (1.2.10)
  • Revision ID: package-import@ubuntu.com-20140217000200-qs6ki7bhqnfhkas7
Tags: 6.0.39-1
* Team upload.
* New upstream release.
  - Refreshed the patches
* Standards-Version updated to 3.9.5 (no changes)
* Switch to debhelper level 9
* Use XZ compression for the upstream tarball
* Use canonical URL for the Vcs-Git field

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/0004-split-deploy-webapps-target-from-deploy-target.patch/build.xml
58
58
  <property name="tomcat.classes"        value="${tomcat.output}/classes"/>
59
59
  <property name="tomcat.dist"           value="${tomcat.output}/dist"/>
60
60
  <property name="tomcat.manifests"      value="${tomcat.output}/manifests"/>
61
 
  <property name="test.failonerror"      value="true"/>
62
 
  <property name="test.runner"           value="junit.textui.TestRunner"/>
63
61
 
64
62
  <!-- Can't be lower - jsp uses templates -->
65
63
  <property name="compile.source" value="1.5"/>
118
116
  <!-- Just build Tomcat -->
119
117
  <target name="build-prepare">
120
118
 
121
 
    <available classname="junit.framework.TestCase" property="junit.present" />
122
 
 
123
119
    <mkdir dir="${tomcat.classes}"/>
124
120
 
125
121
    <delete dir="${tomcat.build}/temp" />
163
159
        <include name="**/*.xml"/>
164
160
      </fileset>
165
161
    </copy>
 
162
    <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
 
163
    <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
 
164
      <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
 
165
        <include name="*" />
 
166
        <exclude name="jspxml*" />
 
167
      </fileset>
 
168
    </copy>
166
169
 
167
170
  </target>
168
171
 
306
309
 
307
310
    <!-- Servlet 2.5 Implementation JAR File -->
308
311
    <jarIt jarfile="${servlet-api.jar}" filesId="files.servlet-api"
309
 
      manifest="${tomcat.manifests}/servlet-api.jar.manifest" />
 
312
      manifest="${tomcat.manifests}/servlet-api.jar.manifest"
 
313
      license="${tomcat.manifests}/servlet-api.jar.license"
 
314
      notice="${tomcat.manifests}/servlet-api.jar.notice" />
310
315
 
311
316
    <!-- JSP 2.1 Implementation JAR File -->
312
317
    <jarIt jarfile="${jsp-api.jar}" filesId="files.jsp-api"