Subversion Repositories DevTools

Rev

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

Rev 7300 Rev 7301
Line 88... Line 88...
88 
        s~["']~~g;
 88 
        s~["']~~g;
89 
        if ( m/^--PatchNum=(.*)/ ) {
 89 
        if ( m/^--PatchNum=(.*)/ ) {
90 
            $result{DEPLOY_PATCH} = $1;         # Deployment patch number
 90 
            $result{DEPLOY_PATCH} = $1;         # Deployment patch number
91 
 
 91 
 
92 
        } elsif ( m/^--RelaxedVersion/ ) {
 92 
        } elsif ( m/^--RelaxedVersion/ ) {
93 
            $result{RELAXED_VERSION} = 1;       # Legacy (COTS) packages have no number scheme
 93 
            $result{RELAXED_VERSION} = 0;       # Ignored. Will now auto detect
94 
 
 94 
 
95 
        } elsif ( m/^--/ ) {
 95 
        } elsif ( m/^--/ ) {
96 
            push @{$result{EXTRA_ARGS}}, $_;    # Unknown options. Just save
 96 
            push @{$result{EXTRA_ARGS}}, $_;    # Unknown options. Just save
97 
 
 97 
 
98 
        } else {
 98 
        } else {
Line 102... Line 102...
102 
 
 102 
 
103 
    #
 103 
    #
104 
    #   Auto detect Relaxed versioning
 104 
    #   Auto detect Relaxed versioning
105 
    #       cots packages
 105 
    #       cots packages
106 
    #       tool packages
 106 
    #       tool packages
- 
 
 107 
    #   Must allow:
107 
    #   Must be of the 3 arg form ('PkgName', PkgVer', 'Proj')
 108 
    #       The 3 arg form ('PkgName', PkgVer', 'Proj')
- 
 
 109 
    #       The 2 arg form ('PkgName', PkgVer.Proj')
- 
 
 110 
    #       The 1 arg form ('PkgName PkgVer Proj')
108 
    #
 111 
    #
109 
    if ( $#args == 2 && ($args[2] eq 'cots' || $args[2] eq 'tool' ))
 112 
    if ( $#args == 2 && ($args[2] eq 'cots' || $args[2] eq 'tool' ))
110 
    {
 113 
    {
111 
        $result{RELAXED_VERSION} = 1;           # Legacy (COTS) packages have no number scheme
 114 
        $result{RELAXED_VERSION} = 1;           # Legacy (COTS) packages have no number scheme
112 
    }
 115 
    }
Line 142... Line 145...
142 
    {
 145 
    {
143 
        #
 146 
        #
144 
        #   Relaxed version allows for some old cots packages
 147 
        #   Relaxed version allows for some old cots packages
145 
        #   DO NOT USE THIS AS A REGULAR OPTION. ITS A KLUDGE
 148 
        #   DO NOT USE THIS AS A REGULAR OPTION. ITS A KLUDGE
146 
        #
 149 
        #
147 
        #   This form will only accept two or three fields as
 150 
        #   This form will only accept three fields as
148 
        #       "name", "version"
 - 
 
149 
        #       "name", "version", "project"
 151 
        #       "name", "version", "project"
150 
        #
 152 
        #
- 
 
 153 
        push (@errors, "Use of --RelaxedVersion with insufficient arguments",
- 
 
 154 
              "Aguments: @arguments") unless ($#args == 2) ;
- 
 
 155 
 
151 
        $result{BUILDNAME_PACKAGE} = $args[0];
 156 
        $result{BUILDNAME_PACKAGE} = $args[0];
152 
        $result{BUILDNAME_VERSION} = $args[1] || '';
 157 
        $result{BUILDNAME_VERSION} = $args[1] || '';
153 
        $result{BUILDNAME_PROJECT} = $args[2] || '';
 158 
        $result{BUILDNAME_PROJECT} = $args[2] || '';
154 
 
 159 
 
155 
        push (@errors , "Package Name should not contain spaces",
 160 
        push (@errors , "Package Name should not contain spaces",
156 
               "Name: \'$args[0]\'" ) if ( $args[0] =~ m~\s~ );
 161 
               "Name: \'$args[0]\'" ) if ( $args[0] =~ m~\s~ );
157 
 
 162 
 
158 
        push (@errors , "Package Version not specified" )
163 
        push (@errors , "Package Version not specified" )
159 
            unless ( $args[1] );
 164 
            unless ( $args[1] );
160 
 
 165 
 
- 
 
 166 
        push (@errors , "Package Project not specified" )
- 
 
 167 
            unless ( $args[2] );
- 
 
 168 
 
161 
        push (@errors , "Package Version should not contain spaces",
 169 
        push (@errors , "Package Version should not contain spaces",
162 
               "Version: \'$args[1]\'" ) if ( $args[1] && $args[1] =~ m~\s~ );
 170 
               "Version: \'$args[1]\'" ) if ( $args[1] && $args[1] =~ m~\s~ );
163 
 
 171 
 
164 
        push (@errors , "Package Project should not contain spaces",
 172 
        push (@errors , "Package Project should not contain spaces",
165 
               "Project: \'$args[2]\'" ) if ( $args[2] && $args[2] =~ m~\s~ );
 173 
               "Project: \'$args[2]\'" ) if ( $args[2] && $args[2] =~ m~\s~ );