You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2018/12/12 20:29:37 UTC

svn commit: r1848793 - in /subversion/trunk: build/generator/gen_win.py subversion/libsvn_subr/win32_crashrpt.c

Author: brane
Date: Wed Dec 12 20:29:37 2018
New Revision: 1848793

URL: http://svn.apache.org/viewvc?rev=1848793&view=rev
Log:
Move the Windows crash reporter mail out of the source code and into
the build generator, where it belongs.

* build/generator/gen_win.py (WinGeneratorBase.get_win_defines):
   Define the SVN_WIN32_CRASHREPORT_EMAIL symbol at the same time as
   SVN_USE_WIN32_CRASHHANDLER.

* subversion/libsvn_subr/win32_crashrpt.c
  (CRASHREPORT_EMAIL): Removed.
  (svn__unhandled_exception_filter): Use SVN_WIN32_CRASHREPORT_EMAIL here.

Modified:
    subversion/trunk/build/generator/gen_win.py
    subversion/trunk/subversion/libsvn_subr/win32_crashrpt.c

Modified: subversion/trunk/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win.py?rev=1848793&r1=1848792&r2=1848793&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win.py (original)
+++ subversion/trunk/build/generator/gen_win.py Wed Dec 12 20:29:37 2018
@@ -736,6 +736,7 @@ class WinGeneratorBase(gen_win_dependenc
 
     if target.name.endswith('svn_subr'):
       fakedefines.append("SVN_USE_WIN32_CRASHHANDLER")
+      fakedefines.append('SVN_WIN32_CRASHREPORT_EMAIL="users@subversion.apache.org"')
 
     return fakedefines
 

Modified: subversion/trunk/subversion/libsvn_subr/win32_crashrpt.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/win32_crashrpt.c?rev=1848793&r1=1848792&r2=1848793&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/win32_crashrpt.c (original)
+++ subversion/trunk/subversion/libsvn_subr/win32_crashrpt.c Wed Dec 12 20:29:37 2018
@@ -45,9 +45,6 @@ typedef int win32_crashrpt__dummy;
 /*** Global variables ***/
 static HANDLE dbghelp_dll = INVALID_HANDLE_VALUE;
 
-/* Email address where the crash reports should be sent too. */
-#define CRASHREPORT_EMAIL "users@subversion.apache.org"
-
 #define DBGHELP_DLL "dbghelp.dll"
 
 #define LOGFILE_PREFIX "svn-crash-log"
@@ -774,7 +771,7 @@ svn__unhandled_exception_filter(PEXCEPTI
                   "usernames and passwords etc.)\n",
                   log_filename,
                   dmp_filename,
-                  CRASHREPORT_EMAIL);
+                  SVN_WIN32_CRASHREPORT_EMAIL);
 
   if (getenv("SVN_DBG_STACKTRACES_TO_STDERR") != NULL)
     {