Some tweaks and exclude the new files from the installer build

rubberduck-vba · May 17, 2018 · a62be58 · a62be58
1 parent 1a3ee34
commit a62be58
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Rubberduck.Deployment/IdlGeneration/IdlListener.cs b/Rubberduck.Deployment/IdlGeneration/IdlListener.cs
@@ -22,7 +22,7 @@ public override void EnterCoClass(ITlibNode coClassNode)
 
         public override void EnterCoClassInterface(ITlibNode coClassInterfaceNode)
         {
-            if (coClassInterfaceNode.Parent.ShortName.StartsWith("_") && coClassInterfaceNode.ShortName != "_Object")
+            if (coClassInterfaceNode.Parent.ShortName.StartsWith("_")) //&& coClassInterfaceNode.ShortName != "_Object")
             {
                 coClassInterfaceNode.Data.Attributes.Remove("default");
                 coClassInterfaceNode.Data.Attributes.Add("restricted");

diff --git a/Rubberduck.Deployment/InnoSetup/Installer Build Script.iss b/Rubberduck.Deployment/InnoSetup/Installer Build Script.iss
@@ -89,7 +89,7 @@ Name: {group}; Attribs: readonly
 
 [Files]
 ; Install the correct bitness binaries.
-Source: "{#BuildDir}*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs replacesameversion; Excludes: "Rubberduck.Deployment.*,Rubberduck.dll.xml,Rubberduck.x32.tlb.xml,{#AddinDLL},\NativeBinaries"; Check: CheckShouldInstallFiles
+Source: "{#BuildDir}*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs replacesameversion; Excludes: "Rubberduck.Deployment.*,olewoo.*,*.idl,*.dll.xml,*.tlb.xml,{#AddinDLL},\NativeBinaries"; Check: CheckShouldInstallFiles
 Source: "{#BuildDir}{#AddinDLL}"; DestDir: "{app}"; Flags: ignoreversion replacesameversion; Check: CheckShouldInstallFiles;
 
 ; Used for customizing the Start menu folder appearance

diff --git a/Rubberduck.Resources/Registration/RubberduckProgId.cs b/Rubberduck.Resources/Registration/RubberduckProgId.cs
@@ -5,7 +5,7 @@ public static class RubberduckProgId
         private const string BaseNamespace = "Rubberduck.";
 
         public const string ExtensionProgId = BaseNamespace + "Extension";
-        public const string DockableWindowHostProgId = BaseNamespace + "UI.DockableWindowHost";
+        public const string DockableWindowHostProgId = BaseNamespace + "DockableWindowHost";
 
         public const string DeclarationProgId = BaseNamespace + "Declaration";
         public const string DeclarationsProgId = BaseNamespace + "Declarations";