Updated version number and README. Makefile can now change program version label, with 'make version LABEL=2.whatever

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@838 416bcca6-2ee7-4201-b75f-2eb2f807beb1

Makefile

@@ -225,7 +225,7 @@ endif
 .PHONY : all debug release clean depend zip version force install uninstall
 
 # This is the list of the objects we want to build. Dependancies are built by "make depend" automatically.
-OBJ = $(OBJDIR)/main.o $(OBJDIR)/init.o $(OBJDIR)/graph.o $(OBJDIR)/sdlscreen.o  $(OBJDIR)/misc.o $(OBJDIR)/special.o $(OBJDIR)/buttons.o $(OBJDIR)/palette.o $(OBJDIR)/help.o $(OBJDIR)/operatio.o $(OBJDIR)/pages.o $(OBJDIR)/loadsave.o $(OBJDIR)/readline.o $(OBJDIR)/engine.o $(OBJDIR)/filesel.o $(OBJDIR)/op_c.o $(OBJDIR)/readini.o $(OBJDIR)/saveini.o $(OBJDIR)/shade.o $(OBJDIR)/keyboard.o $(OBJDIR)/io.o $(OBJDIR)/version.o $(OBJDIR)/text.o $(OBJDIR)/SFont.o $(OBJDIR)/setup.o $(OBJDIR)/pxsimple.o $(OBJDIR)/pxtall.o $(OBJDIR)/pxwide.o $(OBJDIR)/pxdouble.o $(OBJDIR)/pxtriple.o $(OBJDIR)/pxtall2.o $(OBJDIR)/pxwide2.o $(OBJDIR)/pxquad.o $(OBJDIR)/windows.o $(OBJDIR)/brush.o $(OBJDIR)/realpath.o $(OBJDIR)/mountlist.o $(OBJDIR)/input.o $(OBJDIR)/hotkeys.o $(OBJDIR)/transform.o
+OBJ = $(OBJDIR)/main.o $(OBJDIR)/init.o $(OBJDIR)/graph.o $(OBJDIR)/sdlscreen.o  $(OBJDIR)/misc.o $(OBJDIR)/special.o $(OBJDIR)/buttons.o $(OBJDIR)/palette.o $(OBJDIR)/help.o $(OBJDIR)/operatio.o $(OBJDIR)/pages.o $(OBJDIR)/loadsave.o $(OBJDIR)/readline.o $(OBJDIR)/engine.o $(OBJDIR)/filesel.o $(OBJDIR)/op_c.o $(OBJDIR)/readini.o $(OBJDIR)/saveini.o $(OBJDIR)/shade.o $(OBJDIR)/keyboard.o $(OBJDIR)/io.o $(OBJDIR)/version.o $(OBJDIR)/text.o $(OBJDIR)/SFont.o $(OBJDIR)/setup.o $(OBJDIR)/pxsimple.o $(OBJDIR)/pxtall.o $(OBJDIR)/pxwide.o $(OBJDIR)/pxdouble.o $(OBJDIR)/pxtriple.o $(OBJDIR)/pxtall2.o $(OBJDIR)/pxwide2.o $(OBJDIR)/pxquad.o $(OBJDIR)/windows.o $(OBJDIR)/brush.o $(OBJDIR)/realpath.o $(OBJDIR)/mountlist.o $(OBJDIR)/input.o $(OBJDIR)/hotkeys.o $(OBJDIR)/transform.o $(OBJDIR)/pversion.o 
 
 all : $(BIN)
 
@@ -248,11 +248,22 @@ $(BIN) : $(OBJ) $(OBJRES)
 # SVN revision number
 version.c :
 	echo "char SVN_revision[]=\"`svnversion`\";" > version.c
+ifeq ($(LABEL),)
+else
+	echo "char Program_version[]=\"$(LABEL)\";" > pversion.c
+endif
+
+version : delversion delpversion version.c pversion.c $(OBJDIR)/version.o $(OBJDIR)/pversion.o all
 
-version : delversion version.c $(OBJDIR)/version.o
 
 delversion :
 	$(DELCOMMAND) version.c
+	
+delpversion :
+ifeq ($(LABEL),)
+else
+	$(DELCOMMAND) pversion.c
+endif
 
 $(OBJDIR)/%.o :
 	$(if $(wildcard $(OBJDIR)),,$(MKDIR) $(OBJDIR))

Makefile.dep

@@ -3,8 +3,8 @@ $(OBJDIR)/brush.o: brush.c global.h struct.h const.h graph.h misc.h errors.h \
   windows.h sdlscreen.h brush.h
 $(OBJDIR)/buttons.o: buttons.c const.h struct.h global.h misc.h graph.h engine.h \
   readline.h filesel.h loadsave.h init.h buttons.h operatio.h pages.h \
-  errors.h readini.h saveini.h shade.h io.h help.h text.h sdlscreen.h \
+  palette.h errors.h readini.h saveini.h shade.h io.h help.h text.h \
-  windows.h brush.h input.h
+  sdlscreen.h windows.h brush.h input.h
 $(OBJDIR)/engine.o: engine.c const.h struct.h global.h graph.h misc.h special.h \
   buttons.h operatio.h shade.h errors.h sdlscreen.h windows.h brush.h \
   input.h engine.h
@@ -13,7 +13,7 @@ $(OBJDIR)/filesel.o: filesel.c const.h struct.h global.h misc.h errors.h io.h \
   input.h help.h filesel.h
 $(OBJDIR)/graph.o: graph.c global.h struct.h const.h engine.h buttons.h pages.h \
   errors.h sdlscreen.h graph.h misc.h pxsimple.h pxtall.h pxwide.h \
-  pxdouble.h pxtriple.h pxwide2.h pxtall2.h pxquad.h windows.h
+  pxdouble.h pxtriple.h pxwide2.h pxtall2.h pxquad.h windows.h input.h
 $(OBJDIR)/help.o: help.c const.h struct.h global.h misc.h engine.h helpfile.h \
   help.h sdlscreen.h text.h keyboard.h windows.h input.h hotkeys.h \
   errors.h
@@ -41,6 +41,7 @@ $(OBJDIR)/pages.o: pages.c global.h struct.h const.h pages.h errors.h misc.h \
 $(OBJDIR)/palette.o: palette.c const.h struct.h global.h misc.h engine.h readline.h \
   buttons.h pages.h help.h sdlscreen.h errors.h op_c.h windows.h input.h \
   palette.h shade.h
+$(OBJDIR)/pversion.o: pversion.c
 $(OBJDIR)/pxdouble.o: pxdouble.c global.h struct.h const.h sdlscreen.h misc.h \
   pxdouble.h pxwide.h
 $(OBJDIR)/pxquad.o: pxquad.c global.h struct.h const.h sdlscreen.h misc.h pxquad.h

buttons.c

@@ -51,6 +51,9 @@
 #include "brush.h"
 #include "input.h"
 
+extern char SVN_revision[]; // generated in version.c
+extern char Program_version[]; // generated in pversion.c
+
 extern short Old_MX;
 extern short Old_MY;
 
@@ -113,7 +116,7 @@ void Button_Message_initial(void)
   char  str[21];
   int   x_pos,offs_y,x,y;
 
-  sprintf(str,"GrafX %d.%.2d%s%s",VERSION1, VERSION2, ALPHA_BETA,PERCENTAGE_VERSION);
+  sprintf(str,"GrafX2 version %s.%s",Program_version,SVN_revision);
   Open_window(260,172,str);
 
   Window_display_frame_in(10,20,239,62);

const.h

@@ -28,12 +28,10 @@
 
 #define M_2PI 6.28318530717958647692528676656 ///< Hmm, pie...
 
-#define PERCENTAGE_VERSION     "99.0%"  ///< Version label, for display purpose
 #define VERSION1                  2     ///< Version number for gfx2.cfg (1/4)
 #define VERSION2                  0     ///< Version number for gfx2.cfg (2/4)
 #define BETA1                     98    ///< Version number for gfx2.cfg (3/4)
 #define BETA2                     0     ///< Version number for gfx2.cfg (4/4)
-#define ALPHA_BETA                "ß"   ///< Status of Grafx2...
 #define MAX_VIDEO_MODES           100   ///< Maximum number of video modes Grafx2 can propose.
 #define NB_SHORTCUTS              134   ///< Number of actions that can have a key combination associated to it.
 #define NB_ZOOM_FACTORS           12    ///< Number of zoom levels available in the magnifier.

doc/README.txt

@@ -27,10 +27,11 @@ http://code.google.com/p/grafx2 for latest news and bugfixed versions.
 
 === HELP ===
 
-If you are in trouble when using the program, don't forget you can always press
+Remember that right-clicking and left-clicking often have different functions,
-the <F1> key inside it to get some help. You can also check the wiki at
+even on menu buttons. If you are in trouble when using the program, press <F1>
-http://code.google.com/p/grafx2/wiki for some more information. If you've hidden
+to get contextual help. You can also check the wiki at
-the menu and you're stuck, press <F10> to show it again.
+http://code.google.com/p/grafx2/wiki for some more information.
+If you've hidden the menu and you're stuck, press <F10> to show it again.
 
 === LICENSE ===
 
@@ -45,36 +46,51 @@ own licenses:
 - zlib: (on Windows) see doc/README-zlib1.txt
 The font Tuffy.ttf included as a sample in the fonts/ directory is public domain.
 
+The source code of Grafx2 should always be distributed along with the
+executable; You can normally find it in a packed archive whose name begins by
+"src". The source code is also available on the web site, either by accessing
+the Subversion repository:
+http://grafx2.googlecode.com/svn/trunk/
+or you can find the latest versions as packed archives:
+http://code.google.com/p/grafx2/downloads/list
+
 === COMPILING ===
 
+See the file COMPILING.txt for compiling instructions.
+There's also a page on the wiki:
 http://code.google.com/p/grafx2/wiki/Compiling
 
 === AUTHORS AND SUPPORT ===
 
 To watch the full credits list, in the program, click '?' then 'Credits'.
 
-Send bugs and feature requests to our bugtracker:
+Please report bugs and request features on the bugtracker:
 http://code.google.com/p/grafx2/issues/list
 
+E-mail: grafx2@googlegroups.com
+It's a public mailing-list, so be aware that your message will be visible at:
+http://groups.google.com/group/grafx2
+
 Sends greetings and glops to pouet.net : http://pouet.net/prod.php?which=51865
 
 === HISTORY ===
 
 Short revision history :
-  * 04/2009 99.0% Many new features and critical fixes
+  * 06/2009 2.0       Completed the features planned by Sunset Design.
-  * 01/2009 98.0% Now running Linux, Windows, Mac OS X, BeOS, Haiku,
+  * 04/2009 2.0b99.0% Many new features and critical fixes.
-                  AmigaOS 3.x and 4, MorphOS, SkyOS and gp2x.
+  * 01/2009 2.0b98.0% Now running Linux, Windows, Mac OS X, BeOS, Haiku,
-  * 10/2008 97.0% Our first public beta release
+                      AmigaOS 3.x and 4, MorphOS, SkyOS and gp2x.
-  * 07/2008       Our first public alpha release, Windows and Linux only
+  * 10/2008 2.0b97.0% Our first public beta release.
-  * 04/2007       Start of this project and port to SDL
+  * 07/2008           Our first public alpha release, Windows and Linux only
-  *    2001       Sunset Design releases the source under the GNU GPL
+  * 04/2007           Start of this project and port to SDL.
-  * 12/1999 96.5% Last release from Sunset Design.
+  *    2001           Sunset Design releases the source under the GNU GPL.
-  * 11/1996 90%   First public release, at the Wired'96
+  * 12/1999 2.0b96.5% Last release from Sunset Design.
-  * 09/1995       Project starts.
+  * 11/1996 2.0b90%   First public release, at the Wired'96.
+  * 09/1995           Project starts.
 
 Check http://code.google.com/p/grafx2/source/list for (very) detailed changelog.
 Check http://code.google.com/p/grafx2/wiki/History for an overview of the new 
-features and bugfixes in each beta version.
+features and bugfixes in each numbered version.
 
 === FINAL WORDS ===
 

help.c

@@ -47,6 +47,7 @@
 #include "errors.h"
 
 extern char SVN_revision[]; // generated in version.c
+extern char Program_version[]; // generated in pversion.c
 
 // Recherche un raccourci clavier:
 word * Shortcut(word shortcut_number)
@@ -603,10 +604,8 @@ void Button_Stats(void)
 
   // Affichage du numéro de version
   Print_in_window(10,19,"Program version:",STATS_TITLE_COLOR,MC_Black);
-  sprintf(buffer,"GrafX 2.00 %s%s",ALPHA_BETA,PERCENTAGE_VERSION);
+  sprintf(buffer,"%s.%s",Program_version, SVN_revision);
   Print_in_window(146,19,buffer,STATS_DATA_COLOR,MC_Black);
-  Print_in_window(10,27,"SVN revision #:",STATS_TITLE_COLOR,MC_Black);
-  Print_in_window(146,27,SVN_revision,STATS_DATA_COLOR,MC_Black);
   Print_in_window(10,35,"Build options:",STATS_TITLE_COLOR,MC_Black);
   Print_in_window(146,35,TrueType_is_supported()?"TTF fonts":"no TTF fonts",STATS_DATA_COLOR,MC_Black);
 

helpfile.h

@@ -58,7 +58,7 @@ static const T_Help_table helptable_about[] =
   HELP_TEXT ("")
   HELP_TEXT ("")
   HELP_TEXT ("")
-  HELP_TITLE("      GRAFX 2.00")
+  HELP_TITLE("        GRAFX 2   ")
   HELP_BOLD ("  THE ULTIMATE MULTI-RESOLUTION GFX EDITOR")
   HELP_TEXT ("       http://grafx2.googlecode.com")
   HELP_TEXT ("")

main.c

@@ -404,10 +404,8 @@ int Init_program(int argc,char * argv[])
   }
   Joystick = SDL_JoystickOpen(0);
   SDL_EnableKeyRepeat(250, 32);
-  if(ALPHA_BETA[0]=='ß')
+  SDL_WM_SetCaption("GrafX2","GrafX2");
-    SDL_WM_SetCaption("GrafX2 beta "PERCENTAGE_VERSION,"GrafX2");
+
-  else
-    SDL_WM_SetCaption("GrafX2 v2.00 final","GrafX2");
   {
     // Routine pour définir l'icone.
     char icon_path[MAX_PATH_CHARACTERS];

pversion.c

@@ -0,0 +1 @@
+char Program_version[]="2.0";