[cutter-commit 02107] SF.net SVN: cutter: [2110] cutter/trunk

[<kt...@us...>]

Revision: 2110
          http://cutter.svn.sourceforge.net/cutter/?rev=2110&view=rev
Author:   ktou
Date:     2008-06-26 20:05:14 -0700 (Thu, 26 Jun 2008)

Log Message:
-----------
* configure.ac: support cutter/cut-version.h.
* cutter/cut-version.h.in: add.
* cutter/cut-main.h, cutter/cutter.h: include cut-version.h.

Modified Paths:
--------------
    cutter/trunk/ChangeLog
    cutter/trunk/configure.ac
    cutter/trunk/cutter/Makefile.am
    cutter/trunk/cutter/cut-main.h
    cutter/trunk/cutter/cutter.h

Added Paths:
-----------
    cutter/trunk/cutter/cut-version.h.in

Property Changed:
----------------
    cutter/trunk/cutter/

Modified: cutter/trunk/ChangeLog
===================================================================
--- cutter/trunk/ChangeLog	2008-06-27 02:47:17 UTC (rev 2109)
+++ cutter/trunk/ChangeLog	2008-06-27 03:05:14 UTC (rev 2110)
@@ -1,5 +1,10 @@
 2008-06-27  Kouhei Sutou  <ko...@co...>
 
+	* configure.ac: support cutter/cut-version.h.
+	* cutter/cut-version.h.in: add.
+
+	* cutter/cut-main.h, cutter/cutter.h: include cut-version.h.
+
 	* doc/reference/cutter-docs.sgml: add new symbols in 1.0.2 link.
 
 	* doc/reference/ja.po: update.

Modified: cutter/trunk/configure.ac
===================================================================
--- cutter/trunk/configure.ac	2008-06-27 02:47:17 UTC (rev 2109)
+++ cutter/trunk/configure.ac	2008-06-27 03:05:14 UTC (rev 2110)
@@ -3,7 +3,13 @@
 
 AC_PREREQ(2.59)
 
-AC_INIT(cutter, 1.0.2, ko...@co...)
+m4_define([cutter_version_major], [1])
+m4_define([cutter_version_minor], [0])
+m4_define([cutter_version_micro], [2])
+m4_define([cutter_version],
+          [cutter_version_major.cutter_version_minor.cutter_version_micro])
+
+AC_INIT(cutter, [cutter_version], ko...@co...)
 AC_CONFIG_AUX_DIR([config])
 
 AC_CONFIG_SRCDIR([cutter/cut-main.c])
@@ -14,6 +20,15 @@
 PACKAGE_TITLE=Cutter
 AC_SUBST(PACKAGE_TITLE)
 
+CUTTER_VERSION_MAJOR=cutter_version_major
+CUTTER_VERSION_MINOR=cutter_version_minor
+CUTTER_VERSION_MICRO=cutter_version_micro
+CUTTER_VERSION=cutter_version
+AC_SUBST(CUTTER_VERSION_MAJOR)
+AC_SUBST(CUTTER_VERSION_MINOR)
+AC_SUBST(CUTTER_VERSION_MICRO)
+AC_SUBST(CUTTER_VERSION)
+
 AC_CANONICAL_HOST
 
 AC_MSG_CHECKING([for native Win32])
@@ -391,6 +406,7 @@
 		 gcutter.pc
 		 libcutter.pc
 		 m4macros/Makefile
+		 cutter/cut-version.h
 		 cutter/Makefile
 		 module/Makefile
 		 module/ui/Makefile


Property changes on: cutter/trunk/cutter
___________________________________________________________________
Name: svn:ignore
   - Makefile
Makefile.in
.deps
.libs
*.gcno
cutter
config.h.in
config.h
stamp-h1
stamp-cut-enum-types-c
stamp-cut-enum-types-h
cut-enum-types.c
cut-enum-types.h
cut-marshalers.c
cut-marshalers.h
*.gcda
*.exe

   + Makefile
Makefile.in
.deps
.libs
*.gcno
cutter
config.h.in
config.h
stamp-h1
stamp-cut-enum-types-c
stamp-cut-enum-types-h
cut-enum-types.c
cut-enum-types.h
cut-marshalers.c
cut-marshalers.h
*.gcda
*.exe
cut-version.h


Modified: cutter/trunk/cutter/Makefile.am
===================================================================
--- cutter/trunk/cutter/Makefile.am	2008-06-27 02:47:17 UTC (rev 2109)
+++ cutter/trunk/cutter/Makefile.am	2008-06-27 03:05:14 UTC (rev 2110)
@@ -13,6 +13,7 @@
 lib_LTLIBRARIES = libcutter.la
 
 cutter_public_headers = 			\
+		cut-version.h			\
 		cut-assertions.h		\
 		cut-assertions-helper.h		\
 		cut-experimental.h		\

Modified: cutter/trunk/cutter/cut-main.h
===================================================================
--- cutter/trunk/cutter/cut-main.h	2008-06-27 02:47:17 UTC (rev 2109)
+++ cutter/trunk/cutter/cut-main.h	2008-06-27 03:05:14 UTC (rev 2110)
@@ -24,6 +24,8 @@
 #  error "don't include cutter.h with test runner program!"
 #endif
 
+#include <cutter/cut-version.h>
+
 #include <cutter/cut-test-runner.h>
 #include <cutter/cut-test-suite.h>
 

Added: cutter/trunk/cutter/cut-version.h.in
===================================================================
--- cutter/trunk/cutter/cut-version.h.in	                        (rev 0)
+++ cutter/trunk/cutter/cut-version.h.in	2008-06-27 03:05:14 UTC (rev 2110)
@@ -0,0 +1,34 @@
+/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ *  Copyright (C) 2008  Kouhei Sutou <ko...@co...>
+ *
+ *  This library is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This library 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 Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef __CUT_VERSION_H__
+#define __CUT_VERSION_H__
+
+
+#define CUTTER_VERSION_MAJOR @CUTTER_VERSION_MAJOR@
+#define CUTTER_VERSION_MINOR @CUTTER_VERSION_MINOR@
+#define CUTTER_VERSION_MICRO @CUTTER_VERSION_MICRO@
+
+#define CUTTER_VERSION_STRING "@CUTTER_VERSION@"
+
+#endif /* __CUT_VERSION_H__ */
+
+/*
+vi:nowrap:ai:expandtab:sw=4
+*/

Modified: cutter/trunk/cutter/cutter.h
===================================================================
--- cutter/trunk/cutter/cutter.h	2008-06-27 02:47:17 UTC (rev 2109)
+++ cutter/trunk/cutter/cutter.h	2008-06-27 03:05:14 UTC (rev 2110)
@@ -20,6 +20,8 @@
 #ifndef __CUTTER_H__
 #define __CUTTER_H__
 
+#include <cutter/cut-version.h>
+
 #include <cutter/cut-hidden-definitions.h>
 #include <cutter/cut-assertions.h>
 #include <cutter/cut-experimental.h>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.