License stuff

Common/CommandLine.cpp

-// $Id: CommandLine.cpp,v 1.9 2003-03-01 22:36:36 geuzaine Exp $
+// $Id: CommandLine.cpp,v 1.10 2003-03-02 00:16:13 geuzaine Exp $
 //
 // Copyright (C) 1997 - 2003 C. Geuzaine, J.-F. Remacle
 //
@@ -49,8 +49,10 @@ char *TheBgmFileName = NULL, *TheOptString = NULL;
 char gmsh_progname[]  = "This is Gmsh" ;
 char gmsh_copyright[] = "Copyright (C) 1997-2003 Jean-Francois Remacle and Christophe Geuzaine";
 char gmsh_version[]   = "Version        : " ;
-char gmsh_os[]        = "Build OS       : " GMSH_OS ;
+char gmsh_license[]   = "License        : GNU GPL" ;
 char gmsh_gui[]       = "GUI toolkit    : " ;
+char gmsh_os[]        = "Build OS       : " GMSH_OS ;
+char gmsh_options[]   = "Build options  : " ;
 char gmsh_date[]      = "Build date     : " GMSH_DATE ;
 char gmsh_host[]      = "Build host     : " GMSH_HOST ;
 char gmsh_packager[]  = "Packager       : " GMSH_PACKAGER ;
@@ -108,6 +110,26 @@ void Print_Usage(char *name){
   Msg(DIRECT, "  -help                 show this message");
 }
 
+char *Get_BuildOptions(void)
+{
+  static int first=1;
+  static char opt[128] = "";
+  
+  if(first){
+#if defined(HAVE_GSL)
+    strcat(opt, "GSL, ");
+#endif
+#if defined(HAVE_TRIANGLE)
+    strcat(opt, "Triangle, ");
+#endif
+#if defined(HAVE_LIBJPEG)
+    strcat(opt, "JPEG ");
+#endif
+    first = 0;
+  }
+  return opt;
+}
+
 // *INDENT-ON*
 
 void Get_Options(int argc, char *argv[], int *nbfiles)
@@ -380,15 +402,18 @@ void Get_Options(int argc, char *argv[], int *nbfiles)
         exit(1);
       }
       else if(!strcmp(argv[i] + 1, "info") || !strcmp(argv[i] + 1, "-info")) {
+        fprintf(stderr, "%s\n", gmsh_copyright);
         fprintf(stderr, "%s%d.%d.%d\n", gmsh_version, GMSH_MAJOR_VERSION,
                 GMSH_MINOR_VERSION, GMSH_PATCH_VERSION);
-        fprintf(stderr, "%s\n", gmsh_os);
 #if defined(HAVE_FLTK)
         fprintf(stderr, "%sFLTK %d.%d.%d\n", gmsh_gui, FL_MAJOR_VERSION,
                 FL_MINOR_VERSION, FL_PATCH_VERSION);
 #else
         fprintf(stderr, "%snone\n", gmsh_gui);
 #endif
+        fprintf(stderr, "%s\n", gmsh_license);
+        fprintf(stderr, "%s\n", gmsh_os);
+        fprintf(stderr, "%s%s\n", gmsh_options, Get_BuildOptions());
         fprintf(stderr, "%s\n", gmsh_date);
         fprintf(stderr, "%s\n", gmsh_host);
         fprintf(stderr, "%s\n", gmsh_packager);

Common/CommandLine.h

@@ -22,11 +22,12 @@
 
 extern char gmsh_progname[], gmsh_copyright[], gmsh_version[], gmsh_os[];
 extern char gmsh_date[], gmsh_host[], gmsh_packager[], gmsh_url[];
-extern char gmsh_email[], gmsh_gui[];
+extern char gmsh_email[], gmsh_gui[], gmsh_options[], gmsh_license[];
 
 extern char *TheFileNameTab[MAX_OPEN_FILES], *TheBgmFileName, *TheOptString;
 
 void Get_Options(int argc, char *argv[], int *nbfiles);
 void Print_Usage(char *name);
+char *Get_BuildOptions(void);
 
 #endif

Common/Makefile

-# $Id: Makefile,v 1.39 2003-02-23 05:51:27 geuzaine Exp $
+# $Id: Makefile,v 1.40 2003-03-02 00:16:13 geuzaine Exp $
 
 include ../variables
 
@@ -13,7 +13,8 @@ SRC = Context.cpp\
       CommandLine.cpp\
       Timer.cpp\
       ColorTable.cpp\
-      Trackball.cpp
+      Trackball.cpp\
+      GPL.cpp
 
 OBJ = ${SRC:.cpp=.o}
 

Fltk/Callbacks.cpp

-// $Id: Callbacks.cpp,v 1.166 2003-03-01 22:36:37 geuzaine Exp $
+// $Id: Callbacks.cpp,v 1.167 2003-03-02 00:16:13 geuzaine Exp $
 //
 // Copyright (C) 1997 - 2003 C. Geuzaine, J.-F. Remacle
 //
@@ -1336,6 +1336,14 @@ void help_command_line_cb(CALLBACK_ARGS)
   WID->create_message_window();
 }
 
+void help_license_cb(CALLBACK_ARGS)
+{
+  extern void print_gpl();
+  Msg(DIRECT, "");
+  print_gpl();
+  WID->create_message_window();
+}
+
 void help_about_cb(CALLBACK_ARGS)
 {
   WID->create_about_window();

Fltk/Callbacks.h

@@ -140,6 +140,7 @@ void visibility_ok_cb(CALLBACK_ARGS) ;
 
 void help_short_cb(CALLBACK_ARGS) ;
 void help_command_line_cb(CALLBACK_ARGS) ;
+void help_license_cb(CALLBACK_ARGS) ;
 void help_about_cb(CALLBACK_ARGS) ;
 
 // Module Menu

Fltk/GUI.cpp

-// $Id: GUI.cpp,v 1.229 2003-03-01 22:36:37 geuzaine Exp $
+// $Id: GUI.cpp,v 1.230 2003-03-02 00:16:13 geuzaine Exp $
 //
 // Copyright (C) 1997 - 2003 C. Geuzaine, J.-F. Remacle
 //
@@ -3249,13 +3249,17 @@ void GUI::create_about_window()
     sprintf(buffer, "@c@.Version: %d.%d.%d", GMSH_MAJOR_VERSION,
             GMSH_MINOR_VERSION, GMSH_PATCH_VERSION);
     o->add(buffer);
-    sprintf(buffer, "@c@.Build date: %s", GMSH_DATE);
-    o->add(buffer);
-    sprintf(buffer, "@c@.Build OS: %s", GMSH_OS);
+    sprintf(buffer, "@c@.License: GNU GPL");
     o->add(buffer);
     sprintf(buffer, "@c@.Graphical user interface toolkit: FLTK %d.%d.%d",
             FL_MAJOR_VERSION, FL_MINOR_VERSION, FL_PATCH_VERSION);
     o->add(buffer);
+    sprintf(buffer, "@c@.Build OS: %s", GMSH_OS);
+    o->add(buffer);
+    sprintf(buffer, "@c@.Build options: %s", Get_BuildOptions());
+    o->add(buffer);
+    sprintf(buffer, "@c@.Build date: %s", GMSH_DATE);
+    o->add(buffer);
     sprintf(buffer, "@c@.Build host: %s", GMSH_HOST);
     o->add(buffer);
     sprintf(buffer, "@c@.Packaged by: %s", GMSH_PACKAGER);
@@ -3265,6 +3269,12 @@ void GUI::create_about_window()
     o->add("");
   }
 
+  {
+    Fl_Button *o =
+      new Fl_Button(width - 2*BB - 2*WB, height - BH - WB, BB, BH, "License");
+    o->callback(help_license_cb);
+  }
+
   {
     Fl_Return_Button *o =
       new Fl_Return_Button(width - BB - WB, height - BH - WB, BB, BH, "OK");

Fltk/Main.cpp

-// $Id: Main.cpp,v 1.44 2003-03-01 22:36:38 geuzaine Exp $
+// $Id: Main.cpp,v 1.45 2003-03-02 00:16:13 geuzaine Exp $
 //
 // Copyright (C) 1997 - 2003 C. Geuzaine, J.-F. Remacle
 //
@@ -172,6 +172,7 @@ int main(int argc, char *argv[])
 
   Msg(LOG_INFO, "-------------------------------------------------------");
   Msg(LOG_INFO, gmsh_os);
+  Msg(LOG_INFO, "%s%s", gmsh_options, Get_BuildOptions());
   Msg(LOG_INFO, gmsh_date);
   Msg(LOG_INFO, gmsh_host);
   Msg(LOG_INFO, gmsh_packager);