# HG changeset patch # User timkelly # Date 1281543500 18000 # Node ID c13983cc56300b8e360df78970d5527c146f17ca # Parent 9482220f0b7b28b9b7099faf4119e4ca2b2e3fe3 added stubs for two wrapper utils to get build (cpp) macros and metadata macros -- WIP diff -r 9482220f0b7b -r c13983cc5630 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/builder/CarbideCPPBuilder.java --- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/builder/CarbideCPPBuilder.java Wed Aug 11 09:54:24 2010 -0500 +++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/builder/CarbideCPPBuilder.java Wed Aug 11 11:18:20 2010 -0500 @@ -842,6 +842,7 @@ * @param abldArgs array of String arguments to be passed to abld * @param removeMarkers project markers will be removed when true * @return true if operation was successful, false otherwise + * @deprecated - ABLD is deprecated */ public static boolean invokeAbldCommand(ICarbideBuildConfiguration buildConfig, CarbideCommandLauncher launcher, String[] abldArgs, boolean removeMarkers) { ICarbideProjectInfo cpi = buildConfig.getCarbideProject(); diff -r 9482220f0b7b -r c13983cc5630 core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/BuildContextSBSv1.java --- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/BuildContextSBSv1.java Wed Aug 11 09:54:24 2010 -0500 +++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/BuildContextSBSv1.java Wed Aug 11 11:18:20 2010 -0500 @@ -674,6 +674,18 @@ return variantCFGMacros; } + + @Override + public List getBuildMacros() { + // TODO Auto-generated method stub + return null; + } + + @Override + public List getMetadataMacros() { + // TODO Auto-generated method stub + return null; + } } diff -r 9482220f0b7b -r c13983cc5630 core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/BuildContextSBSv2.java --- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/BuildContextSBSv2.java Wed Aug 11 09:54:24 2010 -0500 +++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/BuildContextSBSv2.java Wed Aug 11 11:18:20 2010 -0500 @@ -407,6 +407,18 @@ return sbsv2BldInfo.getPrefixFromVariantCfg(); } + @Override + public List getBuildMacros() { + // TODO Auto-generated method stub + return null; + } + + @Override + public List getMetadataMacros() { + // TODO Auto-generated method stub + return null; + } + } diff -r 9482220f0b7b -r c13983cc5630 core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/sdk/core/ISymbianBuildContext.java --- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/sdk/core/ISymbianBuildContext.java Wed Aug 11 09:54:24 2010 -0500 +++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/sdk/core/ISymbianBuildContext.java Wed Aug 11 11:18:20 2010 -0500 @@ -144,4 +144,17 @@ */ String getConfigurationID(); + /** + * This is the list of macros used to preprocess CPP source files. + * @return a list of defines. + */ + List getBuildMacros(); + + /** + * This is the list of macros used to preprocess Symbian build files (bld.inf & mmp) + * @return a list of defines + */ + List getMetadataMacros(); + + }