S h i v wrote:
> Hello Mike/Steve,
>
> On 8/30/07, S h i v <shivakumar.gn at gmail.com> wrote:
>> I'll have a look at the CCD/SFW sources and get back once I make the
>> necessary change or if there are any other queries.
>>
>
> I have done the necessary steps to integrate expect into SFW.
> I request you to review the same and provide the feedback. My
> contributor agreement number is OS0066.
I'd say 'what about webrev' but saw you ask about that on -tools :)
I'd also probably just do the sfw bit first and the ccd bit a little
later, as it is usually behind a few builds (many now because of
the tcl/tk upgrade) and I'd hate to have a window where there's no
expect anywhere because it's gone from the ccd but not in sfw since
the build with it isn't available yet. Unless it hurts having
one in /opt/sfw too but I wouldn't think it would.
(I'm not reviewing these changes just what you said you did,
as I think Dermot already may have)
he also mentioned the arc so I won't.
> Now, following are the changes done to integrate it into SFW
> 1. Modify ${SFW_SRC}/cmd/Makefile so that expect gets built as part of
> SFW consolidation
> patch: Expect_SFW_Build_Integration.diff
yeah.
>
> 2. Modify tcl's Makefile so that the headers required to build expect
> are installed
> File: ${SFW_SRC}/lib/tcl/Makefile.sfw
> patch: Expect_Install_TclHeaders.diff
>
> Query: I have made change to install_h section. This does not get
> installed as part of "make -f Makefile.sfw install"
> Should it be made part of "all:" in the Makefile
actually I wonder why you're shipping those at all? We tend to ship
what the open source thing would really install, and if it doesn't
install some things when 'make install' runs then we don't either.
Why can't you continue to use, in expect:
--with-tclinclude=/usr/sfw/src/tcl
--with-tkinclude=/usr/sfw/src/tk
but change them to point at the source inside the workspace?
I did some of that when trying to help the ccd cope with the
tcl/tk upgrade, and it looks like I did something like this:
--with-tclinclude=$(SRC)/lib/tcl/tcl8.4.14
--with-tkinclude=$(SRC)/lib/tk/tk8.4.14
well, it's a little different for the ccd since the sources
aren't in there but I changed the paths above to what it looks
like they would be.
>
> 3. Modify expect's Makefile.sfw so that it uses the right lib/src
> paths. Remove the earlier existing patch fixline1.patch since it is no
> longer required.
> fixline1.patch was used to pick /usr/sfw/bin/tail instead of tail, but
> tail is avaialble in /usr/bin and the patch is not required.
actually you mean /opt/sfw/bin/tail. But...
so this confuses me - I don't know why this patch is there (tail has
always been in /usr/bin), so I assume it wanted the one in /opt/sfw/bin
because that was GNU tail. Which it may still want and should point to
/usr/gnu/bin/tail instead. I can't find any more information other than
it was added during the update to 5.39 and created by, I think,
Paul Cunningham, so perhaps he can add something here :)
If it does need that then the expect package will need to
depend on SUNWgnu-coreutils.
> 5. Modify Makefile in pkgdefs so that expect package gets created.
> I have named the package as SUNWexpect.
> patch: Expect_SFW_PackageCreation_Integration.diff
whoever sponsers this will need to register that package name
and do the package rti's and such.
SUNWexpect doesn't seem to be taken so that's good.
> Testing the packaging:
> I am not very familiar with SVR4 packaging related aspects. I have
> made changes based on the existing dir structure and packaging inputs.
> But doing a make failed to create packages for SFW and CCD. I would
> need some inputs as to how to build packages in SFW consolidation.
I would need to see the failure. I would think you could almost
copy the ccd package (SFW*) to usr/src/pkgdefs and call it SUNWexpect,
and it would work, apart from changing 'sfw' in prototype_com to 'usr'.
well and maybe the man pages need a 'share' in there.
nightly should build the packages - if you do it by hand
you need to do 'make all' first to generate some of the files
then 'make install' should run pkgmk. and of course all the files
have to be in the proto area for pkgmk to work first.
> Not Done: I have not made the necessary changes to remove expect from
> CCD consolidation.
that's fine it can be later, and it's much easier anyway.
Mike
