<html>
<head>
<style>
.hmmessage P
{
margin:0px;
padding:0px
}
body.hmmessage
{
font-size: 10pt;
font-family:Verdana
}
</style>
</head>
<body class='hmmessage'>
[truncated]<BR><BR><BR><BR><BR><BR> <BR>
<HR id=stopSpelling>
From: jay.krell@cornell.edu<BR>To: jkrell@elego.de; m3commit@elegosoft.com; m3devel@elegosoft.com; hosking@cs.purdue.edu<BR>Subject: re: removal of recent hardlink usage (using lib and not pkg)<BR>Date: Fri, 3 Jul 2009 13:46:24 +0000<BR><BR>
<STYLE>
.ExternalClass .EC_hmmessage P
{padding:0px;}
.ExternalClass body.EC_hmmessage
{font-size:10pt;font-family:Verdana;}
</STYLE>
Easier than I thought.<BR>See, I kinda though install_derived was more important and should be used.<BR>But just replace it with LibdExport.<BR> <BR>Index: AMD64_DARWIN<BR>===================================================================<BR>RCS file: /usr/cvs/cm3/m3-sys/cminstall/src/config-no-install/AMD64_DARWIN,v<BR>retrieving revision 1.5<BR>diff -u -r1.5 AMD64_DARWIN<BR>--- AMD64_DARWIN 29 Jun 2009 18:52:01 -0000 1.5<BR>+++ AMD64_DARWIN 3 Jul 2009 13:37:03 -0000<BR>@@ -321,18 +321,21 @@<BR> link_file(lib_sox, lib_so)<BR> <BR> % finally, make sure the shared library stuff gets installed properly<BR>- install_derived (lib_soxx)<BR>- install_derived_link (lib_soxx, lib_sox)<BR>- install_derived_link (lib_sox, lib_so)<BR>- install_link_to_derived (lib_soxx, LIB_INSTALL)<BR>- install_link_to_derived (lib_sox, LIB_INSTALL)<BR>- install_link_to_derived (lib_so, LIB_INSTALL)<BR>+ LibdExport(lib_soxx)<BR>+ link_file(lib_soxx, LIB_INSTALL & SL & lib_sox)<BR>+ link_file(lib_sox, LIB_INSTALL & SL & lib_so)<BR> else<BR> delete_file (lib_so)<BR> delete_file (lib_sox)<BR> delete_file (lib_soxx)<BR> end<BR> <BR>+ % delete old .so files in package store<BR>+ local pkg = PKG_INSTALL & SL & lib & SL & TARGET & SL<BR>+ delete_file(pkg & lib_so)<BR>+ delete_file(pkg & lib_sox)<BR>+ delete_file(pkg & lib_soxx)<BR>+<BR> return 0<BR> end<BR> <BR>@@ -355,18 +358,21 @@<BR> link_file(lib_sox, lib_so)<BR> <BR> % make sure the shared library stuff gets installed properly<BR>- install_derived (lib_soxx)<BR>- install_derived_link (lib_soxx, lib_sox)<BR>- install_derived_link (lib_sox, lib_so)<BR>- install_link_to_derived (lib_soxx, LIB_INSTALL)<BR>- install_link_to_derived (lib_sox, LIB_INSTALL)<BR>- install_link_to_derived (lib_so, LIB_INSTALL)<BR>+ LibdExport(lib_soxx)<BR>+ link_file(lib_soxx, LIB_INSTALL & SL & lib_sox)<BR>+ link_file(lib_sox, LIB_INSTALL & SL & lib_so)<BR> else<BR> delete_file (lib_so)<BR> delete_file (lib_sox)<BR> delete_file (lib_soxx)<BR> end<BR> <BR>+ % delete old .so files in package store<BR>+ local pkg = PKG_INSTALL & SL & lib & SL & TARGET & SL<BR>+ delete_file(pkg & lib_so)<BR>+ delete_file(pkg & lib_sox)<BR>+ delete_file(pkg & lib_soxx)<BR>+<BR> return 0<BR> end<BR> <BR>Index: Darwin.common<BR>===================================================================<BR>RCS file: /usr/cvs/cm3/m3-sys/cminstall/src/config-no-install/Darwin.common,v<BR>retrieving revision 1.9<BR>diff -u -r1.9 Darwin.common<BR>--- Darwin.common 29 Jun 2009 18:52:01 -0000 1.9<BR>+++ Darwin.common 3 Jul 2009 13:37:03 -0000<BR>@@ -138,18 +138,20 @@<BR> link_file(lib_sox, lib_so)<BR> <BR> % finally, make sure the shared library stuff gets installed properly<BR>- install_derived (lib_soxx)<BR>- install_derived_link (lib_soxx, lib_sox)<BR>- install_derived_link (lib_sox, lib_so)<BR>- install_link_to_derived (lib_soxx, LIB_INSTALL)<BR>- install_link_to_derived (lib_sox, LIB_INSTALL)<BR>- install_link_to_derived (lib_so, LIB_INSTALL)<BR>+ LibdExport(lib_soxx)<BR>+ link_file(lib_soxx, LIB_INSTALL & SL & lib_sox)<BR>+ link_file(lib_sox, LIB_INSTALL & SL & lib_so)<BR> else<BR> delete_file (lib_so)<BR> delete_file (lib_sox)<BR> delete_file (lib_soxx)<BR> end<BR> <BR>+ % delete old .so files in package store<BR>+ local pkg = PKG_INSTALL & SL & lib & SL & TARGET & SL<BR>+ delete_file(pkg & lib_so)<BR>+ delete_file(pkg & lib_sox)<BR>+<BR> return 0<BR> end<BR> <BR>@@ -172,18 +174,22 @@<BR> link_file(lib_sox, lib_so)<BR> <BR> % make sure the shared library stuff gets installed properly<BR>- install_derived (lib_soxx)<BR>- install_derived_link (lib_soxx, lib_sox)<BR>- install_derived_link (lib_sox, lib_so)<BR>- install_link_to_derived (lib_soxx, LIB_INSTALL)<BR>- install_link_to_derived (lib_sox, LIB_INSTALL)<BR>- install_link_to_derived (lib_so, LIB_INSTALL)<BR>+ LibdExport(lib_soxx)<BR>+ link_file(lib_soxx, LIB_INSTALL & SL & lib_sox)<BR>+ link_file(lib_sox, LIB_INSTALL & SL & lib_so)<BR>+<BR> else<BR> delete_file (lib_so)<BR> delete_file (lib_sox)<BR> delete_file (lib_soxx)<BR> end<BR> <BR>+ % delete old .so files in package store<BR>+ local pkg = PKG_INSTALL & SL & lib & SL & TARGET & SL<BR>+ delete_file(pkg & lib_so)<BR>+ delete_file(pkg & lib_sox)<BR>+ delete_file(pkg & lib_soxx)<BR>+<BR> return 0<BR> end<BR> <BR>Index: Solaris.common<BR>===================================================================<BR>RCS file: /usr/cvs/cm3/m3-sys/cminstall/src/config-no-install/Solaris.common,v<BR>retrieving revision 1.12<BR>diff -u -r1.12 Solaris.common<BR>--- Solaris.common 29 Jun 2009 18:52:01 -0000 1.12<BR>+++ Solaris.common 3 Jul 2009 13:37:03 -0000<BR>@@ -85,15 +85,18 @@<BR> link_file(lib_sox, lib_so)<BR> <BR> % finally, make sure the shared library stuff gets installed properly<BR>- install_derived (lib_sox)<BR>- install_derived_link (lib_sox, lib_so)<BR>- install_link_to_derived (lib_sox, LIB_INSTALL)<BR>- install_link_to_derived (lib_so, LIB_INSTALL)<BR>+ LibdExport(lib_sox)<BR>+ link_file(lib_sox, LIB_INSTALL & SL & lib_so)<BR> else<BR> delete_file (lib_so)<BR> delete_file (lib_sox)<BR> end<BR> <BR>+ % delete old .so files in package store<BR>+ local pkg = PKG_INSTALL & SL & lib & SL & TARGET & SL<BR>+ delete_file(pkg & lib_so)<BR>+ delete_file(pkg & lib_sox)<BR>+<BR> return 0<BR> end<BR> <BR>Index: Unix.common<BR>===================================================================<BR>RCS file: /usr/cvs/cm3/m3-sys/cminstall/src/config-no-install/Unix.common,v<BR>retrieving revision 1.29<BR>diff -u -r1.29 Unix.common<BR>--- Unix.common 27 Jun 2009 16:53:43 -0000 1.29<BR>+++ Unix.common 3 Jul 2009 13:37:03 -0000<BR>@@ -311,12 +311,15 @@<BR> link_file(lib_sox, lib_so)<BR> <BR> % make sure the shared library stuff gets installed properly<BR>- install_derived(lib_sox)<BR>- install_derived_link(lib_sox, lib_so)<BR>- install_hard_link_to_derived(lib_sox, LIB_INSTALL)<BR>- install_link_to_derived(lib_so, LIB_INSTALL)<BR>+ LibdExport(lib_sox)<BR>+ link_file(lib_sox, LIB_INSTALL & SL & lib_so)<BR> ShipM3CoreStaticObjs(lib)<BR> <BR>+ % delete old .so files in package store<BR>+ local pkg = PKG_INSTALL & SL & lib & SL & TARGET & SL<BR>+ delete_file(pkg & lib_so)<BR>+ delete_file(pkg & lib_sox)<BR>+<BR> return 0<BR> end<BR> <BR>@@ -342,16 +345,19 @@<BR> link_file(lib_sox, lib_so)<BR> <BR> % make sure the shared library stuff gets installed properly<BR>- install_derived(lib_sox)<BR>- install_derived_link(lib_sox, lib_so)<BR>- install_hard_link_to_derived(lib_sox, LIB_INSTALL)<BR>- install_link_to_derived(lib_so, LIB_INSTALL)<BR>+ LibdExport(lib_sox)<BR>+ link_file(lib_sox, LIB_INSTALL & SL & lib_so)<BR> ShipM3CoreStaticObjs(lib)<BR> else<BR> delete_file(lib_so)<BR> delete_file(lib_sox)<BR> end<BR> <BR>+ % delete old .so files in package store<BR>+ local pkg = PKG_INSTALL & SL & lib & SL & TARGET & SL<BR>+ delete_file(pkg & lib_so)<BR>+ delete_file(pkg & lib_sox)<BR>+<BR> return 0<BR> end<BR> <BR>Index: cm3cfg.common<BR>===================================================================<BR>RCS file: /usr/cvs/cm3/m3-sys/cminstall/src/config-no-install/cm3cfg.common,v<BR>retrieving revision 1.27<BR>diff -u -r1.27 cm3cfg.common<BR>--- cm3cfg.common 18 Jun 2009 16:20:48 -0000 1.27<BR>+++ cm3cfg.common 3 Jul 2009 13:37:03 -0000<BR>@@ -105,14 +105,6 @@<BR> <BR> %------------------------------------------------------------------------------<BR> <BR>-if not defined("install_hard_link_to_derived")<BR>- proc install_hard_link_to_derived(a, b) is<BR>- install_link_to_derived(a, b)<BR>- end<BR>-end<BR>-<BR>-%------------------------------------------------------------------------------<BR>-<BR> if not defined("subst_chars")<BR> %<BR> % Ok, some cross builds will fail with older tools, but<BR><BR><BR><BR><BR><BR><BR> <BR>> Date: Fri, 3 Jul 2009 15:37:57 +0000<BR>> To: m3commit@elegosoft.com<BR>> From: jkrell@elego.de<BR>> Subject: [M3commit] CVS Update: cm3<BR>> <BR>> CVSROOT: /usr/cvs<BR>> Changes by: jkrell@birch. 09/07/03 15:37:57<BR>> <BR>> Modified files:<BR>> cm3/m3-sys/cminstall/src/config-no-install/: AMD64_DARWIN <BR>> Darwin.common <BR>> Solaris.common <BR>> Unix.common <BR>> cm3cfg.common <BR>> <BR>> Log message:<BR>> Put .so/.dylib files only in root/lib and not in root/pkg.<BR>> Delete any that are leftover in root/pkg.<BR>> Despite the multiple platform-specific implementations,<BR>> tested only on AMD64_LINUX. Solaris, Darwin, subject to<BR>> breakage due to typos, etc., but it should be at least<BR>> close to correct.<BR>> <BR></body>
</html>