cvs commit: jakarta-tomcat-5 tomcat.nsi build.xml

2004-09-03 Thread mturk 
mturk   2004/09/03 01:18:16

  Modified:.tomcat.nsi build.xml
  Log:
  Added dotted version for the installer.
  This enables strange versions like 5.5-rc1, etc...
  The dotted version has to be a four numbers separated with dots.
  
  Revision  ChangesPath
  1.55  +2 -2  jakarta-tomcat-5/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- tomcat.nsi2 Sep 2004 13:16:52 -   1.54
  +++ tomcat.nsi3 Sep 2004 08:18:15 -   1.55
  @@ -19,7 +19,7 @@
 VIAddVersionKey ProductVersion @VERSION@
 VIAddVersionKey Comments jakarta.apache.org/tomcat
 VIAddVersionKey InternalName [EMAIL PROTECTED]@.exe
  -  VIProductVersion @[EMAIL PROTECTED]
  +  VIProductVersion @DOTTEDVER@
   
   !include MUI.nsh
   !include StrFunc.nsh
  
  
  
  1.208 +2 -0  jakarta-tomcat-5/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
  retrieving revision 1.207
  retrieving revision 1.208
  diff -u -r1.207 -r1.208
  --- build.xml 2 Sep 2004 13:16:52 -   1.207
  +++ build.xml 3 Sep 2004 08:18:15 -   1.208
  @@ -14,6 +14,7 @@
 property name=name  value=Apache Tomcat /
 property name=year  value=2004 /
 property name=version   value=5.5-dev /
  +  property name=dottedver value=5.5.0.1 /
 property name=project   value=jakarta-tomcat /
 property name=final.namevalue=${project}-${version} /
 property name=final-src.namevalue=${project}-${version}-src /
  @@ -1507,6 +1508,7 @@
   copy file=${jtc.home}/procrun/bin/tomcat5w.exe 
   tofile=${tomcat.dist}/bin/tomcat5w.exe /
   filter token=VERSION value=${version}/
  +filter token=DOTTEDVER value=${dottedver}/
   copy file=tomcat.nsi tofile=${tomcat.dist}/tomcat.nsi 
filtering=true/
   exec dir=${tomcat.dist} executable=${nsis.exe}
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-5 tomcat.nsi build.xml

2004-04-07 Thread mturk 
mturk   2004/04/07 04:33:40

  Modified:.tomcat.nsi build.xml
  Log:
  Use the new Procrun 2.0
  
  Revision  ChangesPath
  1.43  +20 -14jakarta-tomcat-5/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- tomcat.nsi11 Feb 2004 12:54:30 -  1.42
  +++ tomcat.nsi7 Apr 2004 11:33:40 -   1.43
  @@ -27,8 +27,8 @@
   ;Configuration
   
 !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\webapps\ROOT\RELEASE-NOTES.txt
  -  !define MUI_FINISHPAGE_RUN $INSTDIR\bin\tomcatw.exe
  -  !define MUI_FINISHPAGE_RUN_PARAMETERS //GT//Tomcat5
  +  !define MUI_FINISHPAGE_RUN $INSTDIR\bin\tomcat5w.exe
  +  !define MUI_FINISHPAGE_RUN_PARAMETERS //MS//Tomcat5
 !define MUI_FINISHPAGE_NOREBOOTSUPPORT
   
 !define MUI_ABORTWARNING
  @@ -134,8 +134,14 @@
 ClearErrors
   
 Call configure
  +  Call findJavaPath
  +  Call findJVMPath
  +  Pop $2
   
  -  ExecWait '$INSTDIR\bin\tomcatw.exe //IS//Tomcat5 --DisplayName Apache Tomcat 
--Description Apache Tomcat @VERSION@ Server - http://jakarta.apache.org/tomcat/;  
--Install $INSTDIR\bin\tomcat.exe --ImagePath $INSTDIR\bin\bootstrap.jar 
--StartupClass org.apache.catalina.startup.Bootstrap;main;start --ShutdownClass 
org.apache.catalina.startup.Bootstrap;main;stop --Java java --JavaOptions -Xrs 
--Startup manual'
  +  DetailPrint Using Jvm: $2
  +
  +  nsExec::ExecToLog '$INSTDIR\bin\tomcat5.exe //IS//Tomcat5 --DisplayName Apache 
Tomcat --Description Apache Tomcat @VERSION@ Server - 
http://jakarta.apache.org/tomcat/; --LogPath $INSTDIR\logs --Install 
$INSTDIR\bin\tomcat5.exe --Jvm $2'
  +  ClearErrors
   
   SectionEnd
   
  @@ -154,7 +160,7 @@
 Call findJVMPath
 Pop $2
   
  -  ExecWait '$INSTDIR\bin\tomcatw.exe //US//Tomcat5 --Startup auto'
  +  nsExec::ExecToLog '$INSTDIR\bin\tomcat5.exe //US//Tomcat5 --Startup auto'
   
 ClearErrors
   
  @@ -208,15 +214,15 @@
 CreateShortCut $SMPROGRAMS\Apache Tomcat 5.0\Tomcat 5.0 Program Directory.lnk \
$INSTDIR
   
  -  CreateShortCut $SMPROGRAMS\Apache Tomcat 5.0\Start Tomcat.lnk \
  - $INSTDIR\bin\tomcatw.exe \
  - '//GT//Tomcat5' \
  - $INSTDIR\bin\tomcatw.exe 1 SW_SHOWNORMAL
  +  CreateShortCut $SMPROGRAMS\Apache Tomcat 5.0\Monitor Tomcat.lnk \
  + $INSTDIR\bin\tomcat5w.exe \
  + '//MS//Tomcat5' \
  + $INSTDIR\tomcat.ico 0 SW_SHOWNORMAL
   
 CreateShortCut $SMPROGRAMS\Apache Tomcat 5.0\Configure Tomcat.lnk \
  - $INSTDIR\bin\tomcatw.exe \
  + $INSTDIR\bin\tomcat5w.exe \
'//ES//Tomcat5' \
  - $INSTDIR\bin\tomcatw.exe 0 SW_SHOWNORMAL
  + $INSTDIR\tomcat.ico 0 SW_SHOWNORMAL
   
   SectionEnd
   
  @@ -233,8 +239,8 @@
   SectionEnd
   
   Section -post
  -
  -  ExecWait '$INSTDIR\bin\tomcatw.exe //US//Tomcat5 --JavaOptions 
-Dcatalina.home=\$INSTDIR\#-Djava.endorsed.dirs=\$INSTDIR\common\endorsed\#-Xrs
 --StdOutputFile $INSTDIR\logs\stdout.log --StdErrorFile $INSTDIR\logs\stderr.log 
--WorkingPath $INSTDIR'
  +  nsExec::ExecToLog '$INSTDIR\bin\tomcat5.exe //US//Tomcat5 --Classpath 
$INSTDIR\bin\bootstrap.jar --StartClass org.apache.catalina.startup.Bootstrap 
--StopClass org.apache.catalina.startup.Bootstrap --StartParams start --StopParams 
stop  --StartMode jvm --StopMode jvm'
  +  nsExec::ExecToLog '$INSTDIR\bin\tomcat5.exe //US//Tomcat5 --JvmOptions 
-Dcatalina.home=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\common\endorsed#-Djava.io.tmpdir=$INSTDIR
 --StdOutput $INSTDIR\logs\stdout.log --StdError $INSTDIR\logs\stderr.log'
   
 WriteUninstaller $INSTDIR\Uninstall.exe
   
  @@ -496,7 +502,7 @@
 Delete $INSTDIR\Uninstall.exe
   
 ; Delete Tomcat service
  -  ExecWait '$INSTDIR\bin\tomcatw.exe //DS//Tomcat5'
  +  nsExec::ExecToLog '$INSTDIR\bin\tomcat5.exe //DS//Tomcat5'
 ClearErrors
   
 DeleteRegKey HKCR JSPFile
  
  
  
  1.183 +6 -4  jakarta-tomcat-5/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
  retrieving revision 1.182
  retrieving revision 1.183
  diff -u -r1.182 -r1.183
  --- build.xml 30 Mar 2004 14:48:54 -  1.182
  +++ build.xml 7 Apr 2004 11:33:40 -   1.183
  @@ -1287,10 +1287,11 @@
 fileset dir=resources /
   /copy
   copy file=${nsis.installoptions.dll} todir=${tomcat.dist} /
  -copy file=${jtc.home}/procrun/bin/tomcat.exe 
  -tofile=${tomcat.dist}/bin/tomcat.exe /
  -copy file=${jtc.home}/procrun/bin/tomcatw.exe 
  -tofile=${tomcat.dist}/bin/tomcatw.exe /
  +copy file=${nsis.nsexec.dll} todir=${tomcat.dist} /
  +copy file=${jtc.home}/procrun/bin/tomcat5.exe 
  +

Re: cvs commit: jakarta-tomcat-5 tomcat.nsi build.xml

2004-04-07 Thread Remy Maucherat 
[EMAIL PROTECTED] wrote:
mturk   2004/04/07 04:33:40

  Modified:.tomcat.nsi build.xml
  Log:
  Use the new Procrun 2.0
The new procrun looks professional. It seems really good quality overall 
(I do have a bad feeling about Win9x). The log viewer is gone though.

Rémy

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

RE: cvs commit: jakarta-tomcat-5 tomcat.nsi build.xml

2004-04-07 Thread Mladen Turk 
 

 -Original Message-
 From: Remy Maucherat
 
 The new procrun looks professional.

It's been cooking for over a year and I've tried to do my best :)

 It seems really good
 quality overall (I do have a bad feeling about Win9x). The log viewer 
 is gone though.
 

Win9x is not supported (lack of interest and test platform).
Since procrun now consist of two parts (lib and applications) it wouldn't be
a problem to support that.
But I'm +0 on supporting Win9x cause it's a NT kind of a application.

Log viewer is gone, cause it was not local language independent, and it
required additional sources in j-t-c.
Now there is only monitor (like ApacheMonitor), that can be used to monitor
the service.
Perhaps like in Apache2 it should be run at startup.

The major change is in configuration GUI that now supports all the
configurable options, and in the fact that the java.exe is not needed any
more.
There are two additional apps (apsvcmgr for monitoring all the services with
the options to filter particular services) and jar2exe that can make an .exe
from .jar file. I was able to run the entire Tomcat from single .exe
(although the usability of such application is questionable :).

Few things remains (mostly cosmetic) open, like shutting down monitor when
the service is deleted (for uninstall purposes) etc.

Also I've changed the installation to use the jvm from detected JAVA_HOME
(not the default one set in registry) so it should finally act the same way
as started from startup.bat

Further more the binaries now reflects the service name, so just double
clicking on the application will call the default action (running in debug
mode and configuration editing).

MT.


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]