remm 2005/08/02 12:08:07
Modified: . build.xml build.properties.default tomcat.nsi
Log:
- Add placeholder code to download Windows .dll.
Revision Changes Path
1.234 +2 -0 jakarta-tomcat-5/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -r1.233 -r1.234
--- build.xml 2 Aug 2005 15:33:07 -0000 1.233
+++ build.xml 2 Aug 2005 19:08:07 -0000 1.234
@@ -1445,6 +1445,7 @@
</copy>
<copy file="${nsis.installoptions.dll}" todir="${tomcat.dist}" />
<copy file="${nsis.nsexec.dll}" todir="${tomcat.dist}" />
+ <copy file="${nsis.nsisdl.dll}" todir="${tomcat.dist}" />
<copy file="${jtc.home}/procrun/bin/tomcat5.exe"
tofile="${tomcat.dist}/bin/tomcat5.exe" />
<copy file="${jtc.home}/procrun/bin/tomcat5w.exe"
@@ -1581,6 +1582,7 @@
<available file="${nsis.exe}" />
<available file="${nsis.installoptions.dll}" />
<available file="${nsis.nsexec.dll}" />
+ <available file="${nsis.nsisdl.dll}" />
</and>
</condition>
1.157 +2 -1 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- build.properties.default 2 Aug 2005 15:33:07 -0000 1.156
+++ build.properties.default 2 Aug 2005 19:08:07 -0000 1.157
@@ -220,6 +220,7 @@
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.08.exe
1.80 +18 -1 jakarta-tomcat-5/tomcat.nsi
Index: tomcat.nsi
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- tomcat.nsi 2 Aug 2005 18:35:15 -0000 1.79
+++ tomcat.nsi 2 Aug 2005 19:08:07 -0000 1.80
@@ -83,6 +83,7 @@
LangString DESC_SecTomcat ${LANG_ENGLISH} "Install the Tomcat Servlet
container."
LangString DESC_SecTomcatCore ${LANG_ENGLISH} "Install the Tomcat
Servlet container core."
LangString DESC_SecTomcatService ${LANG_ENGLISH} "Automatically start
Tomcat when the computer is started. This requires Windows NT 4.0, Windows 2000
or Windows XP."
+ LangString DESC_SecTomcatNative ${LANG_ENGLISH} "Downloads and installs
Tomcat native .dll for better performance and scalability in production
environments."
; LangString DESC_SecTomcatSource ${LANG_ENGLISH} "Install the Tomcat
source code."
LangString DESC_SecMenu ${LANG_ENGLISH} "Create a Start Menu program
group for Tomcat."
LangString DESC_SecDocs ${LANG_ENGLISH} "Install the Tomcat
documentation bundle. This include documentation on the servlet container and
its configuration options, on the Jasper JSP page compiler, as well as on the
native webserver connectors."
@@ -198,6 +199,21 @@
SectionEnd
+Section "Native" SecTomcatNative
+
+ SectionIn 3
+
+ NSISdl::download /TIMEOUT=30000 http://blabla/tcnative-1-1.1.0.dll
$INSTDIR\bin\tcnative-1.dll
+ Pop $0
+ StrCmp $0 success success
+ SetDetailsView show
+ DetailPrint "download failed from http://blabla/tcnative-1-1.1.0.dll: $0"
+ success:
+
+ ClearErrors
+
+SectionEnd
+
;Section "Source Code" SecTomcatSource
;
; SectionIn 3
@@ -355,6 +371,7 @@
!insertmacro MUI_DESCRIPTION_TEXT ${SecTomcat} $(DESC_SecTomcat)
!insertmacro MUI_DESCRIPTION_TEXT ${SecTomcatCore} $(DESC_SecTomcatCore)
!insertmacro MUI_DESCRIPTION_TEXT ${SecTomcatService}
$(DESC_SecTomcatService)
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecTomcatNative}
$(DESC_SecTomcatNative)
; !insertmacro MUI_DESCRIPTION_TEXT ${SecTomcatSource}
$(DESC_SecTomcatSource)
; !insertmacro MUI_DESCRIPTION_TEXT ${SecCompat} $(DESC_SecCompat)
!insertmacro MUI_DESCRIPTION_TEXT ${SecMenu} $(DESC_SecMenu)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
