Subversion Repositories DevTools

Rev

Rev 1347 | Rev 2424 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1347 Rev 1348
Line 83... Line 83...
83
# Inputs          : Command Line arguments
83
# Inputs          : Command Line arguments
84
#
84
#
85
my $result = GetOptions (
85
my $result = GetOptions (
86
                "help+"         => \$opt_help,              # flag, multiple use allowed
86
                "help+"         => \$opt_help,              # flag, multiple use allowed
87
                "manual"        => \$opt_manual,            # flag
87
                "manual"        => \$opt_manual,            # flag
88
                "verbose+"      => \$opt_verbose,           # flag, multiple use allowed
88
                "verbose:+"     => \$opt_verbose,           # flag, multiple use allowed
89
                "label=s"       => \$opt_label,             # String
89
                "label=s"       => \$opt_label,             # String
90
                "vob=s"         => \$opt_vob,               # String
90
                "vob=s"         => \$opt_vob,               # String
91
                "test"          => \$opt_test,              # Flag
91
                "test"          => \$opt_test,              # Flag
92
                "keep"          => \$opt_keep,              # Flag
92
                "keep"          => \$opt_keep,              # Flag
93
                "subdir=s"      => \$opt_subdir,            # string
93
                "subdir=s"      => \$opt_subdir,            # string
Line 220... Line 220...
220
        Message ("Label        : $opt_label");
220
        Message ("Label        : $opt_label");
221
        Message ("VCS Tag      : CC::/${vob_name}/${opt_subdir}::${opt_label}");
221
        Message ("VCS Tag      : CC::/${vob_name}/${opt_subdir}::${opt_label}");
222
    }
222
    }
223
    else
223
    else
224
    {
224
    {
-
 
225
        $svnRmRef =~ m~(.*)::(.*)~;
-
 
226
        my $rmPath = $1 || 'Unknown';
-
 
227
        my $rmTag = $2 || 'Unknown';
-
 
228
 
225
        Message ("Package path : $svnPackageName");
229
        Message ("Source Path  : $rmPath");
226
        Message ("Label        : $opt_label");
230
        Message ("Tag          : $rmTag");
227
        Message ("VCS Tag      : SVN::$svnRmRef");
231
        Message ("VCS Tag      : SVN::$svnRmRef");
228
    }
232
    }
229
 
233
 
230
    Warning ("Test Mode: Not Version Control System changes made") if ( $opt_test );
234
    Warning ("Test Mode: Not Version Control System changes made") if ( $opt_test );
231
}
235
}
Line 577... Line 581...
577
        #   Create the package if it does not already exist
581
        #   Create the package if it does not already exist
578
        #   This is the simple process
582
        #   This is the simple process
579
        #
583
        #
580
        $svnSession->{PRINTDATA} = 0;
584
        $svnSession->{PRINTDATA} = 0;
581
        $svnSession->SvnCreatePackage (
585
        $svnSession->SvnCreatePackage (
582
                      'import'  => $dest_dir,
586
                      'import'      => $dest_dir,
583
                      'label'   => $opt_label,
587
                      'label'       => $opt_label,
584
                      'new'     => 1,
588
                      'new'         => 1,
-
 
589
                      'printdata'   => $opt_verbose,
585
                      );
590
                      );
586
        $svnRmRef = $svnSession->RmRef();
591
        $svnRmRef = $svnSession->SvnTag();
587
    }
592
    }
588
    else
593
    else
589
    {
594
    {
590
        #
595
        #
591
        #   Package exists
596
        #   Package exists
Line 599... Line 604...
599
                    "-package=$svnPackageName",
604
                    "-package=$svnPackageName",
600
                    "-dir=$dest_dir",
605
                    "-dir=$dest_dir",
601
                    "-label=$opt_label",
606
                    "-label=$opt_label",
602
                    "-datafile=$datafile",
607
                    "-datafile=$datafile",
603
                    "workspace=$workdir",
608
                    "workspace=$workdir",
604
                    "-replace"
609
                    "-replace",
-
 
610
                    "-printfiles=$opt_verbose"
605
                );
611
                );
606
        if ( $rv )
612
        if ( $rv )
607
        {
613
        {
608
            Error ("Error importing package");
614
            Error ("Error importing package");
609
        }
615
        }