View | Details | Raw Unified | Return to bug 48488 | Differences between
and this patch

Collapse All | Expand All

(-)apisupport/project/src/org/netbeans/modules/apisupport/project/Actions.java (+2 lines)
 Lines 47-52    Link Here 
47
        actions.add(CommonProjectActions.newFileAction());
47
        actions.add(CommonProjectActions.newFileAction());
48
        actions.add(null);
48
        actions.add(null);
49
        actions.add(createGlobalAction(project, new String[] {"netbeans"}, "Build"));
49
        actions.add(createGlobalAction(project, new String[] {"netbeans"}, "Build"));
50
        actions.add(createGlobalAction(project, new String[] {"debug"}, "Debug"));
50
        actions.add(createGlobalAction(project, new String[] {"clean", "netbeans"}, "Clean and Build"));
51
        actions.add(createGlobalAction(project, new String[] {"clean", "netbeans"}, "Clean and Build"));
51
        actions.add(createGlobalAction(project, new String[] {"clean"}, "Clean"));
52
        actions.add(createGlobalAction(project, new String[] {"clean"}, "Clean"));
52
        actions.add(null);
53
        actions.add(null);
 Lines 113-118    Link Here 
113
        globalCommands.put(ActionProvider.COMMAND_BUILD, new String[] {"netbeans"}); // NOI18N
114
        globalCommands.put(ActionProvider.COMMAND_BUILD, new String[] {"netbeans"}); // NOI18N
114
        globalCommands.put(ActionProvider.COMMAND_CLEAN, new String[] {"clean"}); // NOI18N
115
        globalCommands.put(ActionProvider.COMMAND_CLEAN, new String[] {"clean"}); // NOI18N
115
        globalCommands.put(ActionProvider.COMMAND_REBUILD, new String[] {"clean", "netbeans"}); // NOI18N
116
        globalCommands.put(ActionProvider.COMMAND_REBUILD, new String[] {"clean", "netbeans"}); // NOI18N
117
        globalCommands.put(ActionProvider.COMMAND_DEBUG, new String[] {"debug"}); // NOI18N
116
        /* Too dangerous:
118
        /* Too dangerous:
117
        globalCommands.put(ActionProvider.COMMAND_RUN, new String[] {"reload"}); // NOI18N
119
        globalCommands.put(ActionProvider.COMMAND_RUN, new String[] {"reload"}); // NOI18N
118
         */
120
         */
(-)nbbuild/build.xml (-2 / +14 lines)
 Lines 2771-2776    Link Here 
2771
  
2771
  
2772
  <target name="tryme-debug" depends="init,maybe-build-nozip" if="debug.port" >
2772
  <target name="tryme-debug" depends="init,maybe-build-nozip" if="debug.port" >
2773
    <property name="debug.pause" value="n" />
2773
    <property name="debug.pause" value="n" />
2774
    <property name="debug.server" value="y" />
2774
  
2775
  
2775
    <exec os="Windows NT Windows 95 Windows 98 Windows 2000 Windows XP" executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes">
2776
    <exec os="Windows NT Windows 95 Windows 98 Windows 2000 Windows XP" executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes">
2776
      <arg value="-jdkhome"/>
2777
      <arg value="-jdkhome"/>
 Lines 2778-2784    Link Here 
2778
      <arg value="-userdir"/>
2779
      <arg value="-userdir"/>
2779
      <arg file="${test.user.dir}"/>
2780
      <arg file="${test.user.dir}"/>
2780
      <arg line="${tryme.args}"/>
2781
      <arg line="${tryme.args}"/>
2781
      <arg line="-J-Xdebug -J-Xnoagent -J-Xrunjdwp:transport=dt_socket,suspend=${debug.pause},server=y,address=${debug.port}" />
2782
      <arg line="-J-Xdebug -J-Xnoagent -J-Xrunjdwp:transport=dt_socket,suspend=${debug.pause},server=${debug.server},address=${debug.port}" />
2782
    </exec>
2783
    </exec>
2783
    <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="sh" failonerror="yes">
2784
    <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="sh" failonerror="yes">
2784
      <arg value="${netbeans.dest}/bin/netbeans"/>
2785
      <arg value="${netbeans.dest}/bin/netbeans"/>
 Lines 2787-2794    Link Here 
2787
      <arg value="-userdir"/>
2788
      <arg value="-userdir"/>
2788
      <arg file="${test.user.dir}"/>
2789
      <arg file="${test.user.dir}"/>
2789
      <arg line="${tryme.args}"/>
2790
      <arg line="${tryme.args}"/>
2790
      <arg line="-J-Xdebug -J-Xnoagent -J-Xrunjdwp:transport=dt_socket,suspend=${debug.pause},server=y,address=${debug.port}" />
2791
      <arg line="-J-Xdebug -J-Xnoagent -J-Xrunjdwp:transport=dt_socket,suspend=${debug.pause},server=${debug.server},address=${debug.port}" />
2791
    </exec>
2792
    </exec>
2793
  </target>
2794
  <target name="tryme-nbjpda" depends="init,maybe-build-nozip" if="netbeans.home" >
2795
    <nbjpdastart name="NetBeans" addressproperty="debug.port" transport="dt_socket">
2796
        <classpath>
2797
            <fileset dir="netbeans" >
2798
                <include name="**/*.jar" />
2799
            </fileset>
2800
        </classpath>
2801
    </nbjpdastart>
2802
    <property name="debug.server" value="n" />
2803
    <antcall target="tryme-debug" />
2792
  </target>
2804
  </target>
2793
  
2805
  
2794
  <target name="check-target-dependencies" depends="bootstrap" description="Check that all-* targets are up to date.">
2806
  <target name="check-target-dependencies" depends="bootstrap" description="Check that all-* targets are up to date.">
(-)nbbuild/templates/projectized.xml (+5 lines)
 Lines 334-339    Link Here 
334
            <arg line="${test.class}"/>
334
            <arg line="${test.class}"/>
335
        </java>
335
        </java>
336
    </target>
336
    </target>
337
    
338
    <target name="debug" depends="netbeans" >
339
        <ant dir="${nb_all}/nbbuild/" target="tryme-nbjpda" />
340
    </target>
341
    
337
342
338
    <target name="debug-test-single" depends="init,test-init,test-build,do-debug-test-single"/>
343
    <target name="debug-test-single" depends="init,test-init,test-build,do-debug-test-single"/>
339
344

Return to bug 48488
By use of this website, you agree to the NetBeans Policies and Terms of Use. © 2012, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo