GNOME.org
 

[tomboy] [Windows] Add the missing resource "tomboy-note-clipboard-html.xsl" and clean up the msbuild file.

commit a296e846c71493a7dc1fb6abb66eb7729a65ebbf
Author: Benjamin Podszun <benjamin podszun topimagesystems com>
Date:   Tue Aug 10 15:15:06 2010 +0200

    [Windows] Add the missing resource "tomboy-note-clipboard-html.xsl" and clean up the msbuild file.
    
    Add the resource file to the windows build (it was present in the makefiles already)
    to fix bug #625510.
    
    Clean up the references to resources and point them to the real location below data/
    instead of the project root. Before this change a clean clone of Tomboy shows missing
    resources in Visual Studio, the files are (unintuitively) copied to the right spot in
    a pre-build command using a bunch of "copy" invocations.
    
    Remove the post-build event and migrate it to a standard "AfterBuild" target, replacing
    invocations of mkdir/copy with <MakeDir>/<Copy>. That way it works on every OS that
    supports msbuild (or xbuild on mono).

 Setup/Files.wxs |    6 +-
 Tomboy.csproj   |  175 ++++++++++++++++++++++++++++---------------------------
 2 files changed, 93 insertions(+), 88 deletions(-)
---
diff --git a/Setup/Files.wxs b/Setup/Files.wxs
index 38378bb..5a5071b 100644
--- a/Setup/Files.wxs
+++ b/Setup/Files.wxs
@@ -57,9 +57,9 @@
 						<File Source="..\bin\Debug\Underline.pdb" Name="Underline.pdb" Id="Underline.pdb" Vital="yes" />
 						<File Source="..\bin\Debug\WebSyncServiceAddin.pdb" Name="WebSyncServiceAddin.pdb" Id="WebSyncServiceAddin.pdb" Vital="yes" />
 						<File Source="..\bin\Debug\Tomboy.pdb" Name="Tomboy.pdb" Id="Tomboy.pdb" Vital="yes" />
-						<File Source="..\bin\Debug\note.ico" Name="note.ico" Id="note.ico" Vital="yes" />
-						<File Source="..\bin\Debug\new_note.ico" Name="new_note.ico" Id="new_note.ico" Vital="yes" />
-						<File Source="..\bin\Debug\search.ico" Name="search.ico" Id="search.ico" Vital="yes" />	
+						<File Source="..\data\icons\note.ico" Name="note.ico" Id="note.ico" Vital="yes" />
+						<File Source="..\data\icons\new_note.ico" Name="new_note.ico" Id="new_note.ico" Vital="yes" />
+						<File Source="..\data\icons\search.ico" Name="search.ico" Id="search.ico" Vital="yes" />
 					</Component>
 
 					<Directory Id="tomboy" Name="tomboy">
diff --git a/Tomboy.csproj b/Tomboy.csproj
index ef13c21..115aaa6 100644
--- a/Tomboy.csproj
+++ b/Tomboy.csproj
@@ -28,7 +28,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <ApplicationIcon>tomboy.ico</ApplicationIcon>
+    <ApplicationIcon>data\icons\tomboy.ico</ApplicationIcon>
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -195,37 +195,60 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="UIManagerLayout.xml" />
+    <EmbeddedResource Include="data\UIManagerLayout.xml">
+        <LogicalName>UIManagerLayout.xml</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Tomboy.addin.xml" />
+    <EmbeddedResource Include="Tomboy\Tomboy.addin.xml">
+        <LogicalName>Tomboy.addin.xml</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="filter-note-all.png" />
-    <EmbeddedResource Include="filter-note-unfiled.png" />
-    <EmbeddedResource Include="note-new.png" />
-    <EmbeddedResource Include="note.png" />
-    <EmbeddedResource Include="notebook-new.png" />
-    <EmbeddedResource Include="notebook.png" />
-    <EmbeddedResource Include="pin-active.png" />
-    <EmbeddedResource Include="pin-down.png" />
-    <EmbeddedResource Include="pin-up.png" />
-    <EmbeddedResource Include="tomboy.png" />
+    <EmbeddedResource Include="data\tomboy-note-clipboard-html.xsl">
+        <LogicalName>tomboy-note-clipboard-html.xsl</LogicalName>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="data\icons\hicolor_actions_22x22_filter-note-all.png">
+        <LogicalName>filter-note-all.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="data\icons\hicolor_actions_22x22_filter-note-unfiled.png">
+        <LogicalName>filter-note-unfiled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="data\icons\hicolor_actions_16x16_note-new.png">
+        <LogicalName>note-new.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="data\icons\hicolor_places_22x22_note.png">
+        <LogicalName>note.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="data\icons\hicolor_actions_48x48_notebook-new.png">
+        <LogicalName>notebook-new.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="data\icons\hicolor_places_22x22_notebook.png">
+        <LogicalName>notebook.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="data\icons\hicolor_status_16x16_pin-active.png">
+        <LogicalName>pin-active.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="data\icons\hicolor_status_16x16_pin-down.png">
+        <LogicalName>pin-down.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="data\icons\hicolor_status_16x16_pin-up.png">
+        <LogicalName>pin-up.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="data\icons\hicolor_apps_48x48_tomboy.png">
+        <LogicalName>tomboy.png</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <None Include="Tomboy\Defines.cs.in" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="new_note.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="note.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="search.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="tomboy.ico" />
+    <JumpListIcons Include="data\icons\tomboy.ico;data\icons\new_note.ico;data\icons\note.ico;data\icons\search.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <BinaryContent Include="winbin\MonoPosixHelper.dll;winbin\Mono.Addins.dll.config" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
@@ -245,73 +268,55 @@
     </MonoDevelop>
     <VisualStudio />
   </ProjectExtensions>
-  <PropertyGroup>
-    <PreBuildEvent>copy "$(ProjectDir)data\icons\tomboy.ico" "$(ProjectDir)tomboy.ico"
-copy "$(ProjectDir)data\icons\note.ico" "$(ProjectDir)note.ico"
-copy "$(ProjectDir)data\icons\new_note.ico" "$(ProjectDir)new_note.ico"
-copy "$(ProjectDir)data\icons\search.ico" "$(ProjectDir)search.ico"
-copy "$(ProjectDir)data\icons\hicolor_apps_48x48_tomboy.png" "$(ProjectDir)tomboy.png"
-copy "$(ProjectDir)data\icons\hicolor_places_22x22_note.png" "$(ProjectDir)note.png"
-copy "$(ProjectDir)data\icons\hicolor_actions_16x16_note-new.png" "$(ProjectDir)note-new.png"
-copy "$(ProjectDir)data\icons\hicolor_actions_22x22_filter-note-all.png" "$(ProjectDir)filter-note-all.png"
-copy "$(ProjectDir)data\icons\hicolor_actions_22x22_filter-note-unfiled.png" "$(ProjectDir)\filter-note-unfiled.png"
-copy "$(ProjectDir)data\icons\hicolor_places_22x22_notebook.png" "$(ProjectDir)notebook.png"
-copy "$(ProjectDir)data\icons\hicolor_actions_48x48_notebook-new.png" "$(ProjectDir)notebook-new.png"
-copy "$(ProjectDir)data\icons\hicolor_status_16x16_pin-down.png" "$(ProjectDir)pin-down.png"
-copy "$(ProjectDir)data\icons\hicolor_status_16x16_pin-up.png" "$(ProjectDir)pin-up.png"
-copy "$(ProjectDir)data\icons\hicolor_status_16x16_pin-active.png" "$(ProjectDir)pin-active.png"
-copy "$(ProjectDir)Tomboy\Tomboy.addin.xml" "$(ProjectDir)"
-copy "$(ProjectDir)data\UIManagerLayout.xml" "$(ProjectDir)"</PreBuildEvent>
-    <PostBuildEvent>copy "$(ProjectDir)winbin\MonoPosixHelper.dll" "$(ProjectDir)bin\Debug"
-copy "$(ProjectDir)winbin\Mono.Addins.dll.config" "$(ProjectDir)bin\Debug"
+  <Target Name="AfterBuild">
+    <Copy SourceFiles="@(JumpListIcons)" DestinationFolder="$(OutputPath)" />
+    <Copy SourceFiles="@(BinaryContent)" DestinationFolder="$(OutputPath)" />
 
-copy "$(ProjectDir)data\icons\tomboy.ico" "$(ProjectDir)tomboy.ico"
+    <MakeDir Directories="$(OutputPath)\tomboy\icons\hicolor\16x16\apps" />
+    <MakeDir Directories="$(OutputPath)\tomboy\icons\hicolor\22x22\apps" />
+    <MakeDir Directories="$(OutputPath)\tomboy\icons\hicolor\24x24\apps" />
+    <MakeDir Directories="$(OutputPath)\tomboy\icons\hicolor\32x32\apps" />
+    <MakeDir Directories="$(OutputPath)\tomboy\icons\hicolor\48x48\apps" />
+    <MakeDir Directories="$(OutputPath)\tomboy\icons\hicolor\scalable\apps" />
 
-mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\16x16\apps"
-mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\22x22\apps"
-mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\24x24\apps"
-mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\32x32\apps"
-mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\48x48\apps"
-mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\scalable\apps"
+    <MakeDir Directories="$(OutputPath)\tomboy\icons\hicolor\16x16\actions" />
+    <MakeDir Directories="$(OutputPath)\tomboy\icons\hicolor\22x22\actions" />
+    <MakeDir Directories="$(OutputPath)\tomboy\icons\hicolor\24x24\actions" />
+    <MakeDir Directories="$(OutputPath)\tomboy\icons\hicolor\32x32\actions" />
+    <MakeDir Directories="$(OutputPath)\tomboy\icons\hicolor\48x48\actions" />
+    <MakeDir Directories="$(OutputPath)\tomboy\icons\hicolor\scalable\actions" />
 
-mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\16x16\actions"
-mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\22x22\actions"
-mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\24x24\actions"
-mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\32x32\actions"
-mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\48x48\actions"
-mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\scalable\actions"
+    <MakeDir Directories="$(OutputPath)\tomboy\icons\hicolor\16x16\places" />
+    <MakeDir Directories="$(OutputPath)\tomboy\icons\hicolor\22x22\places" />
+    <MakeDir Directories="$(OutputPath)\tomboy\icons\hicolor\24x24\places" />
+    <MakeDir Directories="$(OutputPath)\tomboy\icons\hicolor\32x32\places" />
+    <MakeDir Directories="$(OutputPath)\tomboy\icons\hicolor\48x48\places" />
+    <MakeDir Directories="$(OutputPath)\tomboy\icons\hicolor\scalable\places" />
 
-mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\16x16\places"
-mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\22x22\places"
-mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\24x24\places"
-mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\32x32\places"
-mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\48x48\places"
-mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\scalable\places"
+    <MakeDir Directories="$(OutputPath)\tomboy\icons\hicolor\16x16\status" />
+    <MakeDir Directories="$(OutputPath)\tomboy\icons\hicolor\22x22\status" />
+    <MakeDir Directories="$(OutputPath)\tomboy\icons\hicolor\24x24\status" />
+    <MakeDir Directories="$(OutputPath)\tomboy\icons\hicolor\32x32\status" />
+    <MakeDir Directories="$(OutputPath)\tomboy\icons\hicolor\48x48\status" />
+    <MakeDir Directories="$(OutputPath)\tomboy\icons\hicolor\scalable\status" />
 
-mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\16x16\status"
-mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\22x22\status"
-mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\24x24\status"
-mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\32x32\status"
-mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\48x48\status"
-mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\scalable\status"
+    <Copy SourceFiles="data\icons\hicolor_apps_16x16_tomboy.png" DestinationFiles="$(OutputPath)\tomboy\icons\hicolor\16x16\apps\tomboy.png" />
+    <Copy SourceFiles="data\icons\hicolor_apps_22x22_tomboy.png" DestinationFiles="$(OutputPath)\tomboy\icons\hicolor\22x22\apps\tomboy.png" />
+    <Copy SourceFiles="data\icons\hicolor_apps_24x24_tomboy.png" DestinationFiles="$(OutputPath)\tomboy\icons\hicolor\24x24\apps\tomboy.png" />
+    <Copy SourceFiles="data\icons\hicolor_apps_32x32_tomboy.png" DestinationFiles="$(OutputPath)\tomboy\icons\hicolor\32x32\apps\tomboy.png" />
+    <Copy SourceFiles="data\icons\hicolor_apps_48x48_tomboy.png" DestinationFiles="$(OutputPath)\tomboy\icons\hicolor\48x48\apps\tomboy.png" />
+    <Copy SourceFiles="data\icons\hicolor_apps_scalable_tomboy.svg" DestinationFiles="$(OutputPath)\tomboy\icons\hicolor\scalable\apps\tomboy.svg" />
 
-copy "$(ProjectDir)data\icons\hicolor_actions_16x16_note-new.png" "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\16x16\actions\note-new.png"
-copy "$(ProjectDir)data\icons\hicolor_actions_48x48_notebook-new.png" "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\48x48\actions\notebook-new.png"
-copy "$(ProjectDir)data\icons\hicolor_actions_22x22_filter-note-all.png" "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\22x22\actions\filter-note-all.png"
-copy "$(ProjectDir)data\icons\hicolor_actions_22x22_filter-note-unfiled.png" "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\22x22\actions\filter-note-unfiled.png"
-copy "$(ProjectDir)data\icons\hicolor_apps_16x16_tomboy.png" "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\16x16\apps\tomboy.png"
-copy "$(ProjectDir)data\icons\hicolor_apps_22x22_tomboy.png" "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\22x22\apps\tomboy.png"
-copy "$(ProjectDir)data\icons\hicolor_apps_24x24_tomboy.png" "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\24x24\apps\tomboy.png"
-copy "$(ProjectDir)data\icons\hicolor_apps_32x32_tomboy.png" "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\32x32\apps\tomboy.png"
-copy "$(ProjectDir)data\icons\hicolor_apps_48x48_tomboy.png" "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\48x48\apps\tomboy.png"
-copy "$(ProjectDir)data\icons\hicolor_apps_scalable_tomboy.svg" "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\scalable\apps\tomboy.svg"
-copy "$(ProjectDir)data\icons\hicolor_places_22x22_note.png" "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\22x22\places\note.png"
-copy "$(ProjectDir)data\icons\hicolor_places_22x22_notebook.png" "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\22x22\places\notebook.png"
-copy "$(ProjectDir)data\icons\hicolor_status_16x16_pin-down.png" "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\16x16\status\pin-down.png"
-copy "$(ProjectDir)data\icons\hicolor_status_16x16_pin-up.png" "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\16x16\status\pin-up.png"
-copy "$(ProjectDir)data\icons\hicolor_status_16x16_pin-active.png" "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\16x16\status\pin-active.png"
+    <Copy SourceFiles="data\icons\hicolor_actions_16x16_note-new.png" DestinationFiles="$(OutputPath)\tomboy\icons\hicolor\16x16\actions\note-new.png" />
+    <Copy SourceFiles="data\icons\hicolor_actions_48x48_notebook-new.png" DestinationFiles="$(OutputPath)\tomboy\icons\hicolor\48x48\actions\notebook-new.png" />
+    <Copy SourceFiles="data\icons\hicolor_actions_22x22_filter-note-all.png" DestinationFiles="$(OutputPath)\tomboy\icons\hicolor\22x22\actions\filter-note-all.png" />
+    <Copy SourceFiles="data\icons\hicolor_actions_22x22_filter-note-unfiled.png" DestinationFiles="$(OutputPath)\tomboy\icons\hicolor\22x22\actions\filter-note-unfiled.png" />
 
-copy "$(ProjectDir)Tomboy\Tomboy.addin.xml" "$(ProjectDir)"
-copy "$(ProjectDir)data\UIManagerLayout.xml" "$(ProjectDir)"</PostBuildEvent>
-  </PropertyGroup>
+    <Copy SourceFiles="data\icons\hicolor_places_22x22_note.png" DestinationFiles="$(OutputPath)\tomboy\icons\hicolor\22x22\places\note.png" />
+    <Copy SourceFiles="data\icons\hicolor_places_22x22_notebook.png" DestinationFiles="$(OutputPath)\tomboy\icons\hicolor\22x22\places\notebook.png" />
+
+    <Copy SourceFiles="data\icons\hicolor_status_16x16_pin-down.png" DestinationFiles="$(OutputPath)\tomboy\icons\hicolor\16x16\status\pin-down.png" />
+    <Copy SourceFiles="data\icons\hicolor_status_16x16_pin-up.png" DestinationFiles="$(OutputPath)\tomboy\icons\hicolor\16x16\status\pin-up.png" />
+    <Copy SourceFiles="data\icons\hicolor_status_16x16_pin-active.png" DestinationFiles="$(OutputPath)\tomboy\icons\hicolor\16x16\status\pin-active.png" />
+  </Target>
 </Project>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]