# HG changeset patch # User Ed Swartz # Date 1261166284 21600 # Node ID f48f8fbed3bb15baf1ef3e84f7c74b616f9d2f76 # Parent 4efdeab57e9669da54547a636bd86268f17cc576 Externalize strings diff -r 4efdeab57e96 -r f48f8fbed3bb core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/messages.properties --- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/messages.properties Fri Dec 18 13:51:01 2009 -0600 +++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/messages.properties Fri Dec 18 13:58:04 2009 -0600 @@ -1,6 +1,12 @@ SymbianBuildContext.not.installed=(not installed) BSFCatalog.BSFLoadError=Error loading/parsing BSF file: {0} BSFCatalog.MissingCustomizedPlatform=BSF platform ''{0}'' customizes platform ''{1}'' which cannot be located or parsed. +CheckS60CustKitSupport.undefSBSV2Code=\ +// When building with Raptor, "gnumakefile" builds are no longer recommended.\n\ +// But the extension Makefiles referenced here are only available in OS 9.5+.\n\ +// Uncomment this to always perform Raptor builds using PRJ_EXTENSIONS.\n\ +\#undef SBSV2\n\ +\n SBSv2Utils.CannotFindSBSScriptError=Cannot find {0} on the PATH or under $SBS_HOME/bin. Please verify your SBSv2 installation. SBSv2Utils.DefineSBS_HOMEMessage=Please define the SBS_HOME environment (e.g. /path/to/raptor) and add $SBS_HOME/bin to your PATH before running Carbide. diff -r 4efdeab57e96 -r f48f8fbed3bb core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/processes/CheckS60CustKitSupport.java --- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/processes/CheckS60CustKitSupport.java Fri Dec 18 13:51:01 2009 -0600 +++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/processes/CheckS60CustKitSupport.java Fri Dec 18 13:58:04 2009 -0600 @@ -21,6 +21,7 @@ import org.eclipse.core.runtime.Plugin; import org.osgi.framework.Version; +import com.nokia.carbide.cpp.internal.api.sdk.Messages; import com.nokia.carbide.cpp.internal.api.sdk.SBSv2Utils; import com.nokia.carbide.cpp.sdk.core.ISymbianBuildContext; import com.nokia.carbide.cpp.sdk.core.ISymbianSDK; @@ -52,13 +53,7 @@ private static final String S60_INC_MACROS_SF = "#include \n#include \nAPP_LAYER_SYSTEMINCLUDE"; private static final String UNDEF_SBSV2 = "undefSBSV2"; - private static final String UNDEF_SBSV2_CODE = - "// When building with Raptor, \"gnumakefile\" builds are no longer recommended.\n"+ - "// But the extension Makefiles referenced here are only available in OS 9.5+.\n"+ - "// Uncomment this to always perform Raptor builds using PRJ_EXTENSIONS.\n"+ - "#undef SBSV2\n"+ - "\n"; - + private static final String UNDEF_SBSV2_CODE = Messages.getString("CheckS60CustKitSupport.undefSBSV2Code"); //$NON-NLS-1$ private static final String BUILD_HELP_PREFIX = "buildHelpPrefix"; private static final String BUILD_HELP_SIS_PREFIX = "buildHelpSISPrefix";