You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2003/04/28 23:07:36 UTC
cvs commit: jakarta-tomcat-5 build.xml tomcat.nsi
remm 2003/04/28 14:07:36
Modified: . build.xml tomcat.nsi
Log:
- Package the deployer in the release.
- Don't include useless nsis binary.
Revision Changes Path
1.126 +34 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- build.xml 27 Apr 2003 10:10:33 -0000 1.125
+++ build.xml 28 Apr 2003 21:07:36 -0000 1.126
@@ -1205,7 +1205,7 @@
<!-- ==================== RELEASE: Create Release ======================= -->
- <target name="release" depends="clean,dist,dist-source,prepare-release,installer,package-zip,package-tgz,package-embed-zip,package-embed-tgz,package-src-zip,package-src-tgz"
+ <target name="release" depends="clean,dist,dist-source,prepare-release,installer,package-zip,package-tgz,package-embed-zip,package-embed-tgz,package-deployer-zip,package-deployer-tgz,package-src-zip,package-src-tgz"
description="Create a Tomcat 5 packaged distribution">
<filter token="VERSION" value="${version}"/>
@@ -1276,6 +1276,21 @@
</zip>
</target>
+ <target name="package-deployer-zip">
+ <zip zipfile="${tomcat.release}/v${version}/bin/${final.name}-deployer.zip">
+ <zipfileset dir="${tomcat.deployer}" prefix="${final.name}-deployer"
+ includes="**" />
+ <zipfileset dir="${tomcat.dist}" prefix="${final.name}-deployer"
+ includes="LICENSE" />
+ <zipfileset dir="${tomcat.dist}" prefix="${final.name}-deployer"
+ includes="README.txt" />
+ <zipfileset dir="${tomcat.dist}" prefix="${final.name}-deployer"
+ includes="RELEASE-NOTES" />
+ <zipfileset dir="${tomcat.dist}" prefix="${final.name}-deployer"
+ includes="CHANGELOG" />
+ </zip>
+ </target>
+
<target name="prepare-release">
<mkdir dir="${tomcat.release}"/>
@@ -1351,6 +1366,24 @@
<include name="CHANGELOG" />
</tarfileset>
<tarfileset dir="${tomcat.embed}" prefix="${final.name}-embed">
+ <include name="**" />
+ </tarfileset>
+ </tar>
+ </target>
+
+ <target name="package-deployer-tgz">
+ <fixcrlf srcdir="${tomcat.dist}"
+ includes="*.txt,LICENSE" eol="lf"/>
+ <fixcrlf srcdir="${tomcat.deployer}" includes="*.xml" eol="lf"/>
+ <tar longfile="gnu" compression="gzip"
+ tarfile="${tomcat.release}/v${version}/bin/${final.name}-deployer.tar.gz">
+ <tarfileset dir="${tomcat.dist}" prefix="${final.name}-deployer">
+ <include name="LICENSE" />
+ <include name="README.txt" />
+ <include name="RELEASE-NOTES" />
+ <include name="CHANGELOG" />
+ </tarfileset>
+ <tarfileset dir="${tomcat.deployer}" prefix="${final.name}-deployer">
<include name="**" />
</tarfileset>
</tar>
1.31 +1 -4 jakarta-tomcat-5/tomcat.nsi
Index: tomcat.nsi
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- tomcat.nsi 28 Apr 2003 17:50:25 -0000 1.30
+++ tomcat.nsi 28 Apr 2003 21:07:36 -0000 1.31
@@ -227,9 +227,6 @@
ExecWait '"$INSTDIR\bin\tomcatw.exe" //US//Tomcat5 --JavaOptions -Dcatalina.home="\"$INSTDIR\""#-Djava.endorsed.dirs="\"$INSTDIR\common\endorsed\"" --StdOutputFile "$INSTDIR\logs\stdout.log" --StdErrorFile "$INSTDIR\logs\stderr.log" --WorkingPath "$INSTDIR"'
- SetOutPath "$INSTDIR"
- File "${NSISDIR}\Contrib\UIs\modern.exe"
-
WriteUninstaller "$INSTDIR\Uninstall.exe"
WriteRegStr HKLM "SOFTWARE\Apache Software Foundation\Tomcat\5.0" "InstallPath" $INSTDIR
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org