diff options
| -rw-r--r-- | ChangeLog | 19 | ||||
| -rw-r--r-- | acconfig.h | 1 | ||||
| -rw-r--r-- | configure.in | 18 | ||||
| -rw-r--r-- | libnautilus-extensions/nautilus-file-utilities.c | 10 | ||||
| -rw-r--r-- | libnautilus-extensions/nautilus-file-utilities.h | 5 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-file-utilities.c | 10 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-file-utilities.h | 5 | ||||
| -rw-r--r-- | src/nautilus-navigation-window-menus.c | 8 | ||||
| -rw-r--r-- | src/nautilus-window-menus.c | 8 |
9 files changed, 82 insertions, 2 deletions
@@ -1,3 +1,22 @@ +2001-03-10 Mike Fleming <mfleming@eazel.com> + + reviewed by: <rslomkow@eazel.com> + + Bug 6826: + + Added --with-build-message to ./configure. A build message will + display in the about box if no EAZEL_TIMESTAMP (used by hourly builds) + has been set. + + The default build message for CVS builds "Development Version" + + * acconfig.h: + * configure.in: + * libnautilus-extensions/nautilus-file-utilities.c: + (nautilus_get_build_message): + * libnautilus-extensions/nautilus-file-utilities.h: + * src/nautilus-window-menus.c: (help_menu_about_nautilus_callback): + 2001-03-09 Darin Adler <darin@eazel.com> reviewed by: John Sullivan <sullivan@eazel.com> diff --git a/acconfig.h b/acconfig.h index 843200bf1..3f2d8b10a 100644 --- a/acconfig.h +++ b/acconfig.h @@ -1,3 +1,4 @@ +#undef NAUTILUS_BUILD_MESSAGE #undef EAZEL_BUILD_TIMESTAMP #undef EAZEL_SERVICES #undef ENABLE_NLS diff --git a/configure.in b/configure.in index 4ba5be586..2c3249b47 100644 --- a/configure.in +++ b/configure.in @@ -923,6 +923,7 @@ AC_ARG_ENABLE(more-warnings, [ --enable-more-warnings Maximum compiler warnings], set_more_warnings="$enableval",[ if test -f $srcdir/CVSVERSION; then + is_cvs_version=true set_more_warnings=yes else set_more_warnings=no @@ -959,6 +960,21 @@ else AC_MSG_RESULT(no) fi +dnl +dnl Define the build message (used in the Nautilus about box) +dnl CVSVERSION overrides +dnl + +NAUTILUS_BUILD_MESSAGE="" +AC_ARG_WITH(build-message, [ --with-build-message=MESSAGE Build (about box) message], NAUTILUS_BUILD_MESSAGE=$withval) + +if test -n "$is_cvs_version" +then + NAUTILUS_BUILD_MESSAGE="Development Build" +fi + +AC_DEFINE_UNQUOTED(NAUTILUS_BUILD_MESSAGE, "$NAUTILUS_BUILD_MESSAGE") + dnl dnl Define the build timestamp if given in the environment. @@ -1161,6 +1177,8 @@ echo dnl <= Snapshot things => echo " EAZEL_BUILD_TIMESTAMP : $EAZEL_BUILD_TIMESTAMP" +echo " +NAUTILUS_BUILD_MESSAGE : $NAUTILUS_BUILD_MESSAGE" echo echo " diff --git a/libnautilus-extensions/nautilus-file-utilities.c b/libnautilus-extensions/nautilus-file-utilities.c index 52caa9b1b..6d8e50494 100644 --- a/libnautilus-extensions/nautilus-file-utilities.c +++ b/libnautilus-extensions/nautilus-file-utilities.c @@ -1669,6 +1669,16 @@ nautilus_get_build_time_stamp (void) #endif } +char * +nautilus_get_build_message (void) +{ +#ifdef NAUTILUS_BUILD_MESSAGE + return g_strdup (NAUTILUS_BUILD_MESSAGE); +#else + return NULL; +#endif +} + #if !defined (NAUTILUS_OMIT_SELF_CHECK) void diff --git a/libnautilus-extensions/nautilus-file-utilities.h b/libnautilus-extensions/nautilus-file-utilities.h index df664182f..22266fd82 100644 --- a/libnautilus-extensions/nautilus-file-utilities.h +++ b/libnautilus-extensions/nautilus-file-utilities.h @@ -135,6 +135,11 @@ GnomeVFSResult nautilus_make_directory_and_parents (GnomeVFSURI */ char * nautilus_get_build_time_stamp (void); +/* Returns the "build message", which provides some information on build + * context. May return NULL. + */ +char * nautilus_get_build_message (void); + /* Return an allocated file name that is guranteed to be unique. */ char * nautilus_unique_temporary_file_name (void); char * nautilus_find_file_in_gnome_path (char *file); diff --git a/libnautilus-private/nautilus-file-utilities.c b/libnautilus-private/nautilus-file-utilities.c index 52caa9b1b..6d8e50494 100644 --- a/libnautilus-private/nautilus-file-utilities.c +++ b/libnautilus-private/nautilus-file-utilities.c @@ -1669,6 +1669,16 @@ nautilus_get_build_time_stamp (void) #endif } +char * +nautilus_get_build_message (void) +{ +#ifdef NAUTILUS_BUILD_MESSAGE + return g_strdup (NAUTILUS_BUILD_MESSAGE); +#else + return NULL; +#endif +} + #if !defined (NAUTILUS_OMIT_SELF_CHECK) void diff --git a/libnautilus-private/nautilus-file-utilities.h b/libnautilus-private/nautilus-file-utilities.h index df664182f..22266fd82 100644 --- a/libnautilus-private/nautilus-file-utilities.h +++ b/libnautilus-private/nautilus-file-utilities.h @@ -135,6 +135,11 @@ GnomeVFSResult nautilus_make_directory_and_parents (GnomeVFSURI */ char * nautilus_get_build_time_stamp (void); +/* Returns the "build message", which provides some information on build + * context. May return NULL. + */ +char * nautilus_get_build_message (void); + /* Return an allocated file name that is guranteed to be unique. */ char * nautilus_unique_temporary_file_name (void); char * nautilus_find_file_in_gnome_path (char *file); diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c index cbb5db874..f84f52c81 100644 --- a/src/nautilus-navigation-window-menus.c +++ b/src/nautilus-navigation-window-menus.c @@ -551,9 +551,15 @@ help_menu_about_nautilus_callback (BonoboUIComponent *component, if (about == NULL) { + /* timestamp overrides build message, because timestamp + * should only be set on tinderbox for hourly builds + */ time_stamp = nautilus_get_build_time_stamp (); if (time_stamp == NULL) { - time_stamp = g_strdup (""); + time_stamp = nautilus_get_build_message (); + if (time_stamp == NULL) { + time_stamp = g_strdup (""); + } } /* The copyright character in here is correct for diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c index cbb5db874..f84f52c81 100644 --- a/src/nautilus-window-menus.c +++ b/src/nautilus-window-menus.c @@ -551,9 +551,15 @@ help_menu_about_nautilus_callback (BonoboUIComponent *component, if (about == NULL) { + /* timestamp overrides build message, because timestamp + * should only be set on tinderbox for hourly builds + */ time_stamp = nautilus_get_build_time_stamp (); if (time_stamp == NULL) { - time_stamp = g_strdup (""); + time_stamp = nautilus_get_build_message (); + if (time_stamp == NULL) { + time_stamp = g_strdup (""); + } } /* The copyright character in here is correct for |