Framework 1.8.0
What's new:
* Change: Improved the wizard by adding a new section used to add OST Trace Dictionary Files.
--- a/frameworkplugins/ccbuild.xml Thu Mar 04 13:38:40 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="FrameWork" default="cc" basedir=".">
-
- <!-- declare ant4eclipse -->
- <taskdef resource="net/sf/ant4eclipse/antlib.xml" />
-
- <property name="workspace.path" value="." />
- <property name="java.location" value="C:/APPS/j2sdk_1.5.0_12" />
- <property name="destination.path" value="." />
-
- <property name="basews" value="${ws}"/>
- <property name="baseos" value="${os}"/>
- <property name="basearch" value="${arch}"/>
- <property name="basenl" value="${nl}"/>
-
- <property name="feature.project.folder" location="com.nokia.s60tools.extensions.framework"/>
- <property name="feature.project.name" value="com.nokia.s60tools.extensions.framework"/>
- <property name="feature.name" value="framework"/>
- <property name="help.project.name" value="com.nokia.carbide.tool.help"/>
- <property name="help.jar.filename" value="${help.project.name}.jar"/>
- <property name="feature.name" value="Framework"/>
-
- <!-- Folder definitions -->
-
- <property name="carbide.int.folder" location="c:/Carbide_internal/plugins"/>
- <property name="carbide.dev.folder" location="c:/Carbide_development/plugins"/>
- <property name="carbide.adt.folder" location="c:/Carbide_ADT/plugins"/>
- <property name="test.sdk.folder" location="com.nokia.s60tools.sdk.tests"/>
- <property name="test.util.folder" location="com.nokia.s60tools.util.tests"/>
-
- <property name="binaries.folder" location="${feature.name}.binaries"/>
- <property name="reports.folder" location="reports"/>
- <property name="reports.emma" location="${reports.folder}/emma"/>
- <property name="instr.folder" location="instr"/>
-
-
- <!-- Target Plugin -->
- <target name="build.plugins" depends="">
-
- <!--<buildPlugin workspace="${workspace.path}" targetPlatformLocation="${carbide.int.folder}" projectname="com.nokia.carbide.tool.help" destDir="${destination.path}" packageAsJar="true">
- <javacLibraryCompiler>
- <compilerSettings debug="true" fork="true"/>
- </javacLibraryCompiler>
- </buildPlugin>-->
-
- <!-- Build MultiTestRunner feature -->
- <buildFeature workspace="${workspace.path}"
- targetPlatformLocation="${carbide.int.folder}"
- projectname="${feature.project.name}"
- buildPluginTarget="build.plugin"
- destDir="${destination.path}" />
- </target>
-
- <target name="feature" depends="">
-
- <copy todir="plugins">
- <fileset dir="C:\hudson\jobs\Framework SDK\workspace\com.nokia.s60tools.sdk\plugins"/>
- </copy>
- <copy todir="plugins">
- <fileset dir="C:\hudson\jobs\Framework UI\workspace\com.nokia.s60tools.ui\plugins"/>
- </copy>
- <copy todir="plugins">
- <fileset dir="C:\hudson\jobs\Framework Util\workspace\com.nokia.s60tools.util\plugins"/>
- </copy>
-
- <!-- Copy the actual plug-ins to the carbide folders -->
- <copy todir="${carbide.int.folder}" failonerror="true" overwrite="true">
- <fileset dir="plugins"/>
- <fileset dir="C:\hudson\jobs\Framework Testsupport\workspace\com.nokia.s60tools.testsupport\plugins"/>
- </copy>
- <copy todir="${carbide.dev.folder}" failonerror="true" overwrite="true">
- <fileset dir="plugins"/>
- <fileset dir="C:\hudson\jobs\Framework Testsupport\workspace\com.nokia.s60tools.testsupport\plugins"/>
- </copy>
- <copy todir="${carbide.adt.folder}" failonerror="true" overwrite="true">
- <fileset dir="plugins"/>
- <fileset dir="C:\hudson\jobs\Framework Testsupport\workspace\com.nokia.s60tools.testsupport\plugins"/>
- </copy>
-
- </target>
- <target name="create.zip">
-
- <delete dir="${binaries.folder}/nightly_builds"/>
- <mkdir dir="${binaries.folder}/nightly_builds"/>
-
- <!-- Zip jars to ActiveObjectAnalyser.zip -->
- <tstamp>
- <format property="timestamp" pattern="dd-MM-yyyy" />
- </tstamp>
-
- <zip destfile="${binaries.folder}/nightly_builds/${feature.name}-${timestamp}.zip"
- basedir="."
- includes="plugins/*, features/com.nokia*.*/"/>
- </target>
-
- <!-- Empty target to do nothing -->
- <target name="build.plugin">
- </target>
-
-
- <target name="cc" depends="build.plugins, feature, create.zip" description="build.plugins, instrument, run unit tests and analyze code"/>
-</project>
--- a/frameworkplugins/com.nokia.s60tools.extensions.framework/feature.xml Thu Mar 04 13:38:40 2010 +0200
+++ b/frameworkplugins/com.nokia.s60tools.extensions.framework/feature.xml Wed Apr 21 11:43:59 2010 +0300
@@ -1,36 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<feature
id="com.nokia.s60tools.extensions.framework"
label="Carbide.c++ Extensions - Framework plug-ins"
- version="1.7.0"
+ version="1.8.0"
provider-name="Nokia">
<description>
- Common framework plug-ins feature contains following plug-ins:
-com.nokia.s60tools.util:
-Util plug-in provides miscellaneous utility classes for logging
-to Eclipse’s Console view output, for parametrizable debugging,
-and for interaction with external command line tools.
-com.nokia.s60tools.ui:
-UI plug-in provides classes providing reusable UI services, such
-as, dialogs, customized UI components, custom sorters, and other
-UI related helper classes.
-com.nokia.s60tools.sdk (deprecated):
-Plug-in SDK provides from Carbide.c++ v1.2 onwards a stable API
-for accessing SDK related services. This API is deprecated, and
-by com.nokia.carbide.cpp.sdk.core should be used instead whenever
-possible. This SDK plugin is still however in use because of backward
-compatibility reasons, and it also offers some services that
+ Common framework plug-ins feature contains following plug-ins:
+com.nokia.s60tools.util:
+Util plug-in provides miscellaneous utility classes for logging
+to Eclipse’s Console view output, for parametrizable debugging,
+and for interaction with external command line tools.
+com.nokia.s60tools.ui:
+UI plug-in provides classes providing reusable UI services, such
+as, dialogs, customized UI components, custom sorters, and other
+UI related helper classes.
+com.nokia.s60tools.sdk (deprecated):
+Plug-in SDK provides from Carbide.c++ v1.2 onwards a stable API
+for accessing SDK related services. This API is deprecated, and
+by com.nokia.carbide.cpp.sdk.core should be used instead whenever
+possible. This SDK plugin is still however in use because of
+backward
+compatibility reasons, and it also offers some services that
are not available via Carbide's SDK API.
</description>
<copyright>
- Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+ Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
All rights reserved. License: http://www.eclipse.org/legal/epl-v10.html.
</copyright>
<license>
-Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+ Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
All rights reserved.
This component and the accompanying materials are made available
under the terms of "Eclipse Public License v1.0"
@@ -38,10 +39,6 @@
at the URL "http://www.eclipse.org/legal/epl-v10.html".
</license>
- <url>
- <update label="Carbide.c++ Update Site" url="http://tools.ext.nokia.com/updates/carbide22"/>
- <discovery label="Carbide.c++ Update Site" url="http://tools.ext.nokia.com/updates/carbide22"/>
- </url>
<requires>
<import plugin="org.eclipse.core.runtime"/>
--- a/frameworkplugins/com.nokia.s60tools.extensions.framework/license.txt Thu Mar 04 13:38:40 2010 +0200
+++ b/frameworkplugins/com.nokia.s60tools.extensions.framework/license.txt Wed Apr 21 11:43:59 2010 +0300
@@ -1,4 +1,4 @@
-Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
All rights reserved.
This component and the accompanying materials are made available
under the terms of "Eclipse Public License v1.0"
--- a/frameworkplugins/com.nokia.s60tools.sdk/META-INF/MANIFEST.MF Thu Mar 04 13:38:40 2010 +0200
+++ b/frameworkplugins/com.nokia.s60tools.sdk/META-INF/MANIFEST.MF Wed Apr 21 11:43:59 2010 +0300
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Carbide.c++ Extensions - SDK Manager Service
Bundle-SymbolicName: com.nokia.s60tools.sdk
-Bundle-Version: 1.5.0
+Bundle-Version: 1.8.0
Bundle-Activator: com.nokia.s60tools.sdk.internal.SdkPlugin
Bundle-Vendor: Nokia
Require-Bundle: org.eclipse.core.runtime,
--- a/frameworkplugins/com.nokia.s60tools.sdk/build.xml Thu Mar 04 13:38:40 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,191 +0,0 @@
-
-<project name="com.nokia.s60tools.sdk" default="build.all">
-
- <!-- declare ant4eclipse -->
- <taskdef resource="net/sf/ant4eclipse/antlib.xml" />
-
- <!-- Name definitions -->
- <property name="feature.name" value="FrameworkSDK"/>
- <property name="project.name" value="com.nokia.s60tools.sdk" />
- <property name="jar.filename" value="${ant.project.name}.jar"/>
-
- <!-- Folder definitions -->
- <property name="workspace.path" value="." />
- <property name="java.location" value="C:/APPS/j2sdk_1.5.0_12" />
- <property name="destination.path" value="." />
-
- <property name="carbide.folder" value="C:/Carbide_internal" />
- <property name="carbide.int.folder" location="c:/Carbide_ADT/plugins"/>
- <property name="carbide.dev.folder" location="c:/Carbide_development/plugins"/>
-
- <property name="test.folder" location="../${ant.project.name}.tests"/>
- <property name="reports.folder" location="reports"/>
- <property name="reports.emma" location="${reports.folder}/emma"/>
- <property name="instr.folder" location="instr"/>
- <property name="binaries.folder" location="${feature.name}.binaries"/>
-
-
- <!-- EMMA configuration -->
- <path id="emma.lib" >
- <pathelement location="${ant.home}/lib/emma.jar" />
- <pathelement location="${ant.home}/lib/emma_ant.jar" />
- </path>
-
- <taskdef resource="emma_ant.properties" classpathref="emma.lib" />
-
- <!-- PMD configuration -->
- <path id="pmd.lib" >
- <pathelement location="${ant.home}/lib/pmd-4.2.5.jar" />
- <pathelement location="${ant.home}/lib/asm-3.1.jar" />
- <pathelement location="${ant.home}/lib/jaxen-1.1.1.jar" />
- </path>
-
- <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask" classpathref="pmd.lib" />
-
- <!-- Folders -->
- <delete dir="${instr.folder}"/>
- <mkdir dir="${instr.folder}"/>
-
- <delete dir="${reports.folder}"/>
- <mkdir dir="${reports.folder}"/>
-
- <!-- Carbide_classpath -->
- <path id="carbide_classpath">
- <fileset dir="${carbide.int.folder}" includes="**/*.jar" />
- </path>
-
- <!-- Delete old plugins and features -->
- <target name="delete">
- <delete dir="plugins" failonerror="false"/>
- <delete dir="features" failonerror="false"/>
- <delete dir="bin" failonerror="false"/>
- </target>
-
-
- <!-- Target Plugin -->
- <target name="build.plugins" depends="">
-
- <!-- Copy necessary resources -->
- <copy todir="bin/" failonerror="true" overwrite="false">
- <fileset dir="src/" excludes="**/*.java, **/package.htm*" />
- </copy>
-
- <buildPlugin workspace="${workspace.path}" targetPlatformLocation="${carbide.folder}" projectname="" destDir="${destination.path}" packageAsJar="true">
- <javacLibraryCompiler>
- <compilerSettings debug="true" fork="true"/>
- </javacLibraryCompiler>
- </buildPlugin>
-
- </target>
-
- <!-- Empty target to do nothing -->
- <target name="build.plugin">
- </target>
-
-
-
- <!-- Instrumentation target, depends on build.mtrunner -->
- <target name="instr" depends="build.plugins">
- <!-- Instrument the source code -->
- <emma>
- <instr instrpath="bin" destdir="${instr.folder}" metadatafile="${reports.emma}/metadata.emma" merge="true"/>
- </emma>
- </target>
-
-
- <target name="create.zip">
-
- <mkdir dir="${binaries.folder}/nightly_builds"/>
- <!-- Zip jars to ActiveObjectAnalyser.zip -->
- <tstamp>
- <format property="timestamp" pattern="dd-MM-yyyy" />
- </tstamp>
-
- <zip destfile="${binaries.folder}/nightly_builds/${feature.name}-${timestamp}.zip"
- basedir="."
- includes="plugins/*, features/com.nokia.carbide.extensions.*/"/>
- </target>
-
- <!-- Analyze target -->
- <target name="analyze">
- <!-- PMD -->
- <pmd shortFileNames="true">
- <!-- Rules -->
- <ruleset>basic</ruleset>
- <ruleset>codesize</ruleset>
- <ruleset>coupling</ruleset>
- <ruleset>design</ruleset>
- <ruleset>strictexception</ruleset>
- <ruleset>strings</ruleset>
- <ruleset>sunsecure</ruleset>
- <ruleset>unusedcode</ruleset>
- <ruleset>junit</ruleset>
-
- <!-- XML output -->
- <formatter type="xml" toFile="${reports.folder}/report.pmd.xml"/>
-
- <!-- Files to analyze -->
- <!-- Files to analyze -->
- <fileset dir="src/">
- <include name="**/*.java"/>
- </fileset>
- <fileset dir="../${ant.project.name}.tests/src/">
- <include name="**/*.java"/>
- </fileset>
- </pmd>
- </target>
-
- <!-- Test target, depends on instrumentation and analyze -->
- <target name="test" depends="instr, analyze" description="Run unit tests">
- <!-- Test classpath -->
- <path id="test_classpath">
- <!-- Test classes -->
- <pathelement location="${test.folder}/src"/>
-
- <!-- Instrumented class files -->
- <pathelement location="${instr.folder}"/>
-
- <!-- EMMA -->
- <pathelement path="${ant.home}/lib/emma.jar"/>
-
- <path refid="carbide_classpath" />
- </path>
-
- <!-- Compile the tests -->
- <javac srcdir="${test.folder}" verbose="${javacVerbose}">
- <classpath refid="test_classpath"/>
- </javac>
-
- <!-- Run JUnit -->
- <junit printsummary="yes" fork="yes" haltonfailure="no">
- <classpath refid="test_classpath" />
-
- <!-- Plain format and XML -->
- <formatter type="plain" />
- <formatter type="xml" />
-
- <!-- Instrumentation arguments to JVM -->
- <jvmarg value="-Demma.coverage.out.file=${reports.emma}/coverage.emma" />
- <jvmarg value="-Demma.coverage.out.merge=true" />
-
- <!-- Test classes -->
- <test name="${ant.project.name}.tests.AllPureJUnitTests" todir="${reports.folder}"/>
-
- </junit>
-
- <!-- Create EMMA report -->
- <emma>
- <report sourcepath="src/" >
- <fileset dir="${reports.emma}" >
- <include name="*.emma" />
- </fileset>
- <xml outfile="${reports.emma}/coverage.xml" />
- </report>
- </emma>
- </target>
-
-
- <!-- Target Build all -->
- <target name="build.all" depends="delete, build.plugins, instr, create.zip, analyze,test" />
-
-</project>
\ No newline at end of file
--- a/frameworkplugins/com.nokia.s60tools.sdk/ccbuild.xml Thu Mar 04 13:38:40 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="com.nokia.s60tools.sdk" default="cc" basedir=".">
-
- <target name="cc" depends="build, instr, analyze, test" description="Build, instrument, run unit tests and analyze code"/>
-
- <property name="basews" value="${ws}"/>
- <property name="baseos" value="${os}"/>
- <property name="basearch" value="${arch}"/>
- <property name="basenl" value="${nl}"/>
-
- <!-- Compiler settings -->
- <property name="javacFailOnError" value="true"/>
- <property name="javacDebugInfo" value="on"/>
- <property name="javacVerbose" value="false"/>
- <property name="logExtension" value=".log"/>
- <property name="compilerArg" value=""/>
- <property name="javacSource" value="5"/>
- <property name="javacTarget" value="5"/>
-
- <property name="bootclasspath" refid="path_bootclasspath"/>
- <property name="bundleJavacSource" value="${javacSource}"/>
- <property name="bundleJavacTarget" value="${javacTarget}"/>
- <property name="bundleBootClasspath" value="${bootclasspath}"/>
- <property name="feature.name" value="Framework"/>
-
- <!-- Folder definitions -->
- <property name="carbide.int.folder" location="c:/Carbide_internal/plugins"/>
- <property name="carbide.dev.folder" location="c:/Carbide_development/plugins"/>
- <property name="carbide.adt.folder" location="c:/Carbide_ADT/plugins"/>
- <property name="test.folder" location="../com.nokia.s60tools.sdk.tests"/>
- <property name="binaries.folder" location="C:\Hudson\jobs\Framework\workspace\trunk\${feature.name}.binaries"/>
- <property name="reports.folder" location="reports"/>
- <property name="reports.emma" location="${reports.folder}/emma"/>
- <property name="instr.folder" location="instr"/>
-
-
- <!-- EMMA configuration -->
- <path id="emma.lib" >
- <pathelement location="${ant.home}/lib/emma.jar" />
- <pathelement location="${ant.home}/lib/emma_ant.jar" />
- </path>
-
- <taskdef resource="emma_ant.properties" classpathref="emma.lib" />
-
- <!-- PMD configuration -->
- <path id="pmd.lib" >
- <pathelement location="${ant.home}/lib/pmd-4.2.jar" />
- <pathelement location="${ant.home}/lib/asm-3.1.jar" />
- <pathelement location="${ant.home}/lib/jaxen-1.1.1.jar" />
- </path>
-
- <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask" classpathref="pmd.lib" />
-
- <path id="path_bootclasspath">
- <fileset dir="${java.home}/lib">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <path id="build_classpath">
- <path refid="carbide_classpath"/>
- </path>
-
- <path id="carbide_classpath">
- <fileset dir="${carbide.int.folder}" includes="**/*.jar" />
- </path>
-
- <target name="properties" if="eclipse.running">
- <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
- </target>
-
- <!-- Initialization -->
- <target name="init" depends="properties">
- <condition property="pluginTemp" value="${buildTempFolder}/plugins">
- <isset property="buildTempFolder"/>
- </condition>
- <property name="pluginTemp" value="${basedir}"/>
- <condition property="build.result.folder" value="${pluginTemp}/${ant.project.name}">
- <isset property="buildTempFolder"/>
- </condition>
- <property name="build.result.folder" value="${basedir}"/>
- <property name="temp.folder" value="${basedir}/temp.folder"/>
- <property name="plugin.destination" value="${basedir}"/>
-
- <property name="jar.filename" value="${ant.project.name}.jar"/>
-
- <delete dir="${reports.folder}"/>
- <mkdir dir="${reports.folder}"/>
-
- <delete dir="${instr.folder}"/>
- <mkdir dir="${instr.folder}"/>
-
- <delete dir="../plugins"/>
- <mkdir dir="../plugins"/>
-
- <exec executable="svn" dir="../.">
- <arg line="up"/>
- </exec>
- </target>
-
- <!-- Build target -->
- <target name="build" depends="init" description="Build the source">
- <!-- Build the source -->
- <javac destdir="" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}">
- <compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
- <classpath refid="build_classpath" />
- <src path="src/" />
- <compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
- <compilerarg line="-log '${temp.folder}/bin${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
- </javac>
-
- <!-- Copy necessary resources -->
- <copy todir="" failonerror="true" overwrite="false">
- <fileset dir="src/" excludes="**/*.java, **/package.htm*" />
- </copy>
-
- <zip destfile="../plugins/${jar.filename}">
- <fileset dir="${build.result.folder}">
- <include name="com/**"/>
- <include name="META-INF/**"/>
- <include name="about.html"/>
- </fileset>
- </zip>
-
- <!-- Create build result folder -->
- <mkdir dir="${build.result.folder}"/>
-
- </target>
-
-
-
-
- <!-- Instrumentation target, depends on JAR -->
- <target name="instr" depends="build">
- <!-- Instrument the source code -->
- <emma>
- <instr instrpath="../plugins/${jar.filename}" destdir="${instr.folder}" metadatafile="${reports.emma}/metadata.emma" merge="true"/>
- </emma>
- </target>
-
-
- <!-- Analyze target -->
- <target name="analyze">
- <!-- PMD -->
- <pmd>
- <!-- Rules -->
- <ruleset>basic</ruleset>
- <ruleset>codesize</ruleset>
- <ruleset>coupling</ruleset>
- <ruleset>design</ruleset>
- <ruleset>strictexception</ruleset>
- <ruleset>strings</ruleset>
- <ruleset>sunsecure</ruleset>
- <ruleset>unusedcode</ruleset>
- <ruleset>junit</ruleset>
-
-
- <!-- XML output -->
- <formatter type="xml" toFile="${reports.folder}/report.pmd.xml"/>
-
- <!-- Files to analyze -->
- <fileset dir="src/">
- <include name="**/*.java"/>
- </fileset>
- <fileset dir="${test.folder}/src/">
- <include name="**/*.java"/>
- </fileset>
- </pmd>
- </target>
-
-
- <!-- Test target, depends on instrumentation and analyze -->
- <target name="test" depends="instr" description="Run unit tests">
- <!-- Test classpath -->
- <path id="test_classpath">
- <!-- Test classes -->
- <pathelement location="${test.folder}/src"/>
-
- <!-- Instrumented class files -->
- <pathelement location="${instr.folder}"/>
-
- <!-- EMMA -->
- <pathelement path="${ant.home}/lib/emma.jar"/>
-
- <fileset dir="${carbide.adt.folder}" includes="**/*.jar" />
- </path>
-
- <!-- Compile the tests -->
- <javac srcdir="${test.folder}" verbose="${javacVerbose}">
- <classpath refid="test_classpath"/>
- </javac>
-
- <!-- Run JUnit -->
- <junit printsummary="yes" fork="yes" haltonfailure="no">
- <classpath refid="test_classpath" />
-
- <!-- Plain format and XML -->
- <formatter type="plain" />
- <formatter type="xml" />
-
- <!-- Instrumentation arguments to JVM -->
- <jvmarg value="-Demma.coverage.out.file=${reports.emma}/coverage.emma" />
- <jvmarg value="-Demma.coverage.out.merge=true" />
-
-
- <!-- Test classes -->
- <test name="com.nokia.s60tools.sdk.tests.AllPureJUnitTests" todir="${reports.folder}"/>
- </junit>
-
- <!-- Create EMMA report -->
- <emma>
- <report sourcepath="src/" >
- <fileset dir="${reports.emma}" >
- <include name="*.emma" />
- </fileset>
- <xml outfile="${reports.emma}/coverage.xml" />
- </report>
- </emma>
- </target>
-
-
-
-</project>
--- a/frameworkplugins/com.nokia.s60tools.ui/META-INF/MANIFEST.MF Thu Mar 04 13:38:40 2010 +0200
+++ b/frameworkplugins/com.nokia.s60tools.ui/META-INF/MANIFEST.MF Wed Apr 21 11:43:59 2010 +0300
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Carbide.c++ Extensions - UI Services
Bundle-SymbolicName: com.nokia.s60tools.ui;singleton:=true
-Bundle-Version: 1.7.0
+Bundle-Version: 1.8.0
Bundle-Activator: com.nokia.s60tools.ui.internal.S60ToolsUiPlugin
Bundle-Vendor: Nokia
Require-Bundle: org.eclipse.ui,
--- a/frameworkplugins/com.nokia.s60tools.ui/build.xml Thu Mar 04 13:38:40 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,188 +0,0 @@
-
-<project name="com.nokia.s60tools.ui" default="build.all">
-
- <!-- declare ant4eclipse -->
- <taskdef resource="net/sf/ant4eclipse/antlib.xml" />
-
- <!-- Name definitions -->
- <property name="feature.name" value="FrameworkUI"/>
- <property name="project.name" value="com.nokia.s60tools.sdk" />
- <property name="jar.filename" value="${ant.project.name}.jar"/>
-
- <!-- Folder definitions -->
- <property name="workspace.path" value="." />
- <property name="java.location" value="C:/APPS/j2sdk_1.5.0_12" />
- <property name="destination.path" value="." />
-
- <property name="carbide.folder" value="C:/Carbide_internal" />
- <property name="carbide.int.folder" location="c:/Carbide_internal/plugins"/>
- <property name="carbide.dev.folder" location="c:/Carbide_development/plugins"/>
-
- <property name="test.folder" location="../${ant.project.name}.tests"/>
- <property name="reports.folder" location="reports"/>
- <property name="reports.emma" location="${reports.folder}/emma"/>
- <property name="instr.folder" location="instr"/>
- <property name="binaries.folder" location="${feature.name}.binaries"/>
-
-
- <!-- EMMA configuration -->
- <path id="emma.lib" >
- <pathelement location="${ant.home}/lib/emma.jar" />
- <pathelement location="${ant.home}/lib/emma_ant.jar" />
- </path>
-
- <taskdef resource="emma_ant.properties" classpathref="emma.lib" />
-
- <!-- PMD configuration -->
- <path id="pmd.lib" >
- <pathelement location="${ant.home}/lib/pmd-4.2.5.jar" />
- <pathelement location="${ant.home}/lib/asm-3.1.jar" />
- <pathelement location="${ant.home}/lib/jaxen-1.1.1.jar" />
- </path>
-
- <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask" classpathref="pmd.lib" />
-
- <!-- Folders -->
- <delete dir="${instr.folder}"/>
- <mkdir dir="${instr.folder}"/>
-
- <delete dir="${reports.folder}"/>
- <mkdir dir="${reports.folder}"/>
-
- <!-- Carbide_classpath -->
- <path id="carbide_classpath">
- <fileset dir="${carbide.int.folder}" includes="**/*.jar" />
- </path>
-
- <!-- Delete old plugins and features -->
- <target name="delete">
- <delete dir="plugins" failonerror="false"/>
- <delete dir="features" failonerror="false"/>
- <delete dir="bin" failonerror="false"/>
- </target>
-
-
- <!-- Target Plugin -->
- <target name="build.plugins" depends="">
-
- <!-- Copy necessary resources -->
- <copy todir="bin/" failonerror="true" overwrite="false">
- <fileset dir="src/" excludes="**/*.java, **/package.htm*" />
- </copy>
-
- <buildPlugin workspace="${workspace.path}" targetPlatformLocation="${carbide.folder}" projectname="" destDir="${destination.path}" packageAsJar="true">
- <javacLibraryCompiler>
- <compilerSettings debug="true" fork="true"/>
- </javacLibraryCompiler>
- </buildPlugin>
-
- </target>
-
- <!-- Empty target to do nothing -->
- <target name="build.plugin">
- </target>
-
-
-
- <!-- Instrumentation target, depends on build.mtrunner -->
- <target name="instr" depends="build.plugins">
- <!-- Instrument the source code -->
- <emma>
- <instr instrpath="bin" destdir="${instr.folder}" metadatafile="${reports.emma}/metadata.emma" merge="true"/>
- </emma>
- </target>
-
-
- <target name="create.zip">
-
- <mkdir dir="${binaries.folder}/nightly_builds"/>
- <!-- Zip jars to ActiveObjectAnalyser.zip -->
- <tstamp>
- <format property="timestamp" pattern="dd-MM-yyyy" />
- </tstamp>
-
- <zip destfile="${binaries.folder}/nightly_builds/${feature.name}-${timestamp}.zip"
- basedir="."
- includes="plugins/*, features/com.nokia.carbide.extensions.*/"/>
- </target>
-
- <!-- Analyze target -->
- <target name="analyze">
- <!-- PMD -->
- <pmd shortFileNames="true">
- <!-- Rules -->
- <ruleset>basic</ruleset>
- <ruleset>codesize</ruleset>
- <ruleset>coupling</ruleset>
- <ruleset>design</ruleset>
- <ruleset>strictexception</ruleset>
- <ruleset>strings</ruleset>
- <ruleset>sunsecure</ruleset>
- <ruleset>unusedcode</ruleset>
- <ruleset>junit</ruleset>
-
- <!-- XML output -->
- <formatter type="xml" toFile="${reports.folder}/report.pmd.xml"/>
-
- <!-- Files to analyze -->
- <!-- Files to analyze -->
- <fileset dir="src/">
- <include name="**/*.java"/>
- </fileset>
- </pmd>
- </target>
-
- <!-- Test target, depends on instrumentation and analyze -->
- <target name="test" depends="instr, analyze" description="Run unit tests">
- <!-- Test classpath -->
- <path id="test_classpath">
- <!-- Test classes -->
- <pathelement location="${test.folder}/src"/>
-
- <!-- Instrumented class files -->
- <pathelement location="${instr.folder}"/>
-
- <!-- EMMA -->
- <pathelement path="${ant.home}/lib/emma.jar"/>
-
- <path refid="carbide_classpath" />
- </path>
-
- <!-- Compile the tests -->
- <javac srcdir="${test.folder}" verbose="${javacVerbose}">
- <classpath refid="test_classpath"/>
- </javac>
-
- <!-- Run JUnit -->
- <junit printsummary="yes" fork="yes" haltonfailure="no">
- <classpath refid="test_classpath" />
-
- <!-- Plain format and XML -->
- <formatter type="plain" />
- <formatter type="xml" />
-
- <!-- Instrumentation arguments to JVM -->
- <jvmarg value="-Demma.coverage.out.file=${reports.emma}/coverage.emma" />
- <jvmarg value="-Demma.coverage.out.merge=true" />
-
- <!-- Test classes -->
- <test name="${ant.project.name}.tests.AllPureJUnitTests" todir="${reports.folder}"/>
-
- </junit>
-
- <!-- Create EMMA report -->
- <emma>
- <report sourcepath="src/" >
- <fileset dir="${reports.emma}" >
- <include name="*.emma" />
- </fileset>
- <xml outfile="${reports.emma}/coverage.xml" />
- </report>
- </emma>
- </target>
-
-
- <!-- Target Build all -->
- <target name="build.all" depends="delete, build.plugins, instr, create.zip, analyze" />
-
-</project>
\ No newline at end of file
--- a/frameworkplugins/com.nokia.s60tools.ui/ccbuild.xml Thu Mar 04 13:38:40 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="com.nokia.s60tools.ui" default="cc" basedir=".">
-
- <target name="cc" depends="build, analyze" description="Build, instrument, run unit tests and analyze code"/>
-
- <property name="basews" value="${ws}"/>
- <property name="baseos" value="${os}"/>
- <property name="basearch" value="${arch}"/>
- <property name="basenl" value="${nl}"/>
-
- <!-- Compiler settings -->
- <property name="javacFailOnError" value="true"/>
- <property name="javacDebugInfo" value="on"/>
- <property name="javacVerbose" value="false"/>
- <property name="logExtension" value=".log"/>
- <property name="compilerArg" value=""/>
- <property name="javacSource" value="5"/>
- <property name="javacTarget" value="5"/>
-
- <property name="bootclasspath" refid="path_bootclasspath"/>
- <property name="bundleJavacSource" value="${javacSource}"/>
- <property name="bundleJavacTarget" value="${javacTarget}"/>
- <property name="bundleBootClasspath" value="${bootclasspath}"/>
- <property name="feature.name" value="Framework"/>
-
- <!-- Folder definitions -->
- <property name="carbide.int.folder" location="c:/Carbide_internal/plugins"/>
- <property name="carbide.dev.folder" location="c:/Carbide_development/plugins"/>
- <property name="test.folder" location="../com.nokia.s60tools.ui.tests"/>
-
- <property name="binaries.folder" location="../${feature.name}.binaries"/>
- <property name="reports.folder" location="reports"/>
- <property name="reports.emma" location="${reports.folder}/emma"/>
- <property name="instr.folder" location="instr"/>
-
-
- <!-- EMMA configuration -->
- <path id="emma.lib" >
- <pathelement location="${ant.home}/lib/emma.jar" />
- <pathelement location="${ant.home}/lib/emma_ant.jar" />
- </path>
-
- <taskdef resource="emma_ant.properties" classpathref="emma.lib" />
-
- <!-- PMD configuration -->
- <path id="pmd.lib" >
- <pathelement location="${ant.home}/lib/pmd-4.2.jar" />
- <pathelement location="${ant.home}/lib/asm-3.1.jar" />
- <pathelement location="${ant.home}/lib/jaxen-1.1.1.jar" />
- </path>
-
- <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask" classpathref="pmd.lib" />
-
- <path id="path_bootclasspath">
- <fileset dir="${java.home}/lib">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <path id="build_classpath">
- <path refid="carbide_classpath"/>
- </path>
-
- <path id="carbide_classpath">
- <fileset dir="${carbide.dev.folder}" includes="**/*.jar" />
- </path>
-
- <target name="properties" if="eclipse.running">
- <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
- </target>
-
- <!-- Initialization -->
- <target name="init" depends="properties">
- <condition property="pluginTemp" value="${buildTempFolder}/plugins">
- <isset property="buildTempFolder"/>
- </condition>
- <property name="pluginTemp" value="${basedir}"/>
- <condition property="build.result.folder" value="${pluginTemp}/${ant.project.name}">
- <isset property="buildTempFolder"/>
- </condition>
- <property name="build.result.folder" value="${basedir}"/>
- <property name="temp.folder" value="${basedir}/temp.folder"/>
- <property name="plugin.destination" value="${basedir}"/>
-
- <property name="jar.filename" value="${ant.project.name}.jar"/>
-
- <delete dir="${reports.folder}"/>
- <mkdir dir="${reports.folder}"/>
-
- <delete dir="../plugins"/>
- <mkdir dir="../plugins"/>
-
- <exec executable="svn" dir="../.">
- <arg line="up"/>
- </exec>
- </target>
-
- <!-- Build target -->
- <target name="build" depends="init" description="Build the source">
- <!-- Build the source -->
- <javac destdir="" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}">
- <compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
- <classpath refid="build_classpath" />
- <src path="src/" />
- <compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
- <compilerarg line="-log '${temp.folder}/bin${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
- </javac>
-
- <!-- Copy necessary resources -->
- <copy todir="" failonerror="true" overwrite="false">
- <fileset dir="src/" excludes="**/*.java, **/package.htm*" />
- </copy>
-
- <zip destfile="../plugins/${jar.filename}">
- <fileset dir="${build.result.folder}">
- <include name="com/**"/>
- <include name="META-INF/**"/>
- <include name="about.html"/>
- <include name="icons/**"/>
- </fileset>
- </zip>
-
- <!-- Create build result folder -->
- <mkdir dir="${build.result.folder}"/>
-
- </target>
-
-
- <!-- Analyze target -->
- <target name="analyze">
- <!-- PMD -->
- <pmd>
- <!-- Rules -->
- <ruleset>basic</ruleset>
- <ruleset>codesize</ruleset>
- <ruleset>coupling</ruleset>
- <ruleset>design</ruleset>
- <ruleset>strictexception</ruleset>
- <ruleset>strings</ruleset>
- <ruleset>sunsecure</ruleset>
- <ruleset>unusedcode</ruleset>
- <ruleset>junit</ruleset>
-
- <!-- XML output -->
- <formatter type="xml" toFile="${reports.folder}/report.pmd.xml"/>
-
- <!-- Files to analyze -->
- <fileset dir="src/">
- <include name="**/*.java"/>
- </fileset>
- </pmd>
- </target>
-
-
-
-
-</project>
--- a/frameworkplugins/com.nokia.s60tools.ui/src/com/nokia/s60tools/ui/internal/resources/messages.properties Thu Mar 04 13:38:40 2010 +0200
+++ b/frameworkplugins/com.nokia.s60tools.ui/src/com/nokia/s60tools/ui/internal/resources/messages.properties Wed Apr 21 11:43:59 2010 +0300
@@ -24,3 +24,5 @@
DebugMetadataWizardPage.InvalidMapFilesZip=Invalid MapFiles.zip
DebugMetadataWizardPage.SdkMapFilesFolderNotSelected=SDK Map files folder not selected.
DebugMetadataWizardPage.RomIdsDoNotMatch=ROM IDs of selected files do not match. Only selge.ini can be used.
+DebugMetadataWizardPage.TraceFiles=OST Trace Dictionary Files (.xml, .zip)
+DebugMetadataWizardPage.SelectTraceFile=Select OST trace dictionary file
--- a/frameworkplugins/com.nokia.s60tools.ui/src/com/nokia/s60tools/ui/wizards/DebugMetadataWizardPage.java Thu Mar 04 13:38:40 2010 +0200
+++ b/frameworkplugins/com.nokia.s60tools.ui/src/com/nokia/s60tools/ui/wizards/DebugMetadataWizardPage.java Wed Apr 21 11:43:59 2010 +0300
@@ -69,13 +69,14 @@
// width hint for all buttons in the page
final int BUTTON_WIDTH = 60;
// height hint for all lists in the page
- final int LIST_HEIGHT = 50;
+ final int LIST_HEIGHT = 30;
// filters for file selection dialogs
static final String SELGE_INI_FILTER = "selge.ini";
static final String SYMBOL_FILTER = "*.symbol";
static final String ZIP_FILTER = "*.zip";
static final String[] IMAGE_FILTER = {"*.fpsx", "*.img", "*.v??", ".c??", "*.*"};
+ static final String[] TRACE_FILTER = {"*.xml", "*.zip" };
// wizard saves last entered values to these tags in dialog_settings.xml
static final String LAST_USED_SELGE_INI_FILES = "SelgeIniFiles"; //$NON-NLS-1$
@@ -84,6 +85,7 @@
static final String LAST_USED_MAPFILES_FOLDER = "MapFilesFolder"; //$NON-NLS-1$
static final String LAST_USED_MAPZIP_FILES = "MapZipFiles"; //$NON-NLS-1$
static final String LAST_USED_IMAGE_FILES = "ImageFiles"; //$NON-NLS-1$
+ static final String LAST_USED_TRACE_FILES = "TraceFiles"; //$NON-NLS-1$
static final String LAST_USED_MAPFILE_TYPE = "LastUsedMapFileType"; //$NON-NLS-1$
static final String LAST_USED_SDK = "LastUsedSdk"; //$NON-NLS-1$
@@ -109,6 +111,8 @@
protected Button buttonNoMapFilesRadio;
protected Button buttonAddSymbol;
protected Button buttonRemoveSymbol;
+ protected Button buttonAddTraceFile;
+ protected Button buttonRemoveTraceFile;
protected Button buttonAddImageFile;
protected Button buttonRemoveImageFile;
protected Combo comboMapFilesFolder;
@@ -117,6 +121,7 @@
protected Group groupSymbolFiles;
protected Group groupMapFiles;
protected Group groupImageFiles;
+ protected Group groupTraceFiles;
protected Group groupSelgeSymbolRadios;
protected Label labelMapFilesFolder;
protected Label labelZip;
@@ -124,6 +129,7 @@
protected Label labelNoMapFiles;
protected List listSymbols;
protected List listImageFiles;
+ protected List listTraceFiles;
// owner can pass in ROM IDs so that we can check that correct symbol is selected
protected String[] romIds = null;
@@ -135,7 +141,7 @@
protected String defaultSelgeIniFile = "\\\\Vagrp014\\groups4\\Builds\\S60RnD\\S60_5_0\\SelgeIniFile\\selge.ini"; //$NON-NLS-1$
// defines whether image files selection should be visible in the page
- boolean showImageFilesGroup = false;
+ boolean showImageAndTraceFilesGroup = false;
// section where this wizard pages data is saved
IDialogSettings previousValuesSection;
@@ -154,18 +160,17 @@
*/
public DebugMetadataWizardPage(String pageName,
String title,
- boolean imageFilesGroup,
+ boolean imageAndTraceFilesGroup,
IDialogSettings section,
int maxSavedValues){
super(pageName);
MAX_SAVED_VALUES = maxSavedValues;
- showImageFilesGroup = imageFilesGroup;
+ showImageAndTraceFilesGroup = imageAndTraceFilesGroup;
previousValuesSection = section;
setTitle(title);
setDescription(Messages.getString("DebugMetadataWizardPage.SelgeIniDescription")); //$NON-NLS-1$
-
setPageComplete(true);
}
@@ -182,6 +187,7 @@
}
@Override
+
public void setInitialFocus() {
if (buttonSelgeRadio.getSelection())
comboSelge.setFocus();
@@ -231,6 +237,7 @@
setControl(composite);
}
+
/**
* Creates UI controls for selge.ini usage
@@ -346,8 +353,10 @@
createMapFilesGroup(composite);
// if image files UI is wanted, create it
- if (showImageFilesGroup)
+ if (showImageAndTraceFilesGroup) {
+ createTraceFilesGroup(composite);
createImageFilesGroup(composite);
+ }
}
/**
@@ -507,6 +516,51 @@
}
/**
+ * Creates UI controls for OST trace dictionary files usage.
+ *
+ */
+ void createTraceFilesGroup(Composite parent) {
+ // Image files group
+ groupTraceFiles = new Group(parent, SWT.NONE);
+ GridData gd = new GridData(GridData.FILL_BOTH);
+ gd.horizontalSpan = 2;
+ gd.verticalIndent = 10;
+ GridLayout gl = new GridLayout();
+ gl.numColumns = 2;
+ groupTraceFiles.setLayout(gl);
+ groupTraceFiles.setText(Messages.getString("DebugMetadataWizardPage.TraceFiles")); //$NON-NLS-1$
+ groupTraceFiles.setLayoutData(gd);
+
+ // OST trace dictionary file list
+ listTraceFiles = new List(groupTraceFiles, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL | SWT.MULTI);
+ GridData gdHorizontalTop = new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
+ gdHorizontalTop.verticalSpan = 2;
+ gdHorizontalTop.heightHint = LIST_HEIGHT;
+ listTraceFiles.setLayoutData(gdHorizontalTop);
+
+ // read last used trace dictionary files and fill them into the list
+ String[] lastUsed = getPreviousPaths(LAST_USED_TRACE_FILES);
+ if (lastUsed != null) {
+ listTraceFiles.setItems(lastUsed);
+ }
+
+ GridData gdButtons = new GridData();
+ gdButtons.widthHint = BUTTON_WIDTH;
+
+ // Add trace dictionary file button
+ buttonAddTraceFile = new Button(groupTraceFiles, SWT.PUSH);
+ buttonAddTraceFile.setText(Messages.getString("DebugMetadataWizardPage.Add")); //$NON-NLS-1$
+ buttonAddTraceFile.setLayoutData(gdButtons);
+ buttonAddTraceFile.addSelectionListener(this);
+
+ // Remove trace dictionary file button
+ buttonRemoveTraceFile = new Button(groupTraceFiles, SWT.PUSH);
+ buttonRemoveTraceFile.setText(Messages.getString("DebugMetadataWizardPage.Remove")); //$NON-NLS-1$
+ buttonRemoveTraceFile.setLayoutData(gdButtons);
+ buttonRemoveTraceFile.addSelectionListener(this);
+ }
+
+ /**
* Creates UI controls for image files usage.
*
*/
@@ -563,10 +617,10 @@
// show symbol group
// ROWS COMMENTED SO THAT THEY CAN BE RESTORED INCASE SELGE.INI USAGE IS RESTORED
-/* gd = (GridData)groupSymbol.getLayoutData();
- groupSymbol.setVisible(true);
- gd.exclude = false;
-*/
+// gd = (GridData)groupSymbol.getLayoutData();
+// groupSymbol.setVisible(true);
+// gd.exclude = false;
+//
// hide selge group
gd = (GridData)groupSelge.getLayoutData();
gd.exclude = true;
@@ -665,6 +719,15 @@
}
/**
+ * Returns trace dictionary files selected by user.
+ */
+ public String[] getTraceFiles() {
+ assert listTraceFiles != null;
+
+ return listTraceFiles.getItems();
+ }
+
+ /**
* Returns the provided ROM IDs
*/
public String[] getRomIds() {
@@ -764,6 +827,47 @@
listSymbols.remove(selectedItems);
}
+ // Add trace file button pressed
+ } else if (event.widget == buttonAddTraceFile) {
+ FileDialog dialog = new FileDialog(this.getShell(), SWT.OPEN | SWT.MULTI);
+ dialog.setText(Messages.getString("DebugMetadataWizardPage.SelectTraceFile")); //$NON-NLS-1$
+ String[] filterExt = TRACE_FILTER;
+ dialog.setFilterExtensions(filterExt);
+ String result = dialog.open();
+ // if user selected files, check that files don't already exist in the list
+ // and add them if they don't already exist.
+ if (result != null) {
+ String[] fileNames = dialog.getFileNames();
+ if (fileNames != null) {
+ String path = dialog.getFilterPath() + File.separator;
+ for (int j = 0; j < fileNames.length; j++) {
+ String filePath = path + fileNames[j];
+ String[] listItems = listTraceFiles.getItems();
+ if (listItems != null && listItems.length > 0) {
+ boolean found = false;
+ for (int i = 0; i < listItems.length; i++) {
+ String listItem = listItems[i];
+ if (listItem.compareToIgnoreCase(filePath) == 0) {
+ found = true;
+ break;
+ }
+ }
+ if (!found)
+ listTraceFiles.add(filePath);
+ } else {
+ listTraceFiles.add(filePath);
+ }
+ }
+ }
+ }
+
+ // Remove OST trace file button pressed
+ } else if (event.widget == buttonRemoveTraceFile) {
+ int[] selectedItems = listTraceFiles.getSelectionIndices();
+ if (selectedItems != null && selectedItems.length > 0) {
+ listTraceFiles.remove(selectedItems);
+ }
+
// Add image file button pressed
} else if (event.widget == buttonAddImageFile) {
FileDialog dialog = new FileDialog(this.getShell(), SWT.OPEN | SWT.MULTI);
@@ -1026,8 +1130,12 @@
saveValue(comboMapFilesZip.getText(), LAST_USED_MAPZIP_FILES, false);
saveValue(comboMapFilesFolder.getText(), LAST_USED_MAPFILES_FOLDER, false);
saveValue(comboSdkFolder.getText(), LAST_USED_SDK, true);
- if (showImageFilesGroup)
+
+ if (showImageAndTraceFilesGroup) {
saveValues(listImageFiles.getItems(), LAST_USED_IMAGE_FILES);
+ saveValues(listTraceFiles.getItems(), LAST_USED_TRACE_FILES);
+ }
+
int mapType = NO_MAP_FILES_RADIO;
if (buttonMapFilesFolderRadio.getSelection())
mapType = MAP_FILES_FOLDER_RADIO;
@@ -1071,10 +1179,13 @@
PlatformUI.getWorkbench().getHelpSystem().setHelp(comboSdkFolder, helpContext);
PlatformUI.getWorkbench().getHelpSystem().setHelp(buttonShowSelgeDetails, helpContext);
PlatformUI.getWorkbench().getHelpSystem().setHelp(textSelgeDetails, helpContext);
- if (showImageFilesGroup) {
+ if (showImageAndTraceFilesGroup) {
PlatformUI.getWorkbench().getHelpSystem().setHelp(listImageFiles, helpContext);
PlatformUI.getWorkbench().getHelpSystem().setHelp(buttonAddImageFile, helpContext);
PlatformUI.getWorkbench().getHelpSystem().setHelp(buttonRemoveImageFile, helpContext);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(listTraceFiles, helpContext);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(buttonAddTraceFile, helpContext);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(buttonRemoveTraceFile, helpContext);
}
}
--- a/frameworkplugins/com.nokia.s60tools.util/META-INF/MANIFEST.MF Thu Mar 04 13:38:40 2010 +0200
+++ b/frameworkplugins/com.nokia.s60tools.util/META-INF/MANIFEST.MF Wed Apr 21 11:43:59 2010 +0300
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Carbide.c++ Extensions - Utilities
Bundle-SymbolicName: com.nokia.s60tools.util
-Bundle-Version: 1.7.0
+Bundle-Version: 1.8.0
Bundle-Activator: com.nokia.s60tools.util.internal.UtilPlugin
Bundle-Vendor: Nokia
Require-Bundle: org.eclipse.core.runtime,
--- a/frameworkplugins/com.nokia.s60tools.util/build.xml Thu Mar 04 13:38:40 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,193 +0,0 @@
-
-<project name="com.nokia.s60tools.util" default="build.all">
-
- <!-- declare ant4eclipse -->
- <taskdef resource="net/sf/ant4eclipse/antlib.xml" />
-
- <!-- Name definitions -->
- <property name="feature.name" value="FrameworkUtil"/>
- <property name="project.name" value="com.nokia.s60tools.sdk" />
- <property name="jar.filename" value="${ant.project.name}.jar"/>
-
- <!-- Folder definitions -->
- <property name="workspace.path" value="." />
- <property name="java.location" value="C:/APPS/j2sdk_1.5.0_12" />
- <property name="destination.path" value="." />
-
- <property name="carbide.folder" value="C:/Carbide_internal" />
- <property name="carbide.int.folder" location="c:/Carbide_ADT/plugins"/>
- <property name="carbide.dev.folder" location="c:/Carbide_development/plugins"/>
-
- <property name="test.folder" location="../${ant.project.name}.tests"/>
- <property name="reports.folder" location="reports"/>
- <property name="reports.emma" location="${reports.folder}/emma"/>
- <property name="instr.folder" location="instr"/>
- <property name="binaries.folder" location="${feature.name}.binaries"/>
-
-
- <!-- EMMA configuration -->
- <path id="emma.lib" >
- <pathelement location="${ant.home}/lib/emma.jar" />
- <pathelement location="${ant.home}/lib/emma_ant.jar" />
- </path>
-
- <taskdef resource="emma_ant.properties" classpathref="emma.lib" />
-
- <!-- PMD configuration -->
- <path id="pmd.lib" >
- <pathelement location="${ant.home}/lib/pmd-4.2.5.jar" />
- <pathelement location="${ant.home}/lib/asm-3.1.jar" />
- <pathelement location="${ant.home}/lib/jaxen-1.1.1.jar" />
- </path>
-
- <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask" classpathref="pmd.lib" />
-
- <!-- Folders -->
- <delete dir="${instr.folder}"/>
- <mkdir dir="${instr.folder}"/>
-
- <delete dir="${reports.folder}"/>
- <mkdir dir="${reports.folder}"/>
-
- <!-- Carbide_classpath -->
- <path id="carbide_classpath">
- <fileset dir="${carbide.int.folder}" includes="**/*.jar" />
- </path>
-
- <!-- Delete old plugins and features -->
- <target name="delete">
- <delete dir="plugins" failonerror="false"/>
- <delete dir="features" failonerror="false"/>
- <delete dir="bin" failonerror="false"/>
- <delete dir="features" failonerror="false"/>
- </target>
-
-
- <!-- Target Plugin -->
- <target name="build.plugins" depends="">
-
- <!-- Copy necessary resources -->
- <copy todir="bin/" failonerror="true" overwrite="false">
- <fileset dir="src/" excludes="**/*.java, **/package.htm*" />
- </copy>
-
- <buildPlugin workspace="${workspace.path}" targetPlatformLocation="${carbide.folder}" projectname="" destDir="${destination.path}" packageAsJar="true">
- <javacLibraryCompiler>
- <compilerSettings debug="true" fork="true"/>
- </javacLibraryCompiler>
- </buildPlugin>
-
- </target>
-
- <!-- Empty target to do nothing -->
- <target name="build.plugin">
- </target>
-
-
-
- <!-- Instrumentation target, depends on build.mtrunner -->
- <target name="instr" depends="build.plugins">
- <!-- Instrument the source code -->
- <emma>
- <instr instrpath="bin" destdir="${instr.folder}" metadatafile="${reports.emma}/metadata.emma" merge="true"/>
- </emma>
- </target>
-
-
- <target name="create.zip">
-
- <mkdir dir="${binaries.folder}/nightly_builds"/>
- <!-- Zip jars to ActiveObjectAnalyser.zip -->
- <tstamp>
- <format property="timestamp" pattern="dd-MM-yyyy" />
- </tstamp>
-
- <zip destfile="${binaries.folder}/nightly_builds/${feature.name}-${timestamp}.zip"
- basedir="."
- includes="plugins/*, features/com.nokia.carbide.extensions.*/"/>
- </target>
-
- <!-- Analyze target -->
- <target name="analyze">
- <!-- PMD -->
- <pmd shortFileNames="true">
- <!-- Rules -->
- <ruleset>basic</ruleset>
- <ruleset>codesize</ruleset>
- <ruleset>coupling</ruleset>
- <ruleset>design</ruleset>
- <ruleset>strictexception</ruleset>
- <ruleset>strings</ruleset>
- <ruleset>sunsecure</ruleset>
- <ruleset>unusedcode</ruleset>
- <ruleset>junit</ruleset>
-
- <!-- XML output -->
- <formatter type="xml" toFile="${reports.folder}/report.pmd.xml"/>
-
- <!-- Files to analyze -->
- <!-- Files to analyze -->
- <fileset dir="src/">
- <include name="**/*.java"/>
- </fileset>
- <fileset dir="../${ant.project.name}.tests/src/">
- <include name="**/*.java"/>
- </fileset>
- </pmd>
- </target>
-
- <!-- Test target, depends on instrumentation and analyze -->
- <target name="test" depends="instr, analyze" description="Run unit tests">
- <!-- Test classpath -->
- <path id="test_classpath">
- <!-- Test classes -->
- <pathelement location="${test.folder}/src"/>
-
- <!-- Instrumented class files -->
- <pathelement location="${instr.folder}"/>
-
- <!-- EMMA -->
- <pathelement path="${ant.home}/lib/emma.jar"/>
-
- <path refid="carbide_classpath" />
- </path>
-
- <!-- Compile the tests -->
- <javac srcdir="${test.folder}" verbose="${javacVerbose}">
- <classpath refid="test_classpath"/>
- </javac>
-
- <!-- Run JUnit -->
- <junit printsummary="yes" fork="yes" haltonfailure="no">
- <classpath refid="test_classpath" />
-
- <!-- Plain format and XML -->
- <formatter type="plain" />
- <formatter type="xml" />
-
- <!-- Instrumentation arguments to JVM -->
- <jvmarg value="-Demma.coverage.out.file=${reports.emma}/coverage.emma" />
- <jvmarg value="-Demma.coverage.out.merge=true" />
- <jvmarg value="-D_S60TOOLS_WS_PATH=C:\hudson\jobs\Framework Util\workspace" />
-
- <!-- Test classes -->
- <test name="${ant.project.name}.tests.AllPureJUnitTests" todir="${reports.folder}"/>
-
- </junit>
-
- <!-- Create EMMA report -->
- <emma>
- <report sourcepath="src/" >
- <fileset dir="${reports.emma}" >
- <include name="*.emma" />
- </fileset>
- <xml outfile="${reports.emma}/coverage.xml" />
- </report>
- </emma>
- </target>
-
-
- <!-- Target Build all -->
- <target name="build.all" depends="delete, build.plugins, instr, create.zip, analyze,test" />
-
-</project>
\ No newline at end of file
--- a/frameworkplugins/com.nokia.s60tools.util/ccbuild.xml Thu Mar 04 13:38:40 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,225 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="com.nokia.s60tools.util" default="cc" basedir=".">
-
- <target name="cc" depends="build, instr, analyze, test" description="Build, instrument, run unit tests and analyze code"/>
-
- <property name="basews" value="${ws}"/>
- <property name="baseos" value="${os}"/>
- <property name="basearch" value="${arch}"/>
- <property name="basenl" value="${nl}"/>
-
- <!-- Compiler settings -->
- <property name="javacFailOnError" value="true"/>
- <property name="javacDebugInfo" value="on"/>
- <property name="javacVerbose" value="false"/>
- <property name="logExtension" value=".log"/>
- <property name="compilerArg" value=""/>
- <property name="javacSource" value="5"/>
- <property name="javacTarget" value="5"/>
-
- <property name="bootclasspath" refid="path_bootclasspath"/>
- <property name="bundleJavacSource" value="${javacSource}"/>
- <property name="bundleJavacTarget" value="${javacTarget}"/>
- <property name="bundleBootClasspath" value="${bootclasspath}"/>
- <property name="feature.name" value="Framework"/>
-
- <!-- Folder definitions -->
- <property name="carbide.sym.folder" location="c:/Carbide_SymSee/plugins"/>
- <property name="carbide.idl.folder" location="c:/Carbide_IDL/plugins"/>
- <property name="carbide.adt.folder" location="c:/Carbide_ADT/plugins"/>
-
- <property name="test.folder" location="../com.nokia.s60tools.util.tests"/>
-
- <property name="binaries.folder" location="../${feature.name}.binaries"/>
- <property name="reports.folder" location="reports"/>
- <property name="reports.emma" location="${reports.folder}/emma"/>
- <property name="instr.folder" location="instr"/>
-
-
- <!-- EMMA configuration -->
- <path id="emma.lib" >
- <pathelement location="${ant.home}/lib/emma.jar" />
- <pathelement location="${ant.home}/lib/emma_ant.jar" />
- </path>
-
- <taskdef resource="emma_ant.properties" classpathref="emma.lib" />
-
- <!-- PMD configuration -->
- <path id="pmd.lib" >
- <pathelement location="${ant.home}/lib/pmd-4.2.jar" />
- <pathelement location="${ant.home}/lib/asm-3.1.jar" />
- <pathelement location="${ant.home}/lib/jaxen-1.1.1.jar" />
- </path>
-
- <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask" classpathref="pmd.lib" />
-
- <path id="path_bootclasspath">
- <fileset dir="${java.home}/lib">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <path id="build_classpath">
- <path refid="carbide_classpath"/>
- </path>
-
- <path id="carbide_classpath">
- <fileset dir="${carbide.idl.folder}" includes="**/*.jar" />
- </path>
-
- <target name="properties" if="eclipse.running">
- <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
- </target>
-
- <!-- Initialization -->
- <target name="init" depends="properties">
- <condition property="pluginTemp" value="${buildTempFolder}/plugins">
- <isset property="buildTempFolder"/>
- </condition>
- <property name="pluginTemp" value="${basedir}"/>
- <condition property="build.result.folder" value="${pluginTemp}/${ant.project.name}">
- <isset property="buildTempFolder"/>
- </condition>
- <property name="build.result.folder" value="${basedir}"/>
- <property name="temp.folder" value="${basedir}/temp.folder"/>
- <property name="plugin.destination" value="${basedir}"/>
-
- <property name="jar.filename" value="${ant.project.name}.jar"/>
-
- <delete dir="${reports.folder}"/>
- <mkdir dir="${reports.folder}"/>
-
- <delete dir="${instr.folder}"/>
- <mkdir dir="${instr.folder}"/>
-
- <delete dir="../plugins"/>
- <mkdir dir="../plugins"/>
-
- <delete dir="${build.result.folder}/com"/>
-
- <exec executable="svn" dir="../.">
- <arg line="up"/>
- </exec>
- </target>
-
- <!-- Build target -->
- <target name="build" depends="init" description="Build the source">
- <!-- Build the source -->
- <javac destdir="" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}">
- <compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
- <classpath refid="build_classpath" />
- <src path="src/" />
- <compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
- <compilerarg line="-log '${temp.folder}/bin${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
- </javac>
-
- <!-- Copy necessary resources -->
- <copy todir="" failonerror="true" overwrite="false">
- <fileset dir="src/" excludes="**/*.java, **/package.htm*" />
- </copy>
-
- <zip destfile="../plugins/${jar.filename}">
- <fileset dir="${build.result.folder}">
- <include name="com/**"/>
- <include name="META-INF/**"/>
- <include name="about.html"/>
- </fileset>
- </zip>
-
- <!-- Create build result folder -->
- <mkdir dir="${build.result.folder}"/>
-
- </target>
-
-
- <!-- Analyze target -->
- <target name="analyze">
- <!-- PMD -->
- <pmd>
- <!-- Rules -->
- <ruleset>basic</ruleset>
- <ruleset>codesize</ruleset>
- <ruleset>coupling</ruleset>
- <ruleset>design</ruleset>
- <ruleset>strictexception</ruleset>
- <ruleset>strings</ruleset>
- <ruleset>sunsecure</ruleset>
- <ruleset>unusedcode</ruleset>
- <ruleset>junit</ruleset>
-
-
- <!-- XML output -->
- <formatter type="xml" toFile="${reports.folder}/report.pmd.xml"/>
-
- <!-- Files to analyze -->
- <fileset dir="src/">
- <include name="**/*.java"/>
- </fileset>
- <fileset dir="${test.folder}/src/">
- <include name="**/*.java"/>
- </fileset>
- </pmd>
- </target>
-
- <!-- Instrumentation target, depends on JAR -->
- <target name="instr" depends="build">
- <!-- Instrument the source code -->
- <emma>
- <instr instrpath="../plugins/${jar.filename}" destdir="${instr.folder}" metadatafile="${reports.emma}/metadata.emma" merge="true"/>
- </emma>
- </target>
-
-
- <!-- Test target, depends on instrumentation and analyze -->
- <target name="test" depends="instr" description="Run unit tests">
- <!-- Test classpath -->
- <path id="test_classpath">
- <!-- Test classes -->
- <pathelement location="${test.folder}/src"/>
-
- <!-- Instrumented class files -->
- <pathelement location="${instr.folder}"/>
-
- <!-- EMMA -->
- <pathelement path="${ant.home}/lib/emma.jar"/>
-
- <fileset dir="${carbide.adt.folder}" includes="**/*.jar" />
- </path>
-
- <!-- Compile the tests -->
- <javac srcdir="${test.folder}" verbose="${javacVerbose}">
- <classpath refid="test_classpath"/>
- </javac>
-
- <!-- Run JUnit -->
- <junit printsummary="yes" fork="yes" haltonfailure="no">
- <classpath refid="test_classpath" />
-
- <!-- Plain format and XML -->
- <formatter type="plain" />
- <formatter type="xml" />
-
- <!-- Instrumentation arguments to JVM -->
- <jvmarg value="-Demma.coverage.out.file=${reports.emma}/coverage.emma" />
- <jvmarg value="-Demma.coverage.out.merge=true" />
- <jvmarg value="-D_S60TOOLS_WS_PATH=C:\hudson\jobs\Framework_Util\workspace" />
-
-
- <!-- Test classes -->
- <test name="com.nokia.s60tools.util.tests.AllPureJUnitTests" todir="${reports.folder}"/>
- </junit>
-
- <!-- Create EMMA report -->
- <emma>
- <report sourcepath="src/" >
- <fileset dir="${reports.emma}" >
- <include name="*.emma" />
- </fileset>
- <xml outfile="${reports.emma}/coverage.xml" />
- </report>
- </emma>
- </target>
-
-
-
-</project>
--- a/frameworkplugins/com.nokia.s60tools.util/src/com/nokia/s60tools/util/resource/FileUtils.java Thu Mar 04 13:38:40 2010 +0200
+++ b/frameworkplugins/com.nokia.s60tools.util/src/com/nokia/s60tools/util/resource/FileUtils.java Wed Apr 21 11:43:59 2010 +0300
@@ -26,6 +26,13 @@
import java.io.FileWriter;
import java.io.IOException;
import java.io.OutputStreamWriter;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileLock;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
@@ -46,6 +53,7 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.FileEditorInput;
+import com.nokia.s60tools.util.debug.DbgUtility;
import com.nokia.s60tools.util.internal.Messages;
/**