[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] Prepare the Windows installer scripts for svn 1.4.2

From: Lieven Govaerts <lgo_at_mobsol.be>
Date: 2006-11-04 14:00:38 CET

Since svn 1.4.2 is about to be released, I started fixing the Windows
installer in accordance to the list of remarks I sent to this list some
time ago:
http://svn.haxx.se/dev/archive-2006-09/0504.shtml

Changes:
- The windows .zip packages now include a licenses folder containing the
license files for all our dependencies, like apr, neon & bdb (thanks djh).
- Attached patch to the installer scripts will include this licenses
folder in the installer. It also copies the Subversion license file to
that folder.
- The layout of the COPYING file (the svn license) was fixed on trunk in
r19842, I nominated it for backport to 1.4.x.

- If attached patch is approved, I'll also nominate r21516 and r22155
(some typos and copyright years) + this patch for backport to 1.4.x.

Lieven

[[[
Add license files of Subversion and the included libraries in
the Windows installer.

* packages/windows-innosetup/svn.iss
  Create a licenses folder in the output path and Start menu in
  which we put the license files of Subversion and all included
  libraries.

* packages/windows-innosetup/templates/svn_dynamics.iss
  Define path to licenses folder
]]]

Index: packages/windows-innosetup/svn.iss
===================================================================
--- packages/windows-innosetup/svn.iss (revision 22200)
+++ packages/windows-innosetup/svn.iss (working copy)
@@ -22,7 +22,6 @@
 AppUpdatesURL=http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91
 DefaultDirName={pf}\Subversion
 DefaultGroupName=Subversion
-LicenseFile={#= path_setup_in}\subversion\SubversionLicense.txt
 OutputDir={#= path_setup_out}
 OutputBaseFilename=svn-{#= svn_version}-setup
 Compression=lzma
@@ -71,7 +70,6 @@
 #ifdef inc_locale
 Source: {#= path_locale}\*.*; DestDir: {app}\share\locale; Flags: ignoreversion recursesubdirs
 #endif
-Source: {#= path_setup_in}\berkeley\BerkeleyLicense.txt; DestDir: {app}
 Source: {#= path_setup_in}\doc\svn-book.chm; DestDir: {app}\doc
 
 ; APR DLLs
@@ -117,6 +115,10 @@
 Source: {#= path_iconv_pdb}\*.pdb; DestDir: {app}\iconv; Flags: ignoreversion; Components: pdb
 #endif
 
+; License files;
+Source: {#= path_licenses}\*.*; DestDir: {app}\licenses; Flags: ignoreversion recursesubdirs
+Source: {#= path_setup_in}\subversion\SubversionLicense.txt; DestDir: {app}\licenses; Flags: ignoreversion
+
 ; Internet Shortcuts ----------------------------------------------------------
 Source: svn.url; DestDir: {app}
 
@@ -135,8 +137,7 @@
 [Icons]
 Name: {group}\Subversion on the Web; Filename: {app}\svn.url
 Name: {group}\Uninstall Subversion; Filename: {app}\UninsHs.exe
-Name: {group}\Licenses\Subversion; Filename: {app}\SubversionLicense.txt
-Name: {group}\Licenses\Berkeley DB Licence; Filename: {app}\BerkeleyLicense.txt
+Name: {group}\Licenses; Filename: {app}\Licenses\
 Name: {group}\Subversion Documentation; Filename: {app}\doc\svn-book.chm; IconFilename: {app}\bin\svn.exe; Comment: The standard Subversion documentation; IconIndex: 0
 Name: {userdesktop}\Subversion Documentation; Filename: {app}\doc\svn-book.chm; IconFilename: {app}\bin\svn.exe; Comment: The standard Subversion documentation; IconIndex: 0; Tasks: desktopicon
 Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\Subversion Documentation; Filename: {app}\doc\svn-book.chm; Comment: The standard Subversion Documentation; IconFilename: {app}\bin\svn.exe; IconIndex: 0; MinVersion: 4.01.1998,5.00.2195; Tasks: quicklaunchicon
@@ -174,10 +175,10 @@
 #ifdef inc_locale
 Type: filesandordirs; Name: {app}\share\locale
 #endif
-Type: files; Name: {app}\BerkeleyLicense.txt
 Type: filesandordirs; Name: {app}\doc
 Type: filesandordirs; Name: {app}\helpers
 Type: filesandordirs; Name: {app}\httpd
+Type: filesandordirs; Name: {app}\licenses
 
 ;If add "fixed" flag to "main" in [Components], use these lines:
 ;Type: files; Name: {app}\svn.pdb
Index: packages/windows-innosetup/templates/svn_dynamics.iss
===================================================================
--- packages/windows-innosetup/templates/svn_dynamics.iss (revision 22200)
+++ packages/windows-innosetup/templates/svn_dynamics.iss (working copy)
@@ -69,6 +69,8 @@
 #define path_svnpath "tools\svnpath"
 #define path_iconv (path_svn + "iconv")
 #define path_ssl (path_svn + "bin")
+; Licenses
+#define path_licenses (path_svn + "licenses")
 
 ;Debug symbols ----------------------------------------------------------------
 ; Basic files

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Nov 4 14:01:00 2006

This is an archived mail posted to the Subversion Dev mailing list.