# HG changeset patch
# User tasneems@symbian.org
# Date 1265670531 28800
# Node ID d549572f1221e862cf512d44ae39bcaa042d9fd6
# Parent 19a90881080c07fde71b8af1039b3c716bcde9f5# Parent be38c358a5159bf099d110fe8ffc4f603ffbc3f4
Merged heads. Added HelloWithWRTKit wizard
diff -r 19a90881080c -r d549572f1221 org.symbian.tools.wrttools.debug.core/.options
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/org.symbian.tools.wrttools.debug.core/.options Mon Feb 08 15:08:51 2010 -0800
@@ -0,0 +1,4 @@
+org.symbian.tools.wrttools.debug.core/debug=false
+org.symbian.tools.wrttools.debug.core/debugConnection=false
+org.symbian.tools.wrttools.debug.core/debugResources=false
+org.symbian.tools.wrttools.debug.core/debugBreakpoints=false
\ No newline at end of file
diff -r 19a90881080c -r d549572f1221 org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/Activator.java
--- a/org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/Activator.java Mon Feb 08 15:06:19 2010 -0800
+++ b/org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/Activator.java Mon Feb 08 15:08:51 2010 -0800
@@ -19,6 +19,7 @@
package org.symbian.tools.wrttools.debug.internal;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.resource.ImageRegistry;
import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -32,6 +33,13 @@
// The plug-in ID
public static final String PLUGIN_ID = "org.symbian.tools.wrttools.debug.core";
+ public static final boolean DEBUG = Platform.inDebugMode() && Boolean.valueOf(Platform.getDebugOption(PLUGIN_ID + "/debug"));
+ public static final boolean DEBUG_CONNECTION = DEBUG && Boolean.valueOf(Platform.getDebugOption(PLUGIN_ID + "/debugConnection"));
+ public static final boolean DEBUG_RESOURCES = DEBUG && Boolean.valueOf(Platform.getDebugOption(PLUGIN_ID + "/debugResources"));
+ public static final boolean DEBUG_BREAKPOINTS = DEBUG
+ && Boolean.valueOf(Platform.getDebugOption(PLUGIN_ID
+ + "/debugBreakpoints"));
+
// The shared instance
private static Activator plugin;
diff -r 19a90881080c -r d549572f1221 org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/launch/DebugConnectionJob.java
--- a/org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/launch/DebugConnectionJob.java Mon Feb 08 15:06:19 2010 -0800
+++ b/org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/launch/DebugConnectionJob.java Mon Feb 08 15:08:51 2010 -0800
@@ -34,6 +34,7 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.ILaunch;
+import org.symbian.tools.wrttools.debug.internal.Activator;
import org.symbian.tools.wrttools.previewer.http.IPreviewStartupListener;
public class DebugConnectionJob implements IPreviewStartupListener {
@@ -48,6 +49,10 @@
public DebugConnectionJob(IProject project, final int port,
final ILaunch launch) {
+ if (Activator.DEBUG_CONNECTION) {
+ System.out.println("Debugging " + project.getName() + " on port "
+ + port + ", launch: " + launch.getLaunchConfiguration());
+ }
this.project = project;
this.port = port;
this.launch = launch;
diff -r 19a90881080c -r d549572f1221 org.symbian.tools.wrttools.product/launch/WRT IDE Product (Windows).launch
--- a/org.symbian.tools.wrttools.product/launch/WRT IDE Product (Windows).launch Mon Feb 08 15:06:19 2010 -0800
+++ b/org.symbian.tools.wrttools.product/launch/WRT IDE Product (Windows).launch Mon Feb 08 15:08:51 2010 -0800
@@ -5,7 +5,7 @@
-
+
@@ -21,10 +21,475 @@
-
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+