ASF Bugzilla – Attachment 22200 Details for
Bug 45315
Wine support for building
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Improved patch
patch.txt (text/plain), 3.21 KB, created by
Remy Maucherat
on 2008-07-01 03:05:13 UTC
(
hide
)
Description:
Improved patch
Filename:
MIME Type:
Creator:
Remy Maucherat
Created:
2008-07-01 03:05:13 UTC
Size:
3.21 KB
patch
obsolete
>Index: build.xml >=================================================================== >--- build.xml (revision 673011) >+++ build.xml (working copy) >@@ -29,7 +29,7 @@ > > <!-- Project Properties --> > <property name="name" value="Apache Tomcat" /> >- <property name="year" value="2007" /> >+ <property name="year" value="2008" /> > <property name="version.major" value="6" /> > <property name="version.minor" value="0" /> > <property name="version.build" value="0" /> >@@ -701,6 +701,12 @@ > <param name="basedir" value="${jasper-jdt.home}" /> > </antcall> > >+ <antcall target="downloadzip"> >+ <param name="sourcefile" value="${nsis.loc}"/> >+ <param name="destfile" value="${nsis.exe}"/> >+ <param name="destdir" value="${nsis.home}/.."/> >+ </antcall> >+ > </target> > > <target name="build-tomcat-dbcp"> >Index: dist.xml >=================================================================== >--- dist.xml (revision 673011) >+++ dist.xml (working copy) >@@ -437,7 +437,7 @@ > > <!-- ================= DIST: Create Windows Installer =================== --> > <target name="installer" >- description="Create Windows installer" if="execute.installer"> >+ description="Create Windows installer" unless="skip.installer"> > <echo message="Builds a Windows installer based on Nullsoft Installer"/> > <copy todir="${tomcat.dist}"> > <fileset dir="res" /> >@@ -454,10 +454,15 @@ > <filter token="VERSION_NUMBER" value="${version.number}"/> > > <copy file="res/tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi" filtering="true" overwrite="true"/> >- <exec dir="${tomcat.dist}" executable="${nsis.exe}"> >+ <exec dir="${tomcat.dist}" executable="${nsis.exe}" os="windows"> > <arg value="/DNSISDIR=${nsis.home}" /> > <arg value="tomcat.nsi" /> > </exec> >+ <exec dir="${tomcat.dist}" executable="wine" osfamily="unix"> >+ <arg value="${nsis.exe}" /> >+ <arg value="/DNSISDIR=${nsis.home}" /> >+ <arg value="tomcat.nsi" /> >+ </exec> > > <move file="${tomcat.dist}/tomcat-installer.exe" tofile="${tomcat.release}/v${version}/bin/${final.name}.exe" /> > >Index: build.properties.default >=================================================================== >--- build.properties.default (revision 673011) >+++ build.properties.default (working copy) >@@ -45,6 +45,7 @@ > > base-commons.loc=http://archive.apache.org/dist/commons > base-tomcat.loc=http://archive.apache.org/dist/tomcat >+base-sf.loc=http://downloads.sourceforge.net > > # ----- Commons Logging, version 1.1 or later ----- > commons-logging-version=1.1.1 >@@ -82,12 +83,12 @@ > commons-collections-src.loc=${base-commons.loc}/collections/source/commons-collections-3.2-src.tar.gz > > # ----- NSIS, version 2.0 or later ----- >-nsis.home=${base.path}/nsis-2.34 >+nsis.home=${base.path}/nsis-2.37 > nsis.exe=${nsis.home}/makensis.exe > nsis.installoptions.dll=${nsis.home}/Plugins/InstallOptions.dll > nsis.nsexec.dll=${nsis.home}/Plugins/nsExec.dll > nsis.nsisdl.dll=${nsis.home}/Plugins/NSISdl.dll >-nsis.loc=${base-sf.loc}/nsis/nsis-2.34-setup.exe >+nsis.loc=${base-sf.loc}/nsis/nsis-2.37.zip > > # ----- Commons Daemon, version 1.0-Alpha or later ----- > commons-daemon.home=${base.path}/commons-daemon-1.0.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 45315
:
22199
| 22200