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