tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-4.0 build.xml tomcat.nsi
Date Sun, 15 Jul 2001 19:39:07 GMT
remm        01/07/15 12:39:07

  Modified:    .        build.xml tomcat.nsi
  Log:
  - Use the new resources.
  - Warn about JAVA_HOME before starting the installation.
  
  Revision  Changes    Path
  1.26      +6 -4      jakarta-tomcat-4.0/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/build.xml,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- build.xml	2001/07/15 07:49:08	1.25
  +++ build.xml	2001/07/15 19:39:06	1.26
  @@ -166,11 +166,13 @@
     <target name="installer" depends="dist">
       <echo message="Builds a Windows installer based on Nullsoft Installer"/>
       <echo message="The target requires Nullsoft Installer to be in your PATH"/>
  -    <copy file="resources/tomcat.ico" tofile="${tomcat.dist}/tomcat.ico"/>
  -    <copy file="tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi"/>
  -    <copy file="README.txt" tofile="${tomcat.dist}/README.txt"/>
  +    <copy todir="${tomcat.dist}">
  +      <fileset dir="resources" />
  +    </copy>
  +    <copy file="tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi" />
  +    <copy file="README.txt" tofile="${tomcat.dist}/README.txt" />
       <exec dir="${tomcat.dist}" executable="makensis.exe">
  -      <arg value="tomcat.nsi"/>
  +      <arg value="tomcat.nsi" />
       </exec>
     </target>
   
  
  
  
  1.5       +17 -5     jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- tomcat.nsi	2001/07/15 07:43:27	1.4
  +++ tomcat.nsi	2001/07/15 19:39:06	1.5
  @@ -1,5 +1,6 @@
   
   ; Tomcat 4 script for Nullsoft Installer
  +; $Id: tomcat.nsi,v 1.5 2001/07/15 19:39:06 remm Exp $
   
   Name "jakarta-tomcat-4.0"
   Caption "Jakarta Tomcat 4.0"
  @@ -10,10 +11,14 @@
   
   BGGradient 000000 800000 FFFFFF
   InstallColors FF8080 000000
  -Icon tomcat.ico
   
  +Icon main.ico
  +UninstallIcon uninst.ico 
  +EnabledBitmap tickyes.bmp 
  +DisabledBitmap tickno.bmp
  +
   LicenseText "You must read the following license before installing:"
  -LicenseData LICENSE
  +LicenseData INSTALLLICENSE
   ComponentText "This will install the Jakarta Tomcat 4.0 servlet container on your computer:"
   InstType Normal
   InstType Minimum
  @@ -183,11 +188,18 @@
   
   SectionEnd
   
  +Function .onInit
  +
  +    MessageBox MB_YESNO|MB_ICONEXCLAMATION "If not done already, you need to set the JAVA_HOME
\
  +environment variable and have it point to your JDK installation directory. \
  +Answer No to quit the installer if your environment is not properly set." IDYES NoAbort
  +      Abort ; causes installer to quit.
  +  NoAbort:
  +
  +FunctionEnd
  +
   Function .onInstSuccess
   
  -    MessageBox MB_OK|MB_ICONEXCLAMATION \
  -      "If not done already, you need to set the JAVA_HOME environment\
  - variable and have it point to your JDK installation directory."
     MessageBox MB_YESNO|MB_ICONQUESTION \
                "Setup has completed. View readme file now?" \
                IDNO NoReadme
  
  
  

Mime
View raw message