Re: [RFA] Rename python files.

Thiago Jung Bauermann
2009-09-07T00:48:29Z

[-- Attachment #1: Type: Text/Plain, Size: 754 bytes --]

Hi Joel,

Em Quinta-feira 03 Setembro 2009 19:27:06 Joel Brobecker escreveu:
> > How should said renaming be done, by submitting and committing a patch
> > which removes the old file and adds a new one, or by moving things
> > around in CVSROOT?
>
> Let's just do what you suggested: "cvs rm" followed by "cvs add".
> I looked at your Makefile.in changes, and they seem pretty
> straightforward. I will have a second look again as soon as you post
> a full patch (you can exclude the files being renamed), to make sure
> you did not miss any change elsewhere. (I really doubt it :-)

Thanks. Here's the patch, with ChangeLogs. After "cvs rm"ing and "cvs add"ing
and applying the patch, all Python tests continue to pass.
--
[]'s
Thiago Jung Bauermann

[-- Attachment #2: rename-python.diff --]
[-- Type: text/x-patch, Size: 8858 bytes --]

2009-09-06 Thiago Jung Bauermann <thiago.bauermann@gmail.com>

gdb/
* Makefile.in (py-cmd.o): Renamed from python-cmd.o. Updated
references.
(py-frame.o): Renamed from python-frame.o. Updated references.
(py-function.o): Renamed from python-function.o. Updated references.
(py-objfile.o): Renamed from python-objfile.o. Updated references.
(py-prettyprint.o): Renamed from python-prettyprint.o. Updated references.
(py-type.o): Renamed from python-type.o. Updated references.
(py-utils.o): Renamed from python-utils.o. Updated references.
(py-value.o): Renamed from python-value.o. Updated references.
* py-cmd.o: Renamed from python-cmd.o.
* py-frame.o: Renamed from python-frame.o.
* py-function.o: Renamed from python-function.o.
* py-objfile.o: Renamed from python-objfile.o.
* py-prettyprint.o: Renamed from python-prettyprint.o.
* py-type.o: Renamed from python-type.o.
* py-utils.o: Renamed from python-utils.o.
* py-value.o: Renamed from python-value.o.

gdb/testsuite/
* gdb.python/Makefile.in (EXECUTABLES): Adjust to new executable
names, add missing ones.
* gdb.python/py-cmd.exp: Rename from python-cmd.exp.
* gdb.python/py-frame.c: Rename from python-frame.c.
* gdb.python/py-frame.exp: Rename from python-frame.exp. Adjust
testfile name.
* gdb.python/py-function.exp: Rename from python-function.exp.
* gdb.python/py-mi.exp: Rename from python-mi.exp. Adjust
testfile name.
* gdb.python/py-prettyprint.c: Rename from python-prettyprint.c.
* gdb.python/py-prettyprint.exp: Rename from python-prettyprint.exp.
Adjust testfile name.
* gdb.python/py-prettyprint.py: Rename from python-prettyprint.py.
* gdb.python/py-template.cc: Rename from python-template.cc.
* gdb.python/py-template.exp: Rename from python-template.exp.
Adjust testfile name.
* gdb.python/py-value.c: Rename from python-value.c.
* gdb.python/py-value.exp: Rename from python-value.exp. Adjust
testfile name.

Index: src/gdb/Makefile.in
===================================================================
--- src.orig/gdb/Makefile.in 2009-09-06 18:55:57.000000000 -0300
+++ src/gdb/Makefile.in 2009-09-06 19:10:53.000000000 -0300
@@ -264,24 +264,24 @@ SUBDIR_TUI_CFLAGS= \
#
SUBDIR_PYTHON_OBS = \
python.o \
- python-cmd.o \
- python-frame.o \
- python-function.o \
- python-objfile.o \
- python-prettyprint.o \
- python-type.o \
- python-utils.o \
- python-value.o
+ py-cmd.o \
+ py-frame.o \
+ py-function.o \
+ py-objfile.o \
+ py-prettyprint.o \
+ py-type.o \
+ py-utils.o \
+ py-value.o
SUBDIR_PYTHON_SRCS = \
python/python.c \
- python/python-cmd.c \
- python/python-frame.c \
- python/python-function.c \
- python/python-objfile.c \
- python/python-prettyprint.c \
- python/python-type.c \
- python/python-utils.c \
- python/python-value.c
+ python/py-cmd.c \
+ python/py-frame.c \
+ python/py-function.c \
+ python/py-objfile.c \
+ python/py-prettyprint.c \
+ python/py-type.c \
+ python/py-utils.c \
+ python/py-value.c
SUBDIR_PYTHON_DEPS =
SUBDIR_PYTHON_LDFLAGS=
SUBDIR_PYTHON_CFLAGS=
@@ -1919,36 +1919,36 @@ python.o: $(srcdir)/python/python.c
$(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python.c
$(POSTCOMPILE)

-python-cmd.o: $(srcdir)/python/python-cmd.c
- $(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python-cmd.c
+py-cmd.o: $(srcdir)/python/py-cmd.c
+ $(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/py-cmd.c
$(POSTCOMPILE)

-python-frame.o: $(srcdir)/python/python-frame.c
- $(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python-frame.c
+py-frame.o: $(srcdir)/python/py-frame.c
+ $(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/py-frame.c
$(POSTCOMPILE)

-python-function.o: $(srcdir)/python/python-function.c
- $(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python-function.c
+py-function.o: $(srcdir)/python/py-function.c
+ $(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/py-function.c
$(POSTCOMPILE)

-python-objfile.o: $(srcdir)/python/python-objfile.c
- $(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python-objfile.c
+py-objfile.o: $(srcdir)/python/py-objfile.c
+ $(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/py-objfile.c
$(POSTCOMPILE)

-python-prettyprint.o: $(srcdir)/python/python-prettyprint.c
- $(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python-prettyprint.c
+py-prettyprint.o: $(srcdir)/python/py-prettyprint.c
+ $(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/py-prettyprint.c
$(POSTCOMPILE)

-python-type.o: $(srcdir)/python/python-type.c
- $(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python-type.c
+py-type.o: $(srcdir)/python/py-type.c
+ $(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/py-type.c
$(POSTCOMPILE)

-python-utils.o: $(srcdir)/python/python-utils.c
- $(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python-utils.c
+py-utils.o: $(srcdir)/python/py-utils.c
+ $(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/py-utils.c
$(POSTCOMPILE)

-python-value.o: $(srcdir)/python/python-value.c
- $(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python-value.c
+py-value.o: $(srcdir)/python/py-value.c
+ $(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/py-value.c
$(POSTCOMPILE)

#
Index: src/gdb/testsuite/gdb.python/Makefile.in
===================================================================
--- src.orig/gdb/testsuite/gdb.python/Makefile.in 2008-10-19 17:59:31.000000000 -0200
+++ src/gdb/testsuite/gdb.python/Makefile.in 2009-09-06 19:54:22.000000000 -0300
@@ -1,7 +1,7 @@
VPATH = @srcdir@
srcdir = @srcdir@

-EXECUTABLES = python-value
+EXECUTABLES = py-value py-prettyprint py-template

all info install-info dvi install uninstall installcheck check:
@echo "Nothing to be done for $@..."
Index: src/gdb/testsuite/gdb.python/py-frame.exp
===================================================================
--- src.orig/gdb/testsuite/gdb.python/py-frame.exp 2009-04-13 17:54:59.000000000 -0300
+++ src/gdb/testsuite/gdb.python/py-frame.exp 2009-09-06 19:54:22.000000000 -0300
@@ -20,7 +20,7 @@ if $tracelevel then {
strace $tracelevel
}

-set testfile "python-frame"
+set testfile "py-frame"
set srcfile ${testfile}.c
set binfile ${objdir}/${subdir}/${testfile}
if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
Index: src/gdb/testsuite/gdb.python/py-mi.exp
===================================================================
--- src.orig/gdb/testsuite/gdb.python/py-mi.exp 2009-05-27 22:09:20.000000000 -0300
+++ src/gdb/testsuite/gdb.python/py-mi.exp 2009-09-06 19:54:22.000000000 -0300
@@ -24,7 +24,7 @@ if [mi_gdb_start] {
continue
}

-set testfile "python-prettyprint"
+set testfile "py-prettyprint"
set srcfile ${testfile}.c
set binfile ${objdir}/${subdir}/${testfile}
if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DMI}] != "" } {
Index: src/gdb/testsuite/gdb.python/py-prettyprint.exp
===================================================================
--- src.orig/gdb/testsuite/gdb.python/py-prettyprint.exp 2009-07-10 07:35:17.000000000 -0300
+++ src/gdb/testsuite/gdb.python/py-prettyprint.exp 2009-09-06 19:54:22.000000000 -0300
@@ -20,7 +20,7 @@ if $tracelevel then {
strace $tracelevel
}

-set testfile "python-prettyprint"
+set testfile "py-prettyprint"
set srcfile ${testfile}.c
set binfile ${objdir}/${subdir}/${testfile}

Index: src/gdb/testsuite/gdb.python/py-template.exp
===================================================================
--- src.orig/gdb/testsuite/gdb.python/py-template.exp 2009-05-27 21:47:20.000000000 -0300
+++ src/gdb/testsuite/gdb.python/py-template.exp 2009-09-06 19:54:22.000000000 -0300
@@ -20,7 +20,7 @@ if $tracelevel then {
strace $tracelevel
}

-set testfile "python-template"
+set testfile "py-template"
set srcfile ${testfile}.cc
set binfile ${objdir}/${subdir}/${testfile}
if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable \
Index: src/gdb/testsuite/gdb.python/py-value.exp
===================================================================
--- src.orig/gdb/testsuite/gdb.python/py-value.exp 2009-07-10 07:35:17.000000000 -0300
+++ src/gdb/testsuite/gdb.python/py-value.exp 2009-09-06 19:54:43.000000000 -0300
@@ -20,7 +20,7 @@ if $tracelevel then {
strace $tracelevel
}

-set testfile "python-value"
+set testfile "py-value"
set srcfile ${testfile}.c
set binfile ${objdir}/${subdir}/${testfile}
if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
@@ -257,7 +257,7 @@ proc test_value_in_inferior {} {

# A few objfile tests.
proc test_objfiles {} {
- gdb_test "python\nok=False\nfor file in gdb.objfiles():\n if 'python-value' in file.filename:\n ok=True\nprint ok\nend" "True"
+ gdb_test "python\nok=False\nfor file in gdb.objfiles():\n if 'py-value' in file.filename:\n ok=True\nprint ok\nend" "True"

gdb_test "python print gdb.objfiles()\[0\].pretty_printers" "\\\[\\\]"