[GME-commit] GMESRC/Install Class.idt,1.1,1.2 Component.idt,1.34,1.35 FeatureComponents.idt,1.25,1.26 File.idt,1.38,1.39 ISComponentExtended.idt,1.26,1.27 ProgId.idt,1.7,1.8 Registry.idt,1.21,1.22

gme-commit at list.isis.vanderbilt.edu gme-commit at list.isis.vanderbilt.edu
Tue Aug 15 23:44:21 CDT 2006


Update of /project/gme-repository/GMESRC/Install
In directory escher:/tmp/cvs-serv25653/Install

Modified Files:
	Class.idt Component.idt FeatureComponents.idt File.idt 
	ISComponentExtended.idt ProgId.idt Registry.idt 
Log Message:
Test release for GME merge

CVS User: Peter Volgyesi, ISIS (volgy)

Index: FeatureComponents.idt
===================================================================
RCS file: /project/gme-repository/GMESRC/Install/FeatureComponents.idt,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** FeatureComponents.idt	17 Nov 2005 19:15:38 -0000	1.25
--- FeatureComponents.idt	15 Aug 2006 22:44:19 -0000	1.26
***************
*** 14,17 ****
--- 14,18 ----
  GMEApplication	GME.exe
  GMEApplication	GMEActiveBrowser.ocx
+ GMEApplication	GMEMergeComponent.dll
  GMEApplication	GMETableEditor.dll
  GMEApplication	Harness_1_7_0.dll

Index: Class.idt
===================================================================
RCS file: /project/gme-repository/GMESRC/Install/Class.idt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Class.idt	12 Feb 2003 19:39:29 -0000	1.1
--- Class.idt	15 Aug 2006 22:44:19 -0000	1.2
***************
*** 2,3 ****
--- 2,4 ----
  s38	s32	s72	S255	L255	S38	S255	S72	I2	S32	S255	s38	I2
  Class	CLSID	Context	Component_
+ {FFB720E0-4E92-4A01-A792-29518F09B60C}	InprocServer32	GMEMergeComponent.dll	MGA.Interpreter.GMEMerge	MGA.Interpreter.GMEMerge							GMEApplication	

Index: Registry.idt
===================================================================
RCS file: /project/gme-repository/GMESRC/Install/Registry.idt,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Registry.idt	7 Jun 2005 19:39:42 -0000	1.21
--- Registry.idt	15 Aug 2006 22:44:19 -0000	1.22
***************
*** 30,33 ****
--- 30,34 ----
  Registry32	2	SOFTWARE\GME\Components\MGA.PlugIn.AutoLayout\Associated	SF		AutoLayout.dll	0
  Registry33	2	SOFTWARE\GME\Components\MGA.PlugIn.AutoLayout\Associated	UML		AutoLayout.dll	0
+ Registry35	2	SOFTWARE\GME\Components\MGA.Interpreter.GMEMerge	Type	#9	GMEMergeComponent.dll	0
  Registry36	0	GME.Application\CLSID		{C7DCCC2E-1642-4a40-8060-51A7B9FAE488}	GME.exe	0
  Registry37	2	SOFTWARE\GME\Components\MGA.Interpreter.SFInterpreter	Type	#1	SFInterpreter.dll	0
***************
*** 49,61 ****
--- 50,70 ----
  Registry51	2	SOFTWARE\GME\Components\Mga.AddOn.ConstraintManager	Description	ConstraintManager	ConstraintManager.dll	0
  Registry52	2	SOFTWARE\GME\Components\Mga.AddOn.ConstraintManager	Paradigm	*	ConstraintManager.dll	0
+ Registry53	2	SOFTWARE\GME\Components\MGA.Interpreter.GMEMerge	Description	GMEMerge	GMEMergeComponent.dll	0
+ Registry54	2	SOFTWARE\GME\Components\MGA.Interpreter.GMEMerge	Paradigm	*	GMEMergeComponent.dll	0
  Registry55	2	SOFTWARE\GME\Components\Mga.AddOn.ConstraintManager\Associated	HFSM		ConstraintManager.dll	0
  Registry56	2	SOFTWARE\GME\Components\Mga.AddOn.ConstraintManager\Associated	MetaGME		ConstraintManager.dll	0
  Registry57	2	SOFTWARE\GME\Components\Mga.AddOn.ConstraintManager\Associated	SF		ConstraintManager.dll	0
  Registry58	2	SOFTWARE\GME\Components\Mga.AddOn.ConstraintManager\Associated	UML		ConstraintManager.dll	0
+ Registry59	2	SOFTWARE\GME\Components\MGA.Interpreter.GMEMerge	Icon	,IDI_COMPICON	GMEMergeComponent.dll	0
  Registry6	2	SOFTWARE\GME\Components\MGA.Interpreter.MONTraverser	Type	#9	MONTraverser.dll	0
  Registry60	2	SOFTWARE\GME\Components\Mga.AddOn.ExpressionChecker	Type	#2	ConstraintManager.dll	0
  Registry61	2	SOFTWARE\GME\Components\Mga.AddOn.ExpressionChecker	Description	ExpressionChecker	ConstraintManager.dll	0
  Registry62	2	SOFTWARE\GME\Components\Mga.AddOn.ExpressionChecker	Paradigm	MetaGME	ConstraintManager.dll	0
+ Registry63	2	SOFTWARE\GME\Components\MGA.Interpreter.GMEMerge	Tooltip	GMEMerge Interpreter	GMEMergeComponent.dll	0
+ Registry64	2	SOFTWARE\GME\Components\MGA.Interpreter.GMEMerge\Associated	HFSM		GMEMergeComponent.dll	0
  Registry65	2	SOFTWARE\GME\Components\Mga.AddOn.ExpressionChecker\Associated	MetaGME		ConstraintManager.dll	0
+ Registry66	2	SOFTWARE\GME\Components\MGA.Interpreter.GMEMerge\Associated	MetaGME		GMEMergeComponent.dll	0
+ Registry67	2	SOFTWARE\GME\Components\MGA.Interpreter.GMEMerge\Associated	SF		GMEMergeComponent.dll	0
+ Registry68	2	SOFTWARE\GME\Components\MGA.Interpreter.GMEMerge\Associated	UML		GMEMergeComponent.dll	0
  Registry69	2	SOFTWARE\GME\Components\MGA.Interpreter.BON Extender	Type	#1	BonExtender2004.dll	0
  Registry7	2	SOFTWARE\GME\Paradigms\HFSM	CurrentVersion	[GuidStrHFSM]	HFSMParadigmFiles	0

Index: ISComponentExtended.idt
===================================================================
RCS file: /project/gme-repository/GMESRC/Install/ISComponentExtended.idt,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** ISComponentExtended.idt	17 Nov 2005 19:15:38 -0000	1.26
--- ISComponentExtended.idt	15 Aug 2006 22:44:19 -0000	1.27
***************
*** 17,20 ****
--- 17,21 ----
  GME.exe			_B7C37998_4E38_4B7E_BBBA_40974ECAE4D5_FILTER
  GMEActiveBrowser.ocx			_7152474A_9EFE_4827_9811_E477CB0B1227_FILTER
+ GMEMergeComponent.dll			_BAC80265_9DA4_4A77_A0F2_8711ABED2453_FILTER
  GMETableEditor.dll			_A655D992_5349_4363_8819_0E0AF43B6605_FILTER
  Harness_1_7_0.dll			_C89339DC_714F_4C8B_BBBA_D1F38068318B_FILTER

Index: Component.idt
===================================================================
RCS file: /project/gme-repository/GMESRC/Install/Component.idt,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** Component.idt	17 Nov 2005 19:15:38 -0000	1.34
--- Component.idt	15 Aug 2006 22:44:19 -0000	1.35
***************
*** 17,20 ****
--- 17,21 ----
  GME.exe	{9394F6FE-3677-4C13-A955-271E2E9112E1}	INSTALLDIR	8		GME.exe	17	This component consists of a Windows executable.						
  GMEActiveBrowser.ocx	{7C3679DC-5ECA-439C-8216-DAE521E9D95C}	INSTALLDIR	8		GMEActiveBrowser.ocx	20	This component consists of a custom control.						
+ GMEMergeComponent.dll	{B6333233-A06C-488E-80CD-F57836745234}	INSTALLDIR_TOOLS	8		GMEMergeComponent.dll	20	This component consists of a Windows dynamic link library.			/LogFile=	/LogFile=	/LogFile=	/LogFile=
  GMETableEditor.dll	{9DE9B8B3-E190-4FD9-9BD3-CBCA320620AC}	INSTALLDIR_TOOLS	8		GMETableEditor.dll	20	This component consists of a Windows dynamic link library.			/LogFile=	/LogFile=	/LogFile=	/LogFile=
  Harness_1_7_0.dll	{0C10FA80-BE6E-4205-B788-69FE5C9D9CF0}	INSTALLDIR	8		Harness_1_7_0.dll	17	This component consists of a Windows dynamic link library.			/LogFile=	/LogFile=	/LogFile=	/LogFile=

Index: File.idt
===================================================================
RCS file: /project/gme-repository/GMESRC/Install/File.idt,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** File.idt	16 Feb 2006 22:14:17 -0000	1.38
--- File.idt	15 Aug 2006 22:44:19 -0000	1.39
***************
*** 167,170 ****
--- 167,171 ----
  GMEActiveBrowser.ocx	GMEActiveBrowser.ocx	GMEACT~1.OCX|GMEActiveBrowser.ocx	0				1	<ISProjectFolder>\gme\gmeactivebrowser\release\GMEActiveBrowser.ocx	1
  GMECOM.H	BONFiles	GMECOM.H	0				1	<ISProjectFolder>\sdk\bon\GMECOM.H	1
+ GMEMergeComponent.dll	GMEMergeComponent.dll	GMEMER~1.DLL|GMEMergeComponent.dll	0				1	<ISProjectFolder>\tools\gmemerge\release\GMEMergeComponent.dll	1
  GMESources.txt	SFInterpreterSource	GMESOU~1.TXT|GMESources.txt	0				1	<ISProjectFolder>\paradigms\sf\bon2interpreter\GMESources.txt	1
  GMESources.txt1	HFSMInterpreterSource	GMESOU~1.TXT|GMESources.txt	0				1	<ISProjectFolder>\paradigms\hfsm\interpreter\GMESources.txt	1

Index: ProgId.idt
===================================================================
RCS file: /project/gme-repository/GMESRC/Install/ProgId.idt,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ProgId.idt	26 Jul 2004 08:57:31 -0000	1.7
--- ProgId.idt	15 Aug 2006 22:44:19 -0000	1.8
***************
*** 2,3 ****
--- 2,4 ----
  s255	S255	S38	L255	S72	I2	I4
  ProgId	ProgId
+ MGA.Interpreter.GMEMerge		{FFB720E0-4E92-4A01-A792-29518F09B60C}	MGA.Interpreter.GMEMerge			



More information about the GME-commit mailing list