fix bug 11077 and bug 11033

merge commit

fix a sbsv2 config sorting problem

patch for bug 11077 and bug 11033

David's commit: the connections view was not listening to the changes in connection status, so unless a service changed status, the change in connection status didn?t get updated

PlatSim-related launch wizard changes: (1) Remember last connection created and offer this by default in the Select Connection dialog; (2) Immediately open New Connection dialog if debugging and no connections exist; (3) Split out SelectConnectionDialog; (4) Fix some wording in Select Connection dialog since this is not always an error situation.

Fix ConcurrentModificationException when accumulating service testers

David's commit: the connections view was not listening to the changes in connection status, so unless a service changed status, the change in connection status didn?t get updated

PlatSim-related launch wizard changes: (1) Remember last connection created and offer this by default in the Select Connection dialog; (2) Immediately open New Connection dialog if debugging and no connections exist; (3) Split out SelectConnectionDialog; (4) Fix some wording in Select Connection dialog since this is not always an error situation.

Fix ConcurrentModificationException when accumulating service testers

Merge PlatSim changes from 2.x, but move ILaunchDelegateConnectionExtension into com.nokia.cdt.debug.common so EDC can use it

support for connection status for static connections

support for connection status for static connections

Fix for Bug 10757 (Build is not started when "Use default incremental builder" option is set in preferences).

Fix for Bug 10757 (Build is not started when "Use default incremental builder" option is set in preferences).

Merge commit

Initial pass getting PlatSim connections to work in App/Sys TRK configurations. Add extension for TRK launch delegate for PlatSim-specific behavior.

update sedona templates as part of bug 11049

merge commit

fix bug 11049. use mifconv prj_extension for SBSv2 GUI projects

merge commit

For SBSv2 projects, add SBSV2 macro during bld.inf proprocessing and to build configuration macro cache.

merged changes from 2.6 to 3.0

revised help ID references for project properties dialog

fix name in com.nokia.carbide.cpp.src-feature/.project

revised bugs fixed

BUG 11117 - fixed link to resume debugger page

BUG 11114 - PnP broken link fixed

remove dead code

remove dead code

Fix bug 11022. Get rid of dependency on SBS_HOME.

Fix bug 11022. Get rid of dependency on SBS_HOME.

adding missing images from last commit

adding missing .ini file to product plugin

update API notes for 2.6

updated API notes for new methods for 2.6

clean up comments

little clean-up/refactor after review of bug 11068

little clean-up/refactor after review of bug 11068

merge

Simplify new IConnectionFactory2

fix npe

fix npe

merge

Simplify new IConnectionFactory2

minor edits to remote conn pages, updated copyrights, fixed some broken links

Fix bug 10878

Fix for bug 10878

fix bug 11068. make sbsv2 variant appender configuration specific

Fix bug 11068 (part 2). Add dynamic text to dispaly -c command and release tree when variant is applied. Remove UI added to support appending to a build config from the project setting.

modify IConnectionFactory2

modify IConnectionFactory2

merge commit

Add support for SBSv2 config specific data. Bug 11068.

fix event leak bug 11107

fix event leak bug 11107

add platsim launch plugin as friend

add platsim launch plugin as friend

Disable old way for adding show all variables menu item.

Fix bug 11067 properly

Fix bug 11067 properly

fixed bug #10971. also hiding more CDT stuff that doesn't make sense in Carbide.

Make EDC the default launcher for TRK launch configuration types.

merge 2.6 changes to 3.0 docs

update index for remote connections changes

Merge license changes

implemented initial new connection dialog changes

Bug 10968: fix MMP view placement of new SOURCE entries

Bug 10968: Fix MMP view placement of new SOURCE entries

Cleanup license info.

Fix bug 10967 -- accept dash in target filename

Fix bug 10967 -- accept dash in target filename

adjusted progress bar on splash upwards

bug 11035 - mike's ui tweaks for installer tab

merge

bug 11035 - mike's ui tweaks for installer tab

initial revert to old branding, splash, header image, colors

Fix error parser tests. We were using deprecated APIs. Also, fix some buggy extraction of filenames from linker errors.

Don't assume App TRK if service has no value at all for 'is-sys-trk' property

Merge commits 1174, 1175, 1176, 1184, 1185 from default: Fix issues not disposing listeners in PNP launch wizard Fix use of PathUtils: do not use new Path() on a Windows format path; this breaks in Linux. Bug 11067: fix some issues with the PNP launch wizard Connected service properties need to be propagated just as their statuses are

Merge commit

Don't assume App TRK if service has no value at all for 'is-sys-trk' property

Connected service properties need to be propagated just as their statuses are

Merge commit

Bug 11067: fix some issues with the PNP launch wizard 1) If Sys TRK is detected, and you select to install a package, a Sys TRK launch is created 2) Error message was confusing when Carbide chose to install a package but SIS configuration was not complete. 3) In an internal layout, assume Sys TRK is more likely than App TRK if we cannot tell from the connection.

Fix use of PathUtils: do not use new Path() on a Windows format path; this breaks in Linux.

Fix issues not disposing listeners in PNP launch wizard

Fix bug 11048

merge commit

Fix bug 11048

remove trolltech plugins from cpp feature

merge commit

merge commit

Fix issue of SBSv2 selected as the builder even it SBSv1 was selected in the combo. Update error parser regression for RVCT license check.

Update error parser regression for RVCT license check.

updated build.properties to remove old features

updated build.properties file for src and sdk features

Merge commit

Bug 11013: Don't break binary compatibility (in case someone else uses this)

Bug 11013: choose appropriate launch configs when using Run/Debug As... shortcut and show selection when more than one is available.

Be sure to show an error if selecting SBSv1 but it is not available.

Properly create path for stored bld.inf on Linux host

Bug 11013: choose appropriate launch configs when using Run/Debug As... shortcut

Improved handling of auto-generated connection name in remote connections wizard.

Improved handling of auto-generated connection name in remote connections wizard.

write .branch.txt to make new head

Add checks for RVCT command line errors and warnings (bug 10045)

Add checks for RVCT command line errors and warnings (bug 10045)

Updated remote connections wizard.

Updated remote connections wizard.

For single file compilation under Raptor, make sure to check if anything needs to be appeded to the -c arg value.

merge commit

For single file compilation under Raptor, make sure to check if anything needs to be appeded to the -c arg value.

add com.nokia.carbide.cpp.core.source to 3.0 test build

bug 10674 continuation. Allow SBSv1-style build config names to co-exist with newer SBSv2 configuraiton names that use aliases. This does not use project converstion, just adds the support to differentiate between the two. Also, write new .cproject data to a SBSV2_DATA_ID node (which is not currently read, but to be used for future purposes)

bug 10674 continuation. Allow SBSv1-style build config names to co-exist with newer SBSv2 configuraiton names that use aliases. This does not use project converstion, just adds the support to differentiate between the two. Also, write new .cproject data to a SBSV2_DATA_ID node (which is not currently read, but to be used for future purposes)

fix bug 11019 (regression)

fix bug 11019

commit merge

removed file duplicates moved into html dir

cleanup of build properties to fix index not being built

Fix bug 11010 - free descriptor only if get was successful - merge from 3.0

fix bug 11010 - free discriptor only if the get was successful

merge changes for bug 10674 from default

updated with latest bug fixes for 2.6

Always cache the platform/target as uppercase, and always return platform and target as uppercase (regression for bug 10674). Fixes problems with building and displaying emulator, as well as discovering GCCE prefix file correctly.

Make sure platform names are compared with upper case (bug 10166 - regression when fixing bug 10674)

merge commit

Make sure to compare against sbsv2 alias name when compareing SymbianBuildContext. Also added some preliminary support to update projects from simple plat/target names to SBSv2 names.

Add in new files missing from last commit.

removed cpp.core.source from src feature

Added TCP/IP connect type for TCF agents.

bug 10674. Sort sbsv2 configuration names with same platform_target alias prefix. ensure gcce error parser is used for sbsv2 GCCE4 build configs, add a project specific (sbsv2 only) edit box that allows user to append whatever they want to the -c parameter (the build alias). Also, fixed SDK support for TB kits now that TB92SF appears as a prefix rather than a suffix in the buildinfo.txt file.

added .core back to call for com.nokia.carbide.cpp

updated feature.xml for src feature

Fixed broken link in Content Help info page and redirected bug reports to Symbian Bugzilla

bug 10674. Add support for long alias names from Carbide.xml (initial support)

updated feature.xml for src feature

added capability scanner back to featur.xml for src feature

removed com.nokia.carbide.cpp.capabilityScanner in src build

added com.nokia.carbide.cpp.src-feature

fix errant strings in UI

fix errant strings in UI

fix errant strings in UI

updated link title to 2.6

remove unused classes

merge last changes from 3.0

Update error message when cannot find USB personalities for any or all USB devices.

remove unused classes

remove unused classes

remove unused classes

Clean up error messages.

Increase DMAPI version requirement to v3.8 which is the last PCSuite available. Also attempt to "debounce" the event handling. Changed error messages for version requirement. Removed 1 unused class.

10843 - set in-use status for non-dynamic connections

10837 - add missing support for determining trk type

10837 - add missing support for determining trk type

change version from 2.5.0 to 2.6.0

updated carbide product plugin for 2.6

updated carbide manual for 2.6

remove source feature includes from com.nokia.carbide.cpp.sdk feature

BUG 10841 - fixed link on tutorial welcome page to point to new run mode example

removed hardware breakpoint actions.

Exporting com.nokia.cdt.internal.launch.newwizard for testing purposes

Export com.nokia.cdt.debug.internal.launch.newwizard package for testing purposes

merge

copy in required mylyn code

copy in required mylyn code

fix global carbide debugger prefs read by using proper plugin id for which prefs were written

Refactor executables view support extension from com.nokia.carbide.cpp.edc to com.nokia.cdt.debug.common.

remove com.nokia.cdt.debugger.common (move to debugger feature)

add api analysis launch

Refactor source mapping to com.nokia.cdt.debug.common plugin

add com.nokia.cdt.debug.common

remove bundle-version=3.2.0 from Require-Bundle: org.eclipse.mylyn.commons.ui

Initial commit. Refactor out source mapping support into common plugin to be used with DE and EDC.

added Chads known PnP issues to release notes

BUG 80842 - modified release note to only mention pnp for phone

updated TOC for 2.5 pnp titles

Fix for 1 device and 1 personality not matching. Bug 10843. Should also improve bug 10805, but not in the case of multiple devices.

Fix 10861

Fix 10861

10843 - set in-use status for non-dynamic connections

Fix capitalization of tab title

Fix capitalization of tab title

BUG 10841/10842 revised TOC and Run mode example for PnP

add some more heuristics for matching DMAPI and UPAPI devices - now works in mass storage mode when only VID/PID is present with no serial number and only one device is connected

BUG 10840 - updated release notes

clean up of some warning and todos

merge fixes from 2.5 last commit

Fix 10486 - fixing another bug broke this one - merge from 2.5 branch

Make sure we don't remember non-switch status if only one device is connected. Also increase the timeout to get USB personalities seen on some devices.

Fix 10486 - fixing another bug broke this one

Fix bug 10835.

Fix bug 10835. Also fix issue with null String check where elcipse 3.6 complier removes code, assuming it's dead.

updated bugs fixed list and features for 2.5

added build 488 and 489 notes

minor edits

minor edits

minor edits

Fix sbsv2 validation problem where and error is turned into a warning.

Fix sbsv2 validation problem where and error is turned into a warning.

10823 - if installing and launching from E:, install into E: also

10823 - if installing and launching from E:, install into E: also

10809 - generating warning for missing sis file or missing exe

10809 - generating warning for missing sis file or missing exe

Change to new PCSuite info site

Change to new PCSuite web page

added note on TRK improvements

erge

bug 10815 - connection dialog listen to service status change and update status

bug 10815 - connection dialog listen to service status change and update status

merge

removed note on smart installer

Fixed bug 10788

Clean up some code after review with David D. on bug fix 10742

merge commit

Clean up some code after review with David D. on bug fix 10742

merge commit

Update tool tip explaining what the builders are. Fix problem where sbsv2 builder is always selected.

Add support to check for SBS_HOME and SBS version when creating projects.

remove println

remove println

bug 10804 - add modal dialog behavior

bug 10804 - add modal dialog behavior

more work with multiple phones attached - merged from 2.5 branch

bug 10808 tweak UI + validation + fix issues with non-carbide project case

bug 10808 tweak UI + validation + fix issues with non-carbide project case

Check for Raptor version # when importing a project. Emit a warning in wizard pages if major version is 0 (i.e. raptor version not detected).

bugs 10806 + 10807 fix problems with program to launch

bugs 10806 + 10807 fix problems with program to launch

more work on multiple phone connections

Add support for status notification popups and remove ui dependency + use new notification to switch mode

removed codescanner from dev/ide/carbidecpp/core

Add support for status notification popups and remove ui dependency + use new notification to switch mode

Set error message in all project wizards (symbian/qt) if SBS_HOME does not exist only if SBSv2 is the builder. Always allow SBSv2 to be a selectable builder.

remove ui dependency + use new notification to switch mode

Add support for status notification popups

Fix for Bug 10741, NPE when saving bld.inf and mmp files.

Fix for Bug 10741, NPE when saving bld.inf and mmp files.

merge commit

set proper SDK version for tb92sf kits. bug 10796.

fixed bug #10657.

updated icons and launch page content

added emuator help ID URL to Debug As dialog

fixed help ID URLs for Debug As dialog

turn off debug prints

synched 2.5 and 3.0 pages

file sync with changes in 2.5

BUG 10758 - revised copyright date

Changes to fix bugs 10618 10714 10731 10759 10580 merged from 2.5 branch

added additional links to TOC

Add support for qmke command provider extension.

Add support for qmake command provider extension. sets -spec when projects are created and when qmake is invoked on a .pro file

updated TOC to point to new pages

draft upload of new launch config pages and images

BUG 10786 - added help context IDs for new launch config dialogs

Changes to fix bugs 10618 10714 10731 10759 10580

bug 10786 - fix and add help context ids

bug 10786 - fix and add help context ids

bug 10773 - fix initial text of finish button + tweak width of other settings dialog to wrap text

bug 10773 - fix initial text of finish button + tweak width of other settings dialog to wrap text

fix bug recognizing sys trk for version 3.2.5+

fix bug recognizing sys trk for version 3.2.5+

better fix NPE when connection id is null (found with traceviewer)

better fix for null connection id

fix NPE when connection id is null (found with traceviewer)

make multiple reconnect a noop

make multiple reconnect a noop

Merge commit

Avoid initial PCCS discovery dialog on non-Win32 systems

Fix bug 10756

Fix bug 10756

fixed bug #10720. cleaned up imports.

fixed bug #10720. cleaned up imports.

move buildtags.txt from com.nokia.carbide.cpp plugin to com.nokia.carbide.cpp feature

minor editorial revisions

update to work with Helios and CDT 7.0.

Fix UI glitch

merge

Fix UI glitch

revised some text and copyright date

Fix typo

Fix typo

additions and revisions to tasks and ref pages and images

reordered TOC entries to fix PI issue

reorder launch shortcuts

reorder launch shortcuts

New launch wizard UI tweaks based on demo feedback

New launch wizard UI tweaks based on demo feedback

Fixes bug 10733. In Registry.getConnectedServices(IConnection), return empty collection instead of null. Use isEmpty() instead of == null for caller conditionals

Backed out changeset 1dc37cfc99cd

In Registry.getConnectedServices(IConnection), return empty collection instead of null. Use isEmpty() instead of == null for caller conditionals

Merging heads

In Registry.getConnectedServices(IConnection), return empty collection instead of null. Use isEmpty() instead of == null for caller conditionals

add in Resource logging with Qt SDK is added (lost during merge from default)

fix bothced build.properties that broke build

remove trace status from reconcile logic

Fix bug 10725 -- jam more UI code into syncExec

cleanup dependencies. trying to fix lite builds.

merge commit

add plugin.xml to build.properites.

externalize strings

merge commit

add plugin.xml to build properties for new sdk load extension

externalize strings

remove trace status from reconcile logic

add new button to new launch wizard connection dialog

add new button to new launch wizard connection dialog

Fix bug 10725 -- jam more UI code into syncExec

Fix bug 10725 -- jam more UI code into syncExec

ui tweaks to new launch wizard

ui tweaks to new launch wizard

remove unnecessary commented code

merge commit

new launch wizard implementation

Fix bug 10618

merge commit

new launch wizard implementation

Fix bug 10618

Added for bug fix 10681. Merged from default.

Fix bug 10681. Merge from default.

revised manual reference pages and images

removed unneeded dependencies on ATF

add comments for new code under bug 10681.

merge commit

Add ISymbianManagerLoadedHook - currently used to notify com.nokia.qt plugins that need to ensure that Qt SDKs have been scanned and added to the Qt preferences and that ICarbideBuildConfiguration listeners are added so the proper Qt-SDK can be set with build config changes. Scanned Qt SDKs are wrapped in a Job and added SDKs are reported to the Error log as Info.

daily merge

revised bld.inf pages and images

PnP for switching USB personalities. Bug 10604.

PnP development for switching USB personalities. Bug 10604.

daily merge

revision of concept section of manual pages and images

honor current connection id in ensureConnection

honor current connection id in ensureConnection

merge commit

fix potential ConcurrentModificationException

add QtSDKUtils. Use to read/write pref values from Qt global and project preferences.

fix potential ConcurrentModificationException

Fix deadlock when the Select Connection dialog is up, user plugs in a device, and the Remote Connections view is shown

Fix Bug 10467 - Carbide features cannot be used if SBS hangs or is corrupt

merge commit

Temporarily add earlystartup. Will be replaced by extension point implementation in sdk.core plugin.

Move qt-sdk detection from sdk core to the nokia qt core/ui plugins. Early loading is not working for these changes.

merge commit

Timout SBSv2 version check if sbs hangs (bug 10467)

First working for qt-sdk auto-detection and setting qt-sdk default per project with config change listener

Fix deadlock when the Select Connection dialog is up, user plugs in a device, and the Remote Connections view is shown

revised creating dll project info and images

daily merge

daily merge

revised debugging a program steps and images

updated creating a launch config page and images

updated build project images and text

updated creating new projects example

Fix for TCFServer life-cycle issues bug 10621

better initialization and validation in debugrunprocess dialog

Fix TCFServer life-cycle issues bug 10621

ongoing new launch wizard

fix java6-ism

new wizard initial commit

Fix bug - remove listeners on dispose

Fix bug - remove listeners on dispose

make com.trolltech* plugins optional

Run QtPropertyTester

First pass for read/write of Qt global/local preferences

daily merge

BUG 10603 - removed unused sophia images

BUG 10603 - removed extra sophia image files

10658 - fix up launch config when ensureConnection returns

10658 - fix up launch config when ensureConnection returns

update since tags to 2.5

update since tags to 2.5

bug 10493 - only test one service for each physical connection

merge commit

10625 - add missing change to pnp backport

10493 - add missing change to pnp backport

bug 10493 - only test one service for each physical connection

daily merge

merging 2.5 changes into 3.0

daily merge

revised link to Carbide SDK to point to new Overview page

added overview page to SDK manual so link on welcome did nto lead to a dead end cover page

update to Carbide 2.5 EXE name

don't show dialog for unit tests

don't show dialog for unit tests

merged fix for bug #10641.

removed unused dependencies to facilite Carbide LITE builds.

better fix for bug #10641.

Fix rvct compiler parser bug 10525

daily merge

revised buug fixes for 2.5

merge commit

Fix rvct compiler parser bug 10525

update javadoc

update javadoc

Don't add \epoc32\include to MMP for GUI template if APP_LAYER_SYSTEMINLCUDES is already defined.

Don't print exception for malformed date in sdk manifest.xml. We don't even use it.

fix build

plugin dependency cleanup.

fixed bug #10641.

Made HANDLEs more generic. They all are derived from one type in APIs. Added opening/closing of UPAPI.

move com.nokia.carbide.remoteConnections.discovery.pccs to carbidecpp repository

move com.nokia.carbide.remoteConnections.discovery.pccs to carbidecpp repository

removed unused dependency.

remove testViewDataThreading (add prefix of XXX to function name). It's running into deadlock on Hudson frequently causing nightly builds not to be posted.

daily merge

updated to 3.0 version info

BUG 9748 - reworked text on link to clarify where info is

daily merge

BUG 9748 - reworked text on link to clarify where info is

(no commit message)

backport hostside pnp

backport hostside pnp

backport hostside pnp

tweaks to new discovery error dialog and calling code

Fix bug 10450. Merge from default.

Don't make hasSTDCPPSupport API. Review fixes for bug 10460.

Add STDCPP keyword and targettype support. Bug 10460.

fix where prerequisites checked and no errors

merge commit

Handle prerequisites - bug 10486

Add dialog to notify user of discovery agents not loaded because prerequisites not satisfied. Bug 10486

Show connections view when new connection is added

remove unused dependency

merge commit

Fix bug 10591. Support com.nokia.symbian (Symbian^3 SDK ID) so we treat it as it it was S60 5th Ed.

Fix 10622. Always add epco32\include to search paths when preprocessing varint HRH

changed color from light gray to blue

merge commit

Fix bug 10591. Support com.nokia.symbian (Symbian^3 SDK ID) so we treat it as it it was S60 5th Ed.

Fix 10622. Always add epco32\include to search paths when preprocessing varint HRH

BUG 9748 - renamed anchors and updated link to them

Merge commit

Fix crash when environment contains non-standard variable settings

don't show question dialog when junit is running

don't show question dialog when junit is running

Replaced overloading createControl() with overloading createBuildoptionsGroup()

merge commit

Removed the overloading of createControl() and replaced it by overloading createBuildOptiionsGroup()

Overloaded createBuildOptinsGroup() instead of createControl()

merge commit

Fix bug 10488. Don't add platform_paths.hrh to S60 includes if it does not exist. (merge from default)

removed Sophia support.

daily head merge

BUG 6324 - revised image to show blackflag in selection dialog

BUG 6324 - updated image 2 to show blackflag in selection dialog

removed Sophia support.

removed Sophia support.