[RFC] icedtea-web: make clean errors when building in a separate directory

[Dr Andrew John Hughes]

On 09:08 Tue 26 Oct     , Andrew Su wrote:
> 
> ----- "Dr Andrew John Hughes" <ahughes at redhat.com> wrote:
> 
> > From: "Dr Andrew John Hughes" <ahughes at redhat.com>
> > To: "Deepak Bhole" <dbhole at redhat.com>
> > Cc: "Andrew Su" <asu at redhat.com>, distro-pkg-dev at openjdk.java.net
> > Sent: Tuesday, October 26, 2010 6:56:12 AM GMT -05:00 US/Canada Eastern
> > Subject: Re: [RFC] icedtea-web: make clean errors when building in a separate directory
> >
> > On 11:10 Mon 25 Oct     , Deepak Bhole wrote:
> > > * Andrew Su <asu at redhat.com> [2010-10-25 11:05]:
> > > > Hi,
> > > > 
> > > > This patch fixes the order of cleaning the directory for the
> > "launcher".
> > > > It was removing launcher folder after trying to rmdir the
> > icedteanp folder (this folder is not empty but folders are not
> > considered "stuff" inside the folder).
> > > > This patch just reorders it to remove the launcher folder before
> > doing the rest of the clean.
> > > > 
> > > > Makefile.am: 
> > > > (clean-IcedTeaPlugin): Remove launcher folder first
> > > > (clean-plugin): removed called to remove launcher folder
> > > > 
> > > > Cheers,
> > > >  Andrew
> > > 
> > > Looks good! OK for HEAD.
> > > 
> > > Cheers,
> > > Deepak
> > > 
> > 
> > I spotted an issue with this too when working on the code cleanup but
> > didn't want to mix the two fixes.
> > 
> > Instead of rm -rf, I think it should be:
> > 
> > rm -f $(PLUGIN_DIR)/*.o
> > rmdir $(PLUGIN_DIR)
> > 
> > so it fails if anything else is in the plugin dir rather than deleting
> > it.
> > 
> The plugin dir is removed by rmdir only if it's empty. 

Sorry that should have been:

rm -f $(PLUGIN_DIR)/launcher/*.o
rmdir $(PLUGIN_DIR)/launcher

in place of:

rm -rf $(PLUGIN_DIR)/launcher (your addition)

I _want_ rmdir to fail if the launcher directory contains anything other than compiled objects.

> This just removed the launcher folder which is inside the plugin dir, and it only contains compiled code.
> 
> Cheers,
> --Andrew
> 
> 
> 
> > > > diff -r eb998ed0ab1a Makefile.am
> > > > --- a/Makefile.am	Fri Oct 22 10:44:12 2010 -0400
> > > > +++ b/Makefile.am	Mon Oct 25 10:45:44 2010 -0400
> > > > @@ -188,6 +188,7 @@
> > > >  	$(CC) $(LAUNCHER_LINK) $(PLUGIN_LAUNCHER_OBJECTS)
> > > >  
> > > >  clean-IcedTeaPlugin:
> > > > +	rm -rf $(PLUGIN_DIR)/launcher
> > > >  	rm -f $(PLUGIN_DIR)/*.o
> > > >  	rm -f $(PLUGIN_DIR)/IcedTeaPlugin.so
> > > >  	if [ $(abs_top_srcdir) != $(abs_top_builddir) ]; then \
> > > > @@ -203,7 +204,6 @@
> > > >  	touch stamps/plugin.stamp
> > > >  
> > > >  clean-plugin: $(ICEDTEAPLUGIN_CLEAN)
> > > > -	rm -rf $(PLUGIN_DIR)/launcher
> > > >  	rm -f stamps/plugin.stamp
> > > >  
> > > >  liveconnect-source-files.txt:
> > > 
> > 
> > -- 
> > Andrew :)
> > 
> > Free Java Software Engineer
> > Red Hat, Inc. (http://www.redhat.com)
> > 
> > Support Free Java!
> > Contribute to GNU Classpath and the OpenJDK
> > http://www.gnu.org/software/classpath
> > http://openjdk.java.net
> > PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
> > Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8

-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8