[Ocfs2-tools-commits] jlbec commits r1339 - in trunk: .
ocfs2console/ocfs2interface
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Wed Apr 11 12:19:02 PDT 2007
Author: jlbec
Date: 2007-04-11 12:19:01 -0700 (Wed, 11 Apr 2007)
New Revision: 1339
Added:
trunk/ocfs2console/ocfs2interface/confdefs.py.in
Modified:
trunk/configure.in
trunk/ocfs2console/ocfs2interface/
trunk/ocfs2console/ocfs2interface/Makefile
trunk/ocfs2console/ocfs2interface/about.py
Log:
Move the version string for ocfs2console out of about.py and into the
new confdefs.py.in. This allows configure to control the string.
Signed-off-by: smushran
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2007-04-09 09:26:40 UTC (rev 1338)
+++ trunk/configure.in 2007-04-11 19:19:01 UTC (rev 1339)
@@ -206,6 +206,7 @@
o2cb.pc
o2dlm.pc
ocfs2.pc
+ocfs2console/ocfs2interface/confdefs.py
debugfs.ocfs2/debugfs.ocfs2.8
mkfs.ocfs2/mkfs.ocfs2.8
mounted.ocfs2/mounted.ocfs2.8
Property changes on: trunk/ocfs2console/ocfs2interface
___________________________________________________________________
Name: svn:ignore
- *.d
*.pyc
*.pyo
plistmodule.so
gidlemodule.so
ocfs2module.so
o2cbmodule.so
+ *.d
*.pyc
*.pyo
plistmodule.so
gidlemodule.so
ocfs2module.so
o2cbmodule.so
confdefs.py
Modified: trunk/ocfs2console/ocfs2interface/Makefile
===================================================================
--- trunk/ocfs2console/ocfs2interface/Makefile 2007-04-09 09:26:40 UTC (rev 1338)
+++ trunk/ocfs2console/ocfs2interface/Makefile 2007-04-11 19:19:01 UTC (rev 1339)
@@ -96,11 +96,13 @@
toolbar.py \
tune.py
-PYLIB = $(UNINST_LIBRARIES) $(PYSRC)
+BUILT_PYSRC = confdefs.py
+PYLIB = $(UNINST_LIBRARIES) $(PYSRC) $(BUILT_PYSRC)
+
INSTALL_RULES = install-pylib
-DIST_FILES = $(PLIST_CFILES) $(PLIST_HFILES) $(GIDLE_CFILES) $(OCFS2_CFILES) $(O2CB_CFILES) $(PYSRC)
+DIST_FILES = $(PLIST_CFILES) $(PLIST_HFILES) $(GIDLE_CFILES) $(OCFS2_CFILES) $(O2CB_CFILES) $(PYSRC) $(addsuffix .in,$(BUILT_PYSRC))
plistmodule.so: $(PLIST_OBJS) $(LIBOCFS2_DEPS) $(LIBO2DLM_DEPS) $(LIBO2CB_DEPS) $(BLKID_DEPS)
$(LINK) -shared $(LIBOCFS2_LIBS) $(LIBO2DLM_LIBS) $(LIBO2CB_LIBS) $(BLKID_LIBS) $(COM_ERR_LIBS) $(GLIB_LIBS)
Modified: trunk/ocfs2console/ocfs2interface/about.py
===================================================================
--- trunk/ocfs2console/ocfs2interface/about.py 2007-04-09 09:26:40 UTC (rev 1338)
+++ trunk/ocfs2console/ocfs2interface/about.py 2007-04-11 19:19:01 UTC (rev 1339)
@@ -16,11 +16,11 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 021110-1307, USA.
import sys
+from confdefs import OCFS2TOOLS_VERSION
-OCFS2TOOL_VERSION = '1.1.0'
def print_version():
- print 'OCFS2Console version %s' % OCFS2TOOL_VERSION
+ print 'OCFS2Console version %s' % OCFS2TOOLS_VERSION
def print_usage(name):
print '''Usage: %s [OPTION]...
@@ -55,7 +55,7 @@
from guiutil import set_props
if gtk.pygtk_version >= (2,6,0):
- copyright = 'Copyright (C) 2002, 2005 Oracle. All rights reserved.'
+ copyright = 'Copyright (C) 2002, 2007 Oracle. All rights reserved.'
license = '''
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -83,7 +83,7 @@
dialog.set_destroy_with_parent(True)
set_props(dialog, name='OCFS2 Console',
- version=OCFS2TOOL_VERSION,
+ version=OCFS2TOOLS_VERSION,
copyright=copyright,
license=license,
website='http://oss.oracle.com',
@@ -98,7 +98,7 @@
'''OCFS2 Console
Version %s
Copyright (C) 2002, 2005 Oracle.
-All Rights Reserved.''' % OCFS2TOOL_VERSION)
+All Rights Reserved.''' % OCFS2TOOLS_VERSION)
dialog.run()
dialog.destroy()
Added: trunk/ocfs2console/ocfs2interface/confdefs.py.in
===================================================================
--- trunk/ocfs2console/ocfs2interface/confdefs.py.in 2007-04-09 09:26:40 UTC (rev 1338)
+++ trunk/ocfs2console/ocfs2interface/confdefs.py.in 2007-04-11 19:19:01 UTC (rev 1339)
@@ -0,0 +1,19 @@
+# OCFS2Console - GUI frontend for OCFS2 management and debugging
+# Copyright (C) 2002, 2007 Oracle. All rights reserved.
+#
+# This program 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 2 of the License, or
+# (at your option) any later version.
+#
+# This program 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 this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 021110-1307, USA.
+
+OCFS2TOOLS_VERSION = '@VERSION@'
+
More information about the Ocfs2-tools-commits
mailing list