This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new ee060e9 Move all the installer files into a single directory
ee060e9 is described below
commit ee060e90157e303d808d86a859c480b0832e2546
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Mar 22 08:48:26 2022 +0000
Move all the installer files into a single directory
---
build.xml | 6 +++---
res/{ => install-win}/INSTALLLICENSE | 0
res/{ => install-win}/header.bmp | Bin
res/{ => install-win}/side_left.bmp | Bin
res/{confinstall => install-win}/tomcat-users_1.xml | 0
res/{confinstall => install-win}/tomcat-users_2.xml | 0
res/{ => install-win}/tomcat.ico | Bin
res/{ => install-win}/tomcat.nsi | 8 ++++----
webapps/docs/changelog.xml | 5 +++++
9 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/build.xml b/build.xml
index 98470c7..902ade5 100644
--- a/build.xml
+++ b/build.xml
@@ -2500,11 +2500,11 @@ skip.installer property in build.properties" />
<target name="-installer-prep"
unless="skip.installer" depends="dist-static,-installer-init">
<copy todir="${tomcat.dist}">
- <fileset dir="res">
+ <fileset dir="res/install-win">
<include name="INSTALLLICENSE" />
<include name="*.bmp" />
<include name="*.ico" />
- <include name="confinstall/**" />
+ <include name="*.xml" />
</fileset>
</copy>
<copy file="${nsis.installoptions.dll}" todir="${tomcat.dist}" />
@@ -2512,7 +2512,7 @@ skip.installer property in build.properties" />
<copy file="${nsis.nsisdl.dll}" todir="${tomcat.dist}" />
<copy file="${nsis.system.dll}" todir="${tomcat.dist}" />
<copy file="${nsis.nsdialogs.dll}" todir="${tomcat.dist}" />
- <copy file="res/tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi"
overwrite="true" encoding="ISO-8859-1">
+ <copy file="res/install-win/tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi"
overwrite="true" encoding="ISO-8859-1">
<filterset refid="version.filters"/>
</copy>
<fixcrlf srcdir="${tomcat.dist}" eol="crlf"
diff --git a/res/INSTALLLICENSE b/res/install-win/INSTALLLICENSE
similarity index 100%
rename from res/INSTALLLICENSE
rename to res/install-win/INSTALLLICENSE
diff --git a/res/header.bmp b/res/install-win/header.bmp
similarity index 100%
rename from res/header.bmp
rename to res/install-win/header.bmp
diff --git a/res/side_left.bmp b/res/install-win/side_left.bmp
similarity index 100%
rename from res/side_left.bmp
rename to res/install-win/side_left.bmp
diff --git a/res/confinstall/tomcat-users_1.xml
b/res/install-win/tomcat-users_1.xml
similarity index 100%
rename from res/confinstall/tomcat-users_1.xml
rename to res/install-win/tomcat-users_1.xml
diff --git a/res/confinstall/tomcat-users_2.xml
b/res/install-win/tomcat-users_2.xml
similarity index 100%
rename from res/confinstall/tomcat-users_2.xml
rename to res/install-win/tomcat-users_2.xml
diff --git a/res/tomcat.ico b/res/install-win/tomcat.ico
similarity index 100%
rename from res/tomcat.ico
rename to res/install-win/tomcat.ico
diff --git a/res/tomcat.nsi b/res/install-win/tomcat.nsi
similarity index 99%
rename from res/tomcat.nsi
rename to res/install-win/tomcat.nsi
index b22e7e8..04f5163 100644
--- a/res/tomcat.nsi
+++ b/res/install-win/tomcat.nsi
@@ -160,8 +160,8 @@ Var ServiceInstallLog
ReserveFile System.dll
ReserveFile nsDialogs.dll
- ReserveFile confinstall\tomcat-users_1.xml
- ReserveFile confinstall\tomcat-users_2.xml
+ ReserveFile tomcat-users_1.xml
+ ReserveFile tomcat-users_2.xml
;--------------------------------
;Installer Sections
@@ -1091,8 +1091,8 @@ Function configure
; that is automatically deleted when the installer exits.
InitPluginsDir
SetOutPath $PLUGINSDIR
- File confinstall\tomcat-users_1.xml
- File confinstall\tomcat-users_2.xml
+ File tomcat-users_1.xml
+ File tomcat-users_2.xml
; Build final tomcat-users.xml
Delete "$INSTDIR\conf\tomcat-users.xml"
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index da4e920..8b741e4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -178,6 +178,11 @@
<update>
Update to the Eclipse JDT compiler 4.23. (markt)
</update>
+ <scode>
+ Refactor the resource files for the Apache Tomcat installer for Windows
+ so that all the resource files are located in a single directory in the
+ source tree. (markt)
+ </scode>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
