Index: nbbuild/build.xml
===================================================================
RCS file: /cvs/nbbuild/build.xml,v
retrieving revision 1.709
diff -u -r1.709 build.xml
--- nbbuild/build.xml	6 Oct 2005 08:57:47 -0000	1.709
+++ nbbuild/build.xml	7 Oct 2005 09:44:33 -0000
@@ -791,6 +791,29 @@
     <antcall target="tryme"/>
   </target>
           
+            
+  <target name="tryme-profile" description="Start IDE in debugger. May only be called from within IDE.">
+    <nbprofiledirect 
+        jvmargsprefix="-J" 
+        jvmargsproperty="profiler.jvmargs" 
+        jvmproperty="profiler.jdkhome" 
+        mainclass="org.netbeans.Main"
+    >
+      <classpath>
+        <fileset dir="${netbeans.dest.dir}">
+          <include name="**/*.jar"/>
+        </fileset>
+      </classpath>
+    </nbprofiledirect>
+    
+    <echo message="value1: ${profiler.jvmargs}" />
+    <echo message="value2: ${profiler.jdkhome}" />
+
+    <antcall target="tryme">
+        <param name="tryme.args" value="${profiler.jvmargs} --jdkhome ${profiler.jdkhome}"/>
+    </antcall>
+  </target>
+  
   <target name="tryme" depends="init,maybe-build-nozip,tryme-setup-debug-args"
           description="Try running the IDE interactively (build it first if needed).
 It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in debug mode" 
Index: nbbuild/templates/projectized.xml
===================================================================
RCS file: /cvs/nbbuild/templates/projectized.xml,v
retrieving revision 1.58
diff -u -r1.58 projectized.xml
--- nbbuild/templates/projectized.xml	13 Jul 2005 21:52:52 -0000	1.58
+++ nbbuild/templates/projectized.xml	7 Oct 2005 09:44:33 -0000
@@ -97,6 +97,10 @@
         <ant dir="${nb_all}/nbbuild" target="tryme-debug"/>
     </target>
     
+    <target name="profile" depends="netbeans" >
+        <ant dir="${nb_all}/nbbuild" target="tryme-profile" />
+    </target>
+    
     <target name="reload" depends="netbeans">
         <ant dir="${nb_all}/nbbuild" target="tryme">
             <property name="tryme.debug.args" value="--reload ${cluster}/${module.jar}"/>
Index: apisupport/harness/release/build.xml
===================================================================
RCS file: /cvs/apisupport/harness/release/build.xml,v
retrieving revision 1.6
diff -u -r1.6 build.xml
--- apisupport/harness/release/build.xml	21 Sep 2005 04:18:20 -0000	1.6
+++ apisupport/harness/release/build.xml	7 Oct 2005 09:44:33 -0000
@@ -147,6 +147,10 @@
     <target name="run" depends="netbeans">
         <ant antfile="${harness.dir}/run.xml" target="run"/>
     </target>
+
+    <target name="profile" depends="netbeans" >
+        <ant antfile="${harness.dir}/run.xml" target="profile"/>
+    </target>
     
     <target name="debug" depends="netbeans">
         <ant antfile="${harness.dir}/run.xml" target="debug"/>
Index: apisupport/harness/release/run.xml
===================================================================
RCS file: /cvs/apisupport/harness/release/run.xml,v
retrieving revision 1.9
diff -u -r1.9 run.xml
--- apisupport/harness/release/run.xml	4 Oct 2005 05:43:12 -0000	1.9
+++ apisupport/harness/release/run.xml	7 Oct 2005 09:44:33 -0000
@@ -137,4 +137,74 @@
         </antcall>
     </target>
 
+    
+    <!--
+    <target name="-profile-init-macrodef-profile">
+        <macrodef name="resolve">
+            <attribute name="name"/>
+            <attribute name="value"/>
+            <sequential>
+                <property value="${env.@{value}}" name="@{name}"/>
+            </sequential>
+        </macrodef>
+        <macrodef name="profile">
+            <attribute name="classname" default="${main.class}"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property environment="env"/>
+                <resolve value="${profiler.info.pathvar}" name="profiler.current.path"/>
+                <java jvm="${profiler.info.jvm}" dir="${profiler.info.dir}" classname="@{classname}" fork="true">
+                    <jvmarg value="${profiler.info.jvmargs.agent}"/>
+                    <jvmarg line="${profiler.info.jvmargs}"/>
+                    <env path="${profiler.info.agentpath}:${profiler.current.path}" key="${profiler.info.pathvar}"/>
+                    <arg line="${application.args}"/>
+                    <classpath>
+                        <path path="${run.classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper to="*" from="run-sys-prop.*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    
+    <target name="-profile-init-check" >
+        <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
+        <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
+    </target>
+    -->
+    <!--
+    =================
+    PROFILING SECTION
+    =================
+    -->
+    <target name="profile" description="Profile a project in the IDE.">
+        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
+        <nbprofiledirect 
+            jvmargsprefix="-J" 
+            jvmargsproperty="profiler.jvmargs" 
+            jvmproperty="profiler.jdkhome" 
+            mainclass="org.netbeans.Main"
+        >
+            <classpath>
+                <fileset dir="${netbeans.dest.dir}">
+                    <include name="**/*.jar"/>
+                </fileset>
+                <fileset dir="${cluster}">
+                    <include name="**/*.jar"/>
+                </fileset>
+            </classpath>
+        </nbprofiledirect>
+        
+        <echo message="value1: ${profiler.jvmargs}" />
+        <echo message="value2: ${profiler.jdkhome}" />
+        
+        <antcall target="run">
+            <param name="run.args" value="${profiler.jvmargs} --jdkhome ${profiler.jdkhome}"/>
+        </antcall>
+    </target>
+    
 </project>
Index: apisupport/harness/release/suite.xml
===================================================================
RCS file: /cvs/apisupport/harness/release/suite.xml,v
retrieving revision 1.18
diff -u -r1.18 suite.xml
--- apisupport/harness/release/suite.xml	29 Sep 2005 13:21:48 -0000	1.18
+++ apisupport/harness/release/suite.xml	7 Oct 2005 09:44:33 -0000
@@ -149,6 +149,10 @@
     <target name="debug" depends="build" description="Runs this suite in place in the debugger.">
         <ant antfile="${harness.dir}/run.xml" target="debug"/>
     </target>
+
+    <target name="profile" depends="build" description="Runs this suite in place in the profiler.">
+        <ant antfile="${harness.dir}/run.xml" target="profile"/>
+    </target>
     
     <target name="build-jnlp" depends="build" description="Packages this suite as a JNLP application.">
         <ant antfile="${harness.dir}/jnlp.xml" target="build"/>
Index: apisupport/project/src/org/netbeans/modules/apisupport/project/ui/ModuleActions.java
===================================================================
RCS file: /cvs/apisupport/project/src/org/netbeans/modules/apisupport/project/ui/ModuleActions.java,v
retrieving revision 1.10
diff -u -r1.10 ModuleActions.java
--- apisupport/project/src/org/netbeans/modules/apisupport/project/ui/ModuleActions.java	30 Sep 2005 23:31:27 -0000	1.10
+++ apisupport/project/src/org/netbeans/modules/apisupport/project/ui/ModuleActions.java	7 Oct 2005 09:44:34 -0000
@@ -200,6 +200,7 @@
         globalCommands.put(ActionProvider.COMMAND_REBUILD, new String[] {"clean", "netbeans"}); // NOI18N
         globalCommands.put(ActionProvider.COMMAND_DEBUG, new String[] {"debug"}); // NOI18N
         globalCommands.put(ActionProvider.COMMAND_RUN, new String[] {"reload"}); // NOI18N
+        globalCommands.put("profile", new String[] {"profile"}); // NOI18N
         globalCommands.put(JavaProjectConstants.COMMAND_JAVADOC, new String[] {"javadoc-nb"}); // NOI18N
         if (project.supportsUnitTests()) {
             globalCommands.put(ActionProvider.COMMAND_TEST, new String[] {"test"}); // NOI18N
Index: apisupport/project/src/org/netbeans/modules/apisupport/project/ui/SuiteActions.java
===================================================================
RCS file: /cvs/apisupport/project/src/org/netbeans/modules/apisupport/project/ui/SuiteActions.java,v
retrieving revision 1.9
diff -u -r1.9 SuiteActions.java
--- apisupport/project/src/org/netbeans/modules/apisupport/project/ui/SuiteActions.java	28 Sep 2005 06:13:20 -0000	1.9
+++ apisupport/project/src/org/netbeans/modules/apisupport/project/ui/SuiteActions.java	7 Oct 2005 09:44:35 -0000
@@ -128,6 +128,7 @@
             "build-jnlp", // NOI18N
             "run-jnlp", // NOI18N
             "debug-jnlp", // NOI18N
+            "profile" // NOI18N
         };
     }
     
@@ -179,9 +180,11 @@
                 return null;
             }
             targetNames = new String[] {"debug-jnlp"}; // NOI18N
+        } else if (command.equals("profile")) { // NOI18N
+            targetNames = new String[] {"profile"}; // NOI18N
         } else {
             throw new IllegalArgumentException(command);
-        }
+        } 
         
         return ActionUtils.runTarget(findBuildXml(project), targetNames, null);
     }