[GME-commit] GMESRC/Paradigms/MetaGME/MetaInterpreter2004 BON2Component.cpp,1.15,1.16 Globals.h,1.2,1.3 MetaGME2004.dsp,1.11,1.12 logger.cpp,1.1,1.2 logger.h,1.1,1.2

Wed Jun 30 13:55:22 CDT 2004

Update of /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004
In directory braindrain:/tmp/cvs-serv23547

Modified Files:
	BON2Component.cpp Globals.h MetaGME2004.dsp logger.cpp 
	logger.h 
Log Message:
Interpreter silent running mode introduced.

CVS User: zolmol

Index: BON2Component.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/BON2Component.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** BON2Component.cpp	16 Jun 2004 18:56:51 -0000	1.15
--- BON2Component.cpp	30 Jun 2004 17:55:18 -0000	1.16
***************
*** 1506,1509 ****
--- 1506,1510 ----
  	// Insert application specific code here

+ 	global_vars.silent_mode = (lParam == GME_SILENT_MODE);
  	initMembers( project);

***************
*** 1591,1595 ****
  	global_vars.err << "\nEND OF LOG";
  	global_vars.err.close();
! 	AfxMessageBox( "Metainterpretation completed.", MB_ICONINFORMATION);
  }

--- 1592,1603 ----
  	global_vars.err << "\nEND OF LOG";
  	global_vars.err.close();
! #ifdef NOUSERINPUT
! 	TO("Metainterpretation completed.");
! #else
! 	if ( global_vars.silent_mode)
! 		TO("Metainterpretation completed.");
! 	else
! 		AfxMessageBox( "Metainterpretation completed.", MB_ICONINFORMATION);
! #endif
  }

Index: Globals.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Globals.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Globals.h	28 Jan 2004 00:19:30 -0000	1.2
--- Globals.h	30 Jun 2004 17:55:18 -0000	1.3
***************
*** 19,22 ****
--- 19,23 ----
  	std::string err_file_name;

+ 	bool		silent_mode;
  };

Index: MetaGME2004.dsp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/MetaGME2004.dsp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** MetaGME2004.dsp	22 Jun 2004 21:07:52 -0000	1.11
--- MetaGME2004.dsp	30 Jun 2004 17:55:18 -0000	1.12
***************
*** 20,23 ****
--- 20,24 ----
  !MESSAGE "MetaGME2004 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE "MetaGME2004 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+ !MESSAGE "MetaGME2004 - Win32 ReleaseNoUserInput" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE 

***************
*** 104,107 ****
--- 105,146 ----
  # End Custom Build

+ !ELSEIF  "$(CFG)" == "MetaGME2004 - Win32 ReleaseNoUserInput"
+ 
+ # PROP BASE Use_MFC 2
+ # PROP BASE Use_Debug_Libraries 0
+ # PROP BASE Output_Dir "MetaGME2004___Win32_ReleaseNoUserInput"
+ # PROP BASE Intermediate_Dir "MetaGME2004___Win32_ReleaseNoUserInput"
+ # PROP BASE Ignore_Export_Lib 0
+ # PROP BASE Target_Dir ""
+ # PROP Use_MFC 2
+ # PROP Use_Debug_Libraries 0
+ # PROP Output_Dir "ReleaseNoUserInput"
+ # PROP Intermediate_Dir "ReleaseNoUserInput"
+ # PROP Ignore_Export_Lib 0
+ # PROP Target_Dir ""
+ # ADD BASE CPP /nologo /MD /W3 /GR /GX /Zi /O1 /I ".\\" /I "rep" /I "asp" /I "..\..\..\sdk\BON" /I "..\..\..\sdk\BON\stlport" /D "NDEBUG" /D "_ATL_STATIC_REGISTRY" /D "WIN32" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /D "BUILDER_OBJECT_NETWORK_V2" /Yu"stdafx.h" /FD /Zm200 /c
+ # SUBTRACT BASE CPP /X
+ # ADD CPP /nologo /MD /W3 /GR /GX /Zi /O1 /I ".\\" /I "rep" /I "asp" /I "..\..\..\sdk\BON" /I "..\..\..\sdk\BON\stlport" /D "NOUSERINPUT" /D "NDEBUG" /D "_ATL_STATIC_REGISTRY" /D "WIN32" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /D "BUILDER_OBJECT_NETWORK_V2" /Yu"stdafx.h" /FD /Zm200 /c
+ # SUBTRACT CPP /X
+ # ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
+ # ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
+ BSC32=bscmake.exe
+ # ADD BASE BSC32 /nologo
+ # ADD BSC32 /nologo
+ LINK32=link.exe
+ # ADD BASE LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /out:"Release/MetaInterpreter2004.dll"
+ # ADD LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /out:"ReleaseNoUserInput/MetaInterpreter2004.dll"
+ # Begin Custom Build - Performing registration
+ OutDir=.\ReleaseNoUserInput
+ TargetPath=.\ReleaseNoUserInput\MetaInterpreter2004.dll
+ InputPath=.\ReleaseNoUserInput\MetaInterpreter2004.dll
+ SOURCE="$(InputPath)"
+ 
+ "$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ 	regsvr32 /s /c "$(TargetPath)" 
+ 	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" 
+ 	
+ # End Custom Build
+ 
  !ENDIF 

***************
*** 110,113 ****
--- 149,153 ----
  # Name "MetaGME2004 - Win32 Debug"
  # Name "MetaGME2004 - Win32 Release"
+ # Name "MetaGME2004 - Win32 ReleaseNoUserInput"
  # Begin Group "Source Files"

***************
*** 302,305 ****
--- 342,365 ----
  !ELSEIF  "$(CFG)" == "MetaGME2004 - Win32 Release"

+ # PROP Ignore_Default_Tool 1
+ # Begin Custom Build - MIDL $(InputPath))
+ InputPath="../../../SDK/BON/ComponentLib.idl"
+ 
+ BuildCmds= \
+ 	midl /I.\ /server none /client none "../../../SDK/BON/ComponentLib.idl"
+ 
+ "ComponentLib.tlb" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+    $(BuildCmds)
+ 
+ "ComponentLib.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+    $(BuildCmds)
+ 
+ "ComponentLib_i.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+    $(BuildCmds)
+ # End Custom Build
+ 
+ !ELSEIF  "$(CFG)" == "MetaGME2004 - Win32 ReleaseNoUserInput"
+ 
+ # PROP BASE Ignore_Default_Tool 1
  # PROP Ignore_Default_Tool 1
  # Begin Custom Build - MIDL $(InputPath))

Index: logger.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/logger.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** logger.cpp	4 Dec 2003 16:45:27 -0000	1.1
--- logger.cpp	30 Jun 2004 17:55:18 -0000	1.2
***************
*** 9,64 ****
  extern int ind;

- #define DMP_DEBUG_INFO 0
- 
- void TOF(const char * msg)
- {
- #if(DMP_DEBUG_INFO)
- 	std::string fname = global_vars.xmp_file_name + ".debug.log";//"c:\\atemp\\meta.log";
- 	std::ofstream of;
- 	of.open( fname.c_str(), std::ios_base::out | std::ios_base::app);
- 	of << msg << "\n";
- 	of.close();
- #endif
- }
- 
- void DMP(const char * msg)
- {
- 	global_vars.dmp << msg;
- }
- 
- void ERR_OUT(const char * msg)
- {
- 	const char * fname = global_vars.err_file_name.c_str();//"c:\\atemp\\meta_int_err_dump.log";
- 	std::ofstream of;
- 	of.open( fname, std::ios_base::out /*| std::ios_base::app*/);
- 	of << msg << "\n";
- 	of.close();
- 
- }
- 
- void DMP(const std::string& msg) { DMP( msg.c_str() ); }
- 
- void TO(const char * msg) { AfxMessageBox(msg); TOF(msg); }
- void TO(const CString msg) { AfxMessageBox(msg); TOF(msg); }
- void TO(const std::string msg) { AfxMessageBox(msg.c_str()); TOF(msg); }
- 
- void TOF(const std::string& msg) { TOF( msg.c_str() ); }
- void TOF(CString& msg) { const char * mmm = (LPCTSTR) msg; TOF(mmm); }
- 
- void ERR_OUT(const std::string& msg) { ERR_OUT( msg.c_str() ); }
- void ERR_OUT(CString& msg) { const char * mmm = (LPCTSTR) msg; ERR_OUT(mmm); }
- 
- void writeErrorLog()
- {
- 	/*err << "END OF LOGS\n" << std::ends;
- 	ERR_OUT(err.str());
- 	err.freeze( false);*/
- }
- 
- std::string indStr()
- {
- 	std::string ind_str = "";
- 	for( int i = 0; i < ind; ++i) ind_str +="   ";
- 	return ind_str;
- }
- 
--- 9,10 ----

Index: logger.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/logger.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** logger.h	4 Dec 2003 16:45:27 -0000	1.1
--- logger.h	30 Jun 2004 17:55:18 -0000	1.2
***************
*** 4,7 ****
--- 4,8 ----
  #include "string"
  #include "fstream"
+ #include "globals.h"

  extern std::ofstream err;
***************
*** 12,33 ****
  extern int ind;

! void DMP(const char * msg);
! void DMP(const std::string& msg);

! void TO(const char * msg);
! void TO(const std::string msg);
! void TO(const CString msg);

! void TOF(const char * msg);
! void TOF(const std::string& msg);
! void TOF(CString& msg);

! void ERR_OUT(const char * msg);
! void ERR_OUT(const std::string& msg);
! void ERR_OUT(CString& msg);

! void writeErrorLog();
! std::string indStr();

  #endif // LOGGER_H
--- 13,73 ----
  extern int ind;

! extern Globals global_vars;

! #define DMP_DEBUG_INFO 0

! inline void TOF(const char * msg)
! {
! #if(DMP_DEBUG_INFO)
! 	std::string fname = global_vars.xmp_file_name + ".debug.log";//"c:\\atemp\\meta.log";
! 	std::ofstream of;
! 	of.open( fname.c_str(), std::ios_base::out | std::ios_base::app);
! 	of << msg << "\n";
! 	of.close();
! #endif
! }

! inline void DMP(const char * msg)
! {
! 	global_vars.dmp << msg;
! }

! inline void ERR_OUT(const char * msg)
! {
! 	const char * fname = global_vars.err_file_name.c_str();
! 	std::ofstream of;
! 	of.open( fname, std::ios_base::out | std::ios_base::app);
! 	of << msg << "\n";
! 	of.close();
! }

+ inline void TO(const char * msg)
+ { 
+ #ifdef NOUSERINPUT
+ 	ERR_OUT( msg);
+ #else
+ 	if ( global_vars.silent_mode)
+ 		ERR_OUT( msg);
+ 	else
+ 		AfxMessageBox(msg);
+ #endif
+ 	TOF(msg); 
+ }
+ 
+ inline void DMP(const std::string& msg) { DMP( msg.c_str() ); }
+ 
+ inline void TO( const CString& msg)			{ TO( (LPCTSTR) msg); }
+ inline void TO( const std::string& msg)		{ TO( msg.c_str()); }
+ 
+ inline void TOF( const CString& msg)		{ TOF( (LPCTSTR) msg); }
+ inline void TOF( const std::string& msg)	{ TOF( msg.c_str() ); }
+ 
+ inline void ERR_OUT( const CString& msg)		{ ERR_OUT( (LPCTSTR) msg); }
+ inline void ERR_OUT( const std::string& msg)	{ ERR_OUT( msg.c_str() ); }
+ 
+ inline std::string indStr()
+ {
+ 	return std::string( ind, '\t');
+ }

  #endif // LOGGER_H