View | Details | Raw Unified | Return to bug 54899
Collapse All | Expand All

(-)build.xml (-1 / +42 lines)
Lines 55-60 Link Here
55
55
56
  <!-- Locations to create build artifacts -->
56
  <!-- Locations to create build artifacts -->
57
  <property name="tomcat.home"           value="${basedir}"/>
57
  <property name="tomcat.home"           value="${basedir}"/>
58
  <property name="tomcat-nb.home"        value="${basedir}/nbproject" />
58
  <property name="tomcat.output"         value="${basedir}/output"/>
59
  <property name="tomcat.output"         value="${basedir}/output"/>
59
  <property name="tomcat.build"          value="${tomcat.output}/build"/>
60
  <property name="tomcat.build"          value="${tomcat.output}/build"/>
60
  <property name="tomcat.classes"        value="${tomcat.output}/classes"/>
61
  <property name="tomcat.classes"        value="${tomcat.output}/classes"/>
Lines 536-542 Link Here
536
537
537
  <target name="validate-eoln" depends="build-prepare,compile-prepare"
538
  <target name="validate-eoln" depends="build-prepare,compile-prepare"
538
    description="Validate that the source files have correct line ends">
539
    description="Validate that the source files have correct line ends">
539
540
    <!-- Compile the CheckEol class only. Note that the class depends on
540
    <!-- Compile the CheckEol class only. Note that the class depends on
541
    Ant only. There is no need to download additional dependencies nor
541
    Ant only. There is no need to download additional dependencies nor
542
    add them to the class path. The rest should be the same as in "compile"
542
    add them to the class path. The rest should be the same as in "compile"
Lines 2706-2711 Link Here
2706
2706
2707
  <!-- ============================ IDE Support ============================ -->
2707
  <!-- ============================ IDE Support ============================ -->
2708
2708
2709
  <!-- ============================ Eclipse ================================ -->
2710
2709
  <target name="ide-eclipse" depends="deploy, extras-webservices-prepare"
2711
  <target name="ide-eclipse" depends="deploy, extras-webservices-prepare"
2710
          description="Prepares the source tree to be built in Eclipse">
2712
          description="Prepares the source tree to be built in Eclipse">
2711
2713
Lines 2717-2722 Link Here
2717
Read the Building page on the Apache Tomcat documentation site for details on how to configure your Eclipse workplace.</echo>
2719
Read the Building page on the Apache Tomcat documentation site for details on how to configure your Eclipse workplace.</echo>
2718
  </target>
2720
  </target>
2719
2721
2722
  <!-- ============================ Netbeans =============================== -->
2723
2724
  <target name="ide-netbeans"
2725
          depends="-ide-netbeans-protect,-ide-netbeans-create"
2726
          description="Create netbeans project files only if none exist">
2727
  </target>
2728
2729
  <target name="-ide-netbeans-protect"
2730
          if="tomcat-nb.home.exists"
2731
          depends="-ide-netbeans-check">
2732
    <!-- Protect existing netbeans project files -->
2733
    <echo>Netbeans project files already exist and have been protected!
2734
Use the "ide-netbeans-replace" target if you wish to overwrite them.</echo>
2735
  </target>
2736
2737
  <target name="-ide-netbeans-check">
2738
    <!-- protect existing files if the netbeans project directory exists  -->
2739
    <condition property="tomcat-nb.home.exists">
2740
        <available file="${tomcat-nb.home}" type="dir"/>
2741
    </condition>
2742
  </target>
2743
2744
  <target name="ide-netbeans-replace" depends="-ide-netbeans-create">
2745
    <!-- Bypass protection of any existing netbeans project files -->
2746
  </target>
2747
2748
  <target name="-ide-netbeans-create"
2749
          unless="tomcat-nb.home.exists">
2750
    <!-- Unconditionally create or ovverwrite default netbeans project files -->
2751
    <property name="tomcat-nb.dist" value="${tomcat.home}/res/ide-support/netbeans" />
2752
    <mkdir dir="${tomcat-nb.home}/"/>
2753
    <copy todir="${tomcat-nb.home}" overwrite="true">
2754
      <fileset dir="${tomcat-nb.dist}"/>
2755
    </copy>
2756
    <echo>Netbeans project files created.
2757
Read the Building page on the Apache Tomcat documentation site for details on how to customise your Netbeans project.</echo>
2758
  </target>
2759
2760
2720
  <!-- ======================= Macros, Taskdefs etc ======================== -->
2761
  <!-- ======================= Macros, Taskdefs etc ======================== -->
2721
2762
2722
  <macrodef name="jarIt" description="utility macro for standard JAR packaging">
2763
  <macrodef name="jarIt" description="utility macro for standard JAR packaging">

Return to bug 54899