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 Tue, 07 May 2002 07:04:11 GMT
wrowe       02/05/07 00:04:11

  Modified:    .        apache_2.0-win32.isv
  Log:
    The .36 release.  Kill the seperate .log/.conf types and associate both
    types with txtfile (configured as Notepad by default on nearly any
    Windows install.)  I'm not happy with this solution (we need to reconsider
    this approach entirely) but it's a stop-gap that assures we work around
    the REG_EXPAND_SZ bug in tracking down %SystemRoot%.
  
    Also drop the OPENSSL-LICENSE.txt which is simply incorporated into
    LICENCE.txt if the Makefile.win is invoked and srclib/openssl exists.
  
  Revision  Changes    Path
  1.12      +9 -40     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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- apache_2.0-win32.isv	7 May 2002 06:51:53 -0000	1.11
  +++ apache_2.0-win32.isv	7 May 2002 07:04:11 -0000	1.12
  @@ -1,7 +1,7 @@
   # InstallShield for Windows Installer Generated Project File
   # ** Do Not Edit **
   --------------------------------------------------------
  -KeyCount204295
  +KeyCount206727
   --------------------------------------------------------
   1	035	133ACTION	233	333	1033
   2	035	133ACTIONTEXT	233	333	TKey33f	1033f	1133f
  @@ -1051,41 +1051,21 @@
   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.35	REGISTRYKEY	R55610	2	0	0	-1	-1	0	0	0	0	
  +2.0.36	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
   Classes	REGISTRYKEY	R175429	2	0	0	-1	-1	0	0	0	0	
   R175429(Default)	REGISTRYKEY	R175429		(Default)		%%%%NOVALUESET%%%%	1
   .conf	REGISTRYKEY	R55611	2	0	0	-1	-1	0	0	0	0	
  -R55611(Default)	REGISTRYKEY	R55611		(Default)		conffile	1
  +R55611(Default)	REGISTRYKEY	R55611		(Default)		txtfile	1
   R55611Content Type	REGISTRYKEY	R55611		Content Type		text/plain	1
   .log	REGISTRYKEY	R55612	2	0	0	-1	-1	0	0	0	0	
  -R55612(Default)	REGISTRYKEY	R55612		(Default)		logfile	1
  +R55612(Default)	REGISTRYKEY	R55612		(Default)		txtfile	1
   R55612Content Type	REGISTRYKEY	R55612		Content Type		text/plain	1
   .so	REGISTRYKEY	R55621	2	0	0	-1	-1	0	0	0	0	
   R55621(Default)	REGISTRYKEY	R55621		(Default)		sofile	1
   R55621Content Type	REGISTRYKEY	R55621		Content Type		application/x-apachemodule	1
  -conffile	REGISTRYKEY	R55617	2	0	0	-1	-1	0	0	0	0	
  -R55617(Default)	REGISTRYKEY	R55617		(Default)		Configuration File	1
  -shell	REGISTRYKEY	R55618	2	0	0	-1	-1	0	0	0	0	
  -R55618(Default)	REGISTRYKEY	R55618		(Default)		%%%%NOVALUESET%%%%	1
  -Edit	REGISTRYKEY	R55619	2	0	0	-1	-1	0	0	0	0	
  -R55619(Default)	REGISTRYKEY	R55619		(Default)		%%%%NOVALUESET%%%%	1
  -command	REGISTRYKEY	R55620	2	0	0	-1	-1	0	0	0	0	
  -R55620(Default)	REGISTRYKEY	R55620		(Default)		"%SystemRoot%\system32\NOTEPAD.EXE" "%1"
1
  -DefaultIcon	REGISTRYKEY	R171763	2	0	0	-1	-1	0	0	0	0	
  -R171763(Default)	REGISTRYKEY	R171763		(Default)		%SystemRoot%\system32\shell32.dll,-154
1
  -logfile	REGISTRYKEY	R55613	2	0	0	-1	-1	0	0	0	0	
  -R55613(Default)	REGISTRYKEY	R55613		(Default)		Log File	1
  -shell	REGISTRYKEY	R55614	2	0	0	-1	-1	0	0	0	0	
  -R55614(Default)	REGISTRYKEY	R55614		(Default)		%%%%NOVALUESET%%%%	1
  -Edit	REGISTRYKEY	R55615	2	0	0	-1	-1	0	0	0	0	
  -R55615(Default)	REGISTRYKEY	R55615		(Default)		%%%%NOVALUESET%%%%	1
  -command	REGISTRYKEY	R55616	2	0	0	-1	-1	0	0	0	0	
  -R55616(Default)	REGISTRYKEY	R55616		(Default)		"%SystemRoot%\system32\NOTEPAD.EXE" "%1"
1
  -DefaultIcon	REGISTRYKEY	R171766	2	0	0	-1	-1	0	0	0	0	
  -R171766(Default)	REGISTRYKEY	R171766		(Default)		%SystemRoot%\system32\shell32.dll,-152
1
   sofile	REGISTRYKEY	R55622	2	0	0	-1	-1	0	0	0	0	
   R55622(Default)	REGISTRYKEY	R55622		(Default)		Apache Loadable Module	1
   DefaultIcon	REGISTRYKEY	R176909	2	0	0	-1	-1	0	0	0	0	
  @@ -1126,7 +1106,7 @@
   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.35	REGISTRYKEY	R173773	2	0	0	-1	-1	0	0	0	0	
  +2.0.36	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	
  @@ -1458,7 +1438,7 @@
   REG_HKLM	REGISTRYKEY	R164874	2	0	0	-1	-1	0	0	0	0	
   REG_HKU	REGISTRYKEY	R164875	2	0	0	-1	-1	0	0	0	0	
   REG_HKUS	REGISTRYKEY	R164876	2	0	0	-1	-1	0	0	0	0	
  -openssl_read	COMPONENT	C164899	1				{CC05F6B8-BFEB-4A7D-A994-0B0328B7064E}	0	1	-1	0	0	0
	0	[APACHEDIR]	0		0	2	0		F164941_OPENSSLLICENSE.txt	
  +openssl_read	COMPONENT	C164899	1				{CC05F6B8-BFEB-4A7D-A994-0B0328B7064E}	0	1	-1	0	0	0
	0	[APACHEDIR]	0		0	2	0		F164939_OPENSSLREADME.txt	
   Default	COMCLASS_GROUP	C164900	1
   Default	TYPELIB_GROUP	T164901	1
   Default	PROGID_GROUP	P164902	1
  @@ -1474,7 +1454,6 @@
   Default	FILES	F164911	2
   F164911F164939_OPENSSLREADME.txt	FILES	F164911		F164939_OPENSSLREADME.txt	<ApacheTargetFolder>\OPENSSL-README.txt
	0	0	0			0		0	-1		0	-1	0	OPENSSL-README.txt	0	-1	1033	0	0	0	-1	
   F164911F164940_OPENSSLNEWS.txt	FILES	F164911		F164940_OPENSSLNEWS.txt	<ApacheTargetFolder>\OPENSSL-NEWS.txt
	0	0	0			0		0	-1		0	-1	0	OPENSSL-NEWS.txt	0	-1	1033	0	0	0	-1	
  -F164911F164941_OPENSSLLICENSE.txt	FILES	F164911		F164941_OPENSSLLICENSE.txt	<ApacheTargetFolder>\OPENSSL-LICENSE.txt
	0	0	0			0		0	-1		0	-1	0	OPENSSL-LICENSE.txt	0	-1	1033	0	0	0	-1	
   Default	SHORTCUT	S164912	1
   Default	SHORTCUTTASKBAR	S164913	1
   Default	SHORTCUTSTARTMENU	S164914	1
  @@ -3117,7 +3096,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	M194225	http://www.yourcompany.com	##AppProduct##
0	0	Default	555-555-1234	http://www.yourcompany.com	MS Visual Basic	2.0.35	http://www.yourcompany.com
{C49BD74F-8B16-47B5-88A5-B86D3D15AEB5}	##AppPublisher##	Internet Application	[ProgramFilesFolder]\Apache
Group\	Intel
  +Apache HTTP Server 2.0	PRODUCT	P794	1	M194225	http://www.yourcompany.com	##AppProduct##
0	0	Default	555-555-1234	http://www.yourcompany.com	MS Visual Basic	2.0.36	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
  @@ -4246,7 +4225,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.35		37303.5445601852
SYSTEM_GENERATED
  +S1075AppProduct	STRINGS	S1075		AppProduct	Apache HTTP Server 2.0.36		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	
  @@ -5287,7 +5266,7 @@
   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.35			##IDS_Dev_Warning##		##IDS_Package_Title##
Apache HTTP Server 2.0.35		{495826D5-C9CF-4E88-B694-382EE6A85AEC}			0	0			1
  +win32	BUILDLABEL	B4077	1	##AppProduct_Description##		2.0.36			##IDS_Dev_Warning##		##IDS_Package_Title##
Apache HTTP Server 2.0.36		{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
  @@ -6119,16 +6098,6 @@
   R55611R175429	0
   R55612R175429	0
   R55621R175429	0
  -R55617R175429	0
  -R55618R55617	0
  -R55619R55618	0
  -R55620R55619	0
  -R171763R55617	0
  -R55613R175429	0
  -R55614R55613	0
  -R55615R55614	0
  -R55616R55615	0
  -R171766R55613	0
   R55622R175429	0
   R176909R55622	0
   R55601R55597	0
  
  
  

---------------------------------------------------------------------
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