Minor source patches
Adriaan de Groot <adridg-FlD2LfDziEhmR6Xm/[email protected]>
| Newsgroups | gmane.comp.tools.aap.devel |
|---|---|
| Message-ID | <[email protected]> |
Two little patches: one fixes some typo's in comments, and the doadddef patch
adds one more install-ltlib install target, since ltlibs need to be installed
through libtool, not /bin/install. It will need an action in default.aap as
well. I use:
:action installltlib default
@for i in var2dictlist(source):
destltlib=$DESTDIR/$PREFIX/$DLLDIR
@if i.has_key("installdir"):
@destltlib += "/" + i["installdir"] + "/"
@destltlib = os.path.abspath(destltlib)
@try:
@os.makedirs(destltlib)
@except OSError:
:print $destltlib already exists
@destltlib = destltlib + "/" + i["name"]
@destltlib = os.path.abspath(destltlib)
:sys $libtool --mode=install /usr/bin/install `i["name"]`
$destltlib
but this seems rather hackish to me. The other install targets all use
install_files(), which hides the complexity in the AAP sources, not in the
default recipe.
--
pub 1024D/FEA2A3FE 2002-06-18 Adriaan de Groot <[email protected]>
Key fingerprint = 934E 31AA 80A7 723F 54F9 50ED 76AC EE01 FEA2 A3FE
commands.diff
(text/x-diff, 952 B)
Index: Commands.py
===================================================================
RCS file: /cvsroot/a-a-p/Exec/Commands.py,v
retrieving revision 1.94
diff -u -3 -p -r1.94 Commands.py
--- Commands.py 21 Aug 2003 15:56:48 -0000 1.94
+++ Commands.py 21 Aug 2003 23:18:00 -0000
@@ -402,17 +402,16 @@ def aap_program(line_nr, recdict, arg, t
def aap_lib(line_nr, recdict, arg):
- """Add a static library build from sources."""
+ """Add a static library built from sources."""
aap_program(line_nr, recdict, arg, type = "lib")
def aap_ltlib(line_nr, recdict, arg):
- """Add a libtool library build from sources."""
+ """Add a libtool library built from sources."""
aap_program(line_nr, recdict, arg, type = "ltlib")
-
def aap_dll(line_nr, recdict, arg):
- """Add a dynamic library build from sources."""
+ """Add a dynamic library built from sources."""
aap_program(line_nr, recdict, arg, type = "dll")
doadddef.diff
(text/x-diff, 1.1 KB)
Index: DoAddDef.py
===================================================================
RCS file: /cvsroot/a-a-p/Exec/DoAddDef.py,v
retrieving revision 1.38
diff -u -3 -p -r1.38 DoAddDef.py
--- DoAddDef.py 7 Aug 2003 17:33:41 -0000 1.38
+++ DoAddDef.py 21 Aug 2003 23:18:17 -0000
@@ -67,6 +67,7 @@ def doadddef(work, recdict, toplevel):
"install-sbin",
"install-lib",
"install-dll",
+ "install-ltlib",
"install-conf" ],
"@if has_target('install-platform-local'):\n"
" :update install-platform-local\n")
@@ -86,6 +87,10 @@ def doadddef(work, recdict, toplevel):
"@if _top.get('INSTALL_DLL'):\n"
" :update $_top.INSTALL_DLL\n"
" :do installdll $_top.INSTALL_DLL\n")
+ add_install_target(work, recdict, "install-ltlib", [],
+ "@if _top.get('INSTALL_LTLIB'):\n"
+ " :update $_top.INSTALL_LTLIB\n"
+ " :do installltlib $_top.INSTALL_LTLIB\n")
add_install_target(work, recdict, "install-conf", [],
"@if _top.get('INSTALL_CONF'):\n"
" :update $_top.INSTALL_CONF\n"