[commit] r1510 - in trunk/SDK/Java/native: AutoRouter Jaut JavaCompRegister JavaCompRunner MgaDecoratorWrap

GMESRC Repository Notifications gme-commit at list.isis.vanderbilt.edu
Wed Sep 7 18:02:04 CDT 2011 

Author: ksmyth
Date: Wed Sep  7 18:02:04 2011
New Revision: 1510

Log:
Use standard SDK, nothing in trunk/GME. Upgrade to latest SDK

Deleted:
   trunk/SDK/Java/native/JavaCompRunner/ComHelp.cpp
   trunk/SDK/Java/native/JavaCompRunner/ComHelp.h
   trunk/SDK/Java/native/JavaCompRunner/GMECOM.H
Modified:
   trunk/SDK/Java/native/AutoRouter/   (props changed)
   trunk/SDK/Java/native/Jaut/   (props changed)
   trunk/SDK/Java/native/JavaCompRegister/   (props changed)
   trunk/SDK/Java/native/JavaCompRunner/   (props changed)
   trunk/SDK/Java/native/JavaCompRunner/ComponentDll.cpp
   trunk/SDK/Java/native/JavaCompRunner/JavaCompRunner.vcxproj
   trunk/SDK/Java/native/JavaCompRunner/JavaCompRunner.vcxproj.filters
   trunk/SDK/Java/native/JavaCompRunner/RawComponent.cpp
   trunk/SDK/Java/native/JavaCompRunner/RawComponent.h
   trunk/SDK/Java/native/MgaDecoratorWrap/   (props changed)

Modified: trunk/SDK/Java/native/JavaCompRunner/ComponentDll.cpp
==============================================================================
--- trunk/SDK/Java/native/JavaCompRunner/ComponentDll.cpp	Wed Sep  7 16:44:54 2011	(r1509)
+++ trunk/SDK/Java/native/JavaCompRunner/ComponentDll.cpp	Wed Sep  7 18:02:04 2011	(r1510)
@@ -7,9 +7,16 @@
 #include "ComponentDll.h"
 #include "ComponentObj.h"
 #include "ComponentConfig.h"
-#include "CommonError.h"
 #include "MgaUtil.h"
 
+#define COMRETURN(hr) { HRESULT res; if((res = (hr)) != S_OK) return res; }
+#define VERIFYTHROW(FUNC) \
+do { \
+	if( !(bool)(FUNC) ) { \
+		COMTHROW(E_FAIL); \
+	} \
+} while(false)
+
 #ifdef _DEBUG
 #define new DEBUG_NEW
 #undef THIS_FILE

Modified: trunk/SDK/Java/native/JavaCompRunner/JavaCompRunner.vcxproj
==============================================================================
--- trunk/SDK/Java/native/JavaCompRunner/JavaCompRunner.vcxproj	Wed Sep  7 16:44:54 2011	(r1509)
+++ trunk/SDK/Java/native/JavaCompRunner/JavaCompRunner.vcxproj	Wed Sep  7 18:02:04 2011	(r1510)
@@ -63,7 +63,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(GME_ROOT)\GME\Common;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(GME_ROOT)\SDK\BON\Common\;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -100,7 +100,7 @@
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>$(GME_ROOT)\GME\Common;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(GME_ROOT)\SDK\BON\Common\;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -120,7 +120,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="ComHelp.cpp" />
+    <ClCompile Include="$(GME_ROOT)\SDK\BON\Common\ComHelp.cpp" />
     <ClCompile Include="$(GME_ROOT)\GME\Common\CommonError.cpp" />
     <ClCompile Include="$(GME_ROOT)\GME\Common\CommonSmart.cpp" />
     <ClCompile Include="$(GME_ROOT)\SDK\BON\Common\ComponentDll.cpp">
@@ -153,14 +153,14 @@
     </Midl>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="ComHelp.h" />
+    <ClInclude Include="$(GME_ROOT)\SDK\BON\Common\ComHelp.h" />
     <ClInclude Include="ComponentConfig.h" />
     <ClInclude Include="ComponentDll.h" />
     <ClInclude Include="ComponentLib_h.h" />
     <ClInclude Include="ComponentObj.h" />
     <ClInclude Include="$(GME_ROOT)\SDK\BON\Common\Console.h" />
     <ClInclude Include="$(GME_ROOT)\SDK\BON\Common\Formatter.h" />
-    <ClInclude Include="GMECOM.H" />
+    <ClInclude Include="$(GME_ROOT)\SDK\BON\Common\GMECOM.H" />
     <ClInclude Include="RawComponent.h" />
     <ClInclude Include="Resource.h" />
     <ClInclude Include="StdAfx.h" />

Modified: trunk/SDK/Java/native/JavaCompRunner/JavaCompRunner.vcxproj.filters
==============================================================================
--- trunk/SDK/Java/native/JavaCompRunner/JavaCompRunner.vcxproj.filters	Wed Sep  7 16:44:54 2011	(r1509)
+++ trunk/SDK/Java/native/JavaCompRunner/JavaCompRunner.vcxproj.filters	Wed Sep  7 18:02:04 2011	(r1510)
@@ -15,9 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="ComHelp.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(GME_ROOT)\GME\Common\CommonError.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -48,6 +45,9 @@
     <ClCompile Include="ComponentDll.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="$(GME_ROOT)\SDK\BON\Common\ComHelp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="component.def">
@@ -68,9 +68,6 @@
     </Midl>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="ComHelp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="ComponentConfig.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -83,9 +80,6 @@
     <ClInclude Include="$(GME_ROOT)\SDK\BON\Common\Formatter.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GMECOM.H">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="RawComponent.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -104,5 +98,11 @@
     <ClInclude Include="ComponentObj.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="$(GME_ROOT)\SDK\BON\Common\ComHelp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(GME_ROOT)\SDK\BON\Common\GMECOM.H">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

Modified: trunk/SDK/Java/native/JavaCompRunner/RawComponent.cpp
==============================================================================
--- trunk/SDK/Java/native/JavaCompRunner/RawComponent.cpp	Wed Sep  7 16:44:54 2011	(r1509)
+++ trunk/SDK/Java/native/JavaCompRunner/RawComponent.cpp	Wed Sep  7 18:02:04 2011	(r1510)
@@ -7,7 +7,6 @@
 #include "stdafx.h"
 #include "ComHelp.h"
 #include "GMECOM.h"
-#include "CommonError.h"
 #include "ComponentConfig.h"
 #include "RawComponent.h"
 #include "ComponentDll.h"

Modified: trunk/SDK/Java/native/JavaCompRunner/RawComponent.h
==============================================================================
--- trunk/SDK/Java/native/JavaCompRunner/RawComponent.h	Wed Sep  7 16:44:54 2011	(r1509)
+++ trunk/SDK/Java/native/JavaCompRunner/RawComponent.h	Wed Sep  7 18:02:04 2011	(r1510)
@@ -3,6 +3,7 @@
 
 #include <jni.h>
 #include <string>
+#include "Mga.h"
 
 // Declaration of the main RAW COM component interface class

More information about the gme-commit mailing list