GNOME.org
 

[tasque/xbuild] [build] Restore backend build switches

commit 76c8dc3b43721aee3242c5d0676d721130d32291
Author: Antonius Riha <antoniusriha gmail com>
Date:   Wed Sep 19 23:01:25 2012 +0200

    [build] Restore backend build switches
    
    If a project builds can now be controlled by the BuildEnabled property,
    which has been added to Tasque.targets.
    
    configure.ac:
    	* drop AM_CONDITIONALs and replace by AC_SUBSTs where
    necessary.
    	* Makefile.am: Relay enable_backend_xy switch to xbuild's variable
    EnableBackendXy.

 Makefile.am                                        |   16 +++++++++++++++-
 build/Tasque.targets                               |    6 ++++++
 configure.ac                                       |   19 ++++++-------------
 src/Addins/Backends/Dummy/DummyBackend.csproj      |    1 +
 .../Backends/Hiveminder/HiveminderBackend.csproj   |    1 +
 src/Addins/Backends/IceCore/IceCoreBackend.csproj  |    1 +
 src/Addins/Backends/Rtm/RtmBackend.csproj          |    1 +
 src/Addins/Backends/Sqlite/SqliteBackend.csproj    |    1 +
 src/Libraries/RtmNet/RtmNet.csproj                 |    1 +
 9 files changed, 33 insertions(+), 14 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index ec11278..10dab91 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,6 +8,14 @@ enable_appindicator=$(shell if test "x appindicator@" != "xno" ; then echo "true
 enable_notify_sharp=$(shell if test "x notify_sharp@" != "xno" ; then echo "true" ; else echo "false" ; fi)
 enable_gtk_2_12=$(shell if test "x GTK_2_12@" != "xno" ; then echo "true" ; else echo "false" ; fi)
 
+enable_backend_dummy=$(shell if test "x final_backend_dummy@" != "xno" ; then echo "true" ; else echo "false" ; fi)
+enable_backend_rtm=$(shell if test "x final_backend_rtm@" != "xno" ; then echo "true" ; else echo "false" ; fi)
+enable_backend_sqlite=$(shell if test "x final_backend_sqlite@" != "xno" ; then echo "true" ; else echo "false" ; fi)
+enable_backend_icecore=$(shell if test "x final_backend_icecore@" != "xno" ; then echo "true" ; else echo "false" ; fi)
+enable_backend_eds=$(shell if test "x final_backend_eds@" != "xno" ; then echo "true" ; else echo "false" ; fi)
+enable_backend_hiveminder=$(shell if test "x final_backend_hiveminder@" != "xno" ; then echo "true" ; else echo "false" ; fi)
+
+
 PROPERTIES = \
 	/property:Configuration=$(conf) \
 	/property:AbsTopSrcDir=$(abs_top_srcdir) \
@@ -16,7 +24,13 @@ PROPERTIES = \
 	/property:Prefix=$(prefix) \
 	/property:EnableAppIndicator=$(enable_appindicator) \
 	/property:EnableNotifySharp=$(enable_notify_sharp) \
-	/property:EnableGtkSharp12=$(enable_gtk_2_12)
+	/property:EnableGtkSharp12=$(enable_gtk_2_12) \
+	/property:EnableBackendDummy=$(enable_backend_dummy) \
+	/property:EnableBackendRtm=$(enable_backend_rtm) \
+	/property:EnableBackendSqlite=$(enable_backend_sqlite) \
+	/property:EnableBackendIceCore=$(enable_backend_icecore) \
+	/property:EnableBackendEds=$(enable_backend_eds) \
+	/property:EnableBackendHiveminder=$(enable_backend_hiveminder)
 
 pkgdata_DATA =  $(DLL_REFERENCES)
 
diff --git a/build/Tasque.targets b/build/Tasque.targets
index 18c5823..3a67359 100644
--- a/build/Tasque.targets
+++ b/build/Tasque.targets
@@ -2,6 +2,7 @@
 <Project DefaultTargets="Build" InitialTargets="_CheckProperties;_GetSrcDir" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
   <PropertyGroup>
     <BuildingSolutionFile>True</BuildingSolutionFile>
+    <BuildEnabled Condition=" '$(BuildEnabled)' == '' ">true</BuildEnabled>
 
     <!-- Global dirs -->
     <OutputPath>.</OutputPath>
@@ -101,6 +102,11 @@
     </BuildDependsOn>
   </PropertyGroup>
   
+  <!-- Provide the possibility to opt out of build -->
+  <PropertyGroup Condition=" !'$(BuildEnabled)' ">
+    <BuildDependsOn></BuildDependsOn>
+  </PropertyGroup>
+  
   <PropertyGroup>
     <TasqueBuildDependsOn>
       Substitute;
diff --git a/configure.ac b/configure.ac
index 8ccf967..1271093 100644
--- a/configure.ac
+++ b/configure.ac
@@ -138,8 +138,6 @@ AC_ARG_ENABLE(all_backends,
 	AC_HELP_STRING([--enable-all-backends],
 		[Enable all backends, including standard and experimental [default=no]]),
 		final_all_backends=$enableval, final_all_backends=no)
-AM_CONDITIONAL(ENABLE_ALL_BACKENDS, test "x$final_all_backends" != "xno")
-
 if test "x$final_all_backends" != "xno" ; then
    final_standard_backends=yes
    final_experimental_backends=yes
@@ -152,8 +150,6 @@ AC_ARG_ENABLE(standard_backends,
 	AC_HELP_STRING([--enable-standard-backends],
 		[Enable standard (RTM, SQLite) backends. [default=yes]]),
 		final_standard_backends=$enableval, final_standard_backends=yes)
-AM_CONDITIONAL(ENABLE_STANDARD_BACKENDS, test "x$final_standard_backends" != "xno")
-
 if test "x$final_standard_backends" != "xno" ; then
    final_backend_rtm=yes
    final_backend_sqlite=yes
@@ -166,8 +162,6 @@ AC_ARG_ENABLE(experimental_backends,
 	AC_HELP_STRING([--enable-experimental-backends],
 		[Enable experimental (Hiveminder, ICECore) backends. [default=no]]),
 		final_experimental_backends=$enableval, )
-AM_CONDITIONAL(ENABLE_EXPERIMENTAL_BACKENDS, test "x$final_experimental_backends" != "xno")
-
 if test "x$final_experimental_backends" != "xno" ; then
    final_backend_hiveminder=yes
    final_backend_icecore=yes
@@ -180,7 +174,7 @@ AC_ARG_ENABLE(backend_dummy,
 	AC_HELP_STRING([--enable-backend-dummy],
 		[Enable the Dummy (Debug) Backend [default=if --enable-debug: yes; else: no]]),
 		final_backend_dummy=$enableval, final_backend_dummy=$enable_debug)
-AM_CONDITIONAL(ENABLE_BACKEND_DUMMY, test "x$final_backend_dummy" != "xno")
+AC_SUBST(final_backend_dummy)
 
 #
 # Remember the Milk Backend
@@ -200,7 +194,7 @@ AC_ARG_ENABLE(backend_sqlite,
 if test "x$final_backend_sqlite" != "xno"; then
 	GAC_CHECK_MODULES([MONO_DATA_SQLITE], [Mono.Data.Sqlite])
 fi
-AM_CONDITIONAL(ENABLE_BACKEND_SQLITE, test "x$final_backend_sqlite" != "xno")
+AC_SUBST(final_backend_sqlite)
 
 #
 # ICEcore for IceBackend Support
@@ -209,7 +203,7 @@ AC_ARG_ENABLE(backend_icecore,
 	AC_HELP_STRING([--enable-backend-icecore],
 		[Enable the ICEcore Backend [default=no]]),
 		final_backend_icecore=$enableval, )
-AM_CONDITIONAL(ENABLE_BACKEND_ICECORE, test "x$final_backend_icecore" != "xno")
+AC_SUBST(final_backend_icecore)
 if test "x$final_backend_icecore" != "xno" ; then
        # FIXME : Is this the right way to do this ?
        PKG_CHECK_MODULES(ICE_DESKTOP, Novell.IceDesktop)
@@ -219,12 +213,11 @@ AC_SUBST(ICE_DESKTOP_LIBS)
 #
 # Evolution-Sharp for EDSBackend Support
 #
-
 AC_ARG_ENABLE(backend_eds,
        AC_HELP_STRING([--enable-backend-eds],
                [Enable the EDS Backend [default=no]]),
                final_backend_eds=$enableval, )
-AM_CONDITIONAL(ENABLE_BACKEND_EDS, test "x$final_backend_eds" != "xno")
+AC_SUBST(final_backend_eds)
 if test "x$final_backend_eds" != "xno" ; then
        # FIXME : Is this the right way to do this ?
        PKG_CHECK_MODULES(EVOLUTION_SHARP, evolution-sharp >= 0.18.1)
@@ -238,7 +231,7 @@ AC_ARG_ENABLE(backend_hiveminder,
 	AC_HELP_STRING([--enable-backend-hiveminder],
 		[Enable the Hiveminder Backend [default=no]]),
 		final_backend_hiveminder=$enableval, )
-AM_CONDITIONAL(ENABLE_BACKEND_HIVEMINDER, test "x$final_backend_hiveminder" != "xno")
+AC_SUBST(final_backend_hiveminder)
 
 #
 # If no backends were enabled,
@@ -252,7 +245,7 @@ if test "x$final_backend_dummy" = "xno" -a "x$final_backend_rtm" = "xno" \
 	final_backend_rtm=yes
 fi
 # Define ENABLE_BACKEND_RTM here so it only gets defined once
-AM_CONDITIONAL(ENABLE_BACKEND_RTM, test "x$final_backend_rtm" != "xno")
+AC_SUBST(final_backend_rtm)
 
 
 AC_CONFIG_FILES([
diff --git a/src/Addins/Backends/Dummy/DummyBackend.csproj b/src/Addins/Backends/Dummy/DummyBackend.csproj
index 3c8e04b..3af5bbf 100644
--- a/src/Addins/Backends/Dummy/DummyBackend.csproj
+++ b/src/Addins/Backends/Dummy/DummyBackend.csproj
@@ -16,6 +16,7 @@
     <RelPrefix Condition=" '$(RelPrefix)' == '' ">..\..\..\..\build\bin</RelPrefix>
     <TopSrcDir Condition=" '$(TopSrcDir)' == '' ">..\..\..\..</TopSrcDir>
     <ReleaseVersion>0.1.12</ReleaseVersion>
+    <BuildEnabled>$(EnableBackendDummy)</BuildEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'GtkDebug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/Addins/Backends/Hiveminder/HiveminderBackend.csproj b/src/Addins/Backends/Hiveminder/HiveminderBackend.csproj
index 63d7810..a5b58ba 100644
--- a/src/Addins/Backends/Hiveminder/HiveminderBackend.csproj
+++ b/src/Addins/Backends/Hiveminder/HiveminderBackend.csproj
@@ -16,6 +16,7 @@
     <RelPrefix Condition=" '$(RelPrefix)' == '' ">..\..\..\..\build\bin</RelPrefix>
     <TopSrcDir Condition=" '$(TopSrcDir)' == '' ">..\..\..\..</TopSrcDir>
     <ReleaseVersion>0.1.12</ReleaseVersion>
+    <BuildEnabled>$(EnableBackendHiveminder)</BuildEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'GtkDebug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/Addins/Backends/IceCore/IceCoreBackend.csproj b/src/Addins/Backends/IceCore/IceCoreBackend.csproj
index bacd353..65000e4 100644
--- a/src/Addins/Backends/IceCore/IceCoreBackend.csproj
+++ b/src/Addins/Backends/IceCore/IceCoreBackend.csproj
@@ -16,6 +16,7 @@
     <TopSrcDir Condition=" '$(TopSrcDir)' == '' ">..\..\..\..</TopSrcDir>
     <PackageName>tasque</PackageName>
     <ReleaseVersion>0.1.12</ReleaseVersion>
+    <BuildEnabled>$(EnableBackendIceCore)</BuildEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'GtkDebug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/Addins/Backends/Rtm/RtmBackend.csproj b/src/Addins/Backends/Rtm/RtmBackend.csproj
index 71abf8e..abd5164 100644
--- a/src/Addins/Backends/Rtm/RtmBackend.csproj
+++ b/src/Addins/Backends/Rtm/RtmBackend.csproj
@@ -16,6 +16,7 @@
     <RelPrefix Condition=" '$(RelPrefix)' == '' ">..\..\..\..\build\bin</RelPrefix>
     <TopSrcDir Condition=" '$(TopSrcDir)' == '' ">..\..\..\..</TopSrcDir>
     <ReleaseVersion>0.1.12</ReleaseVersion>
+    <BuildEnabled>$(EnableBackendRtm)</BuildEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'GtkDebug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/Addins/Backends/Sqlite/SqliteBackend.csproj b/src/Addins/Backends/Sqlite/SqliteBackend.csproj
index 3117772..47dff2b 100644
--- a/src/Addins/Backends/Sqlite/SqliteBackend.csproj
+++ b/src/Addins/Backends/Sqlite/SqliteBackend.csproj
@@ -16,6 +16,7 @@
     <RelPrefix Condition=" '$(RelPrefix)' == '' ">..\..\..\..\build\bin</RelPrefix>
     <TopSrcDir Condition=" '$(TopSrcDir)' == '' ">..\..\..\..</TopSrcDir>
     <ReleaseVersion>0.1.12</ReleaseVersion>
+    <BuildEnabled>$(EnableBackendSqlite)</BuildEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'GtkDebug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/Libraries/RtmNet/RtmNet.csproj b/src/Libraries/RtmNet/RtmNet.csproj
index 37147ef..66b8edb 100644
--- a/src/Libraries/RtmNet/RtmNet.csproj
+++ b/src/Libraries/RtmNet/RtmNet.csproj
@@ -16,6 +16,7 @@
     <RelPrefix Condition=" '$(RelPrefix)' == '' ">..\..\..\build\bin</RelPrefix>
     <TopSrcDir Condition=" '$(TopSrcDir)' == '' ">..\..\..</TopSrcDir>
     <ReleaseVersion>0.1.12</ReleaseVersion>
+    <BuildEnabled>$(EnableBackendRtm)</BuildEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]