A few additional points:
1. Expect's build is using the cc wrapper script under tools. I will
change this. (The wrapper script can either be corrected to use
SPRO_VROOT or can remain broken so that it will get caught :) when ppl
using it - esp when moving SW from CCD to SFW)
2. Currently tcl's headers are installed using the
install-private-headers rule in the Makefile generated in the base
package. I see 3 ways to use it while doing expect's build
a) Install using the tcl Makefile's install-private-headers (Currently
I have included in install_h rule of tcl)
b) Create a new install-sfw
c) Do not install to proto area, refer to tcl & tk's source dir
directly within expect's build.
3. Doing a "make -f Makefile.sfw install" on SFW with my changes will
break during build of expect because the required TCL's headers are
not installed during tcl's "make -f Makefile.sfw install". Instead it
is currently in "make -f Makefile.sfw install_h"
This I will change appropriately based on your comment to the above point
4. I have used sfw-src-20070822.tar.bz2 and ccd-src-20070526.tar.bz2
as the sources.
regards
Shiv
On 9/23/07, S h i v <shivakumar.gn at gmail.com> 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.
>
> The required patches are attached. The patches are to be interpreted
> after these steps
>
> # <Set to CCD Source Dir>
> CCD_SRC=ccd-src-20070526/usr/src
>
> # <Set to SFW Source Dir that will remain unchanged>
> SFW_SRC_ORIG=sfw-src-b72-20070822.orig/usr/src
>
> # <Set to Another copy of SFW Source Dir that will get patched>
> SFW_SRC=sfw-src-b72-20070822/usr/src
>
> cp -r ${CCD_SRC}/cmd/expect ${SFW_SRC}/cmd/
> cp -r ${CCD_SRC}/pkgdefs/SFWexpct ${SFW_SRC}/pkgdefs/SUNWexpect
>
> 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
>
> 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
>
> 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.
>
> patch: Expect_Build_Configure_RightPaths.diff
>
> 4. Expect is to be installed to the correct paths (/usr/bin, /usr/lib,
> /usr/man instead of /usr/sfw, /opt/sfw)
> patch: Expect_Install_Correct_Paths.diff
>
> 5. Modify Makefile in pkgdefs so that expect package gets created.
> I have named the package as SUNWexpect.
> patch: Expect_SFW_PackageCreation_Integration.diff
>
> 6. Changes required to SUNWexpect to create package with right name
> and install files to the right paths
> patch: Expect_SFW_PackageCreation_Integration.diff
>
> Testing the expect from proto area:
> I tested the expect created in the proto area by writing simple expect
> scripts.
> Worked without issues.
>
> 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.
>
> Not Done: I have not made the necessary changes to remove expect from
> CCD consolidation.
>
> I can upload the actual tarball of the changed files/dirs if necessary.
>
> thanks and best regards
> Shiv
>
>
