Subversion Repositories DevTools

Rev

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

Rev 255 Rev 3967
Line 130... Line 130...
130
 
130
 
131
        Error ("Package Project should not contain spaces",
131
        Error ("Package Project should not contain spaces",
132
               "Project: \'$args[2]\'" ) if ( $args[2] && $args[2] =~ m~\s~ );
132
               "Project: \'$args[2]\'" ) if ( $args[2] && $args[2] =~ m~\s~ );
133
 
133
 
134
    }
134
    }
135
    elsif ( $BUILDNAME =~ m~^([\w-]+)\s+(\d+\.\d+\.\d+)[\s.]+(\w+)$~ )
135
    elsif ( $BUILDNAME =~ m~^\s*([\w-]+)\s+(\d+\.\d+\.\d+)[\s.]+(\w+)\s*$~ )
136
    {
136
    {
137
        $result{BUILDNAME_PACKAGE} = $1;
137
        $result{BUILDNAME_PACKAGE} = $1;
138
        $result{BUILDNAME_VERSION} = $2;
138
        $result{BUILDNAME_VERSION} = $2;
139
        $result{BUILDNAME_PROJECT} = $3;
139
        $result{BUILDNAME_PROJECT} = $3;
140
 
140
 
141
    }
141
    }
142
    elsif ( $BUILDNAME =~ m~^[\w-]+$~ and $BUILDVERSION =~ m~^(\d+\.\d+\.\d+)\.(\w+)$~ )
142
    elsif ( $BUILDNAME =~ m~^\s*[\w-]+$~ and $BUILDVERSION =~ m~^(\d+\.\d+\.\d+)\.(\w+)\s*$~ )
143
    {
143
    {
144
        $result{BUILDNAME_PACKAGE} = $BUILDNAME;
144
        $result{BUILDNAME_PACKAGE} = $BUILDNAME;
145
        $result{BUILDNAME_VERSION} = $1;
145
        $result{BUILDNAME_VERSION} = $1;
146
        $result{BUILDNAME_PROJECT} = $2;
146
        $result{BUILDNAME_PROJECT} = $2;
147
    }
147
    }
148
    else
148
    else
149
    {
149
    {
150
        Error( "BUILDNAME is not compatible with dpkg_archive tools",
150
        Error( "BUILDNAME is not compatible with dpkg_archive tools",
151
               "Allowed formats: 'name nn.nn.nn prj' or 'name', 'nn.nn.nn.prj' ",
151
               "Allowed formats: 'name nn.nn.nn prj' or 'name', 'nn.nn.nn.prj' ",
152
               "Arguments: @arguments" );
152
               "Arguments: '@arguments'" );
153
    }
153
    }
154
 
154
 
155
    #
155
    #
156
    #   Compatability values
156
    #   Compatability values
157
    #       BUILDNAME       - A space seperated name of name, ver, project
157
    #       BUILDNAME       - A space seperated name of name, ver, project