# HG changeset patch # User bkirk # Date 1285090430 25200 # Node ID 218e49ed806fe7883141919123812d61e5e75c3e # Parent cc55c9707fe433c4b126c0f743a48341fce63e6f should be using JavaSE-1.6 VM, and .classpath, codegen.targetPlatform, compliance and source should also all be 1.6; making these changes requires the project to have custom compiler settings in order to continue to import XPathAPI from its original location com.sun.org.apache.xpath.internal, which is still in JavaSE-1.6 rt.jar . diff -r cc55c9707fe4 -r 218e49ed806f core/com.nokia.carbide.cpp.sdk.core/.classpath --- a/core/com.nokia.carbide.cpp.sdk.core/.classpath Tue Sep 21 10:28:30 2010 -0700 +++ b/core/com.nokia.carbide.cpp.sdk.core/.classpath Tue Sep 21 10:33:50 2010 -0700 @@ -1,7 +1,7 @@ + + - - diff -r cc55c9707fe4 -r 218e49ed806f core/com.nokia.carbide.cpp.sdk.core/.settings/org.eclipse.jdt.core.prefs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/com.nokia.carbide.cpp.sdk.core/.settings/org.eclipse.jdt.core.prefs Tue Sep 21 10:33:50 2010 -0700 @@ -0,0 +1,73 @@ +#Tue Sep 21 09:48:12 PDT 2010 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning +org.eclipse.jdt.core.compiler.problem.deadCode=warning +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore +org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore +org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedImport=warning +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.source=1.6 diff -r cc55c9707fe4 -r 218e49ed806f core/com.nokia.carbide.cpp.sdk.core/.settings/org.eclipse.pde.core.prefs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/com.nokia.carbide.cpp.sdk.core/.settings/org.eclipse.pde.core.prefs Tue Sep 21 10:33:50 2010 -0700 @@ -0,0 +1,3 @@ +#Tue Sep 21 09:42:51 PDT 2010 +eclipse.preferences.version=1 +resolve.requirebundle=false diff -r cc55c9707fe4 -r 218e49ed806f core/com.nokia.carbide.cpp.sdk.core/META-INF/MANIFEST.MF --- a/core/com.nokia.carbide.cpp.sdk.core/META-INF/MANIFEST.MF Tue Sep 21 10:28:30 2010 -0700 +++ b/core/com.nokia.carbide.cpp.sdk.core/META-INF/MANIFEST.MF Tue Sep 21 10:33:50 2010 -0700 @@ -13,7 +13,6 @@ com.nokia.carbide.cpp.epoc.engine, org.eclipse.update.core, com.nokia.carbide.templatewizard, - org.eclipse.core.filesystem, com.nokia.cpp.utils.ui Bundle-ActivationPolicy: lazy Export-Package: com.nokia.carbide.cpp.internal.api.sdk; @@ -39,3 +38,4 @@ com.nokia.carbide.cpp.internal.sdk.core.xml;x-friends:="com.nokia.carbide.cpp.sdk.core.test", com.nokia.carbide.cpp.sdk.core Bundle-ClassPath: sdkCorePlugin.jar +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff -r cc55c9707fe4 -r 218e49ed806f core/com.nokia.carbide.cpp.sdk.core/build.properties --- a/core/com.nokia.carbide.cpp.sdk.core/build.properties Tue Sep 21 10:28:30 2010 -0700 +++ b/core/com.nokia.carbide.cpp.sdk.core/build.properties Tue Sep 21 10:33:50 2010 -0700 @@ -1,7 +1,8 @@ bin.includes = META-INF/,\ plugin.xml,\ data/,\ - sdkCorePlugin.jar + sdkCorePlugin.jar,\ + binxalan_2.7.0.jar jars.compile.order = sdkCorePlugin.jar source.sdkCorePlugin.jar = src/ output.sdkCorePlugin.jar = bin/ diff -r cc55c9707fe4 -r 218e49ed806f core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SymbianSDK.java --- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SymbianSDK.java Tue Sep 21 10:28:30 2010 -0700 +++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SymbianSDK.java Tue Sep 21 10:33:50 2010 -0700 @@ -52,8 +52,15 @@ import com.nokia.carbide.cpp.sdk.core.ISymbianSDK; import com.nokia.carbide.cpp.sdk.core.ISymbianSDKFeatures; import com.nokia.carbide.cpp.sdk.core.SDKCorePlugin; + import com.sun.org.apache.xpath.internal.XPathAPI; +/// for this import, the subsequent SuppressWarnings("restriction") is for +/// "Access restriction: The type XPathAPI is not accessible due to restriction on required library ${JavaSE-1.6}/rt.jar" +/// +/// (also had to set custom settings in (Project) Properties -> Java Compiler -> Errors/Warnings +/// under "Deprecated and Restricted API", setting the "Forbidden access rules" to "Warning") +@SuppressWarnings("restriction") public class SymbianSDK implements ISymbianSDK, ISymbianSDKModifier { public static final String MANIFEST_XML_LOCATION = "/epoc32/kit/manifest.xml"; //$NON-NLS-1$