[Gmodulo-commits] gmodulo-shell/src Makefile.am, 1.2, 1.3 README, 1.1.1.1, 1.2 gmodulo-shell.in, 1.1, 1.2 gtfault.py, 1.1.1.1, NONE gtpprefscmds.py, 1.1.1.1, NONE gtpusercmds.py, 1.1.1.1, NONE gtputil.py, 1.1.1.1, NONE gtserver.py, 1.1.1.1, NONE

[Carlos Martín <in...@us...>]

Update of /cvsroot/gmodulo/gmodulo-shell/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv23115/src

Modified Files:
	Makefile.am README gmodulo-shell.in 
Removed Files:
	gtfault.py gtpprefscmds.py gtpusercmds.py gtputil.py 
	gtserver.py 
Log Message:


--- gtpprefscmds.py DELETED ---

--- gtfault.py DELETED ---

--- gtserver.py DELETED ---

--- gtpusercmds.py DELETED ---

Index: gmodulo-shell.in
===================================================================
RCS file: /cvsroot/gmodulo/gmodulo-shell/src/gmodulo-shell.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gmodulo-shell.in	17 Jun 2007 16:26:51 -0000	1.1
--- gmodulo-shell.in	30 Aug 2007 18:33:46 -0000	1.2
***************
*** 1,59 ****
! #!/usr/bin/env @PYTHON@
! 
! ###
! ### Copyright 2004 Carlos Martín
! ### Copyright 2004 Universidad de Salamnaca
! ###
! ### This program is free software; you can redistribute it and/or modify
! ### it under the terms of the GNU General Public License, version 2,
! ### as published by the Free Software Foundation.
! ###
! ### 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 02111-1307, USA.
! ###
! 
! try:
!     import sys
!     import os
! 
!     gt_dir = "@DDIR@/gt"
  
!     # This is where we look for binary extensions (like the fast
!     # unmarshaller).
!     gt_lib_dir = "@LIBDIR@/gt"
  
!     gt_version = "@VERSION@"
  
!     # FIXME: This has a special check to allow us to run gt in-place
!     # without having done a "make install".  We might want to take this
!     # out at some point.
  
!     if not (os.path.isfile("./gtpmain.py") \
!             or (os.path.isdir(gt_dir) and os.path.isfile(gt_dir + "/gtpmain.py"))):
!         print "ERROR: Gmodulo Provider Command Line Test Client (gtp) doesn't appear to be"
!         print "ERROR: installed properly.  Please check your installation."
          sys.exit(1)
! 
! 
!     sys.path.append(gt_dir)
!     sys.path.append(gt_lib_dir)
!     import gtpmain
! 
!     if "--gt-profile" in sys.argv:
          import profile
          sys.stderr.write("*** Profiling Enabled ***\n")
!         sys.argv = filter(lambda x:x != "--gt-profile", sys.argv)
!         profile.run("gtpmain.main(gt_version, gt_dir)")
      else:
!         gtpmain.main(gt_version, gt_dir)
  except KeyboardInterrupt:
!     # Just quietly exit if we got a ^C
!     print
      sys.exit(0)
      
--- 1,52 ----
! #!/usr/bin/env python
! # -*- mode: Python; indent-tabs-mode: nil; coding: utf-8  -*-
  
! #
! # Copyright 2004, 2007 Carlos Martín
! # Copyright 2004, 2007 Universidad de Salamnaca
! #
! # This program is free software; you can redistribute it and/or modify
! # it under the terms of the GNU General Public License, version 2,
! # as published by the Free Software Foundation.
! #
! # 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 02111-1307, USA.
! #
  
! import os
! import sys
  
! try:
!     gs_dir      = "@gsdir@"
!     gs_version  = "@version@"
!     gs_profile  = "--gs-profile"
  
!     # check that app is well configured
!     if not (os.path.isfile("./gsapp.py") or os.path.isfile(gs_dir + "/gsapp.py")):
!         sys.stderr.write ("ERROR: Gmodulo Shell Command Line Client doesn't appear to be\n")
!         sys.stderr.write ("ERROR: installed properly.  Please check your installation.\n")
          sys.exit(1)
!         
!     # append gs_dir path and import    
!     sys.path.append(gs_dir)
!     from gsapp import GsApp
!     
!     if gs_profile in sys.argv:
          import profile
+ 
          sys.stderr.write("*** Profiling Enabled ***\n")
!         sys.argv = filter(lambda x:x != gs_profile, sys.argv)
!         profile.run("GsApp(gs_dir, gs_version).run()")
      else:
!         GsApp(gs_dir, gs_version).run()
! 
  except KeyboardInterrupt:
!     sys.stderr.write ("\n\nExiting on user cancel.\n")
      sys.exit(0)
      

--- gtputil.py DELETED ---

Index: Makefile.am
===================================================================
RCS file: /cvsroot/gmodulo/gmodulo-shell/src/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am	17 Jun 2007 16:38:42 -0000	1.2
--- Makefile.am	30 Aug 2007 18:33:46 -0000	1.3
***************
*** 1,31 ****
- gtexecdir = $(bindir)
- gtexec_DATA = gmodulo-shell
  NULL=
  
! gtsupportdir = $(datadir)/gmodulo-shell-1
! gtsupport_DATA = 		\
! 	gtpmain.py		\
! 	gtserver.py		\
! 	gtputil.py		\
! 	gtcommand.py		\
! 	gtfault.py		\
! 	gttalk.py		\
! 	gtfactory.py		\
! 	gtformat.py		\
! 	gtshell.py		\
  	$(NULL)
  
  
! gtcmdsdir = $(gtsupportdir)/commands
! gtcmds_DATA = 			\
! 	gtpprefscmds.py		\
! 	gtpsystemcmds.py	\
! 	gtpusercmds.py		\
! 	gtpshellcmds.py		\
  	$(NULL)
  
! CLEAN_FILES = $(gtexec_DATA)
! EXTRA_DIST = $(gtsupport_DATA) $(gtcmds_DATA) README
  
- install-exec-hook:
- 	chmod 0755 $(DESTDIR)$(gtexecdir)/$(gtexec_DATA)
--- 1,47 ----
  NULL=
+ bin_SCRIPTS = gmodulo-shell
  
! # gmodulo shell framework
! gsdir = $(datadir)/gmodulo-shell-1
! gs_DATA = 			\
! 	gsapp.py		\
! 	gserror.py		\
! 	gscommandmanager.py	\
! 	gscommand.py		\
! 	gstalk.py		\
! 	gsformat.py		\
! 	$(NULL)
! 
! # gmodulo shell commands
! gscmdsdir = $(gsdir)/commands
! gscmds_DATA = 			\
! 	gshelpcmds.py		\
! 	gshostcmds.py		\
! 	gsshellcmds.py		\
! 	gsextensioncmds.py	\
! 	gsbrowsecmds.py		\
  	$(NULL)
  
+ EXTRA_DIST = 			\
+ 	$(gs_DATA)		\
+ 	$(gscmds_DATA)		\
+ 	gmodulo-shell.in	\
+ 	README
  
! CLEANFILES =			\
! 	$(bin_SCRIPTS)		\
! 	*.pyc			\
  	$(NULL)
  
! $(bin_SCRIPTS): $(top_srcdir)/src/$(bin_SCRIPTS).in
! 	@echo generate gmodulo-shell ...
! 	@sed -e "s|\@gsdir\@|$(gsdir)|" 		\
! 	     -e "s|\@version\@|$(PACKAGE_VERSION)|" 	\
! 	        $(top_srcdir)/src/$@.in > $@
! 
! 	@echo Set permissions to $(bin_SCRIPTS) script
! 	@chmod 0755 $(bin_SCRIPTS)
! 
! 
! 
  

Index: README
===================================================================
RCS file: /cvsroot/gmodulo/gmodulo-shell/src/README,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** README	6 Jul 2004 19:37:13 -0000	1.1.1.1
--- README	30 Aug 2007 18:33:46 -0000	1.2
***************
*** 1,3 ****
  A brief roadmapt to file naming convenctions:
! 	o gtp-* : Gmodulo Provider test source. 
! 	o gtm-* : Gmodulo Monkey test source.
--- 1,3 ----
  A brief roadmapt to file naming convenctions:
!     o gs*-cmds : Gmodulo Shell Commands
!     o gs*      : Gmodulo Shell Framework