Commit Graph

144 Commits

Author SHA1 Message Date
Pawel Polanski
fa68a545a8 Executable's UID added to the DebuggerStartParameters. Used for debugging on SymbianOs 2010-08-20 13:02:14 +02:00
Pawel Polanski
6e90b51937 Removed unnecessary launch process from S60DeviceDebugRunControl for Symbian
Bug QTCREATORBUG-2088 has been fixed
Task-number: QTCREATORBUG-2088

Reviewed-by: Friedemann Kleint
2010-08-20 10:49:44 +02:00
Pawel Polanski
ace96f3fc3 Deploy related data has been moved from Run-Configuration into Deploy-Configuration. Symbian OS
Reviewed-by: Tobias Hunger
2010-08-16 17:16:20 +02:00
Pawel Polanski
cd5492eb14 Progress bar for Launching for S60 sequence has been changed to behave like for other targets
Reviewed-by: Tobias Hunger
2010-08-16 16:01:31 +02:00
Tobias Hunger
53b14384d5 Fix Build-/DeployConfiguration mixup 2010-08-10 12:31:48 +02:00
Pawel Polanski
d654612cfb Small cleanup for Symbian's RunConfiguration 2010-08-03 15:08:16 +02:00
Tobias Hunger
ee4a04a20b Refactor deployment
* Add a DeployConfiguration class to hold settings related
   to deployment.
 * Add BuildStepsList to hold a list of buildsteps
 * Update BuildConfiguration to use BuildStepLists instead of
   manageing lists of buildsteps itself.
 * Update BuildManager to use BuildStepLists in its interfaces
 * Fix fallout introduced by API changes
 * Update .user file to new way of storing settings

Task-number: QTCREATORBUG-1427
Task-number: QTCREATORBUG-1428
Task-number: QTCREATORBUG-1811
Task-number: QTCREATORBUG-1930
2010-08-02 14:21:05 +02:00
dt
05ae17eadd Fix subdir project deployment for symbian
We create a .sis package per leaf project now, deploy all of them and
start the executable for the runconfiguration that was selected. This
does not cover all use cases, but works for development.
2010-07-26 19:44:07 +02:00
Pawel Polanski
c7278acda0 Installing on a drive other than C: for Symbian OS
Silent installation added to Sumbian's Run Configuration UI

Reviewed-by: Tobias Hunger
2010-07-26 13:32:03 +02:00
Pawel Polanski
647b91c78f Refactor deployment for Symbian OS
* Add buildstep to handle the deployment
 * Remove deployment code from the runconfiguration
 * Update .user files to add new deployment step into existing setups

Reviewed-by: Tobias Hunger
2010-07-22 11:07:58 +02:00
dt
7862e31256 Refactor OutputFormatter
Move link handling code to outputwindow from OutputFormatter

Move createOutputFormatter to the RunConfiguration

That makes it easier for Qt4RunConfiguration et all.
This also fixes that each time a runcontrol was rerun a new
OutputFormatter was created without deleting the old one, thus
increasing the memory usage.
2010-07-14 13:01:43 +02:00
Tobias Hunger
8ccbd0ec6b Rename StepType to BuildStep::Type
* Move and rename the enum
 * Add Q_ENUMS macro

Reviewed-by: dt
2010-07-06 18:36:30 +02:00
Friedemann Kleint
4c655cdd90 ProjectExplorer: Fully qualify signals of run control.
To be able to connect to them in the debugger namespace.
Reviewed-by: dt
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2010-07-02 15:32:00 +02:00
hjk
5adb6559e2 debugger: attempt to fix symbian output connections 2010-06-23 12:40:56 +02:00
hjk
6a6cba5518 debugger: The DebuggerEngine refactoring.
This replaces the (de facto) singleton engines and data handlers by classes
that are instantiated per run. The DebuggerRunControl will now create an
object of (a class derived from) DebuggerEngine that contains all the relevant
"dynamic" data.

DebuggerManager is no more. The "singleton" bits are merged into DebuggerPlugin,
whereas the data bits went to DebuggerEngine.

There is no formal notion of a "current" DebuggerEngine. However, as there's
only one DebuggerEngine at a time that has its data models connected to the
view, there's still some "de facto" notion of a "current" engine. Calling
SomeModel::setData(int role, QVariant data) with custom role is used as the
primary dispatch mechanism from the views to the "current" data models
(and the engine, as all data models know their engine).
2010-06-22 10:59:57 +02:00
hjk
97edcb7977 debugger: start 'runcontrol-ification' of the debugger plugin.
This replaces most uses of DebuggerStartParameters by DebuggerRunControl
which is a simple RunControl with a DebuggerStartParameters member.

Plan is to move all global state to the run controls, and possibly
introduce specialized ones for core debugging etc.
2010-06-14 10:45:11 +02:00
Tobias Hunger
9c4d7f1a95 Improve "Waiting for TRK" dialog
Task-number: QTCREATORBUG-1552
2010-06-10 13:58:16 +02:00
con
7d76940af7 Take the right sis package when using the Smart Installer flag. 2010-05-21 14:18:37 +02:00
con
38f6379f39 Merge remote branch 'origin/2.0'
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/find/currentdocumentfind.cpp
	src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
2010-05-17 17:40:40 +02:00
Leena Miettinen
cf233161fa Doc - UI - Fix UI text capitalization to follow the KDE Style Guide rules.
Reviewed-by: ossi
2010-05-14 15:53:56 +02:00
con
3922be1b2e Merge remote branch 'origin/2.0'
Conflicts:
	src/plugins/texteditor/texteditoractionhandler.cpp
2010-05-11 13:39:21 +02:00
con
7d88da6a32 Find created sis files, even if DESTDIR is set.
Symbian mkspec puts the package file into the build directory,
not the destination directory.
2010-05-07 10:42:39 +02:00
dt
f4ea0d79b9 Add a runMode method to the RunControl
And use it to implement changing the run icon in the application output.
That implementation does only support the two run modes run and debug
for now. Further abstraction for more run modes to be done once needed.

Task-Nr:   QTCREATORBUG-1232
2010-05-03 11:25:09 +02:00
Friedemann Kleint
799c624caf Fix trk-Launcher output connection. 2010-04-22 12:29:20 +02:00
Erik Verbruggen
e3bceff3ee Separated child-process stdout/stderr, and seperated "our" output/errors.
So now the "Applciation Output" can distinguish between these four, and
handle them appropriately.
2010-04-19 14:21:48 +02:00
Thorbjørn Lindeijer
2ab7d2eafc Some documentation comment formatting and a rename
Renamed RunConfiguration::configurationWidget to
createConfigurationWidget.

Reviewed-by: dt
2010-04-16 13:31:22 +02:00
con
1d66348438 Agree on a default sis package name.
Instead of renaming it first. We agree on always deploying
target.sis (where target is the qmake TARGET).
For older Qt for Symbian versions we rename to match this.
2010-04-01 15:49:31 +02:00
con
3f31c5bae8 Remove some unused code. 2010-03-25 16:35:52 +01:00
con
4b185ee2c3 Remove package creation step from symbian run configurations. 2010-03-25 16:35:51 +01:00
Tobias Hunger
1ca8cb2397 Introduce method to access the project directory
... use it.

Reviewed-by: dt
2010-03-25 14:21:43 +01:00
con
3d4260a88a Show error in progress bar in case of symbian deploy error. 2010-03-23 14:44:38 +01:00
Friedemann Kleint
f66df7b9a6 Header cleanup in ProjectExplorer and Qt4ProjectManager 2010-03-17 17:45:33 +01:00
con
d849652700 Start on a build step for creating symbian package. 2010-03-16 19:05:20 +01:00
Friedemann Kleint
be5a259bd5 S60: Fix package names.
Tested with Qt 4.6.1/4.6.2.

Detect both 'basename.sis' (4.6.2 onwards) as well as
'basename_debug-arm5.sis' (4.6.1).
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2010-03-11 18:07:35 +01:00
dt
33a54c8121 Remove connect that is no longer used. 2010-03-11 17:02:36 +01:00
dt
ab8fc52d0b Use exact and aysnc .pro file evaluate
This is a big change touching almost all of our .pro file parsing.
With this patch we only evaluate once exact for all needs and once
greedy for the filelist. That is the qt runconfigurations don't have own
evaluaters but reuse the project wide exact evaluation.

We reevaluate if the user changes the build directory, the qmake
buildconfiguration or the qmake arguments. That is if you open src.pro
(or projects.pro) of qt with a shadow build you still don't get all the
files, but after correcting the build directory, we reevaluate the .pro
files and find all files. So for a suitable definition of fixed, that
bug is now fixed.

We now get the exact defines of all .pro files instead of all defines for all
buildconfigurations. We still don't distinguish in which
.pro file a DEFINE is set. So the code model now knows about all the
defines set for the given configuration but not for which files it is
actually set. Also that includes all DEFINES set in .qmake.cache or the
mkspecs. This means all defines from .pro files should now work.

The intial loading is still synchronous. I haven't looked into it to
deeply, but it seems possible to make it also async.There are probably a
few issues which need to be solved fist.

Also due to the asynchronous nature of the code, the executable is
updated a few seconds after actually changing the build configuration
2010-03-10 17:02:24 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Friedemann Kleint
b2dc5e11ba Symbian: make sis failed when make.exe is not in path.
Reviewed-by: con
2010-03-03 15:31:06 +01:00
Friedemann Kleint
07037d6b1c Symbian/ABLD: Determine package name (make sis) correctly for 4.6.1
Also delete the old package before executing "make sis" to ensure
that no old file lingers around should the naming change again.
2010-02-25 10:18:13 +01:00
Friedemann Kleint
69dfa3566c Symbian: Use 'make sis' for the ABLD-toolchain as well.
No longer set EPOCDEVICE as it causes an error in createpackage.
Remove obsoleted code calling signis.exe and package file rewriting.
2010-02-23 17:36:58 +01:00
Friedemann Kleint
6782d848c1 GnuPoc: Do create pre-parsed pkg-file. 2010-02-22 11:03:04 +01:00
Friedemann Kleint
b9b9f7526b GnuPoc: make 'make sis' work. 2010-02-19 17:42:30 +01:00
Friedemann Kleint
b70a4e62c0 Rework S60DeviceRunconfiguration/RunControl.
- Prepare usage of 'make sis' target for GnuPoc.
- Change the package names to '_unsigned.sis', '.sis'
  instead of using '.sisx' for signed, adding accessors
  to S60DeviceRunconfiguration.
- Determine the local executable file name from the
  package template for GnuPoc (as it is no longer
  located under the SDK tree).
2010-02-18 14:47:00 +01:00
Friedemann Kleint
7c9c99dcf0 Symbian/Linux: Enable building with makefile-based system.
- Autodetect SDK by environment variable EPOCROOT and qt directory
below.
- Environment::appendOrSet/prependOrSet: Avoid duplicate entries
- Rename toolchain enumeration value
- Adapt S60ToolChainMixin to new GnuPoc setup, provide routines for
  all required variables.
- RVCTToolChain: Make RVCT detection smarter (Check for RVCT<v1><v2>BIN
  variable). Set all required variables in case of RVCTToolChain/GnuPoc
- QtVersionManager: Detect toolchain and Qt version properly, make S60
  device run config accept toolchain.
- Modify S60DeviceRunControl to execute 'make sis'
- Modify S60Devices::detectQt...() to check for Qt installed into SDK
  first and symlink as fallback.
2010-02-17 17:38:48 +01:00
Friedemann Kleint
dc006860c4 Symbian: Let SymbianDeviceManager handle TrkDevice leases.
...making use of a shared device by all clients. Detect device removal by
delaying the WM_DEVICE event handling. Introduce Acquire/Release mechanism
to SymbianDeviceManager and let acquire() fail if the device is in use, thus
preventing starting 'run' while debugging is active, etc.
Handle "Device removed" (unplugging of cable) signal by closing the device and adding
handlers to the clients, stabilize TrkDevice against it.
Remove communication type from the run configuration parameters (now handled by
SymbianDeviceManager).

Working towards keeping the Trk-connection always open and a giving the target pane
a meaningful tooltip.
For the moment, pass on tooltips from device manager additional information
(Trk version and such as determined by the launcher).
2010-02-11 12:31:59 +01:00
con
686b21195d Symbian is the term. Also unconditionally reset target names.
Since the target names are translated, we cannot use the saved
display name from the user file.

Reviewed-by: Tobias Hunger
2010-02-10 12:41:07 +01:00
con
d8def18362 Give targets a tool tip property.
Use that for showing details about connected Symbian devices.
Also update the icon with an (not-)connected overlay icon.
Graphics design pending.
2010-02-09 19:07:26 +01:00
Tobias Hunger
d1bdfcc363 Integrate target support
* Ease cross device development by introducing 'targets' which
   group build- and runsettings that are valid for this one target

 Most of the kudos for the code review go to dt. Con, thorbjorn,
 ckandler and others did also review parts of this patch.

Reviewed-by: dt
2010-02-09 16:57:37 +01:00
Friedemann Kleint
3efdb87682 S60/Trk: Make the port a property of TrkDevice.
Associate the port with the device instead of passing it to open
for better handling.
2010-02-08 14:10:51 +01:00
Friedemann Kleint
76872c6ed8 S60: Move serialdevicelister.cpp to symbianutils/symbiandevicemanager.cpp 2010-02-05 17:34:02 +01:00