httpd-win32-msi-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-win32-msi apache_2.0-win32.isv
Date Sat, 18 Jan 2003 22:31:59 GMT
wrowe       2003/01/18 14:31:58

  Modified:    .        apache_2.0-win32.isv
  Log:
    Add apr-iconv's modules and change the manual/programs key from index.html
    to index.html.en.
  
  Revision  Changes    Path
  1.21      +78 -13    httpd-win32-msi/apache_2.0-win32.isv
  
  Index: apache_2.0-win32.isv
  ===================================================================
  RCS file: /home/cvs/httpd-win32-msi/apache_2.0-win32.isv,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- apache_2.0-win32.isv	3 Oct 2002 13:53:52 -0000	1.20
  +++ apache_2.0-win32.isv	18 Jan 2003 22:31:58 -0000	1.21
  @@ -1,7 +1,7 @@
   # InstallShield for Windows Installer Generated Project File
   # ** Do Not Edit **
   --------------------------------------------------------
  -KeyCount218996
  +KeyCount222151
   --------------------------------------------------------
   1	035	133ACTION	233	333	1033
   2	035	133ACTIONTEXT	233	333	TKey33f	1033f	1133f
  @@ -1051,7 +1051,7 @@
   R55608(Default)	REGISTRYKEY	R55608		(Default)		%%%%NOVALUESET%%%%	1
   Apache	REGISTRYKEY	R55609	2	0	0	-1	-1	0	0	0	0	
   R55609(Default)	REGISTRYKEY	R55609		(Default)		%%%%NOVALUESET%%%%	1
  -2.0.43	REGISTRYKEY	R55610	2	0	0	-1	-1	0	0	0	0	
  +2.0.44	REGISTRYKEY	R55610	2	0	0	-1	-1	0	0	0	0	
   R55610(Default)	REGISTRYKEY	R55610		(Default)		%%%%NOVALUESET%%%%	1
   R55610ServerRoot	REGISTRYKEY	R55610		ServerRoot		[APACHEDIR]	1
   R55610Shared	REGISTRYKEY	R55610		Shared		1	0
  @@ -1106,13 +1106,13 @@
   R173771(Default)	REGISTRYKEY	R173771		(Default)		%%%%NOVALUESET%%%%	1
   Apache	REGISTRYKEY	R173772	2	0	0	-1	-1	0	0	0	0	
   R173772(Default)	REGISTRYKEY	R173772		(Default)		%%%%NOVALUESET%%%%	1
  -2.0.43	REGISTRYKEY	R173773	2	0	0	-1	-1	0	0	0	0	
  +2.0.44	REGISTRYKEY	R173773	2	0	0	-1	-1	0	0	0	0	
   R173773(Default)	REGISTRYKEY	R173773		(Default)		%%%%NOVALUESET%%%%	1
   R173773Installed	REGISTRYKEY	R173773		Installed		1	0
   REG_HKLM	REGISTRYKEY	R151086	2	0	0	-1	-1	0	0	0	0	
   REG_HKU	REGISTRYKEY	R151087	2	0	0	-1	-1	0	0	0	0	
   REG_HKUS	REGISTRYKEY	R151088	2	0	0	-1	-1	0	0	0	0	
  -manual_programs	COMPONENT	C156599	1				{7A359C25-72E7-4661-B88A-DE8124C3433D}	0	1	-1	0
0	0		0	[APACHEMANUALDIR]programs	0		0	2	0		F169635_index.html	
  +manual_programs	COMPONENT	C156599	1				{7A359C25-72E7-4661-B88A-DE8124C3433D}	0	1	-1	0
0	0		0	[APACHEMANUALDIR]programs	0		0	2	0		F220380_index.html.en	
   Default	COMCLASS_GROUP	C156600	1
   Default	TYPELIB_GROUP	T156601	1
   Default	PROGID_GROUP	P156602	1
  @@ -1125,9 +1125,9 @@
   Default	ODBC_TRANSLATOR_GROUP	O156609	1
   Default	FILELINKING_GROUP	F156610	1
   Default	FILELINKING	F156626	2
  -F156626<ApacheTargetFolder>\manual\programs	FILELINKING	F156626		<ApacheTargetFolder>\manual\programs
4	1	index.html	LICENSE,*.html.*,*.xml*,*.gif,*.png,*.fig,*.jpg		<ApacheTargetFolder>\manual\programs
  +F156626<ApacheTargetFolder>\manual\programs	FILELINKING	F156626		<ApacheTargetFolder>\manual\programs
4	1	index.html.en	LICENSE,*.html.*,*.xml*,*.gif,*.png,*.fig,*.jpg		<ApacheTargetFolder>\manual\programs
   Default	FILES	F156611	2
  -F156611F169635_index.html	FILES	F156611		F169635_index.html	<ApacheTargetFolder>\manual\programs\index.html
	0	0	0			0		0	-1		0	-1	0	index.html	0	-1	1033	0	0	0	-1	
  +F156611F220380_index.html.en	FILES	F156611		F220380_index.html.en	<ApacheTargetFolder>\manual\programs\index.html.en
	0	0	0			0		0	-1		0	-1	0	index.html.en	0	-1	1033	0	0	0	-1	
   Default	SHORTCUT	S156612	1
   Default	SHORTCUTTASKBAR	S156613	1
   Default	SHORTCUTSTARTMENU	S156614	1
  @@ -3100,6 +3100,36 @@
   REG_HKLM	REGISTRYKEY	R213256	2	0	0	-1	-1	0	0	0	0	
   REG_HKU	REGISTRYKEY	R213257	2	0	0	-1	-1	0	0	0	0	
   REG_HKUS	REGISTRYKEY	R213258	2	0	0	-1	-1	0	0	0	0	
  +iconv_bin	COMPONENT	C218996	1				{89474785-9FF1-4E3A-8180-9B013120DC83}	0	1	-1	0	0	0		0
[APACHEBINDIR]iconv	0		0	2	0		F219024__tbl_simple.so	
  +Default	COMCLASS_GROUP	C218997	1
  +Default	TYPELIB_GROUP	T218998	1
  +Default	PROGID_GROUP	P218999	1
  +Default	EXTENSION_GROUP	E219000	1
  +Default	PUBLISHCOMPONENT_GROUP	P219001	1
  +Default	SERVICE_GROUP	S219002	1
  +Default	SERVICE_CONTROL_GROUP	S219003	1
  +Default	ODBC_DRIVER_GROUP	O219004	1
  +Default	ODBC_DATASOURCE_GROUP	O219005	1
  +Default	ODBC_TRANSLATOR_GROUP	O219006	1
  +Default	FILELINKING_GROUP	F219007	1
  +Default	FILELINKING	F219023	2
  +F219023<ApacheTargetFolder>\bin\iconv	FILELINKING	F219023		<ApacheTargetFolder>\bin\iconv
4	1	_tbl_simple.so			<ApacheTargetFolder>\bin\iconv
  +Default	FILES	F219008	2
  +F219008F219024__tbl_simple.so	FILES	F219008		F219024__tbl_simple.so	<ApacheTargetFolder>\bin\iconv\_tbl_simple.so
	0	0	0			0		0	-1		0	-1	0	_tbl_simple.so	0	-1	1033	0	0	0	-1	
  +Default	SHORTCUT	S219009	1
  +Default	SHORTCUTTASKBAR	S219010	1
  +Default	SHORTCUTSTARTMENU	S219011	1
  +Default	SHORTCUTPROGRAMMENU	S219012	1
  +Default	SHORTCUTSTARTUP	S219013	1
  +Default	SHORTCUTSENDTO	S219014	1
  +Default	SHORTCUTDESKTOP	S219015	1
  +Default	APPPATH	A219016	2
  +Default	REGISTRY	R219017	1
  +REG_HKCR	REGISTRYKEY	R219018	2	0	0	-1	-1	0	0	0	0	
  +REG_HKCU	REGISTRYKEY	R219019	2	0	0	-1	-1	0	0	0	0	
  +REG_HKLM	REGISTRYKEY	R219020	2	0	0	-1	-1	0	0	0	0	
  +REG_HKU	REGISTRYKEY	R219021	2	0	0	-1	-1	0	0	0	0	
  +REG_HKUS	REGISTRYKEY	R219022	2	0	0	-1	-1	0	0	0	0	
   ISCONDITION_LAYOUT	ISCONDITION_LAYOUT	ISCONDITION_LAYOUT	1
   ISCREATEFOLDER_LAYOUT	ISCREATEFOLDER_LAYOUT	ISCREATEFOLDER_LAYOUT	1
   ISDIRECTORY_LAYOUT	ISDIRECTORY_LAYOUT	ISDIRECTORY_LAYOUT	1
  @@ -3143,6 +3173,7 @@
   D728179696	DIRECTORY	D728		179696	APACHEINCDIR	0	include	APACHEDIR
   D728179697	DIRECTORY	D728		179697	APACHELIBDIR	0	lib	APACHEDIR
   D728181219	DIRECTORY	D728		181219	APACHEERRORDIR	0	error	APACHEDIR
  +D728219475	DIRECTORY	D728		219475	APACHEICONVDIR	0	iconv	APACHEBINDIR
   DISPLAYTREE_LAYOUT	DISPLAYTREE_LAYOUT	DISPLAYTREE_LAYOUT	1
   Default	DISPLAYTREE	D729	1
   Default	FEATURE_GROUP	F730	1
  @@ -3152,9 +3183,11 @@
   Default	MERGEMODULE_GROUP	M1189	1
   Default	MMDIALOG_GROUP	M1704	1
   Default	MMCUSTOM_ACTION_GROUP	M1705	1
  -BuildFiles	FEATURE	F166002	1	2	1	##Feature_BuildFiles##		0	[APACHEDIR]	0	101	-1	Enter comments
regarding this feature here.	0	0	0	##Feature_BuildFiles_Description##
  +Iconv	FEATURE	F219473	1	0	0	##Feature_Iconv##		0	[INSTALLDIR]	0	21	-1	Enter comments regarding
this feature here.	0	0	0	##Feature_Iconv_Description##
  +Default	MERGEMODULE_GROUP	M219474	1
  +BuildFiles	FEATURE	F166002	1	2	1	##Feature_BuildFiles##		0	[APACHEDIR]	0	31	-1	Enter comments
regarding this feature here.	0	0	0	##Feature_BuildFiles_Description##
   Default	MERGEMODULE_GROUP	M166003	1
  -SslBin	FEATURE	F183910	1	2	1	##Feature_SSL##	IncludeSSL	0	[APACHEDIR]	0	21	-1	Enter comments
regarding this feature here.	0	0	0	##Feature_SSL_Description##
  +SslBin	FEATURE	F183910	1	2	1	##Feature_SSL##	IncludeSSL	0	[APACHEDIR]	0	41	-1	Enter comments
regarding this feature here.	0	0	0	##Feature_SSL_Description##
   Default	MERGEMODULE_GROUP	M183911	1
   OpensslBin	FEATURE	F164792	1	2	1	##Feature_OpenSSL##	IncludeSSL	0	[OPENSSLBINDIR]	0	31
-1	Enter comments regarding this feature here.	0	0	0	##Feature_OpenSSL_Description##
   Default	MERGEMODULE_GROUP	M164793	1
  @@ -3186,7 +3219,7 @@
   ISPATCH_LAYOUT	ISPATCH_LAYOUT	ISPATCH_LAYOUT	1
   ISPATCHPACKAGE_LAYOUT	ISPATCHPACKAGE_LAYOUT	ISPATCHPACKAGE_LAYOUT	1
   PRODUCT_LAYOUT	PRODUCT_LAYOUT	PRODUCT_LAYOUT	1
  -Apache HTTP Server 2.0	PRODUCT	P794	1	M193662	http://httpd.apache.org	##AppProduct##	0
0	Default	555-555-1234	http://httpd.apache.org	MS Visual C++	2.0.43	http://www.yourcompany.com
{C49BD74F-8B16-47B5-88A5-B86D3D15AEB5}	##AppPublisher##	Internet Application	[ProgramFilesFolder]\Apache
Group\	Intel
  +Apache HTTP Server 2.0	PRODUCT	P794	1	M208940	http://httpd.apache.org	##AppProduct##	0
0	Default	555-555-1234	http://httpd.apache.org	MS Visual C++	2.0.44	http://www.yourcompany.com
{C49BD74F-8B16-47B5-88A5-B86D3D15AEB5}	##AppPublisher##	Internet Application	[ProgramFilesFolder]\Apache
Group\	Intel
   Default	MEDIA_GROUP	M795	1
   Default	LAUNCHCONDITION_GROUP	L796	1
   Default	ADMIN_EXESEQUENCE_GROUP	A139	1
  @@ -4315,7 +4348,7 @@
   S1075IDS_SetupTips_16	STRINGS	S1075		IDS_SetupTips_16	<ISProductFolder>\Redist\Language
Independent\OS Independent\InstallFirstUse.ico		0	
   S1075IDS_SetupTips_17	STRINGS	S1075		IDS_SetupTips_17	<ISProductFolder>\Redist\Language
Independent\OS Independent\InstallPartial.ico		0	
   S1075IDS_SetupTips_19	STRINGS	S1075		IDS_SetupTips_19	<ISProductFolder>\Redist\Language
Independent\OS Independent\InstallStateMenu.ico		0	
  -S1075AppProduct	STRINGS	S1075		AppProduct	Apache HTTP Server 2.0.43		37303.5445601852
SYSTEM_GENERATED
  +S1075AppProduct	STRINGS	S1075		AppProduct	Apache HTTP Server 2.0.44		37303.5445601852
SYSTEM_GENERATED
   S1075IDS__IsReadmeDlg_1	STRINGS	S1075		IDS__IsReadmeDlg_1	Please read the following readme
information carefully.		0	
   S1075IDS__IsDatabaseLocation_12	STRINGS	S1075		IDS__IsDatabaseLocation_12	{&MSSWhiteSerif8}InstallShield
	0	
   S1075IDS__IsDatabaseLocation_13	STRINGS	S1075		IDS__IsDatabaseLocation_13	[ApplicationName]
- Installation Wizard		0	
  @@ -4482,6 +4515,8 @@
   S1075Feature_SSL_Description	STRINGS	S1075		Feature_SSL_Description	The ssl_module and
abs (ApacheBench/SSL)		37208.0863888889	
   S1075IDS_Package_Title	STRINGS	S1075		IDS_Package_Title	Installation Database		37303.7598032407

   S1075Shortcut_ApacheMonitor_desc	STRINGS	S1075		Shortcut_ApacheMonitor_desc	Apache Service
Taskbar Icon		37354.8409490741	
  +S1075Feature_Iconv	STRINGS	S1075		Feature_Iconv	APR Iconv Code Page Modules		37639.5909375

  +S1075Feature_Iconv_Description	STRINGS	S1075		Feature_Iconv_Description	Character Set
Translation Modules (required for mod_charset_lite and some 3rd party modules)		37639.592037037

   CHECKBOX_LAYOUT	CHECKBOX_LAYOUT	CHECKBOX_LAYOUT	1
   LAUNCHPROGRAM	CHECKBOX	C16328	1	
   LAUNCHREADME	CHECKBOX	C16329	1	
  @@ -5351,12 +5386,12 @@
   P791CommonFilesFolder	PATHVARIABLES	P791		CommonFilesFolder		1	
   P791ISProjectFolder	PATHVARIABLES	P791		ISProjectFolder		1	
   P791ISProductFolder	PATHVARIABLES	P791		ISProductFolder		1	
  -P791ApacheBuildFolder	PATHVARIABLES	P791		ApacheBuildFolder	c:\asf-build\httpd-2.0.43
2	
  -P791ApacheTargetFolder	PATHVARIABLES	P791		ApacheTargetFolder	c:\asf-build\target-2.0.43
2	
  +P791ApacheBuildFolder	PATHVARIABLES	P791		ApacheBuildFolder	c:\asf-build\httpd-2.0.44
2	
  +P791ApacheTargetFolder	PATHVARIABLES	P791		ApacheTargetFolder	c:\asf-build\target-2.0.44
2	
   ISAUTMERGEMODULE_LAYOUT	ISAUTMERGEMODULE_LAYOUT	ISAUTMERGEMODULE_LAYOUT	1
   DISKMAP_LAYOUT	DISKMAP_LAYOUT	DISKMAP_LAYOUT	1
   BUILDLABEL_LAYOUT	BUILDLABEL_LAYOUT	BUILDLABEL_LAYOUT	1
  -win32	BUILDLABEL	B4077	1	##AppProduct_Description##		2.0.43			##IDS_Dev_Warning##		##IDS_Package_Title##
Apache HTTP Server 2.0.43		{495826D5-C9CF-4E88-B694-382EE6A85AEC}			0	0			1
  +win32	BUILDLABEL	B4077	1	##AppProduct_Description##		2.0.44			##IDS_Dev_Warning##		##IDS_Package_Title##
Apache HTTP Server 2.0.44		{495826D5-C9CF-4E88-B694-382EE6A85AEC}			0	0			1
   Default	PROPERTIES	P4078	2
   P4078ProductCode	PROPERTIES	P4078		ProductCode	{3A862C7D-0504-48BC-AEF8-7F7479C7C158}
	0
   P4078UpgradeCode	PROPERTIES	P4078		UpgradeCode	{0EA14757-3D48-4F78-878E-B9AF261753D9}
	0
  @@ -8137,6 +8172,34 @@
   R213256R213253	0
   R213257R213253	0
   R213258R213253	0
  +C218996COMPONENT_LAYOUT	0
  +C218997C218996	0
  +T218998C218996	0
  +P218999C218996	0
  +E219000C218996	0
  +P219001C218996	0
  +S219002C218996	0
  +S219003C218996	0
  +O219004C218996	0
  +O219005C218996	0
  +O219006C218996	0
  +F219007C218996	0
  +F219023F219007	0
  +F219008C218996	0
  +S219009C218996	0
  +S219010S219009	0
  +S219011S219010	0
  +S219012S219011	0
  +S219013S219011	0
  +S219014S219009	0
  +S219015S219009	0
  +A219016C218996	0
  +R219017C218996	0
  +R219018R219017	0
  +R219019R219017	0
  +R219020R219017	0
  +R219021R219017	0
  +R219022R219017	0
   ISCONDITION_LAYOUTPROJECTROOT	0
   ISCREATEFOLDER_LAYOUTPROJECTROOT	0
   ISDIRECTORY_LAYOUTPROJECTROOT	0
  @@ -8160,6 +8223,8 @@
   C24882F1188	1
   C46393F1188	1
   C11286F1188	1
  +F219473F1188	0
  +M219474F219473	0
   F166002F1188	0
   M166003F166002	0
   C48266F166002	1
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: win32-msi-cvs-unsubscribe@httpd.apache.org
For additional commands, e-mail: win32-msi-cvs-help@httpd.apache.org


Mime
View raw message