[Lsb-messages] /var/www/bzr/lsb/devel/lsbspec r3832: top level of module renaming
Mats Wichmann
mats at linuxfoundation.org
Fri Nov 9 14:54:01 UTC 2012
------------------------------------------------------------
revno: 3832
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: lsbspec
timestamp: Fri 2012-11-09 07:54:01 -0700
message:
top level of module renaming
modified:
makefile
mkcmdlist
mkcmdtable
mklibapnd
-------------- next part --------------
=== modified file 'makefile'
--- a/makefile 2012-11-08 20:23:40 +0000
+++ b/makefile 2012-11-09 14:54:01 +0000
@@ -1,8 +1,9 @@
-DOCDIRS=ELF LSB Packaging Graphics Graphics-Ext \
- Toolkit_Gtk Toolkit_Qt XML Desktop \
- Perl Python Languages Multimedia Imaging \
- Security TUM TrialUse Print Scan
+DOCDIRS=ELF LSB Packaging Security \
+ Graphics Toolkit_Gtk Toolkit_Qt Multimedia Desktop \
+ Perl Python XML Languages \
+ Print Scan Imaging \
+ TUM TrialUse
SUBDIRS= $(DOCDIRS)
=== modified file 'mkcmdlist'
--- a/mkcmdlist 2012-03-13 09:06:39 +0000
+++ b/mkcmdlist 2012-11-09 14:54:01 +0000
@@ -7,7 +7,7 @@
sub usage()
{
-print STDERR "mkcmdlist -v <lsbversion> [-m <module> ]\n Default module is LSB_Core\n";
+print STDERR "mkcmdlist -v <lsbversion> [-m <submodule> ]\n Default submodule is LSB_Base\n";
die;
}
@@ -17,7 +17,9 @@
#
# 1) process the arguments
#
-# We can get module id from Module Table. Commands list will be generated as per modules.
+# We can get submodule id from SubModule Table.
+# Commands list will be generated as per submodules.
+
GetOptions("m=s" => \$module,
"v=s" => \$lsbversion);
if( !$lsbversion ) { usage(); }
@@ -29,12 +31,10 @@
or die "Couldn't connect to database: ".DBI->errstr;
if( !$module ) {
- $moduleid=1;
-}
-else {
- ($moduleid) = $dbh->selectrow_array("SELECT SMid FROM SubModule WHERE SMname='$module'");
- die("Incorrect SubModule name") if not $moduleid;
-}
+ $module='LSB_Base';
+}
+($moduleid) = $dbh->selectrow_array("SELECT SMid FROM SubModule WHERE SMname='$module'");
+die("Incorrect SubModule name") if not $moduleid;
printf("<!-- Start of generated text - do not edit! -->\n");
printf("<!-- generated from the LSB specification database by mkcmdlist -->\n");
=== modified file 'mkcmdtable'
--- a/mkcmdtable 2012-06-28 23:19:12 +0000
+++ b/mkcmdtable 2012-11-09 14:54:01 +0000
@@ -17,7 +17,7 @@
sub usage()
{
- print STDERR "mkcmdtable -v <lsbversion> [-b] [-m <module>]\n Default module is LSB_Core.\n";
+ print STDERR "mkcmdtable -v <lsbversion> [-b] [-m <subsubmodule>]\n Default module is LSB_Base.\n";
die;
}
################################################################################
@@ -262,17 +262,16 @@
# We can get module id from Module Table. Commands list will be generated as per modules.
GetOptions("b" => \$builtins,
"m=s" => \$module,
- "v=s" => \$lsbversion);
+ "v=s" => \$lsbversion);
lsbOpenDB;
if(!$module) {
- $moduleid=1;
-}
-else {
- ($moduleid) = $dbh->selectrow_array("SELECT SMid FROM SubModule WHERE SMname='$module'");
- die("Incorrect SubModule name") if not $moduleid;
-}
+ $module='LSB_Base';
+}
+($moduleid) = $dbh->selectrow_array("SELECT SMid FROM SubModule WHERE SMname='$module'");
+die("Incorrect SubModule name") if not $moduleid;
+
if(!$lsbversion) { usage(); }
lsbCommands;
=== modified file 'mklibapnd'
--- a/mklibapnd 2012-05-31 15:18:16 +0000
+++ b/mklibapnd 2012-11-09 14:54:01 +0000
@@ -7,7 +7,7 @@
sub usage()
{
-print STDERR "mklibapdn -a <archname> -v <lsbversion> [-m module]\n Default module is LSB Core\n";
+print STDERR "mklibapdn -a <archname> -v <lsbversion> [-m submodule]\n Default submodule is LSB_Base\n";
die;
}
@@ -18,9 +18,10 @@
# 1) process the arguments
#
GetOptions("a=s" => \$archname,
- "v=s" => \$lsbversion,
+ "v=s" => \$lsbversion,
"m=s" => \$module);
-if( !$module ) { $module='LSB_Core'; }
+
+if( !$module ) { $module='LSB_Base'; }
if( !$archname ) { usage(); }
if( !$lsbversion ) { usage(); }
More information about the lsb-messages
mailing list