Revision: 6485
Author: j...@google.com
Date: Tue Oct 27 14:36:36 2009
Log: Update Windows build files for single-XPI, rename some OOPHM bits.

http://code.google.com/p/google-web-toolkit/source/detail?r=6485

Added:
  /changes/jat/single-xpi/plugins/xpcom/xpGWTDMP.def
  /changes/jat/single-xpi/plugins/xpcom/xpGWTDMP.rc
Deleted:
  /changes/jat/single-xpi/plugins/xpcom/VisualStudio/ff3-xpcom.sln
  /changes/jat/single-xpi/plugins/xpcom/VisualStudio/firefox-xpcom.sln
  /changes/jat/single-xpi/plugins/xpcom/VisualStudio/firefox-xpcom.vcproj
  /changes/jat/single-xpi/plugins/xpcom/xpOOPHM.def
  /changes/jat/single-xpi/plugins/xpcom/xpOOPHM.rc
Modified:
  /changes/jat/single-xpi/plugins/xpcom/Makefile
  /changes/jat/single-xpi/plugins/xpcom/VisualStudio/ff2-xpcom.vcproj
  /changes/jat/single-xpi/plugins/xpcom/VisualStudio/ff3-xpcom.vcproj
  /changes/jat/single-xpi/plugins/xpcom/VisualStudio/ff35-xpcom.vcproj
  /changes/jat/single-xpi/plugins/xpcom/install-template.rdf

=======================================
--- /dev/null
+++ /changes/jat/single-xpi/plugins/xpcom/xpGWTDMP.def  Tue Oct 27 14:36:36  
2009
@@ -0,0 +1,3 @@
+LIBRARY XPGWTDMP
+
+EXPORTS
=======================================
--- /dev/null
+++ /changes/jat/single-xpi/plugins/xpcom/xpGWTDMP.rc   Tue Oct 27 14:36:36  
2009
@@ -0,0 +1,71 @@
+#define APSTUDIO_READONLY_SYMBOLS
+#include "windows.h"
+#undef APSTUDIO_READONLY_SYMBOLS
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif
+
+1 VERSIONINFO
+  FILEVERSION 0,1,1,0
+  PRODUCTVERSION 0,1,1,0
+  FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+  FILEFLAGS 0x1L
+#else
+  FILEFLAGS 0x0L
+#endif
+  FILEOS 0x40004L
+  FILETYPE 0x2L
+  FILESUBTYPE 0x0L
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+       BLOCK "040904e4"
+       BEGIN
+         VALUE "CompanyName",          "Google Inc"
+         VALUE "FileDescription",      "GWT DevMode Plugin (XPCOM)"
+#if 0
+         VALUE "FileExtents",          ""
+#endif
+         VALUE "FileOpenName",         "Plugin to allow debugging of GWT 
applications  
in hosted mode."
+         VALUE "FileVersion",          "0.1a"
+         VALUE "InternalName",         "GWT DevMode Plugin (XPCOM)"
+         VALUE "LegalCopyright",       "Copyright © 2008 Google Inc.  Licensed 
under  
Apache 2.0 license."
+         VALUE "MIMEType",                     "application/x-gwt-hosted-mode"
+         VALUE "OriginalFilename",     "xpGWTDMP.dll"
+         VALUE "ProductName",          "GWT DevMode Plugin (XPCOM)"
+         VALUE "ProductVersion",       "0.1a"
+       END
+  END
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x409, 1252
+  END
+END
+
+#ifdef APSTUDIO_INVOKED
+1 TEXTINCLUDE
+BEGIN
+  "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+  "#include ""windows.h""\r\n"
+  "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+  "\r\n"
+  "\0"
+END
+
+#endif
+
+#else
+
+#endif
=======================================
--- /changes/jat/single-xpi/plugins/xpcom/VisualStudio/ff3-xpcom.sln    Mon  
Aug  3 08:30:11 2009
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}")  
= "ff3-xpcom", "ff3-xpcom.vcproj", "{6BF0C2CE-CB0C-421B-A67C-1E448371D24C}"
-EndProject
-Global
-       GlobalSection(SolutionConfigurationPlatforms) = preSolution
-               Debug|Win32 = Debug|Win32
-               Release|Win32 = Release|Win32
-       EndGlobalSection
-       GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {6BF0C2CE-CB0C-421B-A67C-1E448371D24C}.Debug|Win32.ActiveCfg = 
Debug| 
Win32
-               {6BF0C2CE-CB0C-421B-A67C-1E448371D24C}.Debug|Win32.Build.0 = 
Debug|Win32
-               {6BF0C2CE-CB0C-421B-A67C-1E448371D24C}.Release|Win32.ActiveCfg 
= Release| 
Win32
-               {6BF0C2CE-CB0C-421B-A67C-1E448371D24C}.Release|Win32.Build.0 = 
Release| 
Win32
-       EndGlobalSection
-       GlobalSection(SolutionProperties) = preSolution
-               HideSolutionNode = FALSE
-       EndGlobalSection
-EndGlobal
=======================================
--- /changes/jat/single-xpi/plugins/xpcom/VisualStudio/firefox-xpcom.sln        
 
Mon Aug  3 08:30:11 2009
+++ /dev/null
@@ -1,26 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}")  
= "firefox-xpcom", "firefox-xpcom.vcproj", 
"{6BF0C2CE-CB0C-421B-A67C-1E448371D24A}"
-EndProject
-Global
-       GlobalSection(SolutionConfigurationPlatforms) = preSolution
-               Debug|Win32 = Debug|Win32
-               Debug|Win64 = Debug|Win64
-               Release|Win32 = Release|Win32
-               Release|Win64 = Release|Win64
-       EndGlobalSection
-       GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {6BF0C2CE-CB0C-421B-A67C-1E448371D24A}.Debug|Win32.ActiveCfg = 
Debug| 
Win32
-               {6BF0C2CE-CB0C-421B-A67C-1E448371D24A}.Debug|Win32.Build.0 = 
Debug|Win32
-               {6BF0C2CE-CB0C-421B-A67C-1E448371D24A}.Debug|Win64.ActiveCfg = 
Debug| 
Win32
-               {6BF0C2CE-CB0C-421B-A67C-1E448371D24A}.Debug|Win64.Build.0 = 
Debug|Win32
-               {6BF0C2CE-CB0C-421B-A67C-1E448371D24A}.Release|Win32.ActiveCfg 
= Release| 
Win32
-               {6BF0C2CE-CB0C-421B-A67C-1E448371D24A}.Release|Win32.Build.0 = 
Release| 
Win32
-               {6BF0C2CE-CB0C-421B-A67C-1E448371D24A}.Release|Win64.ActiveCfg 
= Release| 
Win32
-               {6BF0C2CE-CB0C-421B-A67C-1E448371D24A}.Release|Win64.Build.0 = 
Release| 
Win32
-       EndGlobalSection
-       GlobalSection(SolutionProperties) = preSolution
-               HideSolutionNode = FALSE
-       EndGlobalSection
-EndGlobal
=======================================
--- /changes/jat/single-xpi/plugins/xpcom/VisualStudio/firefox-xpcom.vcproj     
 
Mon Aug  3 08:30:11 2009
+++ /dev/null
@@ -1,767 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="firefox-xpcom"
-       ProjectGUID="{6BF0C2CE-CB0C-421B-A67C-1E448371D24A}"
-       RootNamespace="firefox-xpcom"
-       Keyword="Win32Proj"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="Debug"
-                       IntermediateDirectory="Debug"
-                       ConfigurationType="2"
-                       UseOfMFC="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                                
AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\common&quot;;&quot;S:\xulrunner-sdk-win\sdk\include&quot;;&quot;S:\xulrunner-sdk-win\include\caps&quot;;&quot;s:\xulrunner-sdk-win\include\dom&quot;;&quot;s:\xulrunner-sdk-win\include\js&quot;;&quot;s:\xulrunner-sdk-win\include\necko&quot;;&quot;s:\xulrunner-sdk-win\include\string&quot;;&quot;s:\xulrunner-sdk-win\include\widget&quot;;&quot;s:\xulrunner-sdk-win\include\xpcom&quot;;&quot;s:\xulrunner-sdk-win\include\xpconnect&quot;;&quot;S:\xulrunner-sdk-win\include&quot;"
-                                
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FIREFOXPLUGIN_EXPORTS;GWT_DEBUGLEVEL=Warning;XPCOM_GLUE;XPCOM_GLUE_USE_NSPR;MOZILLA_STRICT_API"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="1"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               
ResourceOutputFileName="$(IntDir)/$(TargetName).res"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib 
xpcomglue_s.lib xpcom.lib nspr4.lib  
js3250.lib"
-                               ShowProgress="2"
-                                
OutputFile="$(ProjectDir)\..\extension\platform\WINNT_x86-msvc\components\xpOOPHM.dll"
-                               LinkIncremental="1"
-                               
AdditionalLibraryDirectories="..\..\..\..\xulrunner-sdk-win\lib"
-                               
ModuleDefinitionFile="$(ProjectDir)\..\xpOOPHM.def"
-                               GenerateDebugInformation="true"
-                               
ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
-                               SubSystem="2"
-                               ImportLibrary="$(IntDir)\$(TargetName).lib"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="Release"
-                       IntermediateDirectory="Release"
-                       ConfigurationType="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="3"
-                               EnableIntrinsicFunctions="true"
-                               
AdditionalIncludeDirectories="&quot;..\..\common&quot;"
-                                
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FIREFOXPLUGIN_EXPORTS;GWT_DEBUGLEVEL=Warning;XPCOM_GLUE;XPCOM_GLUE_USE_NSPR;MOZILLA_STRICT_API"
-                               ExceptionHandling="1"
-                               RuntimeLibrary="2"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               Detect64BitPortabilityProblems="false"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib 
xpcomglue_s.lib xpcom.lib nspr4.lib  
js3250.lib"
-                               ShowProgress="2"
-                                
OutputFile="..\extension\platform\WINNT_x86-msvc\components\xpOOPHM.dll"
-                               LinkIncremental="0"
-                               
AdditionalLibraryDirectories="..\..\..\..\xulrunner-sdk-win\lib"
-                               ModuleDefinitionFile="..\xpOOPHM.def"
-                               GenerateDebugInformation="true"
-                               
ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
-                               SubSystem="2"
-                               OptimizeReferences="2"
-                               EnableCOMDATFolding="2"
-                               ImportLibrary="$(IntDir)\$(TargetName).lib"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter
-                       Name="Header Files"
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
-                       
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-                       >
-                       <File
-                               RelativePath="..\..\common\AllowedConnections.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\common\BrowserChannel.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\common\ByteOrder.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\common\Debug.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\common\DebugLevel.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\ExternalWrapper.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\FFSessionHandler.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\XpcomDebug.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\common\FreeValueMessage.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\common\HashMap.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\common\HostChannel.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\common\InvokeMessage.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\common\InvokeSpecialMessage.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\JavaObject.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\include\js\jsapi.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\include\js\jsautocfg.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\include\js\jscompat.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\include\js\jsconfig.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\include\js\jslong.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\include\js\jsotypes.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\include\js\jsproto.tbl"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\include\js\jspubtd.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\JSRunner.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\include\js\jstypes.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\include\js\jsutil.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\include\js\jsutil.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\include\js\jsutil.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\include\js\jsutil.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\common\LoadJsniMessage.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\common\LoadModuleMessage.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\common\Message.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\ModuleOOPHM.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\include\mozilla-config.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\mozincludes.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\npapi\npapi.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\npapi\nphostapi.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\npapi\npruntime.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\include\xpconnect\nsAXPCNativeCallContext.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\nsCOMPtr.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\include\xpcom\nscore.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\nscore.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\nsCycleCollector.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\nsDebug.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\nsError.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\include\widget\nsEvent.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\nsICategoryManager.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\nsIClassInfo.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\nsIClassInfoImpl.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\nsIComponentManager.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\nsID.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\include\xpcom\nsIEnumerator.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\include\xpcom\nsIException.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\include\xpcom\nsIExceptionService.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\nsIFactory.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\nsIGenericFactory.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\include\necko\nsIHttpProtocolHandler.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\include\xpcom\nsIInterfaceInfo.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\include\xpcom\nsIInterfaceInfoManager.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\include\xpconnect\nsIJSContextStack.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\nsIMemory.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\nsIModule.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\include\caps\nsIPrincipal.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\nsIProgrammingLanguage.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\include\necko\nsIProtocolHandler.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\include\necko\nsIProxiedProtocolHandler.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\include\xpconnect\nsIScriptableInterfaces.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\include\dom\nsIScriptGlobalObject.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\include\dom\nsIScriptObjectPrincipal.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\include\caps\nsISecurityCheckedComponent.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\include\xpcom\nsISerializable.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\nsIServiceManager.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\include\xpcom\nsISimpleEnumerator.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\nsISimpleEnumerator.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\include\xpcom\nsISupports.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\nsISupports.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\nsISupportsBase.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\include\xpcom\nsISupportsBase.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\nsISupportsImpl.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\nsISupportsUtils.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\include\xpcom\nsISupportsUtils.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\nsIURI.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\include\xpcom\nsIVariant.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\include\xpconnect\nsIXPConnect.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\nsMemory.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\include\necko\nsNetCID.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\nsrootidl.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\include\xpcom\nsrootidl.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\nsServiceManagerUtils.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\nsStringAPI.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\nsTraceRefcnt.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\nsXPCOM.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\nsXPCOMCID.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\nsXPCOMStrings.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\common\Platform.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\pratom.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\prcpucfg.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\prinrval.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\prlock.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\prlog.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\prlong.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\obsolete\protypes.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\prthread.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\prtime.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\prtypes.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\common\QuitMessage.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\common\ReturnMessage.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\RootedObject.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\common\scoped_ptr\scoped_ptr.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\common\ServerMethods.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\SessionData.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\common\SessionHandler.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\common\Socket.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\common\Value.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\include\xpconnect\xpccomponents.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\include\xpconnect\xpcexception.h"
-                               >
-                       </File>
-                       <File
-                                
RelativePath="..\..\..\..\xulrunner-sdk-win\include\xpconnect\xpcjsid.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\sdk\include\xpcom-config.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\include\xpcom\xpt_arena.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\include\xpcom\xpt_struct.h"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\..\..\xulrunner-sdk-win\include\xpcom\xptinfo.h"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Resource Files"
-                       
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-                       
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-                       >
-                       <File
-                               RelativePath="..\xpOOPHM.rc"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Source Files"
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-                       
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-                       >
-                       <File
-                               
RelativePath="..\..\common\AllowedConnections.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\common\Debug.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\ExternalWrapper.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\FFSessionHandler.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\XpcomDebug.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\common\FreeValueMessage.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\common\HostChannel.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\common\InvokeMessage.cpp"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\common\InvokeSpecialMessage.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\JavaObject.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\JSRunner.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\common\LoadJsniMessage.cpp"
-                               >
-                       </File>
-                       <File
-                               
RelativePath="..\..\common\LoadModuleMessage.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\ModuleOOPHM.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\common\ReturnMessage.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\common\ServerMethods.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\common\Socket.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\xpOOPHM.def"
-                               >
-                       </File>
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
=======================================
--- /changes/jat/single-xpi/plugins/xpcom/xpOOPHM.def   Mon Aug  3 08:30:11  
2009
+++ /dev/null
@@ -1,3 +0,0 @@
-LIBRARY XPOOPHM
-
-EXPORTS
=======================================
--- /changes/jat/single-xpi/plugins/xpcom/xpOOPHM.rc    Mon Aug 24 08:21:30  
2009
+++ /dev/null
@@ -1,71 +0,0 @@
-#define APSTUDIO_READONLY_SYMBOLS
-#include "windows.h"
-#undef APSTUDIO_READONLY_SYMBOLS
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif
-
-1 VERSIONINFO
-  FILEVERSION 0,1,1,0
-  PRODUCTVERSION 0,1,1,0
-  FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
-  FILEFLAGS 0x1L
-#else
-  FILEFLAGS 0x0L
-#endif
-  FILEOS 0x40004L
-  FILETYPE 0x2L
-  FILESUBTYPE 0x0L
-BEGIN
-  BLOCK "StringFileInfo"
-  BEGIN
-       BLOCK "040904e4"
-       BEGIN
-         VALUE "CompanyName",          "Google Inc"
-         VALUE "FileDescription",      "GWT XPCOM OOPHM Plugin"
-#if 0
-         VALUE "FileExtents",          ""
-#endif
-         VALUE "FileOpenName",         "Plugin to allow debugging of GWT 
applications  
in hosted mode."
-         VALUE "FileVersion",          "0.1a"
-         VALUE "InternalName",         "GWT XPCOM OOPHM Plugin"
-         VALUE "LegalCopyright",       "Copyright © 2008 Google Inc.  Licensed 
under  
Apache 2.0 license."
-         VALUE "MIMEType",                     "application/x-gwt-hosted-mode"
-         VALUE "OriginalFilename",     "xpOOPHM.dll"
-         VALUE "ProductName",          "GWT XPCOM OOPHM Plugin"
-         VALUE "ProductVersion",       "0.1a"
-       END
-  END
-  BLOCK "VarFileInfo"
-  BEGIN
-    VALUE "Translation", 0x409, 1252
-  END
-END
-
-#ifdef APSTUDIO_INVOKED
-1 TEXTINCLUDE
-BEGIN
-  "resource.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
-  "#include ""windows.h""\r\n"
-  "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
-  "\r\n"
-  "\0"
-END
-
-#endif
-
-#else
-
-#endif
=======================================
--- /changes/jat/single-xpi/plugins/xpcom/Makefile      Mon Oct 26 18:06:40 2009
+++ /changes/jat/single-xpi/plugins/xpcom/Makefile      Tue Oct 27 14:36:36 2009
@@ -144,7 +144,7 @@
  #     fi

  generate-install:: $(EXTENSION_OUTDIR) install-template.rdf
-       sed -e s/GWT_OOPHM_VERSION/$(VERSION)/ install-template.rdf  
>$(INSTALL_RDF)
+       sed -e s/GWT_DMP_VERSION/$(VERSION)/ install-template.rdf 
>$(INSTALL_RDF)

  SRCS =        \
                ExternalWrapper.cpp \
=======================================
--- /changes/jat/single-xpi/plugins/xpcom/VisualStudio/ff2-xpcom.vcproj Thu  
Sep  3 15:22:56 2009
+++ /changes/jat/single-xpi/plugins/xpcom/VisualStudio/ff2-xpcom.vcproj Tue  
Oct 27 14:36:36 2009
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                                
AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\common&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include\caps&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include\dom&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include\js&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include\necko&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include\string&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include\widget&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include\xpcom&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include\xpconnect&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include&quot;"
+                                
AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\common&quot;;&quot;..\prebuilt\ff2\incldue&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include\caps&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include\dom&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include\js&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include\necko&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include\string&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include\widget&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include\xpcom&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include\xpconnect&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\include&quot;"
                                 
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FIREFOXPLUGIN_EXPORTS;GWT_DEBUGLEVEL=Warning;XPCOM_GLUE;XPCOM_GLUE_USE_NSPR;MOZILLA_STRICT_API"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -64,10 +64,10 @@
                                Name="VCLinkerTool"
                                AdditionalDependencies="ws2_32.lib 
xpcomglue_s.lib xpcom.lib nspr4.lib  
js3250.dll"
                                ShowProgress="2"
-                                
OutputFile="$(ProjectDir)\..\extension-ff2\platform\WINNT_x86-msvc\components\xpOOPHM.dll"
+                                
OutputFile="$(ProjectDir)\..\extension\lib\WINNT_x86-msvc\ff2\xpGWTDMP.dll"
                                LinkIncremental="1"
                                 
AdditionalLibraryDirectories="&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\lib&quot;"
-                               
ModuleDefinitionFile="$(ProjectDir)\..\xpOOPHM.def"
+                               
ModuleDefinitionFile="$(ProjectDir)\..\xpGWTDMP.def"
                                GenerateDebugInformation="true"
                                
ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
                                SubSystem="2"
@@ -143,10 +143,10 @@
                                Name="VCLinkerTool"
                                AdditionalDependencies="ws2_32.lib 
xpcomglue_s.lib xpcom.lib nspr4.lib  
js3250.lib"
                                ShowProgress="2"
-                                
OutputFile="..\extension\platform\WINNT_x86-msvc\components\xpOOPHM.dll"
+                                
OutputFile="$(ProjectDir)\..\prebuilt\extension\lib\WINNT_x86-msvc\ff2\xpGWTDMP.dll"
                                LinkIncremental="0"
                                 
AdditionalLibraryDirectories="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.8\WINNT_x86-msvc\lib"
-                               ModuleDefinitionFile="..\xpOOPHM.def"
+                               ModuleDefinitionFile="..\xpGWTDMP.def"
                                GenerateDebugInformation="true"
                                
ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
                                SubSystem="2"
@@ -693,7 +693,7 @@
                        
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
                        >
                        <File
-                               RelativePath="..\xpOOPHM.rc"
+                               RelativePath="..\xpGWTDMP.rc"
                                >
                        </File>
                </Filter>
@@ -791,7 +791,7 @@
                                >
                        </File>
                        <File
-                               RelativePath="..\xpOOPHM.def"
+                               RelativePath="..\xpGWTDMP.def"
                                >
                        </File>
                </Filter>
=======================================
--- /changes/jat/single-xpi/plugins/xpcom/VisualStudio/ff3-xpcom.vcproj Thu  
Sep  3 15:22:56 2009
+++ /changes/jat/single-xpi/plugins/xpcom/VisualStudio/ff3-xpcom.vcproj Tue  
Oct 27 14:36:36 2009
@@ -65,10 +65,10 @@
                                Name="VCLinkerTool"
                                AdditionalDependencies="ws2_32.lib 
xpcomglue_s.lib xpcom.lib nspr4.lib  
js3250.lib"
                                ShowProgress="2"
-                                
OutputFile="$(ProjectDir)\..\prebuilt\extension-ff3\platform\WINNT_x86-msvc\components\xpOOPHM.dll"
+                                
OutputFile="$(ProjectDir)\..\prebuilt\extension\lib\WINNT_x86-msvc\ff3\xpGWTDMP.dll"
                                LinkIncremental="1"
                                 
AdditionalLibraryDirectories="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\WINNT_x86-msvc\lib"
-                               
ModuleDefinitionFile="$(ProjectDir)\..\xpOOPHM.def"
+                               
ModuleDefinitionFile="$(ProjectDir)\..\xpGWTDMP.def"
                                GenerateDebugInformation="true"
                                
ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
                                SubSystem="2"
@@ -148,10 +148,10 @@
                                Name="VCLinkerTool"
                                AdditionalDependencies="ws2_32.lib 
xpcomglue_s.lib xpcom.lib nspr4.lib  
js3250.lib"
                                ShowProgress="2"
-                                
OutputFile="..\extension\platform\WINNT_x86-msvc\components\xpOOPHM.dll"
+                                
OutputFile="$(ProjectDir)\..\prebuilt\extension\lib\WINNT_x86-msvc\ff3\xpGWTDMP.dll"
                                LinkIncremental="0"
                                 
AdditionalLibraryDirectories="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\WINNT_x86-msvc\lib"
-                               ModuleDefinitionFile="..\xpOOPHM.def"
+                               ModuleDefinitionFile="..\xpGWTDMP.def"
                                GenerateDebugInformation="true"
                                
ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
                                SubSystem="2"
@@ -713,7 +713,7 @@
                        
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
                        >
                        <File
-                               RelativePath="..\xpOOPHM.rc"
+                               RelativePath="..\xpGWTDMP.rc"
                                >
                        </File>
                </Filter>
@@ -827,7 +827,7 @@
                                >
                        </File>
                        <File
-                               RelativePath="..\xpOOPHM.def"
+                               RelativePath="..\xpGWTDMP.def"
                                >
                        </File>
                </Filter>
=======================================
--- /changes/jat/single-xpi/plugins/xpcom/VisualStudio/ff35-xpcom.vcproj        
 
Thu Sep  3 15:22:56 2009
+++ /changes/jat/single-xpi/plugins/xpcom/VisualStudio/ff35-xpcom.vcproj        
 
Tue Oct 27 14:36:36 2009
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                                
AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\common&quot;;..\prebuilt\ff3\include;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\WINNT_x86-msvc\include&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\caps&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\dom&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\necko&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\string&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\widget&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpconnect&quot;"
+                                
AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\common&quot;;..\prebuilt\ff35\include;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\WINNT_x86-msvc\include&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\caps&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\dom&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\necko&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\string&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\widget&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpconnect&quot;"
                                 
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FIREFOXPLUGIN_EXPORTS;GWT_DEBUGLEVEL=Warning;XPCOM_GLUE;XPCOM_GLUE_USE_NSPR;MOZILLA_STRICT_API;BROWSER_FF3"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -65,10 +65,10 @@
                                Name="VCLinkerTool"
                                AdditionalDependencies="ws2_32.lib 
xpcomglue_s.lib xpcom.lib nspr4.lib  
js3250.lib"
                                ShowProgress="2"
-                                
OutputFile="$(ProjectDir)\..\prebuilt\extension-ff35\platform\WINNT_x86-msvc\components\xpOOPHM.dll"
+                                
OutputFile="$(ProjectDir)\..\prebuilt\extension\lib\WINNT_x86-msvc\ff35\xpGWTDMP.dll"
                                LinkIncremental="1"
                                 
AdditionalLibraryDirectories="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\WINNT_x86-msvc\lib"
-                               
ModuleDefinitionFile="$(ProjectDir)\..\xpOOPHM.def"
+                               
ModuleDefinitionFile="$(ProjectDir)\..\xpGWTDMP.def"
                                GenerateDebugInformation="true"
                                
ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
                                SubSystem="2"
@@ -125,7 +125,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="3"
                                EnableIntrinsicFunctions="true"
-                                
AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\common&quot;;..\prebuilt\ff3\include;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\WINNT_x86-msvc\include&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\caps&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\dom&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\necko&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\string&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\widget&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpconnect&quot;"
+                                
AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\common&quot;;..\prebuilt\ff35\include;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\WINNT_x86-msvc\include&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\caps&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\dom&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\necko&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\string&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\widget&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom&quot;;&quot;..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpconnect&quot;"
                                 
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FIREFOXPLUGIN_EXPORTS;GWT_DEBUGLEVEL=Warning;XPCOM_GLUE;XPCOM_GLUE_USE_NSPR;MOZILLA_STRICT_API;BROWSER_FF3"
                                ExceptionHandling="1"
                                RuntimeLibrary="2"
@@ -148,10 +148,10 @@
                                Name="VCLinkerTool"
                                AdditionalDependencies="ws2_32.lib 
xpcomglue_s.lib xpcom.lib nspr4.lib  
js3250.lib"
                                ShowProgress="2"
-                                
OutputFile="..\extension\platform\WINNT_x86-msvc\components\xpOOPHM.dll"
+                                
OutputFile="$(ProjectDir)\..\prebuilt\extension\lib\WINNT_x86-msvc\ff35\xpGWTDMP.dll"
                                LinkIncremental="0"
                                 
AdditionalLibraryDirectories="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\WINNT_x86-msvc\lib"
-                               ModuleDefinitionFile="..\xpOOPHM.def"
+                               ModuleDefinitionFile="..\xpGWTDMP.def"
                                GenerateDebugInformation="true"
                                
ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
                                SubSystem="2"
@@ -255,7 +255,7 @@
                                >
                        </File>
                        <File
-                               RelativePath="..\prebuilt\ff3\include\IOOPHM.h"
+                               RelativePath="..\prebuilt\ff35\include\IOOPHM.h"
                                >
                        </File>
                        <File
@@ -717,7 +717,7 @@
                        
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
                        >
                        <File
-                               RelativePath="..\xpOOPHM.rc"
+                               RelativePath="..\xpGWTDMP.rc"
                                >
                        </File>
                </Filter>
@@ -827,7 +827,7 @@
                                >
                        </File>
                        <File
-                               RelativePath="..\xpOOPHM.def"
+                               RelativePath="..\xpGWTDMP.def"
                                >
                        </File>
                </Filter>
=======================================
--- /changes/jat/single-xpi/plugins/xpcom/install-template.rdf  Mon Oct 26  
11:51:28 2009
+++ /changes/jat/single-xpi/plugins/xpcom/install-template.rdf  Tue Oct 27  
14:36:36 2009
@@ -5,7 +5,7 @@
    <Description about="urn:mozilla:install-manifest">
      <em:id>gwt-...@gwt.google.com</em:id>
      <em:name>GWT Development Mode Plugin (XPCOM) for Firefox</em:name>
-    <em:version>GWT_OOPHM_VERSION</em:version>
+    <em:version>GWT_DMP_VERSION</em:version>
      <em:type>2</em:type>
      <em:targetApplication>
        <Description>

--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---

Reply via email to