[commit] r1779 - in trunk: GME/Console Install/Build

[GMESRC Repository Notifications]

Author: ksmyth
Date: Fri Jan  6 11:49:13 2012
New Revision: 1779

Log:
x64: Dont activate ScriptHost 32bit; just require 64bit scripting engines. Potentially confusing, since you must have 64bit interpreters, and the GmeDlg (config dialog) doesnt list 32bit scripting engines

Modified:
   trunk/GME/Console/ScriptEdit.cpp
   trunk/Install/Build/build.py

Modified: trunk/GME/Console/ScriptEdit.cpp
==============================================================================
--- trunk/GME/Console/ScriptEdit.cpp	Fri Jan  6 11:48:58 2012	(r1778)
+++ trunk/GME/Console/ScriptEdit.cpp	Fri Jan  6 11:49:13 2012	(r1779)
@@ -36,14 +36,8 @@
 		m_console = cons;
 
 		HRESULT hr;
-#if defined(_M_IX86)
 		COMTHROW(hr = m_host.CreateInstance(CLSID_ScriptHost, 0, CLSCTX_ALL));
-#elif defined(_M_AMD64)
-		// CLSCTX_ACTIVATE_32_BIT_SERVER to activate 32-bit scripting servers
-		COMTHROW(hr = m_host.CreateInstance(CLSID_ScriptHost, 0, CLSCTX_LOCAL_SERVER|CLSCTX_ACTIVATE_32_BIT_SERVER));
-#else
-#error Unknown arch
-#endif
+
 		_bstr_t engine(L"JScript");
 //		_bstr_t engine(L"Python.AXScript.2");
 		COMTHROW(m_host->InitEngine(m_console->GetIDispatch(false), engine));

Modified: trunk/Install/Build/build.py
==============================================================================
--- trunk/Install/Build/build.py	Fri Jan  6 11:48:58 2012	(r1778)
+++ trunk/Install/Build/build.py	Fri Jan  6 11:49:13 2012	(r1779)
@@ -94,9 +94,6 @@
     sln_file = os.path.join(GME_ROOT, "GME", "GMEDecorators.sln")
     tools.build_VS( sln_file, "Release" )
     cmd_dir = os.path.join(GME_ROOT, "GME")
-    if prefs['arch'] == 'x64':
-        # Need x86 Console on x64 to be able to run the tests, since we use 32bit out-of-proc activation for ScriptHost
-        tools.build_VS(os.path.join(GME_ROOT, 'GME', 'Console', 'Console.vcxproj'), 'Release', 'Win32')
     tools.system( ['call', 'regrelease.bat'] + (['x64'] if prefs['arch'] == 'x64' else []) + ['<NUL'], cmd_dir)
 
 def _Release_PGO_dir():