[Ocfs2-tools-commits] manish commits r579 - in trunk: . ocfs2console

[svn-commits at oss.oracle.com]

Author: manish
Date: 2005-01-25 19:33:38 -0600 (Tue, 25 Jan 2005)
New Revision: 579

Added:
   trunk/ocfs2console/ocfs2console
   trunk/ocfs2console/ocfs2console.8.in
Removed:
   trunk/ocfs2console/ocfs2tool
   trunk/ocfs2console/ocfs2tool.8.in
Modified:
   trunk/Config.make.in
   trunk/Makefile
   trunk/configure.in
   trunk/ocfs2console/Makefile
Log:
The great renaming to ocfs2console continues


Modified: trunk/Config.make.in
===================================================================
--- trunk/Config.make.in	2005-01-26 01:25:01 UTC (rev 578)
+++ trunk/Config.make.in	2005-01-26 01:33:38 UTC (rev 579)
@@ -57,7 +57,7 @@
 PYGTK_CODEGEN = @PYGTK_CODEGEN@
 PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
 
-BUILD_OCFS2TOOL = @BUILD_OCFS2TOOL@
+BUILD_OCFS2CONSOLE = @BUILD_OCFS2CONSOLE@
 
 BUILD_OCFS2CDSL = @BUILD_OCFS2CDSL@
 BUILD_DEBUGOCFS2 = @BUILD_DEBUGOCFS2@

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2005-01-26 01:25:01 UTC (rev 578)
+++ trunk/Makefile	2005-01-26 01:33:38 UTC (rev 579)
@@ -28,7 +28,7 @@
 SUBDIRS += ocfs2cdsl
 endif
 
-ifdef BUILD_OCFS2TOOL
+ifdef BUILD_OCFS2CONSOLE
 SUBDIRS += ocfs2console
 endif
 

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2005-01-26 01:25:01 UTC (rev 578)
+++ trunk/configure.in	2005-01-26 01:33:38 UTC (rev 579)
@@ -154,15 +154,15 @@
 AC_SUBST(BUILD_OCFS2CDSL)
 AC_SUBST(BUILD_DEBUGOCFS2)
 
-BUILD_OCFS2TOOL=
-dnl AC_ARG_ENABLE(ocfs2tool, [  --enable-ocfs2tool=[yes/no]       Build GUI frontend [default=yes]],,enable_ocfs2tool=yes)
-AC_ARG_ENABLE(ocfs2tool, [  --enable-ocfs2tool=[yes/no]       Build GUI frontend [default=no]],,enable_ocfs2tool=no)
+BUILD_OCFS2CONSOLE=
+dnl AC_ARG_ENABLE(ocfs2console, [  --enable-ocfs2console=[yes/no]    Build GUI frontend [default=yes]],,enable_ocfs2console=yes)
+AC_ARG_ENABLE(ocfs2console, [  --enable-ocfs2console=[yes/no]    Build GUI frontend [default=no]],,enable_ocfs2console=no)
 
 if test "x$have_glib" != "xyes"; then
-  enable_ocfs2tool=no
+  enable_ocfs2console=no
 fi
 
-if test "x$enable_ocfs2tool" = "xyes"; then
+if test "x$enable_ocfs2console" = "xyes"; then
   dnl check for Python
   AM_PATH_PYTHON(2.2)
   AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
@@ -174,20 +174,10 @@
   PKG_CHECK_MODULES(PYGTK, pygtk-2.0 >= $PYGTK_REQUIRED_VERSION)
   AC_SUBST(PYGTK_CFLAGS)
 
-  AC_PATH_PROG(PYGTK_CODEGEN, pygtk-codegen-2.0, no)
-  if test "x$PYGTK_CODEGEN" = xno; then
-    AC_MSG_ERROR(could not find pygtk-codegen-2.0 script)
-  fi
-
-  AC_MSG_CHECKING(for pygtk defs)
-  PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
-  AC_SUBST(PYGTK_DEFSDIR)
-  AC_MSG_RESULT($PYGTK_DEFSDIR)
-
-  BUILD_OCFS2TOOL=yes
+  BUILD_OCFS2CONSOLE=yes
 fi
 
-AC_SUBST(BUILD_OCFS2TOOL)
+AC_SUBST(BUILD_OCFS2CONSOLE)
 
 AC_OUTPUT([
 Config.make
@@ -198,6 +188,6 @@
 mkfs.ocfs2/mkfs.ocfs2.8
 fsck.ocfs2/fsck.ocfs2.8
 fsck.ocfs2/fsck.ocfs2.checks.8
-ocfs2console/ocfs2tool.8
+ocfs2console/ocfs2console.8
 vendor/common/ocfs2-tools.spec
 ])

Modified: trunk/ocfs2console/Makefile
===================================================================
--- trunk/ocfs2console/Makefile	2005-01-26 01:25:01 UTC (rev 578)
+++ trunk/ocfs2console/Makefile	2005-01-26 01:33:38 UTC (rev 579)
@@ -33,9 +33,9 @@
 
 OBJS = $(subst .c,.o,$(CFILES))
 
-MANS = ocfs2tool.8
+MANS = ocfs2console.8
 
-SBIN_EXTRA = ocfs2tool
+SBIN_EXTRA = ocfs2console
 
 LIBRARIES = ocfs2module.so
 
@@ -56,15 +56,15 @@
 
 INSTALL_RULES = install-pylib
 
-DIST_FILES = $(CFILES) $(HFILES) $(PYSRC) ocfs2tool ocfs2tool.8.in
+DIST_FILES = $(CFILES) $(HFILES) $(PYSRC) ocfs2console ocfs2console.8.in
 
 ocfs2module.so: $(OBJS) $(LIBOCFS2_DEPS)
 	$(LINK) -shared $(LIBOCFS2_LIBS) $(COM_ERR_LIBS) $(GLIB_LIBS)
 
 install-pylib:
-	$(SHELL) $(TOPDIR)/mkinstalldirs $(DESTDIR)$(pyexecdir)/ocfs2tool
+	$(SHELL) $(TOPDIR)/mkinstalldirs $(DESTDIR)$(pyexecdir)/ocfs2console
 	for f in $(PYLIB); do \
-	  $(INSTALL_DATA) $$f $(DESTDIR)$(pyexecdir)/ocfs2tool/$$f; \
+	  $(INSTALL_DATA) $$f $(DESTDIR)$(pyexecdir)/ocfs2console/$$f; \
 	done
 
 include $(TOPDIR)/Postamble.make

Copied: trunk/ocfs2console/ocfs2console (from rev 578, trunk/ocfs2console/ocfs2tool)

Copied: trunk/ocfs2console/ocfs2console.8.in (from rev 578, trunk/ocfs2console/ocfs2tool.8.in)

Deleted: trunk/ocfs2console/ocfs2tool
===================================================================
--- trunk/ocfs2console/ocfs2tool	2005-01-26 01:25:01 UTC (rev 578)
+++ trunk/ocfs2console/ocfs2tool	2005-01-26 01:33:38 UTC (rev 579)
@@ -1,10 +0,0 @@
-#!/usr/bin/python
-
-# XXX: for production
-#!/usr/bin/python -W ignore::DeprecationWarning
-
-from about import process_info_args
-process_info_args()
-
-from interface import main
-main()

Deleted: trunk/ocfs2console/ocfs2tool.8.in
===================================================================
--- trunk/ocfs2console/ocfs2tool.8.in	2005-01-26 01:25:01 UTC (rev 578)
+++ trunk/ocfs2console/ocfs2tool.8.in	2005-01-26 01:33:38 UTC (rev 579)
@@ -1,24 +0,0 @@
-.TH OCFSTOOL 1 "August 2002" "Version @VERSION@" "OCFS Manual Pages"
-.SH NAME
-ocfstool - GUI frontend for OCFS management and debugging
-.SH SYNOPSIS
-.B ocfstool
-
-.SH DESCRIPTION
-.PP
-\fBocfstool\fP is a GUI frontend for managing and debugging OCFS volumes on
-the system. One can mount and unmount volumes, format, view overview
-information and individual files, see the current node map, and block
-bitmap.
-
-.SH BUGS
-Stuff.
-
-.SH SEE ALSO
-.BR ocfs(5)
-
-.SH AUTHORS
-Oracle Corporation
-
-.SH COPYRIGHT
-Copyright \(co 2002, 2004 Oracle Corporation