Subversion Repositories DevTools

Rev

Rev 7300 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 7300 Rev 7322
Line 186... Line 186...
186 
#
 186 
#
187 
# Returns         : Nothing
 187 
# Returns         : Nothing
188 
#
 188 
#
189 
sub ToolsetPROJECTPreBuild
 189 
sub ToolsetPROJECTPreBuild
190 
{
 190 
{
191 
    my( $name, $androidxml ,$pArgs, $auto_test, $unit_test, $pGenerated ) = @_;
 191 
    my( $name, $androidxml ,$pArgs, $auto_test, $unit_test, $pGenerated, $project ) = @_;
- 
 
 192 
 
- 
 
 193 
    #
- 
 
 194 
    #   Determine the populate mode
- 
 
 195 
    #   Used to limit the shared libraries that are included
- 
 
 196 
    #   In populate mode may have both -tD and -tP
- 
 
 197 
    #       Need -tD last for backward compatability
- 
 
 198 
    #
- 
 
 199 
    my @tArgs;
- 
 
 200 
    if (exists $project->{Prod} && $project->{Prod}) {
- 
 
 201 
        push @tArgs, '-t=P';
- 
 
 202 
    } elsif (exists $project->{Debug} && $project->{Debug}) {
- 
 
 203 
        push @tArgs, '-t=D';
- 
 
 204 
    } else {
- 
 
 205 
        push @tArgs, '-t=P', '-t=D';
- 
 
 206 
    }
192 
 
 207 
 
193 
    #
 208 
    #
194 
    #   Invoke the androidBuilder in a mode so that it will populate the Eclipse project
 209 
    #   Invoke the androidBuilder in a mode so that it will populate the Eclipse project
195 
    #   in a suitable manner.
 210 
    #   in a suitable manner.
196 
    #
 211 
    #
197 
    #   In the build phase there is no 'debug' or 'production' phase
 - 
 
198 
    #   Assume debug - if it needs to be determined
 - 
 
199 
    #
 - 
 
200 
 
 - 
 
201 
    EnvImport( "GBE_PERL" );
 212 
    EnvImport( "GBE_PERL" );
202 
    System ( '--NoShell', '--Exit', $::GBE_PERL, $androidBuilder,
213 
    System ( '--NoShell', '--Exit', $::GBE_PERL, $androidBuilder,
203 
             '-f', $androidxml,
 214 
             '-f', $androidxml,
204 
             '-i', catdir( $::ScmRoot, $::ScmInterface),
 215 
             '-i', catdir( $::ScmRoot, $::ScmInterface),
205 
             '-t', 'D',
 216 
             @tArgs,
206 
             '-pn', $::Pbase,
 217 
             '-pn', $::Pbase,
207 
             '-pv', $::ScmBuildVersionFull,
 218 
             '-pv', $::ScmBuildVersionFull,
208 
             '-populate',
 219 
             '-populate',
209 
             @{$pArgs}
 220 
             @{$pArgs}
210 
           );
 221 
           );
Line 242... Line 253...
242 
        #   Insert test EnvVars
 253 
        #   Insert test EnvVars
243 
        #       In the Java toolset these are not as useful in a Jats RunTest
 254 
        #       In the Java toolset these are not as useful in a Jats RunTest
244 
        $me->AddDefn('export GBE_UTFNAME', 'AndroidStudioTest');
 255 
        $me->AddDefn('export GBE_UTFNAME', 'AndroidStudioTest');
245 
        $me->AddDefn('export GBE_UTFUID', '$(MAKEFILEUID)' . '_' . '1');
 256 
        $me->AddDefn('export GBE_UTFUID', '$(MAKEFILEUID)' . '_' . '1');
246 
        $me->AddDefn('export GBE_UTFFILE','$(UTFDIR_PKG)/$(GBE_PLATFORM)-$(GBE_TYPE)-$(GBE_UTFUID)' . '.xml');
 257 
        $me->AddDefn('export GBE_UTFFILE','$(UTFDIR_PKG)/$(GBE_PLATFORM)-$(GBE_TYPE)-$(GBE_UTFUID)' . '.xml');
- 
 
 258 
        $me->AddDefn('export GBE_UTFTEST','TEST-$(GBE_UTFNAME)-$(GBE_TYPE)-$(GBE_UTFUID)' );
247 
 
 259 
 
248 
        $me->SectionIfDef ('UTF_POSTPROCESS');
 260 
        $me->SectionIfDef ('UTF_POSTPROCESS');
249 
        $me->AddRecipe  ( [
 261 
        $me->AddRecipe  ( [
250 
                           '$(GBE_PERL) -Mjats_runutf -e processUtf -- ',
 262 
                           '$(GBE_PERL) -Mjats_runutf -e processUtf -- ',
251 
                           '$(VERBOSE_OPT)',
 263 
                           '$(VERBOSE_OPT)',