Re: [hwloc-devel] GIT: hwloc branch master updated. 0e6fe307c10d47efee3fb95c50aee9c0f01bc8ec

2014-04-07 Thread Jeff Squyres (jsquyres) 
How about this:

diff --git a/config/distscript.sh b/config/distscript.sh
index d7bdfa4..9f05a2f 100755
--- a/config/distscript.sh
+++ b/config/distscript.sh
@@ -69,7 +69,7 @@ fi
 # Trivial helper function
 doit() {
 echo $*
-$*
+eval $*
 }
 
 echo "*** Copying doxygen-doc tree to dist..."
@@ -77,7 +77,26 @@ echo "*** Directory: srcdir: $srcdir, distdir: $distdir, pwd:
 doit mkdir -p $distdir/doc/doxygen-doc
 doit chmod -R a=rwx $distdir/doc/doxygen-doc
 doit rm -rf $distdir/doc/doxygen-doc
-doit cp -rpf $srcdir/doc/doxygen-doc $distdir/doc
+
+# We want to copy the entire directory tree to the distdir.  In some
+# cases, doxygen-doc may be a sym link, so we want the copy to follow
+# the sym links.  It's a bit of a portability nightmare, so try a few
+# different ways...
+# This seems to work on OS X and Linux (but not Solaris)
+doit "tar c -C $srcdir -h -f - doc/doxygen-doc | tar x -C $distdir -f -"
+if test ! -d $distdir/doc/doxygen-doc; then
+# This seems to work on Linux and Solaris
+doit cp -rpf $srcdir/doc/doxygen-doc/ $distdir/doc
+fi
+if test ! -d $distdir/doc/doxygen-doc; then
+# This seems to work on OS X (probably redundant, but we know it works)
+doit cp -rpf $srcdir/doc/doxygen-doc $distdir/doc
+fi
+# If we still failed, just error out
+if test ! -d $distdir/doc/doxygen-doc; then
+echo "ERROR: Cannot seem to copy a directory to the distdir :-("
+exit 1
+fi
 
 echo "*** Copying new README"
 ls -lf $distdir/README







On Apr 7, 2014, at 6:04 PM, Brice Goglin 
 wrote:

> My jenkins does make distcheck on some Linux and only make check on
> others, so it should be fine on my side.
> 
> Brice
> 
> 
> 
> 
> Le 08/04/2014 00:01, Jeff Squyres (jsquyres) a écrit :
>> Do we care about "make dist" on Solaris?
>> 
>> 
>> On Apr 7, 2014, at 5:57 PM, Brice Goglin  wrote:
>> 
>>> Same error.
>>> Brice
>>> 
>>> 
>>> 
>>> Le 07/04/2014 23:43, Jeff Squyres (jsquyres) a écrit :
 How about:
 
 tar c -C /home/ci/hwloc-gitclone -h -f - doc/doxygen-doc | tar x -C 
 /home/ci/hwloc-gitclone/build/hwloc-gitclone -f -
 
 
 
 On Apr 7, 2014, at 5:36 PM, Brice Goglin 
 wrote:
 
> Works on my Linux but fails on Solaris:
> tar -c -C /home/ci/hwloc-gitclone -h -f - doc/doxygen-doc | tar -x -C
> /home/ci/hwloc-gitclone/build/hwloc-gitclone -f -
> tar: /dev/rmt/0: No such file or directory
> 
> 
> 
> Le 07/04/2014 23:29, Jeff Squyres (jsquyres) a écrit :
>> --- a/config/distscript.sh
>> +++ b/config/distscript.sh
>> @@ -69,7 +69,7 @@ fi
>> # Trivial helper function
>> doit() {
>>   echo $*
>> -$*
>> +eval $*
>> }
>> 
>> echo "*** Copying doxygen-doc tree to dist..."
>> @@ -77,7 +77,7 @@ echo "*** Directory: srcdir: $srcdir, distdir: 
>> $distdir, pwd: 
>> doit mkdir -p $distdir/doc/doxygen-doc
>> doit chmod -R a=rwx $distdir/doc/doxygen-doc
>> doit rm -rf $distdir/doc/doxygen-doc
>> -doit cp -rpf $srcdir/doc/doxygen-doc $distdir/doc
>> +doit "tar -c -C $srcdir -h -f - doc/doxygen-doc | tar -x -C $distdir -f 
>> -"
>> 
>> echo "*** Copying new README"
>> ls -lf $distdir/README
> ___
> hwloc-devel mailing list
> hwloc-de...@open-mpi.org
> http://www.open-mpi.org/mailman/listinfo.cgi/hwloc-devel
>>> ___
>>> hwloc-devel mailing list
>>> hwloc-de...@open-mpi.org
>>> http://www.open-mpi.org/mailman/listinfo.cgi/hwloc-devel
>> 
> 
> ___
> hwloc-devel mailing list
> hwloc-de...@open-mpi.org
> http://www.open-mpi.org/mailman/listinfo.cgi/hwloc-devel


-- 
Jeff Squyres
jsquy...@cisco.com
For corporate legal information go to: 
http://www.cisco.com/web/about/doing_business/legal/cri/

Re: [hwloc-devel] GIT: hwloc branch master updated. 0e6fe307c10d47efee3fb95c50aee9c0f01bc8ec

2014-04-07 Thread Brice Goglin 
Same error.
Brice



Le 07/04/2014 23:43, Jeff Squyres (jsquyres) a écrit :
> How about:
>
> tar c -C /home/ci/hwloc-gitclone -h -f - doc/doxygen-doc | tar x -C 
> /home/ci/hwloc-gitclone/build/hwloc-gitclone -f -
>
>
>
> On Apr 7, 2014, at 5:36 PM, Brice Goglin 
>  wrote:
>
>> Works on my Linux but fails on Solaris:
>> tar -c -C /home/ci/hwloc-gitclone -h -f - doc/doxygen-doc | tar -x -C
>> /home/ci/hwloc-gitclone/build/hwloc-gitclone -f -
>> tar: /dev/rmt/0: No such file or directory
>>
>>
>>
>> Le 07/04/2014 23:29, Jeff Squyres (jsquyres) a écrit :
>>> --- a/config/distscript.sh
>>> +++ b/config/distscript.sh
>>> @@ -69,7 +69,7 @@ fi
>>> # Trivial helper function
>>> doit() {
>>> echo $*
>>> -$*
>>> +eval $*
>>> }
>>>
>>> echo "*** Copying doxygen-doc tree to dist..."
>>> @@ -77,7 +77,7 @@ echo "*** Directory: srcdir: $srcdir, distdir: $distdir, 
>>> pwd: 
>>> doit mkdir -p $distdir/doc/doxygen-doc
>>> doit chmod -R a=rwx $distdir/doc/doxygen-doc
>>> doit rm -rf $distdir/doc/doxygen-doc
>>> -doit cp -rpf $srcdir/doc/doxygen-doc $distdir/doc
>>> +doit "tar -c -C $srcdir -h -f - doc/doxygen-doc | tar -x -C $distdir -f -"
>>>
>>> echo "*** Copying new README"
>>> ls -lf $distdir/README
>> ___
>> hwloc-devel mailing list
>> hwloc-de...@open-mpi.org
>> http://www.open-mpi.org/mailman/listinfo.cgi/hwloc-devel
>

Re: [hwloc-devel] GIT: hwloc branch master updated. 0e6fe307c10d47efee3fb95c50aee9c0f01bc8ec

2014-04-07 Thread Jeff Squyres (jsquyres) 
How about:

tar c -C /home/ci/hwloc-gitclone -h -f - doc/doxygen-doc | tar x -C 
/home/ci/hwloc-gitclone/build/hwloc-gitclone -f -



On Apr 7, 2014, at 5:36 PM, Brice Goglin 
 wrote:

> Works on my Linux but fails on Solaris:
> tar -c -C /home/ci/hwloc-gitclone -h -f - doc/doxygen-doc | tar -x -C
> /home/ci/hwloc-gitclone/build/hwloc-gitclone -f -
> tar: /dev/rmt/0: No such file or directory
> 
> 
> 
> Le 07/04/2014 23:29, Jeff Squyres (jsquyres) a écrit :
>> --- a/config/distscript.sh
>> +++ b/config/distscript.sh
>> @@ -69,7 +69,7 @@ fi
>> # Trivial helper function
>> doit() {
>> echo $*
>> -$*
>> +eval $*
>> }
>> 
>> echo "*** Copying doxygen-doc tree to dist..."
>> @@ -77,7 +77,7 @@ echo "*** Directory: srcdir: $srcdir, distdir: $distdir, 
>> pwd: 
>> doit mkdir -p $distdir/doc/doxygen-doc
>> doit chmod -R a=rwx $distdir/doc/doxygen-doc
>> doit rm -rf $distdir/doc/doxygen-doc
>> -doit cp -rpf $srcdir/doc/doxygen-doc $distdir/doc
>> +doit "tar -c -C $srcdir -h -f - doc/doxygen-doc | tar -x -C $distdir -f -"
>> 
>> echo "*** Copying new README"
>> ls -lf $distdir/README
> 
> ___
> hwloc-devel mailing list
> hwloc-de...@open-mpi.org
> http://www.open-mpi.org/mailman/listinfo.cgi/hwloc-devel


-- 
Jeff Squyres
jsquy...@cisco.com
For corporate legal information go to: 
http://www.cisco.com/web/about/doing_business/legal/cri/

Re: [hwloc-devel] GIT: hwloc branch master updated. 0e6fe307c10d47efee3fb95c50aee9c0f01bc8ec

2014-04-07 Thread Brice Goglin 
Works on my Linux but fails on Solaris:
tar -c -C /home/ci/hwloc-gitclone -h -f - doc/doxygen-doc | tar -x -C
/home/ci/hwloc-gitclone/build/hwloc-gitclone -f -
tar: /dev/rmt/0: No such file or directory



Le 07/04/2014 23:29, Jeff Squyres (jsquyres) a écrit :
> --- a/config/distscript.sh
> +++ b/config/distscript.sh
> @@ -69,7 +69,7 @@ fi
>  # Trivial helper function
>  doit() {
>  echo $*
> -$*
> +eval $*
>  }
>  
>  echo "*** Copying doxygen-doc tree to dist..."
> @@ -77,7 +77,7 @@ echo "*** Directory: srcdir: $srcdir, distdir: $distdir, 
> pwd: 
>  doit mkdir -p $distdir/doc/doxygen-doc
>  doit chmod -R a=rwx $distdir/doc/doxygen-doc
>  doit rm -rf $distdir/doc/doxygen-doc
> -doit cp -rpf $srcdir/doc/doxygen-doc $distdir/doc
> +doit "tar -c -C $srcdir -h -f - doc/doxygen-doc | tar -x -C $distdir -f -"
>  
>  echo "*** Copying new README"
>  ls -lf $distdir/README

Re: [hwloc-devel] GIT: hwloc branch master updated. 0e6fe307c10d47efee3fb95c50aee9c0f01bc8ec

2014-04-07 Thread Jeff Squyres (jsquyres) 
On Apr 7, 2014, at 5:06 PM, "Jeff Squyres (jsquyres)"  
wrote:

> Ok, lemme look at tar -- there's a canonical way to copy dir trees with tar; 
> let me look it up...

Does this work for you?  It seems to do the Right Thing for me on OS X and 
Linux.


diff --git a/config/distscript.sh b/config/distscript.sh
index d7bdfa4..68f1f8a 100755
--- a/config/distscript.sh
+++ b/config/distscript.sh
@@ -69,7 +69,7 @@ fi
 # Trivial helper function
 doit() {
 echo $*
-$*
+eval $*
 }
 
 echo "*** Copying doxygen-doc tree to dist..."
@@ -77,7 +77,7 @@ echo "*** Directory: srcdir: $srcdir, distdir: $distdir, pwd: 
 doit mkdir -p $distdir/doc/doxygen-doc
 doit chmod -R a=rwx $distdir/doc/doxygen-doc
 doit rm -rf $distdir/doc/doxygen-doc
-doit cp -rpf $srcdir/doc/doxygen-doc $distdir/doc
+doit "tar -c -C $srcdir -h -f - doc/doxygen-doc | tar -x -C $distdir -f -"
 
 echo "*** Copying new README"
 ls -lf $distdir/README


-- 
Jeff Squyres
jsquy...@cisco.com
For corporate legal information go to: 
http://www.cisco.com/web/about/doing_business/legal/cri/

Re: [hwloc-devel] GIT: hwloc branch master updated. 0e6fe307c10d47efee3fb95c50aee9c0f01bc8ec

2014-04-07 Thread Jeff Squyres (jsquyres) 
On Apr 7, 2014, at 5:05 PM, Brice Goglin  wrote:

> So you just broke my make dist :/

Really?  Doh!  :-(

> I don't have MacOS to test things. If rsync or tar or whatever can
> dereference symlinks, that'll work for me.

Ok, lemme look at tar -- there's a canonical way to copy dir trees with tar; 
let me look it up...

> 
> commit 0ebeff689e9414d5eedbf53e7c8697a3af5e4b72
> Author: Brice Goglin 
> Date:   Fri Mar 21 18:51:14 2014 +0100
> 
>dist: fix support for doc/doxygen-doc being a symlink
> 
>make dist works when building out-of-source if $srcdir/doc/doxygen-doc
>is a symlink to builddir/doc/doxygen-doc.
>But it actually fails to copy the doxygen-doc tree because it
>doesn't dereference the symlink. Fix that.
> 
> Brice
> 
> 
> 
> 
> Le 07/04/2014 22:59, Jeff Squyres (jsquyres) a écrit :
>> On Apr 7, 2014, at 4:33 PM, Brice Goglin  wrote:
>> 
>>> So you're (always?) getting tarballs without any doc/doxygen-doc
>>> subdirectories?
>> That's correct -- doc/doxygen-doc is in the source tree, but does not end up 
>> in the tarball.
>> 
>>> Does "make dist" say that it's copying the doxygen-doc
>>> subdirectory? Any idea who's removing it later?
>> Mmm... good point... 
>> 
>> /me investigates
>> 
>> Ah, I see the issue.  On OS X, this:
>> 
>> doit cp -rpf $srcdir/doc/doxygen-doc/ $distdir/doc
>> 
>> Does not actually copy the doxygen-doc directory to $distdir.  If I remove 
>> the trailing slash, it works:
>> 
>> doit cp -rpf $srcdir/doc/doxygen-doc $distdir/doc
>> 
>> (i.e., doxygen-doc ends up in $distdir and distcheck works properly)
>> 
>> There's probably a reason for this, but I'm not too interested in tracking 
>> it down.  I just removed the trailing slash...
>> 
>> I note that the OS X man page for cp says:
>> 
>> Historic versions of the cp utility had a -r option.  This implementation
>> supports that option; however, its use is strongly discouraged, as it
>> does not correctly copy special files, symbolic links, or fifo's.
>> 
>> Instead, the OS X cp supports -R (Linux cp does, too).
>> 
>> I guess we should be using something better than cp -r to copy the directory 
>> over -- perhaps tar?
>> 
>>> I managed to get such a tarball without doc only once, but it
>>> disappeared after I added some debug commands to config/distscript.sh to
>>> see where doc/doxygen-doc was being deleted. Strange.
>>> 
>>> Brice
>>> 
>>> 
>>> 
>>> Le 07/04/2014 22:05, Jeff Squyres (jsquyres) a écrit :
 Right -- I've done that (i.e., if I do "make doc" again, it does nothing 
 because it's already done).  And "make dist" works fine.  
 
 But "make distcheck" fails when it runs "make dist" in the subdir of the 
 expanded tarball fails because doc/doxygen-doc doesn't exist in there.
 
 
 On Apr 7, 2014, at 3:57 PM, Brice Goglin  wrote:
 
> In v1.9+, you need make doc before make dist or make distcheck. It may
> explain your problem?
> I changed this a couple weeks ago to make things much easier to
> understand/maintain (but a little bit harder to use :))
> 
> Brice
> 
> 
> Le 07/04/2014 21:37, Jeff Squyres (jsquyres) a écrit :
>> I just pushed 143e27248f928797e2e8532747386c67c9f8d873, which converted 
>> distscript.csh to distscript.sh.
>> 
>> If it works well on master, we can pull it to the v1.9 branch.
>> 
>> I notice that "make distcheck" is broken, however -- when it goes to 
>> "make dist" in the expanded tarball, I get the following message:
>> 
>> -
>> *** The srcdir does not already have a doxygen-doc tree built.
>> *** hwloc's config/distscript.csh requires the docs to be built
>> *** in the srcdir before executing 'make dist'.
>> make[3]: *** [dist-hook] Error 1
>> make[2]: *** [distdir] Error 2
>> make[1]: *** [dist] Error 2
>> make: *** [distcheck] Error 1
>> -
>> 
>> Is this expected / has this been broken for a while?
>> 
>> 
>> 
>> 
>> On Mar 31, 2014, at 1:42 AM, Brice Goglin  wrote:
>> 
>>> Le 31/03/2014 00:57, Christopher Samuel a écrit :
 On 30/03/14 02:04, Ralph Castain wrote:
 
> turns out that some linux distro's automatically set LS_COLORS in
> your environment when running old versions of csh/tcsh via their
> default dot files
 For example RHEL6 does this..
>>> Looks like it's a 10 years old conflict between csh and coreutils. It's
>>> crary hwloc has to work around this very old issue, we should just stop
>>> using csh and distros that haven't fixed this :)
>>> 
>>> Brice
>>> 
>>> ___
>>> hwloc-devel mailing list
>>> hwloc-de...@open-mpi.org
>>> http://www.open-mpi.org/mailman/listinfo.cgi/hwloc-devel
>

Re: [hwloc-devel] GIT: hwloc branch master updated. 0e6fe307c10d47efee3fb95c50aee9c0f01bc8ec

2014-04-07 Thread Brice Goglin 
So you just broke my make dist :/
I don't have MacOS to test things. If rsync or tar or whatever can
dereference symlinks, that'll work for me.


commit 0ebeff689e9414d5eedbf53e7c8697a3af5e4b72
Author: Brice Goglin 
List-Post: hwloc-devel@lists.open-mpi.org
Date:   Fri Mar 21 18:51:14 2014 +0100

dist: fix support for doc/doxygen-doc being a symlink

make dist works when building out-of-source if $srcdir/doc/doxygen-doc
is a symlink to builddir/doc/doxygen-doc.
But it actually fails to copy the doxygen-doc tree because it
doesn't dereference the symlink. Fix that.

Brice




Le 07/04/2014 22:59, Jeff Squyres (jsquyres) a écrit :
> On Apr 7, 2014, at 4:33 PM, Brice Goglin  wrote:
>
>> So you're (always?) getting tarballs without any doc/doxygen-doc
>> subdirectories?
> That's correct -- doc/doxygen-doc is in the source tree, but does not end up 
> in the tarball.
>
>> Does "make dist" say that it's copying the doxygen-doc
>> subdirectory? Any idea who's removing it later?
> Mmm... good point... 
>
> /me investigates
>
> Ah, I see the issue.  On OS X, this:
>
> doit cp -rpf $srcdir/doc/doxygen-doc/ $distdir/doc
>
> Does not actually copy the doxygen-doc directory to $distdir.  If I remove 
> the trailing slash, it works:
>
> doit cp -rpf $srcdir/doc/doxygen-doc $distdir/doc
>
> (i.e., doxygen-doc ends up in $distdir and distcheck works properly)
>
> There's probably a reason for this, but I'm not too interested in tracking it 
> down.  I just removed the trailing slash...
>
> I note that the OS X man page for cp says:
>
>  Historic versions of the cp utility had a -r option.  This implementation
>  supports that option; however, its use is strongly discouraged, as it
>  does not correctly copy special files, symbolic links, or fifo's.
>
> Instead, the OS X cp supports -R (Linux cp does, too).
>
> I guess we should be using something better than cp -r to copy the directory 
> over -- perhaps tar?
>
>> I managed to get such a tarball without doc only once, but it
>> disappeared after I added some debug commands to config/distscript.sh to
>> see where doc/doxygen-doc was being deleted. Strange.
>>
>> Brice
>>
>>
>>
>> Le 07/04/2014 22:05, Jeff Squyres (jsquyres) a écrit :
>>> Right -- I've done that (i.e., if I do "make doc" again, it does nothing 
>>> because it's already done).  And "make dist" works fine.  
>>>
>>> But "make distcheck" fails when it runs "make dist" in the subdir of the 
>>> expanded tarball fails because doc/doxygen-doc doesn't exist in there.
>>>
>>>
>>> On Apr 7, 2014, at 3:57 PM, Brice Goglin  wrote:
>>>
 In v1.9+, you need make doc before make dist or make distcheck. It may
 explain your problem?
 I changed this a couple weeks ago to make things much easier to
 understand/maintain (but a little bit harder to use :))

 Brice


 Le 07/04/2014 21:37, Jeff Squyres (jsquyres) a écrit :
> I just pushed 143e27248f928797e2e8532747386c67c9f8d873, which converted 
> distscript.csh to distscript.sh.
>
> If it works well on master, we can pull it to the v1.9 branch.
>
> I notice that "make distcheck" is broken, however -- when it goes to 
> "make dist" in the expanded tarball, I get the following message:
>
> -
> *** The srcdir does not already have a doxygen-doc tree built.
> *** hwloc's config/distscript.csh requires the docs to be built
> *** in the srcdir before executing 'make dist'.
> make[3]: *** [dist-hook] Error 1
> make[2]: *** [distdir] Error 2
> make[1]: *** [dist] Error 2
> make: *** [distcheck] Error 1
> -
>
> Is this expected / has this been broken for a while?
>
>
>
>
> On Mar 31, 2014, at 1:42 AM, Brice Goglin  wrote:
>
>> Le 31/03/2014 00:57, Christopher Samuel a écrit :
>>> On 30/03/14 02:04, Ralph Castain wrote:
>>>
 turns out that some linux distro's automatically set LS_COLORS in
 your environment when running old versions of csh/tcsh via their
 default dot files
>>> For example RHEL6 does this..
>> Looks like it's a 10 years old conflict between csh and coreutils. It's
>> crary hwloc has to work around this very old issue, we should just stop
>> using csh and distros that haven't fixed this :)
>>
>> Brice
>>
>> ___
>> hwloc-devel mailing list
>> hwloc-de...@open-mpi.org
>> http://www.open-mpi.org/mailman/listinfo.cgi/hwloc-devel
 ___
 hwloc-devel mailing list
 hwloc-de...@open-mpi.org
 http://www.open-mpi.org/mailman/listinfo.cgi/hwloc-devel
>> ___
>> hwloc-devel mailing list
>> hwloc-de...@open-mpi.org
>> http://www.open-mpi.org/mailman/listinfo.cgi/hwloc-devel
>

Re: [hwloc-devel] GIT: hwloc branch master updated. 0e6fe307c10d47efee3fb95c50aee9c0f01bc8ec

2014-04-07 Thread Jeff Squyres (jsquyres) 
On Apr 7, 2014, at 4:33 PM, Brice Goglin  wrote:

> So you're (always?) getting tarballs without any doc/doxygen-doc
> subdirectories?

That's correct -- doc/doxygen-doc is in the source tree, but does not end up in 
the tarball.

> Does "make dist" say that it's copying the doxygen-doc
> subdirectory? Any idea who's removing it later?

Mmm... good point... 

/me investigates

Ah, I see the issue.  On OS X, this:

doit cp -rpf $srcdir/doc/doxygen-doc/ $distdir/doc

Does not actually copy the doxygen-doc directory to $distdir.  If I remove the 
trailing slash, it works:

doit cp -rpf $srcdir/doc/doxygen-doc $distdir/doc

(i.e., doxygen-doc ends up in $distdir and distcheck works properly)

There's probably a reason for this, but I'm not too interested in tracking it 
down.  I just removed the trailing slash...

I note that the OS X man page for cp says:

 Historic versions of the cp utility had a -r option.  This implementation
 supports that option; however, its use is strongly discouraged, as it
 does not correctly copy special files, symbolic links, or fifo's.

Instead, the OS X cp supports -R (Linux cp does, too).

I guess we should be using something better than cp -r to copy the directory 
over -- perhaps tar?

> I managed to get such a tarball without doc only once, but it
> disappeared after I added some debug commands to config/distscript.sh to
> see where doc/doxygen-doc was being deleted. Strange.
> 
> Brice
> 
> 
> 
> Le 07/04/2014 22:05, Jeff Squyres (jsquyres) a écrit :
>> Right -- I've done that (i.e., if I do "make doc" again, it does nothing 
>> because it's already done).  And "make dist" works fine.  
>> 
>> But "make distcheck" fails when it runs "make dist" in the subdir of the 
>> expanded tarball fails because doc/doxygen-doc doesn't exist in there.
>> 
>> 
>> On Apr 7, 2014, at 3:57 PM, Brice Goglin  wrote:
>> 
>>> In v1.9+, you need make doc before make dist or make distcheck. It may
>>> explain your problem?
>>> I changed this a couple weeks ago to make things much easier to
>>> understand/maintain (but a little bit harder to use :))
>>> 
>>> Brice
>>> 
>>> 
>>> Le 07/04/2014 21:37, Jeff Squyres (jsquyres) a écrit :
 I just pushed 143e27248f928797e2e8532747386c67c9f8d873, which converted 
 distscript.csh to distscript.sh.
 
 If it works well on master, we can pull it to the v1.9 branch.
 
 I notice that "make distcheck" is broken, however -- when it goes to "make 
 dist" in the expanded tarball, I get the following message:
 
 -
 *** The srcdir does not already have a doxygen-doc tree built.
 *** hwloc's config/distscript.csh requires the docs to be built
 *** in the srcdir before executing 'make dist'.
 make[3]: *** [dist-hook] Error 1
 make[2]: *** [distdir] Error 2
 make[1]: *** [dist] Error 2
 make: *** [distcheck] Error 1
 -
 
 Is this expected / has this been broken for a while?
 
 
 
 
 On Mar 31, 2014, at 1:42 AM, Brice Goglin  wrote:
 
> Le 31/03/2014 00:57, Christopher Samuel a écrit :
>> On 30/03/14 02:04, Ralph Castain wrote:
>> 
>>> turns out that some linux distro's automatically set LS_COLORS in
>>> your environment when running old versions of csh/tcsh via their
>>> default dot files
>> For example RHEL6 does this..
> Looks like it's a 10 years old conflict between csh and coreutils. It's
> crary hwloc has to work around this very old issue, we should just stop
> using csh and distros that haven't fixed this :)
> 
> Brice
> 
> ___
> hwloc-devel mailing list
> hwloc-de...@open-mpi.org
> http://www.open-mpi.org/mailman/listinfo.cgi/hwloc-devel
>>> ___
>>> hwloc-devel mailing list
>>> hwloc-de...@open-mpi.org
>>> http://www.open-mpi.org/mailman/listinfo.cgi/hwloc-devel
>> 
> 
> ___
> hwloc-devel mailing list
> hwloc-de...@open-mpi.org
> http://www.open-mpi.org/mailman/listinfo.cgi/hwloc-devel


-- 
Jeff Squyres
jsquy...@cisco.com
For corporate legal information go to: 
http://www.cisco.com/web/about/doing_business/legal/cri/

Re: [hwloc-devel] GIT: hwloc branch master updated. 0e6fe307c10d47efee3fb95c50aee9c0f01bc8ec

2014-04-07 Thread Brice Goglin 
So you're (always?) getting tarballs without any doc/doxygen-doc
subdirectories? Does "make dist" say that it's copying the doxygen-doc
subdirectory? Any idea who's removing it later?

I managed to get such a tarball without doc only once, but it
disappeared after I added some debug commands to config/distscript.sh to
see where doc/doxygen-doc was being deleted. Strange.

Brice



Le 07/04/2014 22:05, Jeff Squyres (jsquyres) a écrit :
> Right -- I've done that (i.e., if I do "make doc" again, it does nothing 
> because it's already done).  And "make dist" works fine.  
>
> But "make distcheck" fails when it runs "make dist" in the subdir of the 
> expanded tarball fails because doc/doxygen-doc doesn't exist in there.
>
>
> On Apr 7, 2014, at 3:57 PM, Brice Goglin  wrote:
>
>> In v1.9+, you need make doc before make dist or make distcheck. It may
>> explain your problem?
>> I changed this a couple weeks ago to make things much easier to
>> understand/maintain (but a little bit harder to use :))
>>
>> Brice
>>
>>
>> Le 07/04/2014 21:37, Jeff Squyres (jsquyres) a écrit :
>>> I just pushed 143e27248f928797e2e8532747386c67c9f8d873, which converted 
>>> distscript.csh to distscript.sh.
>>>
>>> If it works well on master, we can pull it to the v1.9 branch.
>>>
>>> I notice that "make distcheck" is broken, however -- when it goes to "make 
>>> dist" in the expanded tarball, I get the following message:
>>>
>>> -
>>> *** The srcdir does not already have a doxygen-doc tree built.
>>> *** hwloc's config/distscript.csh requires the docs to be built
>>> *** in the srcdir before executing 'make dist'.
>>> make[3]: *** [dist-hook] Error 1
>>> make[2]: *** [distdir] Error 2
>>> make[1]: *** [dist] Error 2
>>> make: *** [distcheck] Error 1
>>> -
>>>
>>> Is this expected / has this been broken for a while?
>>>
>>>
>>>
>>>
>>> On Mar 31, 2014, at 1:42 AM, Brice Goglin  wrote:
>>>
 Le 31/03/2014 00:57, Christopher Samuel a écrit :
> On 30/03/14 02:04, Ralph Castain wrote:
>
>> turns out that some linux distro's automatically set LS_COLORS in
>> your environment when running old versions of csh/tcsh via their
>> default dot files
> For example RHEL6 does this..
 Looks like it's a 10 years old conflict between csh and coreutils. It's
 crary hwloc has to work around this very old issue, we should just stop
 using csh and distros that haven't fixed this :)

 Brice

 ___
 hwloc-devel mailing list
 hwloc-de...@open-mpi.org
 http://www.open-mpi.org/mailman/listinfo.cgi/hwloc-devel
>> ___
>> hwloc-devel mailing list
>> hwloc-de...@open-mpi.org
>> http://www.open-mpi.org/mailman/listinfo.cgi/hwloc-devel
>

Re: [hwloc-devel] GIT: hwloc branch master updated. 0e6fe307c10d47efee3fb95c50aee9c0f01bc8ec

2014-04-07 Thread Jeff Squyres (jsquyres) 
Right -- I've done that (i.e., if I do "make doc" again, it does nothing 
because it's already done).  And "make dist" works fine.  

But "make distcheck" fails when it runs "make dist" in the subdir of the 
expanded tarball fails because doc/doxygen-doc doesn't exist in there.


On Apr 7, 2014, at 3:57 PM, Brice Goglin  wrote:

> In v1.9+, you need make doc before make dist or make distcheck. It may
> explain your problem?
> I changed this a couple weeks ago to make things much easier to
> understand/maintain (but a little bit harder to use :))
> 
> Brice
> 
> 
> Le 07/04/2014 21:37, Jeff Squyres (jsquyres) a écrit :
>> I just pushed 143e27248f928797e2e8532747386c67c9f8d873, which converted 
>> distscript.csh to distscript.sh.
>> 
>> If it works well on master, we can pull it to the v1.9 branch.
>> 
>> I notice that "make distcheck" is broken, however -- when it goes to "make 
>> dist" in the expanded tarball, I get the following message:
>> 
>> -
>> *** The srcdir does not already have a doxygen-doc tree built.
>> *** hwloc's config/distscript.csh requires the docs to be built
>> *** in the srcdir before executing 'make dist'.
>> make[3]: *** [dist-hook] Error 1
>> make[2]: *** [distdir] Error 2
>> make[1]: *** [dist] Error 2
>> make: *** [distcheck] Error 1
>> -
>> 
>> Is this expected / has this been broken for a while?
>> 
>> 
>> 
>> 
>> On Mar 31, 2014, at 1:42 AM, Brice Goglin  wrote:
>> 
>>> Le 31/03/2014 00:57, Christopher Samuel a écrit :
 On 30/03/14 02:04, Ralph Castain wrote:
 
> turns out that some linux distro's automatically set LS_COLORS in
> your environment when running old versions of csh/tcsh via their
> default dot files
 For example RHEL6 does this..
>>> Looks like it's a 10 years old conflict between csh and coreutils. It's
>>> crary hwloc has to work around this very old issue, we should just stop
>>> using csh and distros that haven't fixed this :)
>>> 
>>> Brice
>>> 
>>> ___
>>> hwloc-devel mailing list
>>> hwloc-de...@open-mpi.org
>>> http://www.open-mpi.org/mailman/listinfo.cgi/hwloc-devel
>> 
> 
> ___
> hwloc-devel mailing list
> hwloc-de...@open-mpi.org
> http://www.open-mpi.org/mailman/listinfo.cgi/hwloc-devel


-- 
Jeff Squyres
jsquy...@cisco.com
For corporate legal information go to: 
http://www.cisco.com/web/about/doing_business/legal/cri/

Re: [hwloc-devel] GIT: hwloc branch master updated. 0e6fe307c10d47efee3fb95c50aee9c0f01bc8ec

2014-04-07 Thread Brice Goglin 
In v1.9+, you need make doc before make dist or make distcheck. It may
explain your problem?
I changed this a couple weeks ago to make things much easier to
understand/maintain (but a little bit harder to use :))

Brice


Le 07/04/2014 21:37, Jeff Squyres (jsquyres) a écrit :
> I just pushed 143e27248f928797e2e8532747386c67c9f8d873, which converted 
> distscript.csh to distscript.sh.
>
> If it works well on master, we can pull it to the v1.9 branch.
>
> I notice that "make distcheck" is broken, however -- when it goes to "make 
> dist" in the expanded tarball, I get the following message:
>
> -
> *** The srcdir does not already have a doxygen-doc tree built.
> *** hwloc's config/distscript.csh requires the docs to be built
> *** in the srcdir before executing 'make dist'.
> make[3]: *** [dist-hook] Error 1
> make[2]: *** [distdir] Error 2
> make[1]: *** [dist] Error 2
> make: *** [distcheck] Error 1
> -
>
> Is this expected / has this been broken for a while?
>
>
>
>
> On Mar 31, 2014, at 1:42 AM, Brice Goglin  wrote:
>
>> Le 31/03/2014 00:57, Christopher Samuel a écrit :
>>> On 30/03/14 02:04, Ralph Castain wrote:
>>>
 turns out that some linux distro's automatically set LS_COLORS in
 your environment when running old versions of csh/tcsh via their
 default dot files
>>> For example RHEL6 does this..
>> Looks like it's a 10 years old conflict between csh and coreutils. It's
>> crary hwloc has to work around this very old issue, we should just stop
>> using csh and distros that haven't fixed this :)
>>
>> Brice
>>
>> ___
>> hwloc-devel mailing list
>> hwloc-de...@open-mpi.org
>> http://www.open-mpi.org/mailman/listinfo.cgi/hwloc-devel
>

Re: [hwloc-devel] GIT: hwloc branch master updated. 0e6fe307c10d47efee3fb95c50aee9c0f01bc8ec

2014-04-07 Thread Jeff Squyres (jsquyres) 
I just pushed 143e27248f928797e2e8532747386c67c9f8d873, which converted 
distscript.csh to distscript.sh.

If it works well on master, we can pull it to the v1.9 branch.

I notice that "make distcheck" is broken, however -- when it goes to "make 
dist" in the expanded tarball, I get the following message:

-
*** The srcdir does not already have a doxygen-doc tree built.
*** hwloc's config/distscript.csh requires the docs to be built
*** in the srcdir before executing 'make dist'.
make[3]: *** [dist-hook] Error 1
make[2]: *** [distdir] Error 2
make[1]: *** [dist] Error 2
make: *** [distcheck] Error 1
-

Is this expected / has this been broken for a while?




On Mar 31, 2014, at 1:42 AM, Brice Goglin  wrote:

> Le 31/03/2014 00:57, Christopher Samuel a écrit :
>> On 30/03/14 02:04, Ralph Castain wrote:
>> 
>>> turns out that some linux distro's automatically set LS_COLORS in
>>> your environment when running old versions of csh/tcsh via their
>>> default dot files
>> 
>> For example RHEL6 does this..
> 
> Looks like it's a 10 years old conflict between csh and coreutils. It's
> crary hwloc has to work around this very old issue, we should just stop
> using csh and distros that haven't fixed this :)
> 
> Brice
> 
> ___
> hwloc-devel mailing list
> hwloc-de...@open-mpi.org
> http://www.open-mpi.org/mailman/listinfo.cgi/hwloc-devel


-- 
Jeff Squyres
jsquy...@cisco.com
For corporate legal information go to: 
http://www.cisco.com/web/about/doing_business/legal/cri/

Re: [hwloc-devel] GIT: hwloc branch master updated. 0e6fe307c10d47efee3fb95c50aee9c0f01bc8ec

2014-03-31 Thread Brice Goglin 
Le 31/03/2014 00:57, Christopher Samuel a écrit :
> On 30/03/14 02:04, Ralph Castain wrote:
>
> > turns out that some linux distro's automatically set LS_COLORS in
> > your environment when running old versions of csh/tcsh via their
> > default dot files
>
> For example RHEL6 does this..

Looks like it's a 10 years old conflict between csh and coreutils. It's
crary hwloc has to work around this very old issue, we should just stop
using csh and distros that haven't fixed this :)

Brice

Re: [hwloc-devel] GIT: hwloc branch master updated. 0e6fe307c10d47efee3fb95c50aee9c0f01bc8ec

2014-03-30 Thread Christopher Samuel 
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

On 30/03/14 02:04, Ralph Castain wrote:

> turns out that some linux distro's automatically set LS_COLORS in 
> your environment when running old versions of csh/tcsh via their 
> default dot files

For example RHEL6 does this..

- -- 
 Christopher SamuelSenior Systems Administrator
 VLSCI - Victorian Life Sciences Computation Initiative
 Email: sam...@unimelb.edu.au Phone: +61 (0)3 903 55545
 http://www.vlsci.org.au/  http://twitter.com/vlsci

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iEYEARECAAYFAlM4oXcACgkQO2KABBYQAh8Y6QCbBf7tHJ/7CuUSUbcaa+SvRtBx
snwAn2zLdXGF9bzyBVmsPjl56uY3ozWW
=FxcX
-END PGP SIGNATURE-

Re: [hwloc-devel] GIT: hwloc branch master updated. 0e6fe307c10d47efee3fb95c50aee9c0f01bc8ec

2014-03-29 Thread Ralph Castain 
Jeff just left today for a 1-week vacation. However, this came up on the OMPI 
mailing list - turns out that some linux distro's automatically set LS_COLORS 
in your environment when running old versions of csh/tcsh via their default dot 
files, and it can cause problems with the script. So just ensuring it isn't set 
solves the problem.


On Mar 29, 2014, at 7:59 AM, Brice Goglin  wrote:

> Jeff,
> Where does this LS_COLORS variable come from? Who is setting it?
> Brice
> 
> 
> 
> Le 27/03/2014 11:45, MPI Team a écrit :
>> The branch, master has been updated
>>   via  0e6fe307c10d47efee3fb95c50aee9c0f01bc8ec (commit)
>>  from  00f85033d269e2c312370bb24043f92a92dff7e3 (commit)
>> 
>> Those revisions listed above that are new to this repository have
>> not appeared on any other notification email; so we list those
>> revisions in full, below.
>> 
>> - Log -
>> https://github.com/open-mpi/hwloc/commit/0e6fe307c10d47efee3fb95c50aee9c0f01bc8ec
>> 
>> commit 0e6fe307c10d47efee3fb95c50aee9c0f01bc8ec
>> Author: Jeff Squyres 
>> Date:   Thu Mar 27 06:28:45 2014 -0400
>> 
>>BUILD: fix "make dist" failure on some linux distro with old csh/tcsh
>> 
>>On some linux distro (sles11sp2) csh fails to parse $LS_COLORS and
>>borks with error: Unknown colorls variable `mh'.
>> 
>>The workaround is to unset LS_COLORS before calling to csh script.
>> ---
>> Makefile.am | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>> 
>> diff --git a/Makefile.am b/Makefile.am
>> index ca9c00c..34d0aa2 100644
>> --- a/Makefile.am
>> +++ b/Makefile.am
>> @@ -1,6 +1,6 @@
>> # Copyright © 2009-2014 Inria.  All rights reserved.
>> # Copyright © 2009  Université Bordeaux 1
>> -# Copyright © 2009-2010 Cisco Systems, Inc.  All rights reserved.
>> +# Copyright © 2009-2014 Cisco Systems, Inc.  All rights reserved.
>> # See COPYING in top-level directory.
>> 
>> # Note that the -I directory must *exactly* match what was specified
>> @@ -48,7 +48,7 @@ endif
>> 
>> if HWLOC_BUILD_STANDALONE
>> dist-hook:
>> -csh "$(top_srcdir)/config/distscript.csh" "$(top_srcdir)" "$(distdir)" 
>> "$(HWLOC_VERSION)"
>> +env LS_COLORS= csh "$(top_srcdir)/config/distscript.csh" 
>> "$(top_srcdir)" "$(distdir)" "$(HWLOC_VERSION)"
>> endif HWLOC_BUILD_STANDALONE
>> 
>> #
>> 
>> ---
>> 
>> Summary of changes:
>> Makefile.am | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>> 
>> 
>> hooks/post-receive
> 
> ___
> hwloc-devel mailing list
> hwloc-de...@open-mpi.org
> http://www.open-mpi.org/mailman/listinfo.cgi/hwloc-devel

Re: [hwloc-devel] GIT: hwloc branch master updated. 0e6fe307c10d47efee3fb95c50aee9c0f01bc8ec

2014-03-29 Thread Brice Goglin 
Jeff,
Where does this LS_COLORS variable come from? Who is setting it?
Brice



Le 27/03/2014 11:45, MPI Team a écrit :
> The branch, master has been updated
>via  0e6fe307c10d47efee3fb95c50aee9c0f01bc8ec (commit)
>   from  00f85033d269e2c312370bb24043f92a92dff7e3 (commit)
>
> Those revisions listed above that are new to this repository have
> not appeared on any other notification email; so we list those
> revisions in full, below.
>
> - Log -
> https://github.com/open-mpi/hwloc/commit/0e6fe307c10d47efee3fb95c50aee9c0f01bc8ec
>
> commit 0e6fe307c10d47efee3fb95c50aee9c0f01bc8ec
> Author: Jeff Squyres 
> Date:   Thu Mar 27 06:28:45 2014 -0400
>
> BUILD: fix "make dist" failure on some linux distro with old csh/tcsh
> 
> On some linux distro (sles11sp2) csh fails to parse $LS_COLORS and
> borks with error: Unknown colorls variable `mh'.
> 
> The workaround is to unset LS_COLORS before calling to csh script.
> ---
>  Makefile.am | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Makefile.am b/Makefile.am
> index ca9c00c..34d0aa2 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -1,6 +1,6 @@
>  # Copyright © 2009-2014 Inria.  All rights reserved.
>  # Copyright © 2009  Université Bordeaux 1
> -# Copyright © 2009-2010 Cisco Systems, Inc.  All rights reserved.
> +# Copyright © 2009-2014 Cisco Systems, Inc.  All rights reserved.
>  # See COPYING in top-level directory.
>  
>  # Note that the -I directory must *exactly* match what was specified
> @@ -48,7 +48,7 @@ endif
>  
>  if HWLOC_BUILD_STANDALONE
>  dist-hook:
> - csh "$(top_srcdir)/config/distscript.csh" "$(top_srcdir)" "$(distdir)" 
> "$(HWLOC_VERSION)"
> + env LS_COLORS= csh "$(top_srcdir)/config/distscript.csh" 
> "$(top_srcdir)" "$(distdir)" "$(HWLOC_VERSION)"
>  endif HWLOC_BUILD_STANDALONE
>  
>  #
>
> ---
>
> Summary of changes:
>  Makefile.am | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
>
> hooks/post-receive