View | Details | Raw Unified | Return to bug 57344
Collapse All | Expand All

(-)build.xml (-70 / +47 lines)
Lines 1282-1295 Link Here
1282
    <zip destfile="${tomcat.embed}/${final.name}-embed.zip">
1282
    <zip destfile="${tomcat.embed}/${final.name}-embed.zip">
1283
      <fileset dir="${tomcat.embed}">
1283
      <fileset dir="${tomcat.embed}">
1284
        <include name="**" />
1284
        <include name="**" />
1285
        <exclude name="*.asc" />
1285
        <exclude name="*.md5" />
1286
        <exclude name="*.md5" />
1287
        <exclude name="*.sha1" />
1286
        <exclude name="*.zip" />
1288
        <exclude name="*.zip" />
1287
        <exclude name="*.tar.gz" />
1289
        <exclude name="*.tar.gz" />
1288
      </fileset>
1290
      </fileset>
1289
    </zip>
1291
    </zip>
1290
    <antcall target="md5sum">
1292
    <hashAndSign file="${tomcat.embed}/${final.name}-embed.zip" />
1291
      <param name="file" value="${tomcat.embed}/${final.name}-embed.zip" />
1292
    </antcall>
1293
1293
1294
    <fixcrlf srcdir="${tomcat.embed}" eol="lf"
1294
    <fixcrlf srcdir="${tomcat.embed}" eol="lf"
1295
        encoding="ISO-8859-1" fixlast="false" >
1295
        encoding="ISO-8859-1" fixlast="false" >
Lines 1299-1312 Link Here
1299
         tarfile="${tomcat.embed}/${final.name}-embed.tar.gz">
1299
         tarfile="${tomcat.embed}/${final.name}-embed.tar.gz">
1300
      <tarfileset dir="${tomcat.embed}" prefix="${final.name}-embed">
1300
      <tarfileset dir="${tomcat.embed}" prefix="${final.name}-embed">
1301
        <include name="**" />
1301
        <include name="**" />
1302
        <exclude name="*.asc" />
1302
        <exclude name="*.md5" />
1303
        <exclude name="*.md5" />
1304
        <exclude name="*.sha1" />
1303
        <exclude name="*.zip" />
1305
        <exclude name="*.zip" />
1304
        <exclude name="*.tar.gz" />
1306
        <exclude name="*.tar.gz" />
1305
      </tarfileset>
1307
      </tarfileset>
1306
    </tar>
1308
    </tar>
1307
    <antcall target="md5sum">
1309
    <hashAndSign file="${tomcat.embed}/${final.name}-embed.tar.gz" />
1308
      <param name="file" value="${tomcat.embed}/${final.name}-embed.tar.gz" />
1309
    </antcall>
1310
1310
1311
  </target>
1311
  </target>
1312
1312
Lines 1613-1628 Link Here
1613
      <zipfileset file="${tomcat.manifests}/default.license"
1613
      <zipfileset file="${tomcat.manifests}/default.license"
1614
        fullpath="META-INF/LICENSE" />
1614
        fullpath="META-INF/LICENSE" />
1615
    </jar>
1615
    </jar>
1616
    <antcall target="md5sum">
1616
    <hashAndSign file="${tomcat-juli-extras.jar}" />
1617
      <param name="file" value="${tomcat-juli-extras.jar}" />
1618
    </antcall>
1619
1617
1620
    <jarIt jarfile="${tomcat-juli-adapters.jar}"
1618
    <jarIt jarfile="${tomcat-juli-adapters.jar}"
1621
      filesDir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/target/classes"
1619
      filesDir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/target/classes"
1622
      filesId="files.tomcat-extras-juli-adapters" />
1620
      filesId="files.tomcat-extras-juli-adapters" />
1623
    <antcall target="md5sum">
1621
    <hashAndSign file="${tomcat-juli-adapters.jar}" />
1624
      <param name="file" value="${tomcat-juli-adapters.jar}" />
1625
    </antcall>
1626
1622
1627
    <!-- Source JARs -->
1623
    <!-- Source JARs -->
1628
    <jar jarfile="${tomcat-juli-extras-src.jar}"
1624
    <jar jarfile="${tomcat-juli-extras-src.jar}"
Lines 1696-1704 Link Here
1696
      filesDir="${tomcat.classes}"
1692
      filesDir="${tomcat.classes}"
1697
      filesId="files.tomcat-extras-ws" />
1693
      filesId="files.tomcat-extras-ws" />
1698
1694
1699
    <antcall target="md5sum">
1695
    <hashAndSign file="${catalina-ws.jar}" />
1700
      <param name="file" value="${catalina-ws.jar}" />
1701
    </antcall>
1702
1696
1703
    <jarIt jarfile="${catalina-ws-src.jar}"
1697
    <jarIt jarfile="${catalina-ws-src.jar}"
1704
      filesDir="java"
1698
      filesDir="java"
Lines 1714-1722 Link Here
1714
      filesDir="${tomcat.classes}"
1708
      filesDir="${tomcat.classes}"
1715
      filesId="files.tomcat-extras-jmxremote" />
1709
      filesId="files.tomcat-extras-jmxremote" />
1716
1710
1717
    <antcall target="md5sum">
1711
    <hashAndSign file="${catalina-jmx-remote.jar}" />
1718
      <param name="file" value="${catalina-jmx-remote.jar}" />
1719
    </antcall>
1720
1712
1721
    <jarIt jarfile="${catalina-jmx-remote-src.jar}"
1713
    <jarIt jarfile="${catalina-jmx-remote-src.jar}"
1722
      filesDir="java"
1714
      filesDir="java"
Lines 2173-2181 Link Here
2173
      <arg value="tomcat.nsi" />
2165
      <arg value="tomcat.nsi" />
2174
    </exec>
2166
    </exec>
2175
    <move file="${tomcat.dist}/tomcat-installer.exe" tofile="${tomcat.release}/v${version}/bin/${final.name}.exe" />
2167
    <move file="${tomcat.dist}/tomcat-installer.exe" tofile="${tomcat.release}/v${version}/bin/${final.name}.exe" />
2176
    <antcall target="md5sum">
2168
    <hashAndSign file="${tomcat.release}/v${version}/bin/${final.name}.exe" />
2177
      <param name="file" value="${tomcat.release}/v${version}/bin/${final.name}.exe" />
2178
    </antcall>
2179
  </target>
2169
  </target>
2180
2170
2181
  <target name="installer-sign" depends="-installer" if="${do.codesigning}" >
2171
  <target name="installer-sign" depends="-installer" if="${do.codesigning}" >
Lines 2191-2202 Link Here
2191
        <filename name="v${version}/bin/${final.name}.exe"/>
2181
        <filename name="v${version}/bin/${final.name}.exe"/>
2192
      </fileset>
2182
      </fileset>
2193
    </signcode>
2183
    </signcode>
2194
    <!-- .exe has changed so need to redo MD5 and OpenPGP signature -->
2184
    <!-- .exe has changed so need to redo checksums and OpenPGP signature -->
2185
    <delete file="${tomcat.release}/v${version}/bin/${final.name}.exe.asc" />
2195
    <delete file="${tomcat.release}/v${version}/bin/${final.name}.exe.md5" />
2186
    <delete file="${tomcat.release}/v${version}/bin/${final.name}.exe.md5" />
2196
    <delete file="${tomcat.release}/v${version}/bin/${final.name}.exe.asc" />
2187
    <delete file="${tomcat.release}/v${version}/bin/${final.name}.exe.sha1" />
2197
    <antcall target="md5sum">
2188
    <hashAndSign file="${tomcat.release}/v${version}/bin/${final.name}.exe" />
2198
      <param name="file" value="${tomcat.release}/v${version}/bin/${final.name}.exe" />
2199
    </antcall>
2200
  </target>
2189
  </target>
2201
2190
2202
  <target name="release"
2191
  <target name="release"
Lines 2233-2240 Link Here
2233
      <fileset dir="${tomcat.embed}">
2222
      <fileset dir="${tomcat.embed}">
2234
        <include name="*.zip"/>
2223
        <include name="*.zip"/>
2235
        <include name="*.tar.gz"/>
2224
        <include name="*.tar.gz"/>
2225
        <include name="*.asc"/>
2236
        <include name="*.md5"/>
2226
        <include name="*.md5"/>
2237
        <include name="*.asc"/>
2227
        <include name="*.sha1"/>
2238
      </fileset>
2228
      </fileset>
2239
    </copy>
2229
    </copy>
2240
2230
Lines 2283-2291 Link Here
2283
      </zipfileset>
2273
      </zipfileset>
2284
    </zip>
2274
    </zip>
2285
2275
2286
    <antcall target="md5sum">
2276
    <hashAndSign file="${tomcat.release}/v${version}/bin/${final.name}.zip" />
2287
      <param name="file" value="${tomcat.release}/v${version}/bin/${final.name}.zip" />
2288
    </antcall>
2289
  </target>
2277
  </target>
2290
2278
2291
  <!-- Packages the core windows zip distros -->
2279
  <!-- Packages the core windows zip distros -->
Lines 2316-2324 Link Here
2316
      </zipfileset>
2304
      </zipfileset>
2317
2305
2318
    </zip>
2306
    </zip>
2319
    <antcall target="md5sum">
2307
    <hashAndSign file="${tomcat.release}/v${version}/bin/${final.name}-windows-x86.zip" />
2320
      <param name="file" value="${tomcat.release}/v${version}/bin/${final.name}-windows-x86.zip" />
2321
    </antcall>
2322
2308
2323
    <!-- Windows x64 package -->
2309
    <!-- Windows x64 package -->
2324
    <zip zipfile="${tomcat.release}/v${version}/bin/${final.name}-windows-x64.zip">
2310
    <zip zipfile="${tomcat.release}/v${version}/bin/${final.name}-windows-x64.zip">
Lines 2346-2354 Link Here
2346
        <include name="*.exe"/>
2332
        <include name="*.exe"/>
2347
      </zipfileset>
2333
      </zipfileset>
2348
    </zip>
2334
    </zip>
2349
    <antcall target="md5sum">
2335
    <hashAndSign file="${tomcat.release}/v${version}/bin/${final.name}-windows-x64.zip" />
2350
      <param name="file" value="${tomcat.release}/v${version}/bin/${final.name}-windows-x64.zip" />
2351
    </antcall>
2352
2336
2353
    <!-- Windows i64 package -->
2337
    <!-- Windows i64 package -->
2354
    <zip zipfile="${tomcat.release}/v${version}/bin/${final.name}-windows-i64.zip">
2338
    <zip zipfile="${tomcat.release}/v${version}/bin/${final.name}-windows-i64.zip">
Lines 2377-2385 Link Here
2377
      </zipfileset>
2361
      </zipfileset>
2378
    </zip>
2362
    </zip>
2379
2363
2380
    <antcall target="md5sum">
2364
    <hashAndSign file="${tomcat.release}/v${version}/bin/${final.name}-windows-i64.zip" />
2381
      <param name="file" value="${tomcat.release}/v${version}/bin/${final.name}-windows-i64.zip" />
2382
    </antcall>
2383
2365
2384
  </target>
2366
  </target>
2385
2367
Lines 2402-2410 Link Here
2402
      <zipfileset dir="${tomcat.dist}" prefix="${final.name}-deployer" includes="RELEASE-NOTES" />
2384
      <zipfileset dir="${tomcat.dist}" prefix="${final.name}-deployer" includes="RELEASE-NOTES" />
2403
    </zip>
2385
    </zip>
2404
2386
2405
    <antcall target="md5sum">
2387
    <hashAndSign file="${tomcat.release}/v${version}/bin/${final.name}-deployer.zip" />
2406
      <param name="file" value="${tomcat.release}/v${version}/bin/${final.name}-deployer.zip" />
2407
    </antcall>
2408
  </target>
2388
  </target>
2409
2389
2410
  <!-- Packages the core tar.gz distro -->
2390
  <!-- Packages the core tar.gz distro -->
Lines 2472-2480 Link Here
2472
      </tarfileset>
2452
      </tarfileset>
2473
    </tar>
2453
    </tar>
2474
2454
2475
    <antcall target="md5sum">
2455
    <hashAndSign file="${tomcat.release}/v${version}/bin/${final.name}.tar.gz" />
2476
      <param name="file" value="${tomcat.release}/v${version}/bin/${final.name}.tar.gz" />
2477
    </antcall>
2478
  </target>
2456
  </target>
2479
2457
2480
  <!-- Packages the deployer Tomcat distro in tar.gz format -->
2458
  <!-- Packages the deployer Tomcat distro in tar.gz format -->
Lines 2501-2509 Link Here
2501
      </tarfileset>
2479
      </tarfileset>
2502
    </tar>
2480
    </tar>
2503
2481
2504
    <antcall target="md5sum">
2482
    <hashAndSign file="${tomcat.release}/v${version}/bin/${final.name}-deployer.tar.gz" />
2505
      <param name="file" value="${tomcat.release}/v${version}/bin/${final.name}-deployer.tar.gz" />
2506
    </antcall>
2507
  </target>
2483
  </target>
2508
2484
2509
  <!-- Packages the documentation distro in tar.gz format -->
2485
  <!-- Packages the documentation distro in tar.gz format -->
Lines 2525-2533 Link Here
2525
      </tarfileset>
2501
      </tarfileset>
2526
    </tar>
2502
    </tar>
2527
2503
2528
    <antcall target="md5sum">
2504
    <hashAndSign file="${tomcat.release}/v${version}/bin/${final.name}-fulldocs.tar.gz" />
2529
      <param name="file" value="${tomcat.release}/v${version}/bin/${final.name}-fulldocs.tar.gz" />
2530
    </antcall>
2531
  </target>
2505
  </target>
2532
2506
2533
  <!-- Packages the source code distribution in zip format -->
2507
  <!-- Packages the source code distribution in zip format -->
Lines 2543-2551 Link Here
2543
      <zipfileset dir="${tomcat.dist}/src" prefix="${final-src.name}" />
2517
      <zipfileset dir="${tomcat.dist}/src" prefix="${final-src.name}" />
2544
    </zip>
2518
    </zip>
2545
2519
2546
    <antcall target="md5sum">
2520
    <hashAndSign file="${tomcat.release}/v${version}/src/${final-src.name}.zip" />
2547
      <param name="file" value="${tomcat.release}/v${version}/src/${final-src.name}.zip" />
2548
    </antcall>
2549
  </target>
2521
  </target>
2550
2522
2551
  <!-- Packages the source code distribution in tar.gz format -->
2523
  <!-- Packages the source code distribution in tar.gz format -->
Lines 2561-2569 Link Here
2561
         tarfile="${tomcat.release}/v${version}/src/${final-src.name}.tar.gz">
2533
         tarfile="${tomcat.release}/v${version}/src/${final-src.name}.tar.gz">
2562
      <tarfileset dir="${tomcat.dist}/src" prefix="${final-src.name}" />
2534
      <tarfileset dir="${tomcat.dist}/src" prefix="${final-src.name}" />
2563
    </tar>
2535
    </tar>
2564
    <antcall target="md5sum">
2536
    <hashAndSign file="${tomcat.release}/v${version}/src/${final-src.name}.tar.gz" />
2565
      <param name="file" value="${tomcat.release}/v${version}/src/${final-src.name}.tar.gz" />
2566
    </antcall>
2567
  </target>
2537
  </target>
2568
2538
2569
  <!-- Packages the source code in JARs to match the binary JARs -->
2539
  <!-- Packages the source code in JARs to match the binary JARs -->
Lines 3055-3075 Link Here
3055
    </sequential>
3025
    </sequential>
3056
  </macrodef>
3026
  </macrodef>
3057
3027
3058
  <!-- Helper target, used to create a md5 checksum file  -->
3028
  <!-- Macro, used to create checksum and signature files  -->
3059
  <!-- Requires 'file' as a parameter. -->
3029
  <!-- Requires 'file' as a parameter. -->
3060
  <target name="md5sum">
3030
  <macrodef name="hashAndSign">
3061
    <fail unless="file" />
3031
    <attribute name="file" />
3062
    <fail if="filename" />
3032
    <sequential>
3063
    <fail if="value" />
3033
      <local name="filename" />
3064
    <basename file="${file}" property="filename" />
3034
      <local name="md5value" />
3065
    <checksum file="${file}" property="value" />
3035
      <local name="sha1value" />
3066
    <echo file="${file}.md5" message="${value}${md5sum.binary-prefix}${filename}" />
3067
    <!-- Anything that requires an md5 hash, also needs a signature -->
3068
    <antcall target="sign" >
3069
      <param name="file" value="${file}" />
3070
    </antcall>
3071
  </target>
3072
3036
3037
      <basename file="@{file}" property="filename" />
3038
      <checksum algorithm="MD5" file="@{file}" property="md5value" />
3039
      <checksum algorithm="SHA-1" file="@{file}" property="sha1value" />
3040
3041
      <echo file="@{file}.md5" message="${md5value}${md5sum.binary-prefix}${filename}" />
3042
      <echo file="@{file}.sha1" message="${sha1value}${md5sum.binary-prefix}${filename}" />
3043
3044
      <antcall target="sign" >
3045
        <param name="file" value="@{file}" />
3046
      </antcall>
3047
    </sequential>
3048
  </macrodef>
3049
3073
  <!-- Helper target, used to create a detached ascii OpenPGP signature.     -->
3050
  <!-- Helper target, used to create a detached ascii OpenPGP signature.     -->
3074
  <!-- Uses GPG with default key. Requires 'file' as a parameter. Only       -->
3051
  <!-- Uses GPG with default key. Requires 'file' as a parameter. Only       -->
3075
  <!-- executes if gpg passphrase is set which is only set when using the    -->
3052
  <!-- executes if gpg passphrase is set which is only set when using the    -->

Return to bug 57344