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 Mon, 16 Jul 2001 23:07:46 GMT
remm        01/07/16 16:07:46

  Modified:    .        build.xml tomcat.nsi
  Log:
  - Display some JRE information about the VM.
  - Don't assume that NSIS is in the path. Instead, assume it's in the default
    installation directory. The nsis.home variable can be used to change the
    NSIS path. Thanks to Amy Roh for testing.
  
  Revision  Changes    Path
  1.28      +4 -2      jakarta-tomcat-4.0/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/build.xml,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- build.xml	2001/07/16 06:56:35	1.27
  +++ build.xml	2001/07/16 23:07:46	1.28
  @@ -5,6 +5,8 @@
     <property file="build.properties"/>
     <property file="${user.home}/build.properties"/>
   
  +  <property name="nsis.home"       value="c:\program files\nsis"/>
  +
     <property name="catalina.build"  value="${basedir}/catalina/build"/>
     <property name="jasper.build"    value="${basedir}/jasper/build"/>
     <property name="servletapi.home" value="../jakarta-servletapi-4/dist"/>
  @@ -165,12 +167,12 @@
     <!-- ================= DIST: Create Windows Installer =================== -->
     <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"/>
  +    <echo message="NSIS must be installed in the default directory"/>
       <copy todir="${tomcat.dist}">
         <fileset dir="resources" />
       </copy>
       <copy file="tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi" />
  -    <exec dir="${tomcat.dist}" executable="makensis.exe">
  +    <exec dir="${tomcat.dist}" executable="${nsis.home}\makensis.exe">
         <arg value="tomcat.nsi" />
       </exec>
     </target>
  
  
  
  1.9       +4 -2      jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- tomcat.nsi	2001/07/16 07:50:33	1.8
  +++ tomcat.nsi	2001/07/16 23:07:46	1.9
  @@ -1,6 +1,6 @@
   
   ; Tomcat 4 script for Nullsoft Installer
  -; $Id: tomcat.nsi,v 1.8 2001/07/16 07:50:33 remm Exp $
  +; $Id: tomcat.nsi,v 1.9 2001/07/16 23:07:46 remm Exp $
   
   Name "jakarta-tomcat-4.0"
   Caption "Jakarta Tomcat 4.0"
  @@ -196,6 +196,8 @@
   
     ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Development Kit" "CurrentVersion"
     ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Development Kit\$1" "JavaHome"
  +  ReadRegStr $3 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" "CurrentVersion"
  +  ReadRegStr $4 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$3" "RuntimeLib"
   
     IfErrors 0 NoAbort
       MessageBox MB_OK "Couldn't find a Java Development Kit installed on this \
  @@ -203,7 +205,7 @@
       Abort
   
     NoAbort:
  -    MessageBox MB_OK "Using Java Development Kit version $1 found in $2"
  +    MessageBox MB_OK "Using Java Development Kit version $1 found in $2$\r$\nUsing Java
Runtime Environment version $3 found in $4"
   
   FunctionEnd
   
  
  
  

Mime
View raw message