Subversion Repositories DevTools

Rev

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

Rev 6619 Rev 7579
Line 84... Line 84...
84 
sub ToolsetPROJECT
 84 
sub ToolsetPROJECT
85 
{
 85 
{
86 
    my( $name, $androidxml ,$pArgs, $auto_test, $unit_test, $pGenerated ) = @_;
 86 
    my( $name, $androidxml ,$pArgs, $auto_test, $unit_test, $pGenerated ) = @_;
87 
 
 87 
 
88 
    #
 88 
    #
89 
    #   Kludge Alert
 - 
 
90 
    #       The AndroidStudioBuilder needs to target platform
 - 
 
91 
    #       The AndroidBuilder cannot handle this argument
 - 
 
92 
    #       Luckily the AndroidStudioBuilder builds under windows
 - 
 
93 
    #       and the AndroidBuilder under unix
- 
 
94 
    #
 - 
 
95 
    if ($::GBE_HOSTMACH eq 'win32')
 - 
 
96 
    {
 - 
 
97 
        push @{$pArgs}, '-pf', $::ScmPlatform;
 - 
 
98 
    }
 - 
 
99 
 
 - 
 
100 
    #
 - 
 
101 
    #   Populate the project for the user
 89 
    #   Populate the project for the user
102 
    #
 90 
    #
103 
    ToolsetPROJECTPreBuild (@_);
 91 
    ToolsetPROJECTPreBuild (@_);
104 
 
 92 
 
105 
    #
 93 
    #
Line 156... Line 144...
156 
    my @cmdargs;
 144 
    my @cmdargs;
157 
    push @cmdargs, '$(GBE_PERL)','$(ANDROIDBUILDER)';
 145 
    push @cmdargs, '$(GBE_PERL)','$(ANDROIDBUILDER)';
158 
    push @cmdargs, '-f', $androidxml;
 146 
    push @cmdargs, '-f', $androidxml;
159 
    push @cmdargs, '-i=$(PWD)/$(INTERFACEDIR)';
 147 
    push @cmdargs, '-i=$(PWD)/$(INTERFACEDIR)';
160 
    push @cmdargs, '-t=$(GBE_TYPE)';
 148 
    push @cmdargs, '-t=$(GBE_TYPE)';
- 
 
 149 
    push @cmdargs, '-pf=$(GBE_PLATFORM)';
161 
    push @cmdargs, '-pn=$(GBE_PBASE) -pv=$(BUILDVER)';
 150 
    push @cmdargs, '-pn=$(GBE_PBASE)', '-pv=$(BUILDVER)';
162 
    push @cmdargs, '-hasTests' if ( $auto_test || $unit_test );
 151 
    push @cmdargs, '-hasTests' if ( $auto_test || $unit_test );
- 
 
 152 
    push @cmdargs, '$(VERBOSE_OPT)';
163 
    push @cmdargs, @{$pArgs}, '$1';
 153 
    push @cmdargs, @{$pArgs}, '$1';
164 
 
 154 
 
165 
    $me = MakeEntry::New (*MAKEFILE, 'ProjectDefine_'.$name, '--Define' );
 155 
    $me = MakeEntry::New (*MAKEFILE, 'ProjectDefine_'.$name, '--Define' );
166 
    $me->AddComment ("Macro to invoke project: $name" );
 156 
    $me->AddComment ("Macro to invoke project: $name" );
167 
    $me->AddRecipe ( join(' ', @cmdargs)  );
 157 
    $me->AddRecipe ( join(' ', @cmdargs)  );
Line 212... Line 202...
212 
    EnvImport( "GBE_PERL" );
 202 
    EnvImport( "GBE_PERL" );
213 
    System ( '--NoShell', '--Exit', $::GBE_PERL, $androidBuilder,
203 
    System ( '--NoShell', '--Exit', $::GBE_PERL, $androidBuilder,
214 
             '-f', $androidxml,
 204 
             '-f', $androidxml,
215 
             '-i', catdir( $::ScmRoot, $::ScmInterface),
 205 
             '-i', catdir( $::ScmRoot, $::ScmInterface),
216 
             @tArgs,
 206 
             @tArgs,
- 
 
 207 
             '-pf', $::ScmPlatform,
217 
             '-pn', $::Pbase,
 208 
             '-pn', $::Pbase,
218 
             '-pv', $::ScmBuildVersionFull,
 209 
             '-pv', $::ScmBuildVersionFull,
219 
             '-populate',
 210 
             '-populate',
220 
             @{$pArgs}
 211 
             @{$pArgs}
221 
           );
 212 
           );