GNOME.org
 

[tasque/xbuild] [xbuild] Adjust data.mdproj to new base proj file

commit 3e99f9e4b9dc582a2f54092734d21e7de1ee1e71
Author: Antonius Riha <antoniusriha gmail com>
Date:   Tue Sep 18 15:28:18 2012 +0200

    [xbuild] Adjust data.mdproj to new base proj file
    
    * Added required properties
    	- PackageName
    	- RelPrefix
    	- TopSrcDir
    * Dropped a lot of properties that are now defined in base proj
    * Renaming in favor of consitent naming with autotool terms:
    	- GlobalIcon -> Icon
    	- LocalIcon -> PkgIcon
    	- LocalSound -> PkgSound
    * tasque.desktop.in is now a "Translate" item (needs translation)
    * org.gnome.Tasque.in is now a "Substitute" item (needs var subst)
    * Dropped "Linux targets" - use the targets of base proj instead
    * Override CoreBuild with no-op target: This proj doesn't compile any
    files, CoreBuild would fail otherwise.
    * Override SetupInstallFile hook to register some files for installation

 data/data.mdproj |  171 +++++++++++++++++++++--------------------------------
 1 files changed, 68 insertions(+), 103 deletions(-)
---
diff --git a/data/data.mdproj b/data/data.mdproj
index 56949d8..b908667 100644
--- a/data/data.mdproj
+++ b/data/data.mdproj
@@ -8,18 +8,11 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6F2F4BAA-3C60-464D-B757-9DD18FED0BAA}</ProjectGuid>
     <OutputPath>.</OutputPath>
+    <PackageName>tasque</PackageName>
+    <RelPrefix Condition=" '$(RelPrefix)' == '' ">..\build\bin</RelPrefix>
+    <TopSrcDir Condition=" '$(TopSrcDir)' == '' ">..</TopSrcDir>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Linux|AnyCPU' ">
-    <Prefix Condition=" '$(Prefix)' == '' ">..\build\bin</Prefix>
-    <DesktopDir Condition=" '$(DesktopDir)' == '' ">$(DataDir)\applications</DesktopDir>
-    <DbusServiceDir Condition=" '$(DbusServiceDir)' == '' ">$(DataDir)\dbus-1\services</DbusServiceDir>
-    <PixmapDir Condition=" '$(PixmapDir)' == '' ">$(DataDir)\pixmaps</PixmapDir>
-    <HiColorDir Condition=" '$(HiColorDir)' == '' ">$(DataDir)\icons\hicolor</HiColorDir>
-    <LocalHiColorDir Condition=" '$(LocalHiColorDir)' == '' ">$(DataDir)\tasque\icons\hicolor</LocalHiColorDir>
-    <SoundsDir>$(DataDir)/tasque/sounds</SoundsDir>
-    <IntlToolMerge Condition=" '$(IntlToolMerge)' == '' ">intltool-merge</IntlToolMerge>
-    <DesktopFileName>tasque.desktop</DesktopFileName>
-    <DBusServiceFileName>org.gnome.Tasque.service</DBusServiceFileName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Windows|AnyCPU' ">
   </PropertyGroup>
@@ -27,187 +20,159 @@
   </PropertyGroup>
   <Import Project="..\build\Tasque.targets" />
   <ItemGroup>
-    <GlobalIcon Include="images\tasque-16.png">
+    <Icon Include="images\tasque-16.png">
       <Name>tasque.png</Name>
       <Context>apps</Context>
       <Size>16x16</Size>
       <Pixmaps>true</Pixmaps>
-    </GlobalIcon>
-    <GlobalIcon Include="images\tasque-22.png">
+    </Icon>
+    <Icon Include="images\tasque-22.png">
       <Name>tasque.png</Name>
       <Context>apps</Context>
       <Size>22x22</Size>
       <Pixmaps>false</Pixmaps>
-    </GlobalIcon>
-    <GlobalIcon Include="images\tasque-24.png">
+    </Icon>
+    <Icon Include="images\tasque-24.png">
       <Name>tasque.png</Name>
       <Context>apps</Context>
       <Size>24x24</Size>
       <Pixmaps>false</Pixmaps>
-    </GlobalIcon>
-    <GlobalIcon Include="images\tasque-32.png">
+    </Icon>
+    <Icon Include="images\tasque-32.png">
       <Name>tasque.png</Name>
       <Context>apps</Context>
       <Size>32x32</Size>
       <Pixmaps>true</Pixmaps>
-    </GlobalIcon>
-    <GlobalIcon Include="images\tasque-48.png">
+    </Icon>
+    <Icon Include="images\tasque-48.png">
       <Name>tasque.png</Name>
       <Context>apps</Context>
       <Size>48x48</Size>
       <Pixmaps>false</Pixmaps>
-    </GlobalIcon>
-    <GlobalIcon Include="images\tasque.svg">
+    </Icon>
+    <Icon Include="images\tasque.svg">
       <Name>tasque.svg</Name>
       <Context>apps</Context>
       <Size>scalable</Size>
       <Pixmaps>false</Pixmaps>
-    </GlobalIcon>
-    <GlobalIcon Include="images\tasque-panel-16.png">
+    </Icon>
+    <Icon Include="images\tasque-panel-16.png">
       <Name>tasque-panel.png</Name>
       <Context>apps</Context>
       <Size>16x16</Size>
       <Pixmaps>false</Pixmaps>
-    </GlobalIcon>
-    <GlobalIcon Include="images\tasque-panel-22.png">
+    </Icon>
+    <Icon Include="images\tasque-panel-22.png">
       <Name>tasque-panel.png</Name>
       <Context>apps</Context>
       <Size>22x22</Size>
       <Pixmaps>false</Pixmaps>
-    </GlobalIcon>
-    <GlobalIcon Include="images\tasque-panel-24.png">
+    </Icon>
+    <Icon Include="images\tasque-panel-24.png">
       <Name>tasque-panel.png</Name>
       <Context>apps</Context>
       <Size>24x24</Size>
       <Pixmaps>false</Pixmaps>
-    </GlobalIcon>
-    <LocalIcon Include="images\tasque-note.png">
+    </Icon>
+    <PkgIcon Include="images\tasque-note.png">
       <Name>tasque-note.png</Name>
       <Context>status</Context>
       <Size>16x16</Size>
-    </LocalIcon>
-    <LocalIcon Include="images\tasque-rtm-logo.png">
+    </PkgIcon>
+    <PkgIcon Include="images\tasque-rtm-logo.png">
       <Name>tasque-rtm-logo.png</Name>
       <Context>places</Context>
       <Size>128x128</Size>
-    </LocalIcon>
-    <LocalIcon Include="images\tasque-completing-0.png">
+    </PkgIcon>
+    <PkgIcon Include="images\tasque-completing-0.png">
       <Name>tasque-completing-0.png</Name>
       <Context>status</Context>
       <Size>16x16</Size>
-    </LocalIcon>
-    <LocalIcon Include="images\tasque-completing-1.png">
+    </PkgIcon>
+    <PkgIcon Include="images\tasque-completing-1.png">
       <Name>tasque-completing-1.png</Name>
       <Context>status</Context>
       <Size>16x16</Size>
-    </LocalIcon>
-    <LocalIcon Include="images\tasque-completing-2.png">
+    </PkgIcon>
+    <PkgIcon Include="images\tasque-completing-2.png">
       <Name>tasque-completing-2.png</Name>
       <Context>status</Context>
       <Size>16x16</Size>
-    </LocalIcon>
-    <LocalIcon Include="images\tasque-completing-3.png">
+    </PkgIcon>
+    <PkgIcon Include="images\tasque-completing-3.png">
       <Name>tasque-completing-3.png</Name>
       <Context>status</Context>
       <Size>16x16</Size>
-    </LocalIcon>
-    <LocalIcon Include="images\tasque-completing-4.png">
+    </PkgIcon>
+    <PkgIcon Include="images\tasque-completing-4.png">
       <Name>tasque-completing-4.png</Name>
       <Context>status</Context>
       <Size>16x16</Size>
-    </LocalIcon>
-    <LocalIcon Include="images\tasque-completing-5.png">
+    </PkgIcon>
+    <PkgIcon Include="images\tasque-completing-5.png">
       <Name>tasque-completing-5.png</Name>
       <Context>status</Context>
       <Size>16x16</Size>
-    </LocalIcon>
-    <LocalIcon Include="images\tasque-completing-6.png">
+    </PkgIcon>
+    <PkgIcon Include="images\tasque-completing-6.png">
       <Name>tasque-completing-6.png</Name>
       <Context>status</Context>
       <Size>16x16</Size>
-    </LocalIcon>
-    <LocalIcon Include="images\tasque-completing-7.png">
+    </PkgIcon>
+    <PkgIcon Include="images\tasque-completing-7.png">
       <Name>tasque-completing-7.png</Name>
       <Context>status</Context>
       <Size>16x16</Size>
-    </LocalIcon>
-    <LocalIcon Include="images\tasque-completing-8.png">
+    </PkgIcon>
+    <PkgIcon Include="images\tasque-completing-8.png">
       <Name>tasque-completing-8.png</Name>
       <Context>status</Context>
       <Size>16x16</Size>
-    </LocalIcon>
-    <LocalIcon Include="images\tasque-completing-9.png">
+    </PkgIcon>
+    <PkgIcon Include="images\tasque-completing-9.png">
       <Name>tasque-completing-9.png</Name>
       <Context>status</Context>
       <Size>16x16</Size>
-    </LocalIcon>
-    <LocalIcon Include="images\tasque-completing-10.png">
+    </PkgIcon>
+    <PkgIcon Include="images\tasque-completing-10.png">
       <Name>tasque-completing-10.png</Name>
       <Context>status</Context>
       <Size>16x16</Size>
-    </LocalIcon>
-    <LocalIcon Include="images\tasque-completing-11.png">
+    </PkgIcon>
+    <PkgIcon Include="images\tasque-completing-11.png">
       <Name>tasque-completing-11.png</Name>
       <Context>status</Context>
       <Size>16x16</Size>
-    </LocalIcon>
+    </PkgIcon>
   </ItemGroup>
   <ItemGroup>
-    <LocalSound Include="sounds\notify.wav" />
+    <PkgSound Include="sounds\notify.wav" />
   </ItemGroup>
   <ItemGroup>
-    <DistFile Include="tasque.desktop.in" />
-    <DistFile Include="org.gnome.Tasque.service.in" />
+    <Translate Include="tasque.desktop.in" />
+  </ItemGroup>
+  <ItemGroup>
+    <Substitute Include="org.gnome.Tasque.service.in" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="images\" />
     <Folder Include="sounds\" />
   </ItemGroup>
-  <!-- Linux targets -->
-  <Target Name="LinuxBuild">
-    <Exec Command="LC_ALL=C $(IntlToolMerge) -d -u -c ..\po\.intltool-merge-cache $(SrcDir)\..\po $(SrcDir)\$(DesktopFileName).in $(DesktopFileName)" />
-    <Exec Command="sed -e %22s|%5C%40bindir%5C%40|$(BinDir)|g%22 -e %22s|%5C%40wrapper%5C%40|tasque|g%22 &lt; $(SrcDir)\$(DBusServiceFileName).in &gt; $(DBusServiceFileName)" />
-  </Target>
-  <Target Name="LinuxClean">
-    <Delete Files="$(DesktopFileName);$(DBusServiceFileName)" />
-  </Target>
-  <Target Name="LinuxInstall">
-    <Copy SourceFiles="$(DesktopFileName)" DestinationFiles="$(DestDir)$(DesktopDir)\$(DesktopFileName)" SkipUnchangedFiles="true" />
-    <Copy SourceFiles="$(DBusServiceFileName)" DestinationFiles="$(DestDir)$(DbusServiceDir)\$(DBusServiceFileName)" SkipUnchangedFiles="true" />
-    <Copy SourceFiles="$(SrcDir)\%(GlobalIcon.Identity)" DestinationFiles="$(DestDir)$(HiColorDir)\%(Size)\%(Context)\%(Name)" SkipUnchangedFiles="true" />
-    <Copy SourceFiles="$(SrcDir)\%(LocalIcon.Identity)" DestinationFiles="$(DestDir)$(LocalHiColorDir)\%(Size)\%(Context)\%(Name)" SkipUnchangedFiles="true" />
-    <Copy SourceFiles="$(SrcDir)\%(GlobalIcon.Identity)" DestinationFolder="$(DestDir)$(PixmapDir)" Condition="'%(Pixmaps)'" SkipUnchangedFiles="true" />
-    <CallTarget Targets="UpdateIconCache" />
-    <Copy SourceFiles="$(SrcDir)\%(LocalSound.Identity)" DestinationFolder="$(DestDir)$(SoundsDir)" />
-  </Target>
-  <Target Name="LinuxUninstall">
-    <Delete Files="$(DestDir)$(DesktopDir)\$(DesktopFileName)" />
-    <Delete Files="$(DestDir)$(DbusServiceDir)\$(DBusServiceFileName)" />
-    <Delete Files="$(DestDir)$(HiColorDir)\%(GlobalIcon.Size)\%(Context)\%(Name)" />
-    <Delete Files="$(DestDir)$(LocalHiColorDir)\%(LocalIcon.Size)\%(Context)\%(Name)" />
-    <Delete Files="$(DestDir)$(PixmapDir)\%(GlobalIcon.FileName)%(Extension)" Condition="'%(Pixmaps)'" />
-    <CallTarget Targets="UpdateIconCache" />
-    <Delete Files="$(DestDir)$(SoundsDir)\%(LocalSound.FileName)%(Extension)" />
-  </Target>
-  <Target Name="UpdateIconCache">
-    <Exec Command="gtk-update-icon-cache -f -t $(HiColorDir)" IgnoreExitCode="true" />
-    <Exec Command="gtk-update-icon-cache -f -t $(LocalHiColorDir)" IgnoreExitCode="true" />
-  </Target>
-  <Target Name="Dist">
-    <CreateItem Include="data.mdproj;$(DesktopFileName).in;$(DBusServiceFileName).in;@(GlobalIcon);@(LocalIcon);@(LocalSound)">
-      <Output TaskParameter="Include" ItemName="DistFile" />
+  <!-- CoreBuild (ignore) -->
+  <Target Name="CoreBuild" />
+  <!-- Install -->
+  <Target Name="SetupInstallFile">
+    <CreateProperty Value="$(DataDir)\applications">
+      <Output TaskParameter="Value" PropertyName="DesktopDir" />
+    </CreateProperty>
+    <CreateProperty Value="$(DataDir)\dbus-1\services">
+      <Output TaskParameter="Value" PropertyName="DbusServiceDir" />
+    </CreateProperty>
+    <CreateItem Include="%(Translate.FileName)" AdditionalMetadata="InstallPath=$(DesktopDir);InstallFileName=%(Translate.FileName)">
+      <Output TaskParameter="Include" ItemName="InstallFile" />
     </CreateItem>
-    <Copy SourceFiles="$(SrcDir)\%(DistFile.Identity)" DestinationFiles="$(DistDir)\%(DistFile.Identity)" SkipUnchangedFiles="true" />
-  </Target>
-  <Target Name="DistClean" DependsOnTargets="Clean">
-    <CreateItem Include="Makefile;data.mdp;$(DesktopFileName);$(DBusServiceFileName)">
-      <Output TaskParameter="Include" ItemName="DistCleanFile" />
+    <CreateItem Include="%(Substitute.FileName)" AdditionalMetadata="InstallPath=$(DbusServiceDir);InstallFileName=%(Substitute.FileName)">
+      <Output TaskParameter="Include" ItemName="InstallFile" />
     </CreateItem>
-    <Delete Files="@(DistCleanFile)" />
   </Target>
-  <Target Name="Rebuild" DependsOnTargets="Clean;Build" />
-  <Target Name="Build" DependsOnTargets="$(Configuration)Build" />
-  <Target Name="Clean" DependsOnTargets="$(Configuration)Clean" />
-  <Target Name="Install" DependsOnTargets="$(Configuration)Install" />
-  <Target Name="Uninstall" DependsOnTargets="$(Configuration)Uninstall" />
 </Project>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]