[tasque/xbuild] [build] Switch Gtk.Tasque build to xbuild

From: Antonius Riha <antoniusri src gnome org>
To: commits-list gnome org
Cc:
Subject: [tasque/xbuild] [build] Switch Gtk.Tasque build to xbuild
Date: Wed, 5 Sep 2012 13:26:49 +0000 (UTC)
commit 44e34916cd3fb8ac32b0262fef58ed0e32fd67b0
Author: Antonius Riha <antoniusriha gmail com>
Date:   Wed Sep 5 15:25:19 2012 +0200

    [build] Switch Gtk.Tasque build to xbuild
    
    * build/Tasque.CSharp.targets:
    	- Added BuildingSolutionFile property so that the
    ResolveAssemblyReferences task (which resides in
    Microsoft.Common.targets) doesn't build referenced projects again.
    	- Added ChildProjectReferences item group. This item group holds
    dlls of referenced projects
    	- Added target AfterClean: cleans up properly so that distcheck
    doesn't complain. Projects that import Tasque.CSharp.targets can add
    items to be cleaned to TasqueCleanFile item group.
    
    * configure.ac:
    	- Added substs for appindicator, notify-sharp and gtk-2.12 as well as for
    Gtk.Tasque.csproj, which is also copied to build directory.
    
    * src/Gtk.Tasque/Makefile.in: Adapter for automake -> xbuild relay.
    Replaces src/Gtk.Tasque/Makefile.am.
    
    * src/Gtk.Tasque/Gtk.Tasque.csproj:
    	- Clean up (Removed custom commands, updated ProductVersion,
    Updated references)
    	- Added build flags for appindicator, notify-sharp and gtk-2.12. Also
    setup some files to be conditionally built.
    	- imports Tasque.CSharp.targets instead of Microsoft.CSharp.targets,
    hence use of "TasqueCompile" instead of "Compile" items.
    	- Removed refs to resources (icons). Icons are now retrieved via the
    Gtk.IconTheme.Default. All icons are being installed in the resp. icon paths
    (see GnomeApplication.cs).
    	- Added targets BeforeBeforeBuild (for generating Defines.cs) and
    BeforeClean (for cleaning up Defines.cs).
    
    * src/Gtk.Tasque/GnomeApplication.cs: Added package icon path (usually
    /usr/share/tasque/icons) to default icon theme search path.
    
    * src/Gtk.Tasque/Defines.cs.in and src/Gtk.Tasque/Defines.WIN32.cs:
    Provide IconsDir path
    
    * po/POTFILES.in and po/POTFILES.skip: OSXApplication.cs is excluded
    from build atm, hence exclude it from i18n build, so that distcheck doesn't
    complain.
    
    * src/Gtk.Tasque/TaskTreeView.cs: The note icon appeared to big for the
    provided space in the tree view,  hence made it smaller (This was a side
    effect of the change in resource handling).

 .gitignore                         |    3 +
 build/Tasque.CSharp.targets        |   11 ++
 configure.ac                       |   13 ++-
 po/POTFILES.in                     |    1 -
 po/POTFILES.skip                   |    1 +
 src/Gtk.Tasque/Defines.WIN32.cs    |    1 +
 src/Gtk.Tasque/Defines.cs.in       |    1 +
 src/Gtk.Tasque/GnomeApplication.cs |    4 +
 src/Gtk.Tasque/Gtk.Tasque.csproj   |  210 ++++++++++++------------------------
 src/Gtk.Tasque/Makefile.am         |  115 --------------------
 src/Gtk.Tasque/Makefile.in         |   53 +++++++++
 src/Gtk.Tasque/TaskTreeView.cs     |    2 +-
 12 files changed, 152 insertions(+), 263 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9776374..f06b6f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,6 +79,9 @@ Makefile.in
 /src/Gtk.Tasque/*.dll
 /src/Gtk.Tasque/*.mdb
 /src/Gtk.Tasque/Defines.cs
+/src/Gtk.Tasque/Gtk.Tasque.csp
+/src/Gtk.Tasque/obj/
+!/src/Gtk.Tasque/Makefile.in
 
 # /src/libtasque/
 /src/libtasque/*.dll
diff --git a/build/Tasque.CSharp.targets b/build/Tasque.CSharp.targets
index 00dde98..bd5b1ee 100644
--- a/build/Tasque.CSharp.targets
+++ b/build/Tasque.CSharp.targets
@@ -6,6 +6,7 @@
     <SrcDir Condition=" '$(SrcDir)' == '' ">.</SrcDir>
     <PkgLibDir Condition=" '$(PkgLibDir)' == '' ">$(Prefix)\lib\tasque</PkgLibDir>
     <DestDir Condition=" '$(DestDir)' != '' And !HasTrailingSlash('$(DestDir)')">$(DestDir)\</DestDir>
+    <BuildingSolutionFile>True</BuildingSolutionFile>
   </PropertyGroup>
   <ItemGroup>
     <InstallFileName Include="$(TargetFileName)" />
@@ -23,6 +24,9 @@
     <CreateItem Include="$(SrcDir)\%(TasqueCompile.RelativeDir)%(FileName)%(Extension)">
       <Output TaskParameter="Include" ItemName="Compile" />
     </CreateItem>
+    <CreateItem Condition=" '@(ProjectReference)' != '' " Include="%(ProjectReference.RelativeDir)\*.dll" >
+      <Output TaskParameter="Include" ItemName="ChildProjectReferences" />
+    </CreateItem>
   </Target>
   <Target Name="Install">
     <CreateItem Condition="Exists('$(TargetFileName).mdb')" Include="$(TargetFileName).mdb">
@@ -47,6 +51,13 @@
     <Message Text="@(DistFile)" />
     <Copy SourceFiles="$(SrcDir)\%(DistFile.RelativeDir)%(FileName)%(Extension)" DestinationFiles="$(DistDir)\%(DistFile.RelativeDir)%(FileName)%(Extension)" SkipUnchangedFiles="true" />
   </Target>
+  <Target Name="AfterClean">
+    <CreateItem Include="*.dll;*.mdb">
+      <Output TaskParameter="Include" ItemName="TasqueCleanFile" />
+    </CreateItem>
+    <Message Text="TasqueCleanFile: @(TasqueCleanFile)" />
+    <Delete Files="@(TasqueCleanFile)" />
+  </Target>
   <Target Name="DistClean" DependsOnTargets="Clean">
     <CreateItem Include="Makefile;*.csp">
       <Output TaskParameter="Include" ItemName="DistCleanFile" />
diff --git a/configure.ac b/configure.ac
index 53e7a74..d959bfa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,7 +59,7 @@ PKG_CHECK_MODULES([GLIB_SHARP_20], [glib-sharp-2.0])
 PKG_CHECK_MODULES([GNOME_SHARP_20], [gnome-sharp-2.0])
 PKG_CHECK_MODULES([GTK_SHARP_20], [gtk-sharp-2.0 >= 2.10.0])
 PKG_CHECK_MODULES([GTK_SHARP_2_12], gtk-sharp-2.0 >= 2.12.0, GTK_2_12="yes", GTK_2_12="no")
-AM_CONDITIONAL(GTK_2_12, test "$GTK_2_12" = "yes")
+AC_SUBST(GTK_2_12)
 PKG_CHECK_MODULES([NDESK_DBUS_10], [ndesk-dbus-1.0])
 PKG_CHECK_MODULES([NDESK_DBUS_GLIB_10], [ndesk-dbus-glib-1.0])
 
@@ -67,7 +67,7 @@ PKG_CHECK_MODULES([NDESK_DBUS_GLIB_10], [ndesk-dbus-glib-1.0])
 # Allow the project to build without notify-sharp
 #
 PKG_CHECK_MODULES(NOTIFY_SHARP, notify-sharp, enable_notify_sharp="yes", enable_notify_sharp="no")
-AM_CONDITIONAL(ENABLE_NOTIFY_SHARP, test "x$enable_notify_sharp" != "xno")
+AC_SUBST(enable_notify_sharp)
 AC_SUBST(NOTIFY_SHARP_LIBS)
 
 #
@@ -88,7 +88,7 @@ If appindicator-sharp is not available on your system, you probably won't need i
 appindicator pass --enable-appindicator=no to configure."])
 	fi
 fi
-AM_CONDITIONAL(ENABLE_APPINDICATOR, test "x$appindicator" != "xno")
+AC_SUBST(appindicator)
 
 
 AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [Use 'Debug' Configuration [default=no]]),
@@ -280,6 +280,12 @@ AC_SUBST(DATAMDPROJ)
 LIBTASQUECSPROJ=libtasque.csp
 AC_SUBST(LIBTASQUECSPROJ)
 
+#
+# Setup Gtk.Tasque.csproj
+#
+GTKTASQUECSPROJ=Gtk.Tasque.csp
+AC_SUBST(GTKTASQUECSPROJ)
+
 AC_CONFIG_FILES([
 Makefile
 build/Tasque.CSharp.targets:build/Tasque.CSharp.targets
@@ -288,6 +294,7 @@ src/Libraries/RtmNet/Makefile
 src/libtasque/Makefile
 src/libtasque/${LIBTASQUECSPROJ}:src/libtasque/libtasque.csproj
 src/Gtk.Tasque/Makefile
+src/Gtk.Tasque/${GTKTASQUECSPROJ}:src/Gtk.Tasque/Gtk.Tasque.csproj
 src/tasque/Makefile
 src/tasque/tasque.pc
 src/Addins/Backends/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d58c968..50ca57b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,7 +7,6 @@ src/Gtk.Tasque/AllCategory.cs
 src/Gtk.Tasque/CompletedTaskGroup.cs
 src/Gtk.Tasque/GtkTray.cs
 src/Gtk.Tasque/NoteDialog.cs
-src/Gtk.Tasque/OSXApplication.cs
 src/Gtk.Tasque/PreferencesDialog.cs
 src/Gtk.Tasque/RemoteControl.cs
 src/Gtk.Tasque/TaskTreeView.cs
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
new file mode 100644
index 0000000..d3325ad
--- /dev/null
+++ b/po/POTFILES.skip
@@ -0,0 +1 @@
+src/Gtk.Tasque/OSXApplication.cs
diff --git a/src/Gtk.Tasque/Defines.WIN32.cs b/src/Gtk.Tasque/Defines.WIN32.cs
index e8d9d09..85cb9a9 100644
--- a/src/Gtk.Tasque/Defines.WIN32.cs
+++ b/src/Gtk.Tasque/Defines.WIN32.cs
@@ -35,6 +35,7 @@ namespace Tasque
 		public const string Version		= "0.1.12";
 		public const string DataDir		= "@datadir@";
 		public const string LocaleDir	= "@datadir@/locale";
+		public const string IconsDir		= "@datadir@/tasque/icons";
 		public const string SoundDir		= "@datadir@/tasque/sounds";
 	}
 }
diff --git a/src/Gtk.Tasque/Defines.cs.in b/src/Gtk.Tasque/Defines.cs.in
index a468a50..0d3fd87 100644
--- a/src/Gtk.Tasque/Defines.cs.in
+++ b/src/Gtk.Tasque/Defines.cs.in
@@ -35,6 +35,7 @@ namespace Tasque
 		public const string Version		= "@version@";
 		public const string DataDir		= "@datadir@";
 		public const string LocaleDir	= "@datadir@/locale";
+		public const string IconsDir		= "@datadir@/tasque/icons";
 		public const string SoundDir		= "@datadir@/tasque/sounds";
 	}
 }
diff --git a/src/Gtk.Tasque/GnomeApplication.cs b/src/Gtk.Tasque/GnomeApplication.cs
index 96b56e2..ead6b8e 100644
--- a/src/Gtk.Tasque/GnomeApplication.cs
+++ b/src/Gtk.Tasque/GnomeApplication.cs
@@ -36,6 +36,10 @@ namespace Tasque
 			} catch {} // Ignore exception if fail (not needed to run)
 
 			Gtk.Application.Init ();
+
+			// add package icon path to default icon theme search paths
+			Gtk.IconTheme.Default.PrependSearchPath (Defines.IconsDir);
+
 			program = new Gnome.Program (display_name,
 			                             Defines.Version,
 			                             Gnome.Modules.UI,
diff --git a/src/Gtk.Tasque/Gtk.Tasque.csproj b/src/Gtk.Tasque/Gtk.Tasque.csproj
index 837d818..6aa1005 100644
--- a/src/Gtk.Tasque/Gtk.Tasque.csproj
+++ b/src/Gtk.Tasque/Gtk.Tasque.csproj
@@ -4,60 +4,41 @@
     <Configuration Condition=" '$(Configuration)' == '' ">LinuxDebug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{B19B9840-669D-4984-9772-E1F55193A67F}</ProjectGuid>
-    <ProductVersion>9.0.21022</ProductVersion>
+    <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <OutputType>Library</OutputType>
-    <NoStandardLibraries>false</NoStandardLibraries>
-    <AssemblyName>tasque</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <NoWin32Manifest>True</NoWin32Manifest>
+    <OutputPath>.</OutputPath>
+    <AssemblyName>Gtk.Tasque</AssemblyName>
     <RootNamespace>Gtk.Tasque</RootNamespace>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <GtkSharp12 Condition=" '$(EnableGtkSharp12)' == '' Or '$(EnableGtkSharp12)' ">GTK_2_12</GtkSharp12>
+    <NotifySharp Condition=" '$(EnableNotifySharp)' == '' Or '$(EnableNotifySharp)' ">ENABLE_NOTIFY_SHARP</NotifySharp>
+    <AppIndicator Condition=" '$(EnableAppIndicator)' == '' Or '$(EnableAppIndicator)' ">APPINDICATOR</AppIndicator>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'LinuxDebug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;LINUX</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CustomCommands>
-      <CustomCommands>
-        <Command type="Build" command="echo &quot;&quot;" />
-      </CustomCommands>
-    </CustomCommands>
+    <DefineConstants>DEBUG;TRACE;LINUX;$(GtkSharp12);$(NotifySharp);$(AppIndicator)</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'LinuxRelease|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;LINUX</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <DefineConstants>TRACE;LINUX;$(GtkSharp12);$(NotifySharp);$(AppIndicator)</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'WinDebug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;WIN</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CustomCommands>
-      <CustomCommands>
-        <Command type="Build" command="echo &quot;&quot;" />
-      </CustomCommands>
-    </CustomCommands>
+    <DefineConstants>DEBUG;TRACE;WIN;$(GtkSharp12)</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'WinRelease|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;WIN</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <DefineConstants>TRACE;WIN;$(GtkSharp12)</DefineConstants>
   </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\..\build\Tasque.CSharp.targets" />
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -80,16 +61,24 @@
     <Reference Include="NDesk.DBus, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099">
       <Package>ndesk-dbus-1.0</Package>
     </Reference>
-    <Reference Include="Mono.Posix">
-      <HintPath>winbin\Mono.Posix.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Data.Sqlite">
-      <HintPath>winbin\Mono.Data.Sqlite.dll</HintPath>
-    </Reference>
+    <Reference Include="Mono.Posix" />
+    <Reference Include="Mono.Data.Sqlite" />
     <Reference Include="appindicator-sharp, Version=0.2.0.0, Culture=neutral, PublicKeyToken=bcae265d1c7ab4c2">
       <Private>False</Private>
       <Package>appindicator-sharp-0.1</Package>
     </Reference>
+    <Reference Include="notify-sharp, Version=0.4.0.0, Culture=neutral, PublicKeyToken=2df29c54e245917a">
+      <Private>False</Private>
+      <Package>notify-sharp</Package>
+    </Reference>
+    <Reference Include="gnome-sharp, Version=2.24.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <Private>False</Private>
+      <Package>gnome-sharp-2.0</Package>
+    </Reference>
+    <Reference Include="NDesk.DBus.GLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099">
+      <Private>False</Private>
+      <Package>ndesk-dbus-glib-1.0</Package>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\libtasque\libtasque.csproj">
@@ -98,116 +87,51 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Defines.cs" />
-    <Compile Include="GtkTray.cs" />
-    <Compile Include="StatusIconTray.cs" />
-    <Compile Include="AppIndicatorTray.cs" />
-    <Compile Include="AbstractTask.cs" />
-    <Compile Include="AllCategory.cs" />
-    <Compile Include="Application.cs" />
-    <Compile Include="CellRendererDate.cs" />
-    <Compile Include="CompletedTaskGroup.cs" />
-    <Compile Include="CompletedTaskGroupModel.cs" />
-    <Compile Include="DateButton.cs" />
-    <None Include="GnomeApplication.cs" />
-    <Compile Include="GtkApplication.cs" />
-    <Compile Include="Logger.cs" />
-    <Compile Include="NoteDialog.cs" />
-    <Compile Include="NoteWidget.cs" />
+    <TasqueCompile Condition=" '$(Configuration)' == 'WinDebug' Or '$(Configuration)' == 'WinRelease' " Include="Defines.WIN32.cs" />
+    <TasqueCompile Include="GtkTray.cs" />
+    <TasqueCompile Include="StatusIconTray.cs" />
+    <TasqueCompile Condition=" '$(AppIndicator)' != '' " Include="AppIndicatorTray.cs" />
+    <TasqueCompile Include="AbstractTask.cs" />
+    <TasqueCompile Include="AllCategory.cs" />
+    <TasqueCompile Include="Application.cs" />
+    <TasqueCompile Include="CellRendererDate.cs" />
+    <TasqueCompile Include="CompletedTaskGroup.cs" />
+    <TasqueCompile Include="CompletedTaskGroupModel.cs" />
+    <TasqueCompile Include="DateButton.cs" />
+    <TasqueCompile Include="GnomeApplication.cs" />
+    <TasqueCompile Include="GtkApplication.cs" />
+    <TasqueCompile Include="Logger.cs" />
+    <TasqueCompile Include="NoteDialog.cs" />
+    <TasqueCompile Include="NoteWidget.cs" />
     <None Include="OSXApplication.cs" />
-    <Compile Include="Preferences.cs" />
-    <Compile Include="PreferencesDialog.cs" />
-    <Compile Include="TaskCalendar.cs" />
-    <Compile Include="TaskGroup.cs" />
-    <Compile Include="TaskGroupModel.cs" />
-    <Compile Include="TaskGroupModelFactory.cs" />
-    <Compile Include="TaskTreeView.cs" />
-    <Compile Include="TaskWindow.cs" />
-    <Compile Include="Utilities.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <!--<PropertyGroup>
-    <PostBuildEvent>copy "$(SolutionDir)\winbin" "$(TargetDir)"</PostBuildEvent>
-    <PreBuildEvent>copy "$(SolutionDir)\data\images\*.png" "$(ProjectDir)"</PreBuildEvent>
-  </PropertyGroup>-->
-  <ItemGroup>
-    <Content Include="..\..\data\images\tasque-completing-0.png">
-      <Link>data\images\tasque-completing-0.png</Link>
-    </Content>
-    <Content Include="..\..\data\images\tasque-completing-1.png">
-      <Link>data\images\tasque-completing-1.png</Link>
-    </Content>
-    <Content Include="..\..\data\images\tasque-completing-10.png">
-      <Link>data\images\tasque-completing-10.png</Link>
-    </Content>
-    <Content Include="..\..\data\images\tasque-completing-11.png">
-      <Link>data\images\tasque-completing-11.png</Link>
-    </Content>
-    <Content Include="..\..\data\images\tasque-completing-2.png">
-      <Link>data\images\tasque-completing-2.png</Link>
-    </Content>
-    <Content Include="..\..\data\images\tasque-completing-3.png">
-      <Link>data\images\tasque-completing-3.png</Link>
-    </Content>
-    <Content Include="..\..\data\images\tasque-completing-4.png">
-      <Link>data\images\tasque-completing-4.png</Link>
-    </Content>
-    <Content Include="..\..\data\images\tasque-completing-5.png">
-      <Link>data\images\tasque-completing-5.png</Link>
-    </Content>
-    <Content Include="..\..\data\images\tasque-completing-6.png">
-      <Link>data\images\tasque-completing-6.png</Link>
-    </Content>
-    <Content Include="..\..\data\images\tasque-completing-7.png">
-      <Link>data\images\tasque-completing-7.png</Link>
-    </Content>
-    <Content Include="..\..\data\images\tasque-completing-8.png">
-      <Link>data\images\tasque-completing-8.png</Link>
-    </Content>
-    <Content Include="..\..\data\images\tasque-completing-9.png">
-      <Link>data\images\tasque-completing-9.png</Link>
-    </Content>
-    <Content Include="..\..\data\images\tasque-note.png">
-      <Link>data\images\tasque-note.png</Link>
-    </Content>
-    <Content Include="..\..\data\images\tasque-rtm-logo.png">
-      <Link>data\images\tasque-rtm-logo.png</Link>
-    </Content>
-    <Content Include="..\..\data\images\tasque-16.png">
-      <Link>data\images\tasque-16.png</Link>
-    </Content>
-    <Content Include="..\..\data\images\tasque-22.png">
-      <Link>data\images\tasque-22.png</Link>
-    </Content>
-    <Content Include="..\..\data\images\tasque-24.png">
-      <Link>data\images\tasque-24.png</Link>
-    </Content>
-    <Content Include="..\..\data\images\tasque-32.png">
-      <Link>data\images\tasque-32.png</Link>
-    </Content>
-    <Content Include="..\..\data\images\tasque-48.png">
-      <Link>data\images\tasque-48.png</Link>
-    </Content>
-    <Content Include="..\..\data\sounds\notify.wav">
-      <Link>data\sounds\notify.wav</Link>
-    </Content>
+    <TasqueCompile Include="Preferences.cs" />
+    <TasqueCompile Include="PreferencesDialog.cs" />
+    <TasqueCompile Include="TaskCalendar.cs" />
+    <TasqueCompile Include="TaskGroup.cs" />
+    <TasqueCompile Include="TaskGroupModel.cs" />
+    <TasqueCompile Include="TaskGroupModelFactory.cs" />
+    <TasqueCompile Include="TaskTreeView.cs" />
+    <TasqueCompile Include="TaskWindow.cs" />
+    <TasqueCompile Include="Utilities.cs" />
+    <TasqueCompile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\data\images\tasque-completing-0.svg">
-      <Link>data\images\tasque-completing-0.svg</Link>
-    </None>
-    <None Include="..\..\data\images\tasque-note.svg">
-      <Link>data\images\tasque-note.svg</Link>
-    </None>
-    <None Include="..\..\data\images\tasque-icons-source.svg">
-      <Link>data\images\tasque-icons-source.svg</Link>
-    </None>
-    <None Include="..\..\data\images\tasque.svg">
-      <Link>data\images\tasque.svg</Link>
-    </None>
+    <DistFile Include="Defines.cs.in" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="data\" />
     <Folder Include="Properties\" />
   </ItemGroup>
+  <ItemGroup Condition=" '$(Configuration)' == 'LinuxDebug' Or '$(Configuration)' == 'LinuxRelease' ">
+    <Compile Include="Defines.cs" />
+    <TasqueCompile Include="RemoteControl.cs" />
+    <TasqueCompile Include="RemoteControlProxy.cs" />
+  </ItemGroup>
+  <Target Name="BeforeBeforeBuild" Condition=" '$(Configuration)' == 'LinuxDebug' Or '$(Configuration)' == 'LinuxRelease' ">
+    <Exec Command="sed -e %22s|%5C%40version%5C%40|$(Version)|%22 -e %22s|%5C%40datadir%5C%40|$(DataDir)|%22 &lt; $(SrcDir)\Defines.cs.in &gt; Defines.cs" />
+  </Target>
+  <Target Name="BeforeClean">
+    <CreateItem Include="Defines.cs">
+      <Output TaskParameter="Include" ItemName="TasqueCleanFile" />
+    </CreateItem>
+  </Target>
 </Project>
diff --git a/src/Gtk.Tasque/Makefile.in b/src/Gtk.Tasque/Makefile.in
new file mode 100644
index 0000000..3fb22be
--- /dev/null
+++ b/src/Gtk.Tasque/Makefile.in
@@ -0,0 +1,53 @@
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+pkglibdir = @libdir@/$(PACKAGE)
+datarootdir = @datarootdir@
+datadir = @datadir@
+
+XBUILD = @XBUILD@
+
+GTKTASQUECSPROJ = @GTKTASQUECSPROJ@
+
+conf=$(shell if test "x enable_debug@" != "xno" ; then echo "LinuxDebug" ; else echo "LinuxRelease" ; fi)
+enable_gtk_sharp_2_12=$(shell if test "x GTK_2_12@" != "xno" ; then echo "true" ; else echo "false" ; fi)
+enable_notify_sharp=$(shell if test "x enable_notify_sharp@" != "xno" ; then echo "true" ; else echo "false" ; fi)
+enable_appindicator=$(shell if test "x appindicator@" != "xno" ; then echo "true" ; else echo "false" ; fi)
+
+PROPERTIES = \
+	/property:Configuration=$(conf) \
+	/property:SrcDir=$(srcdir) \
+	/property:Prefix=$(prefix) \
+	/property:PkgLibDir=$(pkglibdir) \
+	/property:DestDir=$(DESTDIR) \
+	/property:DistDir=../../$(PACKAGE)-$(VERSION)/src/Gtk.Tasque \
+	/property:EnableGtkSharp12=$(enable_gtk_sharp_2_12) \
+	/property:EnableNotifySharp=$(enable_notify_sharp) \
+	/property:EnableAppIndicator=$(enable_appindicator) \
+	/property:Version=$(VERSION) \
+	/property:DataDir=$(datadir)
+
+all:
+	$(XBUILD) $(PROPERTIES) $(GTKTASQUECSPROJ)
+
+clean:
+	$(XBUILD) $(PROPERTIES) /target:clean $(GTKTASQUECSPROJ)
+
+install:
+	$(XBUILD) $(PROPERTIES) /target:install $(GTKTASQUECSPROJ)
+
+uninstall:
+	$(XBUILD) $(PROPERTIES) /target:uninstall $(GTKTASQUECSPROJ)
+
+dist distdir:
+	$(XBUILD) $(PROPERTIES) /target:dist $(GTKTASQUECSPROJ)
+
+distclean:
+	$(XBUILD) $(PROPERTIES) /target:distclean $(GTKTASQUECSPROJ)
+
+dvi installcheck check:
diff --git a/src/Gtk.Tasque/TaskTreeView.cs b/src/Gtk.Tasque/TaskTreeView.cs
index 8b93481..e0d87b2 100644
--- a/src/Gtk.Tasque/TaskTreeView.cs
+++ b/src/Gtk.Tasque/TaskTreeView.cs
@@ -26,7 +26,7 @@ namespace Tasque
 		
 		static TaskTreeView ()
 		{
-			notePixbuf = Utilities.GetIcon ("tasque-note", 16);
+			notePixbuf = Utilities.GetIcon ("tasque-note", 12);
 			
 			inactiveAnimPixbufs = new Gdk.Pixbuf [12];
 			for (int i = 0; i < 12; i++) {
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]