[GME-commit] GMESRC/Install ISFeatureMergeModules.idt,1.1,1.2 ISMergeModule.idt,1.1,1.2 ISMergeModuleCfgValues.idt,1.1,1.2

[gme-commit at list.isis.vanderbilt.edu]

Update of /var/lib/gme/GMESRC/Install
In directory braindrain:/tmp/cvs-serv9648/Install

Modified Files:
	ISFeatureMergeModules.idt ISMergeModule.idt 
	ISMergeModuleCfgValues.idt 
Log Message:
View/Console put on the toolbar

CVS User: volgy

Index: ISFeatureMergeModules.idt
===================================================================
RCS file: /var/lib/gme/GMESRC/Install/ISFeatureMergeModules.idt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ISFeatureMergeModules.idt	12 Feb 2003 19:39:30 -0000	1.1
--- ISFeatureMergeModules.idt	28 Jul 2004 13:21:03 -0000	1.2
***************
*** 3,7 ****
  ISFeatureMergeModules	Feature_	ISMergeModule_	Language_
  GMEApplication	ATL.7EBEDD68_AA66_11D2_B980_006097C4DE24	0
! GMEApplication	MDAC27ENU.C9C35FC7_5AEE_4C1E_8BD2_80ED9FA87FFF	1033
  GMEApplication	MFC42.51D569E2_8A28_11D2_B962_006097C4DE24	0
  GMEApplication	MSVCIRT.3CE1F932_C090_11D2_977B_006097C4DE24	0
--- 3,7 ----
  ISFeatureMergeModules	Feature_	ISMergeModule_	Language_
  GMEApplication	ATL.7EBEDD68_AA66_11D2_B980_006097C4DE24	0
! GMEApplication	MDAC28.E7D6BCFA_9BFA_49D4_A1EE_767B7FD61E38	1033
  GMEApplication	MFC42.51D569E2_8A28_11D2_B962_006097C4DE24	0
  GMEApplication	MSVCIRT.3CE1F932_C090_11D2_977B_006097C4DE24	0

Index: ISMergeModule.idt
===================================================================
RCS file: /var/lib/gme/GMESRC/Install/ISMergeModule.idt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ISMergeModule.idt	12 Feb 2003 19:39:30 -0000	1.1
--- ISMergeModule.idt	28 Jul 2004 13:21:03 -0000	1.2
***************
*** 3,7 ****
  ISMergeModule	ISMergeModule	Language
  ATL.7EBEDD68_AA66_11D2_B980_006097C4DE24	0	ATL Module for Windows		
! MDAC27ENU.C9C35FC7_5AEE_4C1E_8BD2_80ED9FA87FFF	1033	MDAC 2.7 (English)		
  MFC42.51D569E2_8A28_11D2_B962_006097C4DE24	0	MFCDLL Shared Library - Retail Version		
  MSVCIRT.3CE1F932_C090_11D2_977B_006097C4DE24	0	Microsoft (R) C++ Runtime Library		
--- 3,7 ----
  ISMergeModule	ISMergeModule	Language
  ATL.7EBEDD68_AA66_11D2_B980_006097C4DE24	0	ATL Module for Windows		
! MDAC28.E7D6BCFA_9BFA_49D4_A1EE_767B7FD61E38	1033	MDAC 2.8 (English)		
  MFC42.51D569E2_8A28_11D2_B962_006097C4DE24	0	MFCDLL Shared Library - Retail Version		
  MSVCIRT.3CE1F932_C090_11D2_977B_006097C4DE24	0	Microsoft (R) C++ Runtime Library		

Index: ISMergeModuleCfgValues.idt
===================================================================
RCS file: /var/lib/gme/GMESRC/Install/ISMergeModuleCfgValues.idt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ISMergeModuleCfgValues.idt	12 Feb 2003 19:39:30 -0000	1.1
--- ISMergeModuleCfgValues.idt	28 Jul 2004 13:21:03 -0000	1.2
***************
*** 2,3 ****
--- 2,6 ----
  s255	i2	s72	L0	i2	L255	L255	L255	I2	L255	L255	L255	L255
  ISMergeModuleCfgValues	ISMergeModule_	Language_	ModuleConfiguration_
+ MDAC28.E7D6BCFA_9BFA_49D4_A1EE_767B7FD61E38	1033	MDAC28_SUPPRESS_REBOOT	NotSuppress	1	Property	Public	NotSuppress	2	Suppress MDAC 2.8 Reboot	Setting this value to "Suppress" will prevent the end-user from cancelling the reboot. It will just show a message saying a reboot is required and then reboot the computer.		
+ MDAC28.E7D6BCFA_9BFA_49D4_A1EE_767B7FD61E38	1033	MDAC28_INSTALL_SEQUENCE	EXEC	1	Property	Public	EXEC	2	MDAC 2.8 Install Location	Setting this value to "UI" will install MDAC 2.8 before the Install Welcome dialog launches. The setup will then reboot the machine and continue.		
+ MDAC28.E7D6BCFA_9BFA_49D4_A1EE_767B7FD61E38	1033	MDAC28_INSTALL_REBOOT	0	1	Property	Public	0	2	MDAC 2.8 Reboot Location	Setting this value to "1" will force a reboot soon after MDAC is installed. Try adding a condition of "Not AFTERREBOOT" to InstallWelcome in the InstallUISequence for a better end-user experience.