|
Lines 1398-1403
Link Here
|
| 1398 |
<!-- Bugzilla 37035: http://issues.apache.org/bugzilla/show_bug.cgi?id=37035 --> |
1398 |
<!-- Bugzilla 37035: http://issues.apache.org/bugzilla/show_bug.cgi?id=37035 --> |
| 1399 |
<touch file="${tomcat.dist}/temp/bugzilla37035-safeToDelete.tmp" /> |
1399 |
<touch file="${tomcat.dist}/temp/bugzilla37035-safeToDelete.tmp" /> |
| 1400 |
|
1400 |
|
|
|
1401 |
<!-- Windows binaries for each platform --> |
| 1402 |
<!-- 32 bit --> |
| 1403 |
<copy file="${commons-daemon.home}/windows/prunsrv.exe" |
| 1404 |
tofile="${tomcat.dist}/bin/tomcat${version.major}.exe" /> |
| 1405 |
<copy file="${commons-daemon.home}/windows/prunmgr.exe" |
| 1406 |
tofile="${tomcat.dist}/bin/tomcat${version.major}w.exe" /> |
| 1407 |
<!-- 64 bit amd --> |
| 1408 |
<copy file="${commons-daemon.home}/windows/amd64/prunsrv.exe" |
| 1409 |
tofile="${tomcat.dist}/bin/x64/tomcat${version.major}.exe" /> |
| 1410 |
<!-- 64 bit ia --> |
| 1411 |
<copy file="${commons-daemon.home}/windows/ia64/prunsrv.exe" |
| 1412 |
tofile="${tomcat.dist}/bin/i64/tomcat${version.major}.exe" /> |
| 1413 |
<!-- tc native --> |
| 1414 |
<copy file="${tomcat-native.home}/tcnative-1.dll.x86" |
| 1415 |
tofile="${tomcat.dist}/bin/tcnative-1.dll" /> |
| 1416 |
<!-- tc native 64 bit for amd/emt --> |
| 1417 |
<copy file="${tomcat-native.home}/tcnative-1.dll.x64" |
| 1418 |
tofile="${tomcat.dist}/bin/x64/tcnative-1.dll" /> |
| 1419 |
<!-- tc native 64 bit for ia --> |
| 1420 |
<copy file="${tomcat-native.home}/tcnative-1.dll.i64" |
| 1421 |
tofile="${tomcat.dist}/bin/i64/tcnative-1.dll" /> |
| 1422 |
|
| 1401 |
<!-- Correct permissions and line endings on "bin" scripts --> |
1423 |
<!-- Correct permissions and line endings on "bin" scripts --> |
| 1402 |
<fixcrlf srcdir="${tomcat.dist}/bin" includes="*.sh" eol="lf" |
1424 |
<fixcrlf srcdir="${tomcat.dist}/bin" includes="*.sh" eol="lf" |
| 1403 |
encoding="ISO-8859-1" fixlast="false" /> |
1425 |
encoding="ISO-8859-1" fixlast="false" /> |
|
Lines 1530-1555
Link Here
|
| 1530 |
<copy file="${nsis.installoptions.dll}" todir="${tomcat.dist}" /> |
1552 |
<copy file="${nsis.installoptions.dll}" todir="${tomcat.dist}" /> |
| 1531 |
<copy file="${nsis.nsexec.dll}" todir="${tomcat.dist}" /> |
1553 |
<copy file="${nsis.nsexec.dll}" todir="${tomcat.dist}" /> |
| 1532 |
<copy file="${nsis.nsisdl.dll}" todir="${tomcat.dist}" /> |
1554 |
<copy file="${nsis.nsisdl.dll}" todir="${tomcat.dist}" /> |
| 1533 |
<!-- 32 bit --> |
|
|
| 1534 |
<copy file="${commons-daemon.home}/windows/prunsrv.exe" |
| 1535 |
tofile="${tomcat.dist}/bin/tomcat${version.major}.exe" /> |
| 1536 |
<copy file="${commons-daemon.home}/windows/prunmgr.exe" |
| 1537 |
tofile="${tomcat.dist}/bin/tomcat${version.major}w.exe" /> |
| 1538 |
<!-- 64 bit amd --> |
| 1539 |
<copy file="${commons-daemon.home}/windows/amd64/prunsrv.exe" |
| 1540 |
tofile="${tomcat.dist}/bin/x64/tomcat${version.major}.exe" /> |
| 1541 |
<!-- 64 bit ia --> |
| 1542 |
<copy file="${commons-daemon.home}/windows/ia64/prunsrv.exe" |
| 1543 |
tofile="${tomcat.dist}/bin/i64/tomcat${version.major}.exe" /> |
| 1544 |
<!-- tc native --> |
| 1545 |
<copy file="${tomcat-native.home}/tcnative-1.dll.x86" |
| 1546 |
tofile="${tomcat.dist}/bin/tcnative-1.dll" /> |
| 1547 |
<!-- tc native 64 bit for amd/emt --> |
| 1548 |
<copy file="${tomcat-native.home}/tcnative-1.dll.x64" |
| 1549 |
tofile="${tomcat.dist}/bin/x64/tcnative-1.dll" /> |
| 1550 |
<!-- tc native 64 bit for ia --> |
| 1551 |
<copy file="${tomcat-native.home}/tcnative-1.dll.i64" |
| 1552 |
tofile="${tomcat.dist}/bin/i64/tcnative-1.dll" /> |
| 1553 |
|
1555 |
|
| 1554 |
<filter token="VERSION" value="${version}"/> |
1556 |
<filter token="VERSION" value="${version}"/> |
| 1555 |
<filter token="VERSION_NUMBER" value="${version.number}"/> |
1557 |
<filter token="VERSION_NUMBER" value="${version.number}"/> |
|
Lines 1702-1707
Link Here
|
| 1702 |
otherwise this check fails and the .exe distro is not generated --> |
1704 |
otherwise this check fails and the .exe distro is not generated --> |
| 1703 |
<condition property="execute.installer"> |
1705 |
<condition property="execute.installer"> |
| 1704 |
<and> |
1706 |
<and> |
|
|
1707 |
<not><isset property="skip.installer" /></not> |
| 1705 |
<os family="windows" /> |
1708 |
<os family="windows" /> |
| 1706 |
<available file="${nsis.exe}" /> |
1709 |
<available file="${nsis.exe}" /> |
| 1707 |
<available file="${nsis.installoptions.dll}" /> |
1710 |
<available file="${nsis.installoptions.dll}" /> |