Changeset 11472 for trunk

Timestamp:

10/04/08 16:27:05 (3 months ago)

Author:

juruen@…

Message:

add ebox-moddev-model

Location:

trunk/extra/moddev

Files:

• configure.ac (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• src/ebox-moddev-create (modified) (10 diffs)
• src/ebox-moddev-model.in (added)

trunk/extra/moddev/configure.ac

@@ -16 +16 @@
 src/Makefile
 src/ebox-moddev-create
+src/ebox-moddev-model
 stubs/Makefile
 ])

trunk/extra/moddev/src/Makefile.am

@@ -1 +1 @@
 ## Process this file with automake to produce Makefile.in
-bin_SCRIPTS = ebox-moddev-create 
+bin_SCRIPTS = ebox-moddev-create ebox-moddev-model
 
 DISTCLEANFILES = 

trunk/extra/moddev/src/ebox-moddev-create

@@ -14 +14 @@
     {
        MODULE_VERSION => '0.1',
-       STUBS_PATH => '/home/magnetic/dev/ebox/sources/trunk/extra/moddev/stubs',
+       STUBS_PATH => '/usr/share/emoddev/stubs',
     };
 
@@ -23 +23 @@
     print STDERR "\t--version\n"; 
     print STDERR "\t--destdir\n";
+    print STDERR "\t--model form | table. Default: form\n";
     exit 1;
 }
@@ -34 +35 @@
             version => MODULE_VERSION,
             destdir => undef,
-
+            model => 'form',
             );
     my $help;
@@ -44 +45 @@
             'version=s' => \$options{version},
             'destdir=s' => \$options{destdir},
+            'model=s' => \$options{model},
             'help'  => \$help,
             'info'  => \$info,
@@ -136 +138 @@
               name => $options->{moduleName},
               printableName => $options->{printableModuleName},
-              domain => 'ebox-' . $options->{moduleName}
+              domain => 'ebox-' . $options->{moduleName},
+              modelDomain => $options->{mainClass},
               ));
     write_file($dir . "/$mainClass", ${$output});
@@ -158 +161 @@
     write_file($dir . '/Makefile.am', ${$output});
     
-    $comp = $interp->make_component(
-            comp_file => STUBS_PATH .  '/src/Model/TableModel.pm.mas',
+    # TableModel or FormModel ?
+    my $template;
+    if ($options->{model} eq 'table') {
+        $template = '/src/Model/TableModel.pm.mas';
+    } else {
+        $template = '/src/Model/FormModel.pm.mas';
+    }
+    $comp = $interp->make_component(
+            comp_file => STUBS_PATH . $template,
             );
     ${$output} = '';
@@ -270 +280 @@
 }
 
+sub _stubs
+{
+    my ($interp, $output, $options) = @_;
+
+    my $dir = $options->{destdir} . '/stubs';
+    my $module = $options->{moduleName};
+
+    mkdir ("$dir") or die "Can't create $dir";
+
+    my $comp = $interp->make_component(
+            comp_file => STUBS_PATH .  '/stubs/Makefile.am.mas',
+            );
+    ${$output} = '';
+    $interp->exec($comp, ( module=> $module));
+    write_file($dir . '/Makefile.am', ${$output});
+
+   my $confSrc = STUBS_PATH . '/stubs/';
+   my $confDst = $options->{destdir} . '/tools';
+
+   copy(STUBS_PATH . '/stubs/service.conf.mas', "$dir/service.conf.mas");
+
+  
+}
 sub _m4
 {
@@ -288 +321 @@
 
     `cp -a $toolsSrc $toolsDst`;
+    chmod(0755, "$toolsDst/po-am.generator");
 } 
 
@@ -301 +335 @@
 
 }
+
+sub _runAutogen
+{
+    my ($options) = @_;
+
+    my $dir = $options->{destdir};
+
+    my $cwd = getcwd();
+    chdir($dir);
+
+    system("./autogen.sh");
+
+    chdir($cwd);
+}
+
 sub _createModule
 {
@@ -325 +374 @@
    _autogen($interp, \$output, $options);
    _tools($interp, \$output, $options);
+   _stubs($interp, \$output, $options);
+   _runAutogen($options);
 
 }