[Mobies-commit] [commit] r3949 - in GReAT/trunk: . Etc InnoSetup Libraries/GRCC Libraries/GReATUtils Release Tools/Engine/GRE_Interpreter Tools/MetaGME2UMX Tools/UMTInterpreters/Blockify Tools/UMTInterpreters/CreateRule include
ksmyth at redhat1.isis.vanderbilt.edu
ksmyth at redhat1.isis.vanderbilt.edu
Fri Nov 18 10:20:30 CST 2011
Author: ksmyth
Date: Fri Nov 18 10:20:30 2011
New Revision: 3949
Log:
Move mpc from UDM_3RDPARTY_PATH to GREAT_3RDPARTY_PATH
Deleted:
GReAT/trunk/Etc/GRC_make2005.bat
GReAT/trunk/Release/build_bin.bat
GReAT/trunk/set-paths-VC9.bat
Modified:
GReAT/trunk/Etc/GRC_make.bat
GReAT/trunk/Etc/GRC_make2008.bat
GReAT/trunk/Etc/GRC_make2010.bat
GReAT/trunk/InnoSetup/GReAT_innosetupVS2010.iss
GReAT/trunk/Libraries/GRCC/GRC_dynamic.mpc.tmpl
GReAT/trunk/Libraries/GRCC/GRC_exe.mpc.tmpl
GReAT/trunk/Libraries/GRCC/GRC_static.mpc.tmpl
GReAT/trunk/Libraries/GRCC/GRCforCG.cpp
GReAT/trunk/Libraries/GReATUtils/GReATUtils.cpp
GReAT/trunk/Tools/Engine/GRE_Interpreter/GRThread.cpp
GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UML_2.cpp
GReAT/trunk/Tools/UMTInterpreters/Blockify/README.txt
GReAT/trunk/Tools/UMTInterpreters/CreateRule/README.txt
GReAT/trunk/UdmDll.props
GReAT/trunk/include/GReATUtils.h
Modified: GReAT/trunk/Etc/GRC_make.bat
==============================================================================
--- GReAT/trunk/Etc/GRC_make.bat Fri Nov 18 09:35:15 2011 (r3948)
+++ GReAT/trunk/Etc/GRC_make.bat Fri Nov 18 10:20:30 2011 (r3949)
@@ -23,7 +23,7 @@
if %ERRORLEVEL% NEQ 0 goto VCERROR
:: Generate nmake makefile
-"%UDM_3RDPARTY_PATH%\mpc\mpc.exe" -type nmake -into %TARGET_DIR% %MPCFILE%
+"%GREAT_3RDPARTY_PATH%\mpc\mpc.exe" -type nmake -into %TARGET_DIR% %MPCFILE%
if %ERRORLEVEL% NEQ 0 goto MPCERROR
:: invoke nmake.exe
Modified: GReAT/trunk/Etc/GRC_make2008.bat
==============================================================================
--- GReAT/trunk/Etc/GRC_make2008.bat Fri Nov 18 09:35:15 2011 (r3948)
+++ GReAT/trunk/Etc/GRC_make2008.bat Fri Nov 18 10:20:30 2011 (r3949)
@@ -23,7 +23,7 @@
if %ERRORLEVEL% NEQ 0 goto VCERROR
:: Generate nmake makefile
-"%UDM_3RDPARTY_PATH%\mpc\mpc.exe" -type nmake -into %TARGET_DIR% %MPCFILE%
+"%GREAT_3RDPARTY_PATH%\mpc\mpc.exe" -type nmake -into %TARGET_DIR% %MPCFILE%
if %ERRORLEVEL% NEQ 0 goto MPCERROR
:: invoke nmake.exe
Modified: GReAT/trunk/Etc/GRC_make2010.bat
==============================================================================
--- GReAT/trunk/Etc/GRC_make2010.bat Fri Nov 18 09:35:15 2011 (r3948)
+++ GReAT/trunk/Etc/GRC_make2010.bat Fri Nov 18 10:20:30 2011 (r3949)
@@ -23,7 +23,7 @@
if %ERRORLEVEL% NEQ 0 goto VCERROR
:: Generate nmake makefile
-"%UDM_3RDPARTY_PATH%\mpc\mpc.exe" -type nmake -into %TARGET_DIR% %MPCFILE%
+"%GREAT_3RDPARTY_PATH%\mpc\mpc.exe" -type nmake -into %TARGET_DIR% %MPCFILE%
if %ERRORLEVEL% NEQ 0 goto MPCERROR
:: invoke nmake.exe
Modified: GReAT/trunk/InnoSetup/GReAT_innosetupVS2010.iss
==============================================================================
--- GReAT/trunk/InnoSetup/GReAT_innosetupVS2010.iss Fri Nov 18 09:35:15 2011 (r3948)
+++ GReAT/trunk/InnoSetup/GReAT_innosetupVS2010.iss Fri Nov 18 10:20:30 2011 (r3949)
@@ -12,6 +12,7 @@
#define UDMDLL "UdmDll_3_2.dll"
#define GREATPATH GetEnv('GREAT_PATH')
+#define GREAT_3RDPARTY_PATH GetEnv('GREAT_3RDPARTY_PATH')
#define GREATVER GetEnv('GREAT_VERSION')
#if GREATVER == ""
@@ -225,6 +226,8 @@
Source: {#GREATPATH}\common-scripts\VC10Redist\bin\Release\VC10Redist.msi; DestDir: "{tmp}"
+Source: {#GREAT_3RDPARTY_PATH}\mpc\*; Destdir: {app}\3rdparty\mpc; Flags: recursesubdirs; Excludes: .svn
+
[Dirs]
Name: {app}\etc; Components: G
Name: {app}\Meta; Components: G
@@ -237,6 +240,8 @@
[Registry]
Root: HKCU; Subkey: Environment; ValueType: string; ValueName: GREAT_PATH; ValueData: {app}; Flags: uninsdeletevalue deletevalue; Components: not System
Root: HKLM; Subkey: SYSTEM\CurrentControlSet\Control\Session Manager\Environment; ValueType: string; ValueName: GREAT_PATH; ValueData: {app}; Flags: uninsdeletevalue deletevalue; Components: System
+Root: HKCU; Subkey: Environment; ValueType: string; ValueName: GREAT_3RDPARTY_PATH; ValueData: {app}\3rdparty; Flags: uninsdeletevalue deletevalue; Components: not System
+Root: HKLM; Subkey: SYSTEM\CurrentControlSet\Control\Session Manager\Environment; ValueType: string; ValueName: GREAT_3RDPARTY_PATH; ValueData: {app}\3rdparty; Flags: uninsdeletevalue deletevalue; Components: System
[Code]
var
Modified: GReAT/trunk/Libraries/GRCC/GRC_dynamic.mpc.tmpl
==============================================================================
--- GReAT/trunk/Libraries/GRCC/GRC_dynamic.mpc.tmpl Fri Nov 18 09:35:15 2011 (r3948)
+++ GReAT/trunk/Libraries/GRCC/GRC_dynamic.mpc.tmpl Fri Nov 18 10:20:30 2011 (r3949)
@@ -10,7 +10,7 @@
// 7. header files (CRLF separated)
project (%s) %s {
sharedname= %s
- includes+= "$(UDM_PATH)/include" "$(UDM_3RDPARTY_PATH)/xerces-c_2_8_0/include" %s
+ includes+= "$(UDM_PATH)/include" %s
macros+= UDM_DYNAMIC_LINKING _SCL_SECURE_NO_WARNINGS
libpaths+= "$(UDM_PATH)/lib"
libout= .
Modified: GReAT/trunk/Libraries/GRCC/GRC_exe.mpc.tmpl
==============================================================================
--- GReAT/trunk/Libraries/GRCC/GRC_exe.mpc.tmpl Fri Nov 18 09:35:15 2011 (r3948)
+++ GReAT/trunk/Libraries/GRCC/GRC_exe.mpc.tmpl Fri Nov 18 10:20:30 2011 (r3949)
@@ -11,7 +11,7 @@
project (%s) %s {
exename= %s
- includes+= "$(UDM_PATH)/include" "$(UDM_3RDPARTY_PATH)/xerces-c_2_8_0/include" "$(TEMP)/GReAT" "$(GREAT_PATH)/include" %s
+ includes+= "$(UDM_PATH)/include" "$(TEMP)/GReAT" "$(GREAT_PATH)/include" %s
macros+= UDM_DYNAMIC_LINKING _SCL_SECURE_NO_WARNINGS
libs+= %s
libpaths+= "$(UDM_PATH)/lib" "$(GREAT_PATH)/lib" "$(TEMP)/GReAT"
Modified: GReAT/trunk/Libraries/GRCC/GRC_static.mpc.tmpl
==============================================================================
--- GReAT/trunk/Libraries/GRCC/GRC_static.mpc.tmpl Fri Nov 18 09:35:15 2011 (r3948)
+++ GReAT/trunk/Libraries/GRCC/GRC_static.mpc.tmpl Fri Nov 18 10:20:30 2011 (r3949)
@@ -9,7 +9,7 @@
// 6. header files (CRLF separated)
project (%s) %s {
staticname = %s
- includes+= "$(UDM_PATH)/include" "$(UDM_3RDPARTY_PATH)/xerces-c_2_8_0/include" %s
+ includes+= "$(UDM_PATH)/include" %s
macros+= UDM_DYNAMIC_LINKING _SCL_SECURE_NO_WARNINGS
libout= .
specific (vc6,vc7,vc71,vc8,nmake) {
Modified: GReAT/trunk/Libraries/GRCC/GRCforCG.cpp
==============================================================================
--- GReAT/trunk/Libraries/GRCC/GRCforCG.cpp Fri Nov 18 09:35:15 2011 (r3948)
+++ GReAT/trunk/Libraries/GRCC/GRCforCG.cpp Fri Nov 18 10:20:30 2011 (r3949)
@@ -40,7 +40,7 @@
#else
projtype= "vc6";
#endif
- std::string cmdline= "call \"%UDM_3RDPARTY_PATH%\\mpc\\mpc.exe\" -type "+ projtype+ " -into \""+ getPath( _ccfg._genFileName, true)+ "\" "+ mpcFile;
+ std::string cmdline= "call \"%GREAT_3RDPARTY_PATH%\\mpc\\mpc.exe\" -type "+ projtype+ " -into \""+ getPath( _ccfg._genFileName, true)+ "\" "+ mpcFile;
std::string restoreDir= getCwd();
changeDir( getGreatTempDir());
int sysret = system( cmdline.c_str());
Modified: GReAT/trunk/Libraries/GReATUtils/GReATUtils.cpp
==============================================================================
--- GReAT/trunk/Libraries/GReATUtils/GReATUtils.cpp Fri Nov 18 09:35:15 2011 (r3948)
+++ GReAT/trunk/Libraries/GReATUtils/GReATUtils.cpp Fri Nov 18 10:20:30 2011 (r3949)
@@ -229,11 +229,7 @@
}
std::string getStlDir() {
-#if _MSC_VER >= 1300
std::string stldir= "";
-#else
- std::string stldir= "\"$(UDM_3RDPARTY_PATH)/stl\"";
-#endif
return stldir;
}
Modified: GReAT/trunk/Tools/Engine/GRE_Interpreter/GRThread.cpp
==============================================================================
--- GReAT/trunk/Tools/Engine/GRE_Interpreter/GRThread.cpp Fri Nov 18 09:35:15 2011 (r3948)
+++ GReAT/trunk/Tools/Engine/GRE_Interpreter/GRThread.cpp Fri Nov 18 10:20:30 2011 (r3949)
@@ -150,6 +150,7 @@
}
catch(udm_exception &exc)
{
+ // FIXME: pass this to the other thread instead
AfxMessageBox(CString("Exception: ") + CString(exc.what()));
if (great)
delete great, great = 0;
Modified: GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UML_2.cpp
==============================================================================
--- GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UML_2.cpp Fri Nov 18 09:35:15 2011 (r3948)
+++ GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UML_2.cpp Fri Nov 18 10:20:30 2011 (r3949)
@@ -440,6 +440,7 @@
else
{ */
+ // FIXME: don't need _Members_Base for bidirectional association to itself
UmlGME::ClassDiagram ncd = UmlGME::ClassDiagram::Create(urf);
ncd.name() = "zC_" + (string)cassococ.name() + "_Bidirectional_Association";
UmlGME::ClassCopy assp = UmlGME::ClassCopy::Create(ncd);
Modified: GReAT/trunk/Tools/UMTInterpreters/Blockify/README.txt
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/Blockify/README.txt Fri Nov 18 09:35:15 2011 (r3948)
+++ GReAT/trunk/Tools/UMTInterpreters/Blockify/README.txt Fri Nov 18 10:20:30 2011 (r3949)
@@ -8,11 +8,11 @@
From the "Component" folder of your UdmInterpreter, run this command:
-...\Component>%UDM_3RDPARTY_PATH%\mpc\mpc.exe -features "mfc=1" -type vc71 -ti vc7dll Component.mpc
+...\Component>%GREAT_3RDPARTY_PATH%\mpc\mpc.exe -features "mfc=1" -type vc71 -ti vc7dll Component.mpc
This will generate a .vcproj file which will compile correctly in VS2003.
-Make sure that the UDM_3RDPARTY_PATH environment variable is set correctly, or enter the correct path in its place int he command line.
+Make sure that the GREAT_3RDPARTY_PATH environment variable is set correctly, or enter the correct path in its place int he command line.
(Please refer the MPC documentation if you are using another development configuration)
Modified: GReAT/trunk/Tools/UMTInterpreters/CreateRule/README.txt
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/CreateRule/README.txt Fri Nov 18 09:35:15 2011 (r3948)
+++ GReAT/trunk/Tools/UMTInterpreters/CreateRule/README.txt Fri Nov 18 10:20:30 2011 (r3949)
@@ -8,11 +8,11 @@
From the "Component" folder of your UdmInterpreter, run this command:
-...\Component>%UDM_3RDPARTY_PATH%\mpc\mpc.exe -features "mfc=1" -type vc71 -ti vc7dll Component.mpc
+...\Component>%GREAT_3RDPARTY_PATH%\mpc\mpc.exe -features "mfc=1" -type vc71 -ti vc7dll Component.mpc
This will generate a .vcproj file which will compile correctly in VS2003.
-Make sure that the UDM_3RDPARTY_PATH environment variable is set correctly, or enter the correct path in its place int he command line.
+Make sure that the GREAT_3RDPARTY_PATH environment variable is set correctly, or enter the correct path in its place int he command line.
(Please refer the MPC documentation if you are using another development configuration)
Modified: GReAT/trunk/UdmDll.props
==============================================================================
--- GReAT/trunk/UdmDll.props Fri Nov 18 09:35:15 2011 (r3948)
+++ GReAT/trunk/UdmDll.props Fri Nov 18 10:20:30 2011 (r3949)
@@ -6,7 +6,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
- <AdditionalIncludeDirectories>$(UDM_PATH)\include;$(UDM_3RDPARTY_PATH)\xerces-c_2_8_0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(UDM_PATH)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>UDM_DYNAMIC_LINKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
Modified: GReAT/trunk/include/GReATUtils.h
==============================================================================
--- GReAT/trunk/include/GReATUtils.h Fri Nov 18 09:35:15 2011 (r3948)
+++ GReAT/trunk/include/GReATUtils.h Fri Nov 18 10:20:30 2011 (r3949)
@@ -69,7 +69,7 @@
extern std::string getGreatTempDir();
// return with "/* <filen> generated on <current datetime>/*"
extern std::string timestamp( const std::string& filen);
-// return "$(UDM_3RDPARTY_PATH)/3rdParty/stl" for VC6. Return empty string for VC7 and later
+// Return empty string for VC7 and later
extern std::string getStlDir();
// return with current working directory
extern std::string getCwd();
More information about the Mobies-commit
mailing list