[mono/monodevelop] 336839cf: Put the BUILD_REVISION checking back in, but in the right place. It was being overwritten by later PropertyGroups before.

"Cody Russell ([email protected])" <[email protected]> Fri, 15 Nov 2013 19:15:51 +0000
Newsgroups gmane.comp.gnome.mono.patches
Message-ID <000001425d30d838-e966220b-e12b-4537-9ba8-19eb41ce6654-000000@email.amazonses.com>
   Branch: refs/heads/master
     Home: https://github.com/mono/monodevelop
  Compare: https://github.com/mono/monodevelop/compare/e62279dd33c0...336839cf7304

   Commit: 336839cf73049186de6ec1d85070b46c4c95cd06
   Author: Cody Russell <[email protected]> (bratsche)
     Date: 2013-11-15 19:14:10 GMT
      URL: https://github.com/mono/monodevelop/commit/336839cf73049186de6ec1d85070b46c4c95cd06

Put the BUILD_REVISION checking back in, but in the right place. It was being overwritten by later PropertyGroups before.

Changed paths:
  M main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
  M main/src/core/MonoDevelop.Core/MonoDevelop.Core/LoggingService.cs

Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
===================================================================
@@ -68,6 +68,9 @@
     <GenerateDocumentation>true</GenerateDocumentation>
     <NoWarn>1591;1573</NoWarn>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(BUILD_REVISION)' != ''">
+    <DefineConstants>$(DefineConstants);ENABLE_RAYGUN</DefineConstants>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="Mono.Posix" />

Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Core/LoggingService.cs
===================================================================
@@ -101,10 +101,12 @@ static LoggingService ()
 
 			timestamp = DateTime.Now;
 
+#if ENABLE_RAYGUN
 			string raygunKey = BrandingService.GetString ("RaygunApiKey");
 			if (raygunKey != null) {
 				raygunClient = new RaygunClient (raygunKey);
 			}
+#endif
 
 			//remove the default trace listener on .NET, it throws up horrible dialog boxes for asserts
 			System.Diagnostics.Debug.Listeners.Clear ();


_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches