Changeset 11484


Ignore:
Timestamp:
12/26/08 23:12:35 (6 years ago)
Author:
mevenson
Message:

Removed obsolete references to 'j' artifacts in Netbeans build.

'abcl' should open in any Netbeans 6.x release.

Location:
trunk/abcl/nbproject
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/nbproject/build-impl.xml

    r11483 r11484  
    6969        <condition property="have.sources">
    7070            <or>
    71                 <available file="${src.doc.dir}"/>
    72                 <available file="${src.themes.dir}"/>
    7371                <available file="${src.dir}"/>
    7472            </or>
     
    125123    </target>
    126124    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
    127         <fail unless="src.doc.dir">Must set src.doc.dir</fail>
    128         <fail unless="src.themes.dir">Must set src.themes.dir</fail>
    129125        <fail unless="src.dir">Must set src.dir</fail>
    130126        <fail unless="build.dir">Must set build.dir</fail>
     
    148144    <target name="-init-macrodef-javac">
    149145        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
    150             <attribute default="${src.doc.dir}:${src.themes.dir}:${src.dir}" name="srcdir"/>
     146            <attribute default="${src.dir}" name="srcdir"/>
    151147            <attribute default="${build.classes.dir}" name="destdir"/>
    152148            <attribute default="${javac.classpath}" name="classpath"/>
     
    167163        </macrodef>
    168164        <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
    169             <attribute default="${src.doc.dir}:${src.themes.dir}:${src.dir}" name="srcdir"/>
     165            <attribute default="${src.dir}" name="srcdir"/>
    170166            <attribute default="${build.classes.dir}" name="destdir"/>
    171167            <attribute default="${javac.classpath}" name="classpath"/>
     
    216212        </macrodef>
    217213    </target>
    218     <target name="-init-macrodef-nbjpda">
     214    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
    219215        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
    220216            <attribute default="${main.class}" name="name"/>
     
    222218            <attribute default="" name="stopclassname"/>
    223219            <sequential>
    224                 <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="dt_socket">
     220                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
    225221                    <classpath>
    226222                        <path path="@{classpath}"/>
     
    253249            <istrue value="${have-jdk-older-than-1.4}"/>
    254250        </condition>
     251        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
     252            <os family="windows"/>
     253        </condition>
     254        <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
     255            <isset property="debug.transport"/>
     256        </condition>
    255257    </target>
    256258    <target depends="-init-debug-args" name="-init-macrodef-debug">
     
    262264                <java classname="@{classname}" dir="${work.dir}" fork="true">
    263265                    <jvmarg line="${debug-args-line}"/>
    264                     <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
     266                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
    265267                    <jvmarg line="${run.jvmargs}"/>
    266268                    <classpath>
     
    309311            -->
    310312    <target depends="init" name="deps-jar" unless="no.deps"/>
     313    <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
     314    <target depends="init" name="-check-automatic-build">
     315        <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
     316    </target>
     317    <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
     318        <antcall target="clean"/>
     319    </target>
    311320    <target depends="init,deps-jar" name="-pre-pre-compile">
    312321        <mkdir dir="${build.classes.dir}"/>
     
    322331        <j2seproject3:javac/>
    323332        <copy todir="${build.classes.dir}">
    324             <fileset dir="${src.doc.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
    325             <fileset dir="${src.themes.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
    326333            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
    327334        </copy>
     
    331338        <!-- You can override this target in the ../build.xml file. -->
    332339    </target>
    333     <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
     340    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
    334341    <target name="-pre-compile-single">
    335342        <!-- Empty placeholder for easier customization. -->
     
    339346        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
    340347        <j2seproject3:force-recompile/>
    341         <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${src.doc.dir}:${src.themes.dir}:${src.dir}"/>
     348        <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${src.dir}"/>
    342349    </target>
    343350    <target name="-post-compile-single">
     
    345352        <!-- You can override this target in the ../build.xml file. -->
    346353    </target>
    347     <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
     354    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
    348355    <!--
    349356                ====================
     
    473480                <path path="${javac.classpath}"/>
    474481            </classpath>
    475             <fileset dir="${src.doc.dir}" excludes="${excludes}" includes="${includes}">
    476                 <filename name="**/*.java"/>
    477             </fileset>
    478             <fileset dir="${src.themes.dir}" excludes="${excludes}" includes="${includes}">
    479                 <filename name="**/*.java"/>
    480             </fileset>
    481482            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
    482483                <filename name="**/*.java"/>
  • trunk/abcl/nbproject/genfiles.properties

    r11483 r11484  
    44# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
    55# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
    6 nbproject/build-impl.xml.data.CRC32=14c5a06e
    7 nbproject/build-impl.xml.script.CRC32=fe8c9181
    8 nbproject/build-impl.xml.stylesheet.CRC32=487672f9
     6nbproject/build-impl.xml.data.CRC32=71623fcd
     7nbproject/build-impl.xml.script.CRC32=7d8238bd
     8nbproject/build-impl.xml.stylesheet.CRC32=e55b27f5
    99nbproject/profiler-build-impl.xml.data.CRC32=71623fcd
    1010nbproject/profiler-build-impl.xml.script.CRC32=abda56ed
  • trunk/abcl/nbproject/project.properties

    r11483 r11484  
    2020excludes=
    2121file.reference.abcl-src=src
    22 includes=org/armedbear/lisp/*.lisp,org/armedbear/lisp/*.java
     22includes=org/armedbear/lisp/*.lisp,org/armedbear/lisp/*.java,org/armedbear/lisp/util/*.java
    2323jar.compress=true
    2424javac.classpath=
  • trunk/abcl/nbproject/project.xml

    r11483 r11484  
    77            <minimum-ant-version>1.6.5</minimum-ant-version>
    88            <source-roots>
    9                 <root id="src.doc.dir"/>
    10                 <root id="src.themes.dir"/>
    119                <root id="src.dir"/>
    1210            </source-roots>
Note: See TracChangeset for help on using the changeset viewer.