Changeset 1994 for trunk/eraser

Timestamp:

5/1/2010 12:23:50 AM (3 years ago)

Author:

lowjoel

Message:

• Build the source file strings and compile into a resource assembly for BlackBox?
• Install Eraser.BlackBox? in the correct path (The Plugins folder)
• The English localisation of BlackBox? should always be installed
• Install the BlackBox? localisations as required by the selected languages for installation

Location:

trunk/eraser

Files:

• Eraser.BlackBox/Eraser.BlackBox.csproj (modified) (1 diff)
• Installer/DirectoryStructure.wxs (modified) (2 diffs)
• Installer/Eraser.wxs (modified) (1 diff)
• Installer/Localisations.wxs (modified) (2 diffs)

trunk/eraser/Eraser.BlackBox/Eraser.BlackBox.csproj

@@ -103 +103 @@
       <DependentUpon>BlackBoxUploadForm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Strings.en.resx" />
+    <EmbeddedResource Include="Strings.it.resx" />
+    <EmbeddedResource Include="Strings.nl.resx" />
+    <EmbeddedResource Include="Strings.pl.resx" />
+    <EmbeddedResource Include="Strings.resx" />
   </ItemGroup>
   <ItemGroup>

trunk/eraser/Installer/DirectoryStructure.wxs

@@ -102 +102 @@
                         Type="string" />
                 </Component>
-                <Component Id="EraserBlackBox" Guid="3C9273B0-7A35-479b-BBEE-12AA3AB141EE">
-                    <File Id="EraserBlackBoxDll" Name="Eraser.BlackBox.dll"
-                        Source="..\Bin\Release\Plugins\Eraser.BlackBox.dll"
-                        ProcessorArchitecture="msil" />
-                </Component>
                 <Component Id="EraserShell" Guid="4C446C7E-BCBC-4561-B8F6-D406516D356F">
                     <?if $(sys.BUILDARCH) = "x64"?>
@@ -231 +226 @@
                             ProcessorArchitecture="msil" />
                     </Component>
+                    
+                    <Component Id="EraserBlackBox" Guid="3C9273B0-7A35-479b-BBEE-12AA3AB141EE">
+                        <File Id="EraserBlackBoxDll" Name="Eraser.BlackBox.dll"
+                            Source="..\Bin\Release\Plugins\Eraser.BlackBox.dll"
+                            ProcessorArchitecture="msil" />
+                    </Component>
 
                     <Directory Id="EraserPluginsLangEnDir" Name="en">
-                        <Component Id="EraserPluginsLangEn" Guid="23B2B7DD-C518-4dde-A229-94CA9122B995">
+                        <Component Id="EraserDefaultPluginsLangEn" Guid="23B2B7DD-C518-4dde-A229-94CA9122B995">
                             <File Id="EraserDefaultPluginsEn" Name="Eraser.DefaultPlugins.resources.dll"
                                 Source="..\bin\Release\Plugins\en\Eraser.DefaultPlugins.resources.dll"
+                                ProcessorArchitecture="msil" />
+                        </Component>
+
+                        <Component Id="EraserBlackBoxLangEn" Guid="0820F778-7868-442e-B5BE-B1A5E727CCE6">
+                            <File Id="EraserBlackBoxEn" Name="Eraser.BlackBox.resources.dll"
+                                Source="..\bin\Release\Plugins\en\Eraser.BlackBox.resources.dll"
                                 ProcessorArchitecture="msil" />
                         </Component>

trunk/eraser/Installer/Eraser.wxs

@@ -69 +69 @@
             <ComponentRef Id="EraserLangEn" />
             <ComponentRef Id="EraserPlugins" />
-            <ComponentRef Id="EraserPluginsLangEn" />
+            <ComponentRef Id="EraserDefaultPluginsLangEn" />
 
             <Feature Id="EraserMainBlackBox" Title="Eraser BlackBox"
                     Description="Eraser BlackBox error reporting component" Level="1">
                 <ComponentRef Id="EraserBlackBox"/>
+                <ComponentRef Id="EraserBlackBoxLangEn" />
             </Feature>
             <Feature Id="EraserMainShell" Title="Eraser Shell Extension"

trunk/eraser/Installer/Localisations.wxs

@@ -57 +57 @@
         <DirectoryRef Id="EraserPluginsDir">
             <Directory Id="EraserPluginsLangNlDir" Name="nl">
-                <Component Id="EraserPluginsLangNl" Guid="CD85AC3F-2B4E-4ac8-8FF9-6BD3BC90BD3D">
+                <Component Id="EraserDefaultPluginsLangNl" Guid="CD85AC3F-2B4E-4ac8-8FF9-6BD3BC90BD3D">
                     <File Id="EraserDefaultPluginsNl" Name="Eraser.DefaultPlugins.resources.dll"
                         Source="..\bin\Release\Plugins\nl\Eraser.DefaultPlugins.resources.dll"
                         ProcessorArchitecture="msil" />
                 </Component>
+                <Component Id="EraserBlackBoxLangNl" Guid="A336F90E-38EE-4883-91D9-3791C0E897EA" Transitive="yes">
+                    <File Id="EraserBlackBoxNl" Name="Eraser.BlackBox.resources.dll"
+                        Source="..\bin\Release\Plugins\nl\Eraser.BlackBox.resources.dll"
+                        ProcessorArchitecture="msil" />
+                </Component>
             </Directory>
             <Directory Id="EraserPluginsLangItDir" Name="it">
-                <Component Id="EraserPluginsLangIt" Guid="26236C68-69E8-4cc6-B8AA-C6130A7EDB10">
+                <Component Id="EraserDefaultPluginsLangIt" Guid="26236C68-69E8-4cc6-B8AA-C6130A7EDB10">
                     <File Id="EraserDefaultPluginsIt" Name="Eraser.DefaultPlugins.resources.dll"
                         Source="..\bin\Release\Plugins\it\Eraser.DefaultPlugins.resources.dll"
                         ProcessorArchitecture="msil" />
                 </Component>
+                <Component Id="EraserBlackBoxLangIt" Guid="9A7134F4-DED9-4ef6-B624-B5D0CD03FD43" Transitive="yes">
+                    <File Id="EraserBlackBoxIt" Name="Eraser.BlackBox.resources.dll"
+                        Source="..\bin\Release\Plugins\it\Eraser.BlackBox.resources.dll"
+                        ProcessorArchitecture="msil" />
+                </Component>
             </Directory>
             <Directory Id="EraserPluginsLangPlDir" Name="pl">
-                <Component Id="EraserPluginsLangPl" Guid="138E9CF4-17B9-498a-B476-0A1F91FFB64B">
+                <Component Id="EraserDefaultPluginsLangPl" Guid="138E9CF4-17B9-498a-B476-0A1F91FFB64B">
                     <File Id="EraserDefaultPluginsPl" Name="Eraser.DefaultPlugins.resources.dll"
                         Source="..\bin\Release\Plugins\pl\Eraser.DefaultPlugins.resources.dll"
+                        ProcessorArchitecture="msil" />
+                </Component>
+                <Component Id="EraserBlackBoxLangPl" Guid="63F255DF-9DD5-46ff-BC92-1AAE00772193" Transitive="yes">
+                    <File Id="EraserBlackBoxPl" Name="Eraser.BlackBox.resources.dll"
+                        Source="..\bin\Release\Plugins\pl\Eraser.BlackBox.resources.dll"
                         ProcessorArchitecture="msil" />
                 </Component>
@@ -85 +100 @@
             <Feature Id="EraserLanguagesNl" Title="Dutch" Description="Dutch localisation" Level="10">
                 <ComponentRef Id="EraserLangNl" />
-                <ComponentRef Id="EraserPluginsLangNl" />
+                <ComponentRef Id="EraserDefaultPluginsLangNl" />
+                <ComponentRef Id="EraserBlackBoxLangNl" />
             </Feature>
             <Feature Id="EraserLanguagesIt" Title="Italian" Description="Italian localisation" Level="10">
                 <ComponentRef Id="EraserLangIt" />
-                <ComponentRef Id="EraserPluginsLangIt" />
+                <ComponentRef Id="EraserDefaultPluginsLangIt" />
+                <ComponentRef Id="EraserBlackBoxLangIt" />
             </Feature>
             <Feature Id="EraserLanguagesPl" Title="Polish" Description="Polish localisation" Level="10">
                 <ComponentRef Id="EraserLangPl"/>
-                <ComponentRef Id="EraserPluginsLangPl"/>
+                <ComponentRef Id="EraserDefaultPluginsLangPl"/>
+                <ComponentRef Id="EraserBlackBoxLangPl" />
             </Feature>
         </Feature>