[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: branch: master updated (1.0-20070526-67-g57b2848)
The branch, master has been updated
via 57b2848a7e69d19e18ac03a1264cb55d41c65d0e (commit)
from daa5d16aee1f0ec58cced5ca835dcb4f53339339 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
gattrib/src/g_rc.c | 3 ++-
gattrib/src/gattrib.c | 4 ++--
gattrib/src/x_dialog.c | 2 +-
gnetlist/src/gnetlist.c | 4 ++--
gschem/src/g_rc.c | 3 ++-
gschem/src/gschem.c | 5 +++--
gschem/src/x_dialog.c | 5 +++--
gsymcheck/src/g_rc.c | 3 ++-
gsymcheck/src/gsymcheck.c | 3 ++-
libgeda/include/defines.h | 13 ++++++++-----
utils/gschlas/g_rc.c | 3 ++-
utils/gschlas/gschlas.c | 2 +-
12 files changed, 30 insertions(+), 20 deletions(-)
=================
Commit Messages
=================
commit 57b2848a7e69d19e18ac03a1264cb55d41c65d0e
Author: Ales Hvezda <ahvezda@xxxxxxxxxxxxxxx>
Date: Mon Jun 25 22:31:07 2007 -0400
Changed/updated the #define mechanism for creating custom gEDA/gaf versions.
Previously this mechanism was used to create custom versions of gEDA/gaf.
With the coming of stable and development versions of gEDA/gaf, this
mechanism was changed so that end users can tell the difference between
a stable release vs a development release (by looking at the version string).
The CUSTOM_VERSION #define was changed PREPEND_VERSION_STRING and is now
prepended to any strings that output the VERSION string.
:100644 100644 4ce7959... 95c9728... M gattrib/src/g_rc.c
:100644 100644 0b3bb18... 2e95db4... M gattrib/src/gattrib.c
:100644 100644 5a28cb9... 67ad1b6... M gattrib/src/x_dialog.c
:100644 100644 9699be1... abdd10b... M gnetlist/src/gnetlist.c
:100644 100644 e3ce92d... b582106... M gschem/src/g_rc.c
:100644 100644 b2b7369... e109eba... M gschem/src/gschem.c
:100644 100644 fcc429f... 511630c... M gschem/src/x_dialog.c
:100644 100644 0e2b96a... c9bee24... M gsymcheck/src/g_rc.c
:100644 100644 8c730c5... 3c3fde7... M gsymcheck/src/gsymcheck.c
:100644 100644 43bd984... c42f613... M libgeda/include/defines.h
:100644 100644 7a98926... cec9313... M utils/gschlas/g_rc.c
:100644 100644 3b0503a... c4443c9... M utils/gschlas/gschlas.c
=========
Changes
=========
commit 57b2848a7e69d19e18ac03a1264cb55d41c65d0e
Author: Ales Hvezda <ahvezda@xxxxxxxxxxxxxxx>
Date: Mon Jun 25 22:31:07 2007 -0400
Changed/updated the #define mechanism for creating custom gEDA/gaf versions.
Previously this mechanism was used to create custom versions of gEDA/gaf.
With the coming of stable and development versions of gEDA/gaf, this
mechanism was changed so that end users can tell the difference between
a stable release vs a development release (by looking at the version string).
The CUSTOM_VERSION #define was changed PREPEND_VERSION_STRING and is now
prepended to any strings that output the VERSION string.
diff --git a/gattrib/src/g_rc.c b/gattrib/src/g_rc.c
index 4ce7959..95c9728 100644
--- a/gattrib/src/g_rc.c
+++ b/gattrib/src/g_rc.c
@@ -70,7 +70,8 @@ SCM g_rc_gattrib_version(SCM version)
if (g_strcasecmp (SCM_STRING_CHARS (version), VERSION) != 0) {
fprintf(stderr,
- "You are running gEDA version [%s%s],\n", VERSION, CUSTOM_VERSION);
+ "You are running gEDA version [%s%s],\n", PREPEND_VERSION_STRING,
+ VERSION);
fprintf(stderr,
"but you have a version [%s] gattribrc file:\n[%s]\n",
SCM_STRING_CHARS (version), rc_filename);
diff --git a/gattrib/src/gattrib.c b/gattrib/src/gattrib.c
index 0b3bb18..2e95db4 100644
--- a/gattrib/src/gattrib.c
+++ b/gattrib/src/gattrib.c
@@ -152,7 +152,7 @@ void gattrib_main(void *closure, int argc, char *argv[])
g_free (logfile);
s_log_message
- ("gEDA/gattrib version %s%s\n", VERSION, CUSTOM_VERSION);
+ ("gEDA/gattrib version %s%s\n", PREPEND_VERSION_STRING, VERSION);
s_log_message
("gEDA/gattrib comes with ABSOLUTELY NO WARRANTY; see COPYING for more details.\n");
s_log_message
@@ -164,7 +164,7 @@ void gattrib_main(void *closure, int argc, char *argv[])
fflush(stderr);
fflush(stdout);
fprintf(stderr,
- "gEDA/gattrib version %s%s\n", VERSION, CUSTOM_VERSION);
+ "gEDA/gattrib version %s%s\n", PREPEND_VERSION_STRING, VERSION);
fprintf(stderr,
"gEDA/gattrib comes with ABSOLUTELY NO WARRANTY; see COPYING for more details.\n");
fprintf(stderr,
diff --git a/gattrib/src/x_dialog.c b/gattrib/src/x_dialog.c
index 5a28cb9..67ad1b6 100644
--- a/gattrib/src/x_dialog.c
+++ b/gattrib/src/x_dialog.c
@@ -349,7 +349,7 @@ void x_dialog_about_dialog()
dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
GTK_MESSAGE_INFO,
GTK_BUTTONS_OK,
- string, VERSION, CUSTOM_VERSION);
+ string, PREPEND_VERSION_STRING, VERSION);
gtk_window_set_title(GTK_WINDOW(dialog), "About...");
diff --git a/gnetlist/src/gnetlist.c b/gnetlist/src/gnetlist.c
index 9699be1..abdd10b 100644
--- a/gnetlist/src/gnetlist.c
+++ b/gnetlist/src/gnetlist.c
@@ -155,7 +155,7 @@ void main_prog(void *closure, int argc, char *argv[])
s_log_init (logfile);
g_free (logfile);
- s_log_message("gEDA/gnetlist version %s%s\n", VERSION, CUSTOM_VERSION);
+ s_log_message("gEDA/gnetlist version %s%s\n", PREPEND_VERSION_STRING, VERSION);
s_log_message
("gEDA/gnetlist comes with ABSOLUTELY NO WARRANTY; see COPYING for more details.\n");
s_log_message
@@ -164,7 +164,7 @@ void main_prog(void *closure, int argc, char *argv[])
("conditions; please see the COPYING file for more details.\n\n");
if (!quiet_mode) {
- fprintf(stderr, "gEDA/gnetlist version %s%s\n", VERSION, CUSTOM_VERSION);
+ fprintf(stderr, "gEDA/gnetlist version %s%s\n", PREPEND_VERSION_STRING, VERSION);
fprintf(stderr,
"gEDA/gnetlist comes with ABSOLUTELY NO WARRANTY; see COPYING for more details.\n");
fprintf(stderr,
diff --git a/gschem/src/g_rc.c b/gschem/src/g_rc.c
index e3ce92d..b582106 100644
--- a/gschem/src/g_rc.c
+++ b/gschem/src/g_rc.c
@@ -105,7 +105,8 @@ SCM g_rc_gschem_version(SCM version)
if (g_strcasecmp (SCM_STRING_CHARS (version), VERSION) != 0) {
fprintf(stderr,
_("Found a version [%s%s] gschemrc file:\n[%s]\n"),
- SCM_STRING_CHARS (version), CUSTOM_VERSION, rc_filename);
+ PREPEND_VERSION_STRING, SCM_STRING_CHARS (version),
+ rc_filename);
fprintf(stderr,
_("While gschem is in ALPHA, "
"please be sure that you have the latest rc file.\n"));
diff --git a/gschem/src/gschem.c b/gschem/src/gschem.c
index b2b7369..e109eba 100644
--- a/gschem/src/gschem.c
+++ b/gschem/src/gschem.c
@@ -188,7 +188,8 @@ void main_prog(void *closure, int argc, char *argv[])
#endif
s_log_message(
- _("gEDA/gschem version %s%s\n"), VERSION, CUSTOM_VERSION);
+ _("gEDA/gschem version %s%s\n"), PREPEND_VERSION_STRING,
+ VERSION);
s_log_message(
_("gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more details.\n"));
s_log_message(
@@ -198,7 +199,7 @@ void main_prog(void *closure, int argc, char *argv[])
if (!quiet_mode) {
fprintf(stderr,
- _("gEDA/gschem version %s%s\n"), VERSION, CUSTOM_VERSION);
+ _("gEDA/gschem version %s%s\n"), PREPEND_VERSION_STRING, VERSION);
fprintf(stderr,
_("gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more details.\n"));
fprintf(stderr,
diff --git a/gschem/src/x_dialog.c b/gschem/src/x_dialog.c
index fcc429f..511630c 100644
--- a/gschem/src/x_dialog.c
+++ b/gschem/src/x_dialog.c
@@ -2032,14 +2032,15 @@ void about_dialog (TOPLEVEL *w_current)
gtk_label_set_use_markup (GTK_LABEL(label), TRUE);
gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
- string = g_strdup_printf(_("<b>gschem version %s%s</b>"), VERSION, CUSTOM_VERSION);
+ string = g_strdup_printf(_("<b>gschem version %s%s</b>"),
+ PREPEND_VERSION_STRING, VERSION);
label = gtk_label_new (string);
gtk_label_set_use_markup (GTK_LABEL(label), TRUE);
g_free(string);
gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
label = gtk_label_new ( _("Written by:\n"
- "Ales V. Hvezda\n"
+ "Ales Hvezda\n"
"ahvezda@xxxxxxxxxxxxx\n"
"And many others (See AUTHORS file)"));
gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
diff --git a/gsymcheck/src/g_rc.c b/gsymcheck/src/g_rc.c
index 0e2b96a..c9bee24 100644
--- a/gsymcheck/src/g_rc.c
+++ b/gsymcheck/src/g_rc.c
@@ -117,7 +117,8 @@ SCM g_rc_gsymcheck_version(SCM version)
if (g_strcasecmp (SCM_STRING_CHARS (version), VERSION) != 0) {
fprintf(stderr,
- "You are running gEDA version [%s%s],\n", VERSION, CUSTOM_VERSION);
+ "You are running gEDA version [%s%s],\n", PREPEND_VERSION_STRING,
+ VERSION);
fprintf(stderr,
"but you have a version [%s] gsymcheck file:\n[%s]\n",
SCM_STRING_CHARS (version), rc_filename);
diff --git a/gsymcheck/src/gsymcheck.c b/gsymcheck/src/gsymcheck.c
index 8c730c5..3c3fde7 100644
--- a/gsymcheck/src/gsymcheck.c
+++ b/gsymcheck/src/gsymcheck.c
@@ -78,7 +78,8 @@ main_prog(void *closure, int argc, char *argv[])
if (!quiet_mode)
{
s_log_message(
- "gEDA/gsymcheck version %s%s\n", VERSION, CUSTOM_VERSION);
+ "gEDA/gsymcheck version %s%s\n", PREPEND_VERSION_STRING,
+ VERSION);
s_log_message(
"gEDA/symcheck comes with ABSOLUTELY NO WARRANTY; see COPYING for more details.\n");
s_log_message(
diff --git a/libgeda/include/defines.h b/libgeda/include/defines.h
index 43bd984..c42f613 100644
--- a/libgeda/include/defines.h
+++ b/libgeda/include/defines.h
@@ -33,12 +33,15 @@
/* 20030921 wasn't a real version, just a MinGW test version, but it is */
/* out there */
-/* Set this empty string to something interesting if creating a custom */
-/* version of gEDA/gaf. This string is appended to all messages that */
+/* Set this string to something interesting to create a custom */
+/* version of gEDA/gaf. This string is prepended to all messages that */
/* output the program's VERSION. You would set this if you are creating a */
-/* specific custom version of gEDA/gaf. For example if you set this string */
-/* to "-TEST", the resulting output would be 20060906-TEST. */
-#define CUSTOM_VERSION ""
+/* specific custom version of gEDA/gaf. This string is also used to */
+/* distinguish between stable and development versions of gEDA/gaf. */
+/* For example, if you set this string to "1.0-", the resulting output is: */
+/* 1.0-20060906. */
+#define PREPEND_VERSION_STRING "1.1-"
+
/* for color mechanism used in gschem */
#define MAX_COLORS 25
diff --git a/utils/gschlas/g_rc.c b/utils/gschlas/g_rc.c
index 7a98926..cec9313 100644
--- a/utils/gschlas/g_rc.c
+++ b/utils/gschlas/g_rc.c
@@ -117,7 +117,8 @@ SCM g_rc_gschlas_version(SCM version)
if (g_strcasecmp (SCM_STRING_CHARS (version), VERSION) != 0) {
fprintf(stderr, "Found a version [%s%s] gschlas file:\n[%s]\n",
- SCM_STRING_CHARS (version), CUSTOM_VERSION, rc_filename ? rc_filename : "unknown");
+ PREPEND_VERSION_STRING, SCM_STRING_CHARS (version),
+ rc_filename ? rc_filename : "unknown");
fprintf(stderr,
"While gschlas is in ALPHA, please be sure that you have the latest rc file.\n");
return SCM_BOOL_F;
diff --git a/utils/gschlas/gschlas.c b/utils/gschlas/gschlas.c
index 3b0503a..c4443c9 100644
--- a/utils/gschlas/gschlas.c
+++ b/utils/gschlas/gschlas.c
@@ -79,7 +79,7 @@ main_prog(void *closure, int argc, char *argv[])
if (!quiet_mode)
{
s_log_message(
- "gEDA/gschlas version %s%s\n", VERSION, CUSTOM_VERSION);
+ "gEDA/gschlas version %s%s\n", PREPEND_VERSION_STRING, VERSION);
s_log_message(
"gEDA/gschlas comes with ABSOLUTELY NO WARRANTY; see COPYING for more details.\n");
s_log_message(
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs