Changeset 1468 in ProjectBuilder for projects

Timestamp:

Apr 16, 2012, 2:46:27 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Still working to have a first cbusterize version working

Location:

projects/casparbuster

Files:

• devel/Makefile.PL (modified) (1 diff)
• devel/bin/cbusterize (modified) (8 diffs)
• devel/lib/CasparBuster/Version.pm (added)
• pbconf/devel/casparbuster.pb (modified) (1 diff)
• pbconf/devel/cb/rpm/cb.spec (modified) (2 diffs)

projects/casparbuster/devel/Makefile.PL

@@ -22 +22 @@
             'bin/cb' => '$(INST_MAN1DIR)/cb.$(MAN1EXT)', 
     },
-    MAN3PODS      => {  'lib/CasparBuster/Env.pm' => '$(INST_MAN3DIR)/CasparBuster::Env.$(MAN3EXT)',
-                        #'lib/ProjectBuilder/Base.pm' => '$(INST_MAN3DIR)/ProjectBuilder::Base.$(MAN3EXT)', 
+    MAN3PODS      => {  
+            'lib/CasparBuster/Env.pm' => '$(INST_MAN3DIR)/CasparBuster::Env.$(MAN3EXT)',
+            'lib/CasparBuster/Version.pm' => '$(INST_MAN3DIR)/CasparBuster::Version.$(MAN3EXT)',
                     },
 );

projects/casparbuster/devel/bin/cbusterize

@@ -7 +7 @@
 =head1 SYNOPSIS
 
-cbusterize.pl [options] --source /path/to/file/to/CasparBusterize
+cbusterize [options] --source /path/to/file/to/CasparBusterize
 
  Options:
@@ -100 +100 @@
 =cut
 use strict;
-use Cwd 'realpath';
+use CasparBuster::Version;
+use CasparBuster::Env;
+#use Cwd 'realpath';
 use File::Find;
 use File::Copy;
@@ -108 +110 @@
 use Getopt::Long;
 use Pod::Usage;
+use Data::Dumper;
 use List::Util qw(first);
 use ProjectBuilder::Base;
 use ProjectBuilder::Conf;
-use CasparBuster::Env;
 
 # settings
 my $debug = 0;
-my $help = 0;
-my $man = 0;
+my $help = undef;
+my $man = undef;
 my $source = undef;
 my $machine = undef;
+my $plugin = undef;
 my $quiet = undef;
 my $log = undef;
 my $LOG = undef;
 
-my ($cbver,$cbrev) = pb_version_init();
+my ($cbver,$cbrev) = cb_version_init();
 my $appname = "cb";
 $ENV{'PBPROJ'} = $appname;
@@ -140 +143 @@
     'log-files|l=s' => \$log,
     'source|s=s'  => \$source,
+    'plugin|p=s'  => \$plugin,
 ) || pb_syntax(-1,0);
 
@@ -156 +160 @@
     $debug = 0  if ($debug == -1);
 }
+
+$pbdebug = $debug;
 pb_log_init($debug, $LOG);
 pb_log(0,"Starting cbusterize\n");
@@ -161 +167 @@
 # Get conf file in context
 pb_conf_init($appname);
+# The personal one if there is such
+pb_conf_add("$ENV{'HOME'}/.cbrc") if (-f "$ENV{'HOME'}/.cbrc");
 # The system one
 pb_conf_add(cb_env_conffile());
-# The personal one if there is such
-pb_conf_add("$ENV{'HOME'}/.cbrc") if (-f "$ENV{'HOME'}/.cbrc");
 
 # Get configuration parameters
-my ($basedir,$opt,$usemach,$pluginsdir,$cms) = pb_conf_get("cbbasedir","cbdatabase","cbusemachines","cbpluginssubdir","cbcms");
+my %cb;
+my $cb = \%cb;
+($cb->{'basedir'},$cb->{'database'},$cb->{'usemachines'},$cb->{'pluginsdir'},$cb->{'cms'}) = pb_conf_get("cbbasedir","cbdatabase","cbusemachines","cbpluginssubdir","cbcms");
+
+print Dumper($cb) if ($debug);
 
 # Check for mandatory params
-pod2usage("Error: --source is a mandatory argument\n") (if not defined $source);
-pod2usage("Error: --machine is a mandatory argument when configure with cbusemachines = true\n") if ($usemach->{$appname} =~ /true/) && (not defined $machine));
-
-# Are the source and basedir full path names ? if not, make it such
-$source = realpath($source);
-$basedir = realpath($basedir->{$appname});
+pod2usage("Error: --source or --plugin is a mandatory argument\n") if ((not defined $source) && (not defined $plugin));
+pod2usage("Error: --machine is a mandatory argument when configure with cbusemachines = true\n") if (($cb->{'usemachines'}->{$appname} =~ /true/) && (not defined $machine));
+
+if (defined $plugin) {
+    # Load plugin conf
+}
+
+my $basedir = $cb->{'basedir'}->{$appname};
+eval { $basedir =~ s/(\$ENV.+\})/$1/eeg };
 
 # debug mode overview
@@ -218 +231 @@
 }
 
-# Find the include/install.mk file by looking up the tree 
-# from basedir/machine or basedir if no machine given
-my $sdir1 = $basedir;
-$sdir1 .= "/$machine" if defined ($machine);
-my $sdir = $sdir1;
-while (! -f "$sdir/include/install.mk") {
-    $sdir = dirname($sdir);
-    if ($sdir eq "/") {
-        die <<EOF;
-ERROR: No include/install.mk file was found while 
-       parsing $sdir1 and its parents
-       Your tree is not CasparBuster compliant. 
-       Please fix it before relaunching CasparBuster.pl
-EOF
-    }
-}
-if ($debug) {
-    print "DEBUG: Found sdir = $sdir\n";
-}
-# Now checking conformity
-print "CHECK: $sdir/include/install.mk\n" if ($debug);
-my $cf = 0;
-my $remote = undef;
-open(MF,"$sdir/include/install.mk");
-while (<MF>) {
-    if (($_ =~ /csp_UHOST\s*=/) && ($_ =~ /(\w+\@$machine.*)/)) {
-        $remote = $1;
-        $cf++; 
-        if ($debug) {
-            print "DEBUG: csp_UHOST conform line found with ref to $machine\n";
-            print "DEBUG: remote configuration is $remote\n";
-        }
-    }
-    if (/include\s+CasparBuster\/mk\/CasparBuster.mk/) {
-        $cf++; 
-        if ($debug) {
-            print "DEBUG: include conform line found with ref to CasparBuster.mk\n";
-        }
-    }
-}
-close(MF);
-if ($cf < 2) {
-    print "WARNING: Non conform $sdir/include/install.mk file found\n";
-}
-die "No remote configuration defined in $sdir/include/install.mk" if (not defined $remote);
-
-my $target = "$sdir1/$srcdir";
+# Deduce the target directory from the local structure and the source
+my $target = $basedir;
+$target .= "/$machine" if defined ($machine);
+$target .= "$srcdir";
+
 # If both source and target are dirs, then copy into the parent of the target
 $target = basename($target) if ((not defined $srcfile) && (-d $target));
 
-# Create Makefiles if none exists also in parents, warn else
-my $tdir = $target;
-my $sd = $srcdir;
-while (! -f "$tdir/Makefile") {
-
-    # Create target if it doesn't exist
-    if (not -d $tdir) {
-        if ($debug) {
-            print "DEBUG: Creating recursively directory $tdir\n";
-        } else {
-            mkpath($tdir,0,0755) or die "Unable to recursively create $tdir";
-            print "INFO: Created $tdir you may want to add it to your CMS\n";
-        }
-    }
-
-    if (-f "$tdir/Makefile") {
-        print "CHECK: $tdir/Makefile\n" if ($debug);
-        # Now checking conformity
-        $cf = 0;
-        open(MF,"$tdir/Makefile") || die "Unable to open $tdir/Makefile";
-        while (<MF>) {
-            my $sd1 = $sd;
-            $sd1 =~ s|/|\/|g;
-            if (/csp_DIR\s*=\s*$sd1/) {
-                $cf++; 
-                if ($debug) {
-                    print "DEBUG: csp_DIR conform line found with ref to $sd\n";
-                }
-            }
-            $sd1 = $sdir;
-            $sd1 =~ s|/|\/|g;
-            if (/include\s+$sd1[\/]*install.mk/) {
-                $cf++; 
-                if ($debug) {
-                    print "DEBUG: include conform line found with ref to install.mk\n";
-                }
-            }
-            close(MF);
-    
-            if ($cf < 2) {
-                print "WARNING: Non conform $tdir/Makefile file found\n";
-            }
-        }
-    } else {
-        # In this case we create one
-        if ($debug) {
-            print <<EOF;
-DEBUG: Creating $tdir/Makefile with the following content:
-csp_DIR = $sd
-include $sdir/include/install.mk
-EOF
-        } else {
-            my $mf = "$tdir/Makefile";
-            $mf =~ s|//|/|g;
-            open(MF,"> $mf") || die "Unable to create $mf";
-            print MF <<EOF;
-# Created by CasparBuster.pl - \$Id\$
-csp_DIR = $sd
-# That include should be last of these declarations
-include $sdir/include/install.mk
-EOF
-            close(MF);
-            print "INFO: Created $mf you may want to add it to your CMS\n";
-        }
-    }
-    $tdir = dirname($tdir);
-    $sd = dirname($sd);
+# Create target if it doesn't exist
+if (not -d $target) {
     if ($debug) {
-        print "DEBUG: Next round, tdir = $tdir and sd = $sd\n";
-    }
-    # Stop at basedir
-    last if ($tdir eq $basedir);
+        print "DEBUG: Creating recursively directory $target\n";
+    } else {
+        mkpath($target,0,0755) or die "Unable to recursively create $target";
+        print "INFO: Created $target you may want to add it to your CMS\n";
+        # TODO: Add it to the CMS
+    }
 }
 
@@ -350 +258 @@
 
 if (defined $machine) {
-    $cmd = "scp -p -q $cmdopt $remote:$source $target";
+    $cmd = "scp -p -q $cmdopt $machine:$source $target";
 } else {
     $cmd = "cp -p $cmdopt $source $target";
 }
+
 # Now add content if not already there
 if ((defined $srcfile) && (! -f "$target/$srcfile")) {

projects/casparbuster/pbconf/devel/casparbuster.pb

@@ -68 +68 @@
 # List of files per pkg on which to apply filters
 # Files are mentioned relatively to pbroot/defpkgdir
-filteredfiles cb = Makefile.PL
+filteredfiles cb = Makefile.PL,lib/CasparBuster/Version.pm
 #,cb.1,cbusterize.1
 #supfiles cb = cb.init

projects/casparbuster/pbconf/devel/cb/rpm/cb.spec

@@ -16 +16 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 BuildArch:      noarch
-Requires:       perl >= 5.8.4,perl-DateManip,perl-ProjectBuilder,perl-File-MimeInfo
+Requires:       perl >= 5.8.4,perl-DateManip,perl-ProjectBuilder,perl-File-MimeInfo,perl-Data-Dumper
 
 %description
@@ -41 +41 @@
 %doc AUTHORS INSTALL COPYING README
 
-#%{perlvendorlib}/*
+%{perlvendorlib}/*
 %{_bindir}/*
 %{_sysconfdir}/cb
 %{_mandir}/man1/*
+%{_mandir}/man3/*
 %{_mandir}/man5/*