[Lsb-messages] /var/www/bzr/lsb/devel/lsbspec r4063: Add Languages commands.
Jeff Licquia
licquia at linuxfoundation.org
Mon Feb 16 22:35:40 UTC 2015
------------------------------------------------------------
revno: 4063
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: lsbspec
timestamp: Mon 2015-02-16 17:35:40 -0500
message:
Add Languages commands.
added:
Common/generic/langcmds.sgml
modified:
Common/generic/commands.m4
Common/generic/commands.sgml
Common/generic/intro.sgml
Common/generic/makefile
mkcmdtable
-------------- next part --------------
=== modified file 'Common/generic/commands.m4'
--- a/Common/generic/commands.m4 2015-02-16 21:39:50 +0000
+++ b/Common/generic/commands.m4 2015-02-16 22:35:40 +0000
@@ -12,3 +12,12 @@
</tgroup>
</table>
</para>
+
+<para>
+<table id=tbl-langcmd>
+<title>LSB Languages Module Command Names</title>
+<tgroup cols=5>
+m4_include(`langcmds.sgml')
+</tgroup>
+</table>
+</para>
=== modified file 'Common/generic/commands.sgml'
--- a/Common/generic/commands.sgml 2015-02-16 21:39:50 +0000
+++ b/Common/generic/commands.sgml 2015-02-16 22:35:40 +0000
@@ -325,3 +325,28 @@
</tgroup>
</table>
</para>
+
+<para>
+<table id=tbl-langcmd>
+<title>LSB Languages Module Command Names</title>
+<tgroup cols=5>
+<!-- Start of text generated from database -->
+<tbody>
+<row>
+<entry>perl
+</entry>
+<entry>python
+</entry>
+<entry>
+</entry>
+<entry>
+</entry>
+<entry>
+</entry>
+</row>
+</tbody>
+<!-- End of text generated from database -->
+
+</tgroup>
+</table>
+</para>
=== modified file 'Common/generic/intro.sgml'
--- a/Common/generic/intro.sgml 2015-02-16 21:39:50 +0000
+++ b/Common/generic/intro.sgml 2015-02-16 22:35:40 +0000
@@ -591,6 +591,31 @@
</table>
</para>
+<para>
+<table id=tbl-langcmd>
+<title>LSB Languages Module Command Names</title>
+<tgroup cols=5>
+<!-- Start of text generated from database -->
+<tbody>
+<row>
+<entry>perl
+</entry>
+<entry>python
+</entry>
+<entry>
+</entry>
+<entry>
+</entry>
+<entry>
+</entry>
+</row>
+</tbody>
+<!-- End of text generated from database -->
+
+</tgroup>
+</table>
+</para>
+
</sect1>
<sect1 id="Implementation">
=== added file 'Common/generic/langcmds.sgml'
--- a/Common/generic/langcmds.sgml 1970-01-01 00:00:00 +0000
+++ b/Common/generic/langcmds.sgml 2015-02-16 22:35:40 +0000
@@ -0,0 +1,16 @@
+<!-- Start of text generated from database -->
+<tbody>
+<row>
+<entry>perl
+</entry>
+<entry>python
+</entry>
+<entry>
+</entry>
+<entry>
+</entry>
+<entry>
+</entry>
+</row>
+</tbody>
+<!-- End of text generated from database -->
=== modified file 'Common/generic/makefile'
--- a/Common/generic/makefile 2015-02-16 21:39:50 +0000
+++ b/Common/generic/makefile 2015-02-16 22:35:40 +0000
@@ -5,7 +5,7 @@
FILES=intro.sgml
LIBTABLES= corelibs.sgml pscorelibs.sgml desklibs.sgml imaglibs.sgml \
langlibs.sgml
-CMDTABLES= corecmds.sgml
+CMDTABLES= corecmds.sgml langcmds.sgml
SCOPES=scope.sgml
CORESUBMOD="LSB_Base,LSB_Security"
# LSB_Toolkit_Independent has no libraries currently
@@ -33,6 +33,8 @@
-m $(LANGSUBMOD) >langlibs.sgml
$(TOP)/mkcmdtable -q -v `cat $(TOP)/target_version` \
-m LSB_Base >corecmds.sgml
+ $(TOP)/mkcmdtable -q -v `cat $(TOP)/target_version` \
+ -m LSB_Perl,LSB_Python >langcmds.sgml
clean:
rm -f $(FILES)
=== modified file 'mkcmdtable'
--- a/mkcmdtable 2015-02-16 21:39:50 +0000
+++ b/mkcmdtable 2015-02-16 22:35:40 +0000
@@ -160,7 +160,7 @@
$sth = $dbh->prepare("SELECT DISTINCT Sfull, Sid, Sname FROM Standard,Command
LEFT JOIN SModCmd ON Command.Cid=SModCmd.SMCcid
LEFT JOIN CmdStd ON CScid=Cid
- WHERE SModCmd.SMCsmid=$moduleid
+ WHERE SModCmd.SMCsmid IN ($moduleid)
AND Standard.Sid=CSsid
AND SMCappearedin > '' AND SMCappearedin<='$lsbversion'
AND (SMCwithdrawnin IS NULL OR SMCwithdrawnin>'$lsbversion')
@@ -199,7 +199,7 @@
AND CSappearedin > '' AND CSappearedin<='$lsbversion'
AND (CSwithdrawnin IS NULL OR CSwithdrawnin>'$lsbversion')
AND $builtinCheck
- AND SModCmd.SMCsmid=$moduleid
+ AND SModCmd.SMCsmid IN ($moduleid)
ORDER BY Command.Cname");
$sth->execute;
@@ -316,8 +316,16 @@
if(!$module) {
$module='LSB_Base';
}
-($moduleid) = $dbh->selectrow_array("SELECT SMid FROM SubModule WHERE SMname='$module'");
-die("Incorrect SubModule name") if not $moduleid;
+$moduleid = "";
+foreach $mod (split /,/, $module) {
+ ($modid) = $dbh->selectrow_array("SELECT SMid FROM SubModule WHERE SMname='$mod'");
+ die("Incorrect SubModule name: " . $mod) if not $modid;
+ if ($moduleid == "") {
+ $moduleid = $modid;
+ } else {
+ $moduleid = $moduleid . "," . $modid;
+ }
+}
if(!$lsbversion) { usage(); }
More information about the lsb-messages
mailing list