[patch] leim/Makefile.in: make distclean should make clean

[patch] leim/Makefile.in: make distclean should make clean

[Jérôme Marant]

[-- Attachment #1: Type: text/plain, Size: 104 bytes --]


Hi,

make distclean in leim/Makefile.in doesn't currently make clean.
I've attached a patch.

Cheers,


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: leim-Makefile.in.patch --]
[-- Type: text/x-patch, Size: 442 bytes --]

--- emacs-snapshot-20040111/leim/Makefile.in.orig	2004-02-15 20:10:38.000000000 +0100
+++ emacs-snapshot-20040111/leim/Makefile.in	2004-02-15 20:10:56.000000000 +0100
@@ -226,7 +226,7 @@
 	rm -f ${TIT} ${NON-TIT} ${WORLD} ${TIT:.elc=.el} \
 	  ${MISC-DIC} ${MISC-DIC:.elc=.el} leim-list.el
 
-distclean maintainer-clean:
+distclean maintainer-clean: clean
 	if test -f stamp-subdir; then rm -rf ${SUBDIRS} stamp-subdir; fi
 	rm -f Makefile
 

[-- Attachment #3: Type: text/plain, Size: 24 bytes --]



-- 
Jérôme Marant

[-- Attachment #4: Type: text/plain, Size: 141 bytes --]

_______________________________________________
Emacs-devel mailing list
Emacs-devel@gnu.org
http://mail.gnu.org/mailman/listinfo/emacs-devel

Re: [patch] leim/Makefile.in: make distclean should make clean

[Kenichi Handa]

In article <87y8r4i27c.fsf@marant.org>, jmarant@nerim.net (Jérôme Marant) writes:

> make distclean in leim/Makefile.in doesn't currently make clean.
> I've attached a patch.

Thank you, I've just installed it.

---
Ken'ichi HANDA
handa@m17n.org

Re: [patch] leim/Makefile.in: make distclean should make clean

[Eli Zaretskii]

> Date: Mon, 16 Feb 2004 08:35:42 +0900 (JST)
> From: Kenichi Handa <handa@m17n.org>
> 
> > make distclean in leim/Makefile.in doesn't currently make clean.
> > I've attached a patch.
> 
> Thank you, I've just installed it.

I'm not sure we should install that change as it is: it will cause
"make distclean" to remove some of the files that are distributed as
part of the Leim tarball.  For example, cyrillic.elc is removed by
"make clean", but it is also part of leim-NN.MM.tar.gz, AFAICS.  And
there are others.

Perhaps the `clean' target needs to be changed as well.

Re: [patch] leim/Makefile.in: make distclean should make clean

[Kenichi Handa]

In article <2914-Mon16Feb2004113906+0200-eliz@elta.co.il>, "Eli Zaretskii" <eliz@elta.co.il> writes:
>>  > make distclean in leim/Makefile.in doesn't currently make clean.
>>  > I've attached a patch.
>>  
>>  Thank you, I've just installed it.

> I'm not sure we should install that change as it is: it will cause
> "make distclean" to remove some of the files that are distributed as
> part of the Leim tarball.  For example, cyrillic.elc is removed by
> "make clean", but it is also part of leim-NN.MM.tar.gz, AFAICS.  And
> there are others.

?? Do we still make the Leim tarball?

> Perhaps the `clean' target needs to be changed as well.

I see your point.  The target clean is documented as this in
top Makefile.in. 

### `clean'
###      Delete all files from the current directory that are normally
###      created by building the program.  Don't delete the files that
###      record the configuration.  Also preserve files that could be made
###      by building, but normally aren't because the distribution comes
###      with them.

It seems that distclean also should not delete *.elc.  About
maintainer-clean and extraclean, I'm not sure if we should
delete *.elc or not.  As they don't delete lisp/*.elc,
perhaps, it is better not to delete leim/*/*.elc.

Then, only the case that we should delete leim/*/*.elc is at
bootstrapping time.  Is it right?

---
Ken'ichi HANDA
handa@m17n.org

Re: [patch] leim/Makefile.in: make distclean should make clean

[Eli Zaretskii]

> Date: Mon, 16 Feb 2004 20:42:57 +0900 (JST)
> From: Kenichi Handa <handa@m17n.org>
> 
> ?? Do we still make the Leim tarball?

We don't.  But since no release was done yet that included Leim as
part of the Emacs tarball, I looked into leim-21.*.tar.gz archives to
find out what Leim files should be distributed.

> It seems that distclean also should not delete *.elc.

It should only delete those *.elc files that were built as part of
building Emacs/Leim on the user's machine.  Some of the *.elc files
are like that (e.g., 4Corner.elc), others aren't.

> Then, only the case that we should delete leim/*/*.elc is at
> bootstrapping time.  Is it right?

At bootstrap we should delete *.elc and also those *.el files that
were produced from *.tit and other files in *-DIC/ directories.

Re: [patch] leim/Makefile.in: make distclean should make clean

[Stefan Monnier]

> At bootstrap we should delete *.elc and also those *.el files that
> were produced from *.tit and other files in *-DIC/ directories.

[ I know it's not really related but anyway: ]

Let me disagree here.  Removing those files in 99% of my cases does nothing
better than significantly lengthen to time to get a working system.
Yes, `bootstrap-clean' (which I'd call `spotless' or `cvsclean' since it's
not only used for bootstrapping purposes) should remove those files, but
not `bootstrap'.

If people want to use `bootstrap' to get a "fully clean build", they should
first do a `bootstrap-clean' explicitly.


        Stefan

Re: [patch] leim/Makefile.in: make distclean should make clean

[Kenichi Handa]

In article <jwv4qtrdl17.fsf-monnier+emacs/devel@asado.iro.umontreal.ca>, Stefan Monnier <monnier@iro.umontreal.ca> writes:

>>  At bootstrap we should delete *.elc and also those *.el files that
>>  were produced from *.tit and other files in *-DIC/ directories.

> [ I know it's not really related but anyway: ]

> Let me disagree here.  Removing those files in 99% of my cases does nothing
> better than significantly lengthen to time to get a working system.
> Yes, `bootstrap-clean' (which I'd call `spotless' or `cvsclean' since it's
> not only used for bootstrapping purposes) should remove those files, but
> not `bootstrap'.

> If people want to use `bootstrap' to get a "fully clean build", they should
> first do a `bootstrap-clean' explicitly.

But, there's no such target in ./Makefile.in (top level).
lisp/Makefile.in and nt/makefile.nt have it.
src/Makefile.in has "bootstrapclean" instead.  Do you mean
that we should add that target in ./Makefile.in.

In ./Makefile.in, we already have these targets.

# make clean  or  make mostlyclean
#      Delete all files from the current directory that are normally
#      created by building the program.	 Don't delete the files that
#      record the configuration.  Also preserve files that could be made
#      by building, but normally aren't because the distribution comes
#      with them.
#
#      Delete `.dvi' files here if they are not part of the distribution.
#
# make distclean
#      Delete all files from the current directory that are created by
#      configuring or building the program.  If you have unpacked the
#      source and built the program without creating any other files,
#      `make distclean' should leave only the files that were in the
#      distribution.
#
# make maintainer-clean
#      Delete everything from the current directory that can be
#      reconstructed with this Makefile.  This typically includes
#      everything deleted by distclean, plus more: C source files
#      produced by Bison, tags tables, info files, and so on.
#
# make extraclean
#      Still more severe - delete backup and autosave files, too.

It seems that maintainer-clean is the best target to make
the directory the same as just after we do "cvs co".

---
Ken'ichi HANDA
handa@m17n.org

Re: [patch] leim/Makefile.in: make distclean should make clean

[Stefan Monnier]

> src/Makefile.in has "bootstrapclean" instead.  Do you mean
> that we should add that target in ./Makefile.in.

Yes.  Or adjust some existing target so that it can be used for
the purpose of `bootstrap-clean'.

> It seems that maintainer-clean is the best target to make
> the directory the same as just after we do "cvs co".

Indeed.  So

        make maintainer-clean
        make bootstrap

should be used by those people who want a "clean build".  What I'm
personally interested in is to remove the `clean' part of `bootstrap'
so that I can do

        make bootstrap
        <fix up problems that prevented building>
        make bootstrap
        <fix up new problems the prevented building>
        ...

without having to rebuild the whole world each time.


        Stefan

Re: [patch] leim/Makefile.in: make distclean should make clean

[Jérôme Marant]

> I'm not sure we should install that change as it is: it will cause
> "make distclean" to remove some of the files that are distributed as
> part of the Leim tarball.  For example, cyrillic.elc is removed by
> "make clean", but it is also part of leim-NN.MM.tar.gz, AFAICS.  And
> there are others.
>
> Perhaps the `clean' target needs to be changed as well.

I understand your point. Nonetheless, I need to clean such
files, so would it be possible to keep such a target around, no
matter how it is called?

Thanks.


-- 
Jérôme Marant

Re: [patch] leim/Makefile.in: make distclean should make clean

[Stefan Monnier]

> I understand your point. Nonetheless, I need to clean such
> files, so would it be possible to keep such a target around, no
> matter how it is called?

To make things spotless, I use cvsclean.


        Stefan


emacs/work-0% cat =cvsclean
#!/usr/bin/perl

sub cvsclean {
    my($path) = @_;
    my(%files) = ();
    my(@subdirs);

    print STDOUT "Cleaning $path\n";
    opendir (DIR, "$path/") || die "No directory $path";
    open (ENTRIES, "$path/CVS/Entries") || die "No $path/CVS/Entries file";
    while (<ENTRIES>) {
        if (m[^D/([^/]+)]) {
            push (@subdirs, "$path/$1");
        } elsif (m[^/([^/]+)/[^/-]]) {
            $files{$1} = "managed";
        }
    }

    foreach $entry (readdir(DIR)) {
        if (!exists ($files{$entry})) {
            $entry = "$path/$entry";
            if (-f $entry) {
                print STDOUT "unlink $entry\n";
                unlink $entry;
            }
        }
    }
    
    foreach $subdir (@subdirs) {
        &cvsclean ($subdir);
    }
}

&cvsclean (".");
emacs/work-0% 

Re: [patch] leim/Makefile.in: make distclean should make clean

[Jérôme Marant]

Quoting Stefan Monnier <monnier@iro.umontreal.ca>:

> > I understand your point. Nonetheless, I need to clean such
> > files, so would it be possible to keep such a target around, no
> > matter how it is called?
> 
> To make things spotless, I use cvsclean.

This is nice but I need to do it from a CVS export of Emacs CVS
(from make-dist), which means I can no longer access to
CVS-specific files.

Of course, I could manually list files that I want to remove
but it is harder to track those which were added to the
list than just calling a makefile target.

Cheers,

-- 
Jérôme Marant

Re: [patch] leim/Makefile.in: make distclean should make clean

[Eli Zaretskii]

> Date: Mon, 16 Feb 2004 13:37:15 +0100 (CET)
> From: =?iso-8859-1?Q?J=E9r=F4me_Marant?= <jmarant@nerim.net>
> 
> I understand your point. Nonetheless, I need to clean such
> files

Can you explain why you need it?

Re: [patch] leim/Makefile.in: make distclean should make clean

[Jérôme Marant]

Quoting Eli Zaretskii <eliz@elta.co.il>:

> > Date: Mon, 16 Feb 2004 13:37:15 +0100 (CET)
> > From: =?iso-8859-1?Q?J=E9r=F4me_Marant?= <jmarant@nerim.net>
> > 
> > I understand your point. Nonetheless, I need to clean such
> > files
> 
> Can you explain why you need it?

Sure. I'm currently working on an emacs-snapshot Debian package
which will make us easier to prepare upcoming stable releases
and to find problems with the build system ASAP.

I'm building it from a tarball I do generate from make-dist
and every time I clean the package, I remove .elc files
as well as autogenerated .el ones.

There is a rationale for removing them: we usually apply
patches (which may modify .el files) prior to bootstrapping
emacs, so we need to regenerate them anyway.

I hope I answered your question.

Cheers,

-- 
Jérôme Marant

Re: [patch] leim/Makefile.in: make distclean should make clean

[Eli Zaretskii]

> Date: Mon, 16 Feb 2004 18:07:02 +0100
> From: =?iso-8859-1?b?Suly9G1l?= Marant <jmarant@free.fr>
> 
> I'm currently working on an emacs-snapshot Debian package
> which will make us easier to prepare upcoming stable releases
> and to find problems with the build system ASAP.
> 
> I'm building it from a tarball I do generate from make-dist
> and every time I clean the package, I remove .elc files
> as well as autogenerated .el ones.

I think this warrants a special target to remove all *.elc files.
The situation you describe is pretty much special.

> There is a rationale for removing them: we usually apply
> patches (which may modify .el files) prior to bootstrapping
> emacs, so we need to regenerate them anyway.

That doesn't require to remove them first: Make will DTRT when it sees
that the corresponding *.el files changed, and will compile only those
which are in the need.

Re: [patch] leim/Makefile.in: make distclean should make clean

[Jérôme Marant]

"Eli Zaretskii" <eliz@elta.co.il> writes:

>> Date: Mon, 16 Feb 2004 18:07:02 +0100
>> From: =?iso-8859-1?b?Suly9G1l?= Marant <jmarant@free.fr>
>> 
>> I'm currently working on an emacs-snapshot Debian package
>> which will make us easier to prepare upcoming stable releases
>> and to find problems with the build system ASAP.
>> 
>> I'm building it from a tarball I do generate from make-dist
>> and every time I clean the package, I remove .elc files
>> as well as autogenerated .el ones.
>
> I think this warrants a special target to remove all *.elc files.
> The situation you describe is pretty much special.

Currently, .elc files are not really a problem for me: I do
remove them with a simple combination of find and rm.

>> There is a rationale for removing them: we usually apply
>> patches (which may modify .el files) prior to bootstrapping
>> emacs, so we need to regenerate them anyway.
>
> That doesn't require to remove them first: Make will DTRT when it sees
> that the corresponding *.el files changed, and will compile only those
> which are in the need.

But this doesn't need my requirements: the Debian packaging scheme
generates a diff between the pristine tree and the set of files
added by the packaging; since autogenerated files are no part of
the pristine tree, they'd be considered as packaging-specific
which I don't want to.

Basically, I'd need a bootstrap-clean target that would clean any file
generated by the bootstrap (both .elc and autogenerated .el).  I
didn't find anything do this.

Cheers,

-- 
Jérôme Marant

Re: [patch] leim/Makefile.in: make distclean should make clean

[Jérôme Marant]

jmarant@nerim.net (Jérôme Marant) writes:


> But this doesn't need my requirements: the Debian packaging scheme
                   ^^^^
                   meet

Cheers,

-- 
Jérôme Marant

Re: [patch] leim/Makefile.in: make distclean should make clean

[Eli Zaretskii]

> From: jmarant@nerim.net (=?iso-8859-15?q?J=E9r=F4me_Marant?=)
> Date: Mon, 16 Feb 2004 22:28:14 +0100
> >
> > I think this warrants a special target to remove all *.elc files.
> > The situation you describe is pretty much special.
> 
> Currently, .elc files are not really a problem for me: I do
> remove them with a simple combination of find and rm.

Then what _is_ the problem?  The changes you asked to make remove
*.elc files and do not much else.

> Basically, I'd need a bootstrap-clean target that would clean any file
> generated by the bootstrap (both .elc and autogenerated .el).

maintainer-clean is supposed to be what you want; if it does not,
please describe why not (I feel that I still don't understand your
needs well enough), and let's think how to do better.

Re: [patch] leim/Makefile.in: make distclean should make clean

[Jérôme Marant]

Quoting Eli Zaretskii <eliz@elta.co.il>:

> > From: jmarant@nerim.net (=?iso-8859-15?q?J=E9r=F4me_Marant?=)
> > Date: Mon, 16 Feb 2004 22:28:14 +0100
> > >
> > > I think this warrants a special target to remove all *.elc files.
> > > The situation you describe is pretty much special.
> > 
> > Currently, .elc files are not really a problem for me: I do
> > remove them with a simple combination of find and rm.
> 
> Then what _is_ the problem?  The changes you asked to make remove
> *.elc files and do not much else.

I said it's not a problem because I can use brute force removal
as a workaround.
The problem is about the autogenerated .el files, as I explained
earlier.

> > Basically, I'd need a bootstrap-clean target that would clean any file
> > generated by the bootstrap (both .elc and autogenerated .el).
> 
> maintainer-clean is supposed to be what you want; if it does not,
> please describe why not (I feel that I still don't understand your
> needs well enough), and let's think how to do better.

Agreed.
I said in a previous messages that I tried many targets without any
success.
Currently, maintainer-clean doesn't work like you describe since:
- it needs the change I asked for (maintainer-clean depending on
clean, that it) in order to remove autogenerated .el files
- it doesn't clean the 'lisp' directory (both .elc files and
autogenerated ones)
- info files are not cleaned from the info directory (it has been
disabled from man/Makefile.in)

Cheers,


-- 
Jérôme Marant