| Line 106... |
Line 106... |
| 106 |
# Validate the required version of Java for the tool
|
106 |
# Validate the required version of Java for the tool
|
| 107 |
# Assume JAVA_VERSION is of the form JAVA_HOME_1_6 and
|
107 |
# Assume JAVA_VERSION is of the form JAVA_HOME_1_6 and
|
| 108 |
# that we can do a crude string comparison
|
108 |
# that we can do a crude string comparison
|
| 109 |
#
|
109 |
#
|
| 110 |
my $javaVersion = $antTool->{JAVA_VERSION};
|
110 |
my $javaVersion = $antTool->{JAVA_VERSION};
|
| 111 |
if (("JAVA_HOME_$nice_ver" cmp $javaVersion) <= 0 )
|
111 |
if (("JAVA_HOME_$nice_ver" cmp $javaVersion) < 0 )
|
| 112 |
{
|
112 |
{
|
| 113 |
Error ("The version of Java required by the ant package is not suitable",
|
113 |
Error ("The version of Java required by the ant package is not suitable",
|
| 114 |
"The ant plugin requires: $javaVersion",
|
114 |
"The ant plugin requires: $javaVersion",
|
| 115 |
"This package is building for: JAVA_HOME_$nice_ver"
|
115 |
"This package is building for: JAVA_HOME_$nice_ver"
|
| 116 |
);
|
116 |
);
|
| Line 198... |
Line 198... |
| 198 |
# Generate macro to contain the project invocation
|
198 |
# Generate macro to contain the project invocation
|
| 199 |
# The first argument will be a 'build target' argument
|
199 |
# The first argument will be a 'build target' argument
|
| 200 |
#
|
200 |
#
|
| 201 |
$io->Label( "Macro to invoke project", $name );
|
201 |
$io->Label( "Macro to invoke project", $name );
|
| 202 |
$io->PrtLn( "define ProjectDefine_$name" );
|
202 |
$io->PrtLn( "define ProjectDefine_$name" );
|
| 203 |
$io->PrtLn( "\t$cmd -f $buildxml -DINTERFACEDIR=\$(PWD)/\$(INTERFACEDIR) -DGBE_TYPE=\$(GBE_TYPE) @{$pArgs} \$1" );
|
203 |
$io->PrtLn( "\t$cmd -f $buildxml -DINTERFACEDIR=\$(abspath \$(INTERFACEDIR)) -DGBE_TYPE=\$(GBE_TYPE) @{$pArgs} \$1" );
|
| 204 |
$io->PrtLn( "endef");
|
204 |
$io->PrtLn( "endef");
|
| 205 |
$io->Newline();
|
205 |
$io->Newline();
|
| 206 |
}
|
206 |
}
|
| 207 |
|
207 |
|
| 208 |
#-------------------------------------------------------------------------------
|
208 |
#-------------------------------------------------------------------------------
|
| Line 237... |
Line 237... |
| 237 |
# Insert test EnvVars
|
237 |
# Insert test EnvVars
|
| 238 |
# In the Java toolset these are not as useful in a Jats RunTest
|
238 |
# In the Java toolset these are not as useful in a Jats RunTest
|
| 239 |
$me->AddDefn('export GBE_UTFNAME', 'junit4Test');
|
239 |
$me->AddDefn('export GBE_UTFNAME', 'junit4Test');
|
| 240 |
$me->AddDefn('export GBE_UTFUID', '$(MAKEFILEUID)' . '_' . '1');
|
240 |
$me->AddDefn('export GBE_UTFUID', '$(MAKEFILEUID)' . '_' . '1');
|
| 241 |
$me->AddDefn('export GBE_UTFFILE','$(UTFDIR_PKG)/$(GBE_PLATFORM)-$(GBE_TYPE)-$(GBE_UTFUID)' . '.xml');
|
241 |
$me->AddDefn('export GBE_UTFFILE','$(UTFDIR_PKG)/$(GBE_PLATFORM)-$(GBE_TYPE)-$(GBE_UTFUID)' . '.xml');
|
| - |
|
242 |
$me->AddDefn('export GBE_UTFTEST','TEST-$(GBE_UTFNAME)-$(GBE_TYPE)-$(GBE_UTFUID)' );
|
| 242 |
|
243 |
|
| 243 |
$me->SectionIfDef ('UTF_POSTPROCESS');
|
244 |
$me->SectionIfDef ('UTF_POSTPROCESS');
|
| 244 |
$me->AddRecipe ( [
|
245 |
$me->AddRecipe ( [
|
| 245 |
'$(GBE_PERL) -Mjats_runutf -e processUtf -- ',
|
246 |
'$(GBE_PERL) -Mjats_runutf -e processUtf -- ',
|
| 246 |
'$(VERBOSE_OPT)',
|
247 |
'$(VERBOSE_OPT)',
|