X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-version.cc;h=f84730450fc40530b0e2b643cbc2301a7666e013;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=b6a37c812b785ac2b838e8ffbdfe4233e4b41b55;hpb=63c9cee8ce190aaae4a5db3d2e200d35a570838d;p=lilypond.git

diff --git a/lily/lily-version.cc b/lily/lily-version.cc
index b6a37c812b..f84730450f 100644
--- a/lily/lily-version.cc
+++ b/lily/lily-version.cc
@@ -1,23 +1,48 @@
-#include <stdio.h>
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
-#include "config.hh"
-#include "version.hh"
+  Copyright (C) 1999--2015 Jan Nieuwenhuizen <janneke@gnu.org>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
- #define VERSION_SZ  MAJOR_VERSION "." MINOR_VERSION "."  PATCH_LEVEL MY_PATCH_LEVEL
+#include "lily-version.hh"
 
-//#define VERSION_SZ TOPLEVEL_VERSION
-//#define VERSION_SZ "version"
-static char *s = "GNU LilyPond " VERSION_SZ ;
+#include "config.hh"
+#include "version.hh"
 
+string
+version_string ()
+{
+  string str = MAJOR_VERSION "." MINOR_VERSION "." PATCH_LEVEL;
+  string mpl ("." MY_PATCH_LEVEL);
+  if (mpl != ".")
+    str += mpl;
+  return str;
+}
 
-char const *
-lily_version_number_sz()
+string
+gnu_lilypond_string ()
 {
-  return VERSION_SZ;
+  string str = "GNU LilyPond";
+  return str;
 }
 
-char const * 
-lily_version_sz()
+string
+gnu_lilypond_version_string ()
 {
-	return s;
+  string str = gnu_lilypond_string () + " " + version_string ();
+  return str;
 }
+