Subversion Repositories DevTools

Rev

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

Rev 379 Rev 1403
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~(.*)::(.*)~;
225 
        Message ("Package path : $svnPackageName");
 226 
        my $rmPath = $1 || 'Unknown';
- 
 
 227 
        my $rmTag = $2 || 'Unknown';
- 
 
 228 
 
226 
        Message ("Label        : $opt_label");
 229 
        Message ("Source Path  : $rmPath");
227 
        Message ("RM Reference : $svnRmRef");
 230 
        Message ("Tag          : $rmTag");
228 
        Message ("VCS Tag      : SVN::$svnRmRef");
 231 
        Message ("VCS Tag      : SVN::$svnRmRef");
229 
    }
 232 
    }
230 
 
 233 
 
231 
    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 );
232 
}
 235 
}
Line 578... Line 581...
578 
        #   Create the package if it does not already exist
 581 
        #   Create the package if it does not already exist
579 
        #   This is the simple process
 582 
        #   This is the simple process
580 
        #
 583 
        #
581 
        $svnSession->{PRINTDATA} = 0;
 584 
        $svnSession->{PRINTDATA} = 0;
582 
        $svnSession->SvnCreatePackage (
 585 
        $svnSession->SvnCreatePackage (
583 
                      'import'  => $dest_dir,
 586 
                      'import'      => $dest_dir,
584 
                      'label'   => $opt_label,
 587 
                      'label'       => $opt_label,
585 
                      'new'     => 1,
 588 
                      'new'         => 1,
- 
 
 589 
                      'printdata'   => $opt_verbose,
586 
                      );
 590 
                      );
587 
        $svnRmRef = $svnSession->RmRef();
 591 
        $svnRmRef = $svnSession->SvnTag();
588 
    }
 592 
    }
589 
    else
 593 
    else
590 
    {
 594 
    {
591 
        #
 595 
        #
592 
        #   Package exists
 596 
        #   Package exists
593 
        #   Hard bit: Need to merge the existign trunk with this version
 597 
        #   Hard bit: Need to merge the existing trunk with this version
594 
        #             and label the entire lot
 598 
        #             and label the entire lot
595 
        #   We already have a program to do that.
 599 
        #   We already have a program to do that.
596 
        #
 600 
        #
597 
        my $workdir = "$dest_root/SvnImport";
 601 
        my $workdir = "$dest_root/SvnImport";
598 
        my $datafile = "$dest_root/svnData.txt";
 602 
        my $datafile = "$dest_root/svnData.txt";
Line 600... Line 604...
600 
                    "-package=$svnPackageName",
 604 
                    "-package=$svnPackageName",
601 
                    "-dir=$dest_dir",
 605 
                    "-dir=$dest_dir",
602 
                    "-label=$opt_label",
 606 
                    "-label=$opt_label",
603 
                    "-datafile=$datafile",
 607 
                    "-datafile=$datafile",
604 
                    "workspace=$workdir",
 608 
                    "workspace=$workdir",
605 
                    "-replace"
 609 
                    "-replace",
- 
 
 610 
                    "-printfiles=$opt_verbose"
606 
                );
 611 
                );
607 
        if ( $rv )
 612 
        if ( $rv )
608 
        {
 613 
        {
609 
            Error ("Error importing package");
 614 
            Error ("Error importing package");
610 
        }
 615 
        }