Changeset 14890


Ignore:
Timestamp:
10/07/16 17:32:48 (6 years ago)
Author:
Mark Evenson
Message:

build: update netbeans-8.2 build metadata

Location:
trunk/abcl/nbproject
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/abcl/nbproject/build-impl.xml

    r14878 r14890  
    4747        <!-- The two properties below are usually overridden -->
    4848        <!-- by the active platform. Just a fallback. -->
    49         <property name="default.javac.source" value="1.4"/>
    50         <property name="default.javac.target" value="1.4"/>
     49        <property name="default.javac.source" value="1.6"/>
     50        <property name="default.javac.target" value="1.6"/>
    5151    </target>
    5252    <target depends="-pre-init,-init-private,-init-user" name="-init-project">
    … …  
    7777                <isset property="javac.profile"/>
    7878                <length length="0" string="${javac.profile}" when="greater"/>
    79                 <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
     79                <matches pattern="((1\.[89])|9)(\..*)?" string="${javac.source}"/>
    8080            </and>
    8181        </condition>
    … …  
    157157        <property name="source.encoding" value="${file.encoding}"/>
    158158        <property name="runtime.encoding" value="${source.encoding}"/>
     159        <property name="manifest.encoding" value="${source.encoding}"/>
    159160        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
    160161            <and>
    … …  
    841842                </pathconvert>
    842843                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
    843                 <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
     844                <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" manifestencoding="UTF-8" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
    844845                    <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
    845846                    <manifest>
    … …  
    853854    <target name="-init-presetdef-jar">
    854855        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
    855             <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
     856            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8">
    856857                <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
    857858            </jar>
    … …  
    976977    <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
    977978        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
    978         <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
     979        <copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/>
    979980    </target>
    980981    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
    981         <manifest file="${tmp.manifest.file}" mode="update">
     982        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
    982983            <attribute name="Main-Class" value="${main.class}"/>
    983984        </manifest>
    984985    </target>
    985986    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
    986         <manifest file="${tmp.manifest.file}" mode="update">
     987        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
    987988            <attribute name="Profile" value="${javac.profile}"/>
    988989        </manifest>
    … …  
    992993        <mkdir dir="${build.classes.dir}/META-INF"/>
    993994        <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
    994         <manifest file="${tmp.manifest.file}" mode="update">
     995        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
    995996            <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
    996997        </manifest>
    … …  
    11871188        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
    11881189        <startprofiler/>
    1189         <antcal target="run-test-with-main"/>
     1190        <antcall target="run-test-with-main"/>
    11901191    </target>
    11911192    <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">

  • trunk/abcl/nbproject/genfiles.properties

    r14878 r14890  
    55# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
    66nbproject/build-impl.xml.data.CRC32=742204ce
    7 nbproject/build-impl.xml.script.CRC32=4c2b716d
    8 nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48
     7nbproject/build-impl.xml.script.CRC32=dc81b4ba
     8nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48
    99nbproject/profiler-build-impl.xml.data.CRC32=71623fcd
    1010nbproject/profiler-build-impl.xml.script.CRC32=abda56ed

  • trunk/abcl/nbproject/project.properties

    r14610 r14890  
    1 annotation.processing.enabled=true
    2 annotation.processing.enabled.in.editor=false
     1#Fri Oct 07 19:23:08 CEST 2016
     2excludes=
     3javac.deprecation=false
     4jnlp.enabled=false
     5build.test.results.dir=${build.dir}/test/results
     6run.classpath=${build.classes.dir}\:${javac.classpath}\:${file.reference.abcl-contrib.jar}
     7javadoc.nonavbar=false
     8run.test.classpath=${build.test.classes.dir}\:${javac.test.classpath}
     9javac.processorpath=${javac.classpath}
     10jnlp.signed=false
     11javac.target=1.6
    312annotation.processing.processors.list=
    4 annotation.processing.run.all.processors=true
    5 application.title=abcl
     13javadoc.noindex=false
     14src.themes.dir=themes
     15javadoc.additionalparam=
     16includes=org/armedbear/lisp/**/*.java,org/armedbear/lisp/**/*.lisp
     17build.classes.dir=${build.dir}/classes
     18source.encoding=UTF-8
     19javadoc.author=false
     20test.src.dir=test/src
     21build.dir=build
     22build.test.classes.dir=${build.dir}/test/classes
     23platform.active=default_platform
     24javac.compilerargs=
     25main.class=org.armedbear.lisp.Main
     26dist.jar=${dist.dir}/abcl.jar
     27jnlp.codebase.url=file\:/Users/evenson/work/abcl/dist/
     28javadoc.use=true
     29build.sysclasspath=ignore
     30debug.test.classpath=${run.test.classpath}
     31dist.dir=dist
     32build.classes.excludes=**/*.java,**/*.form,**/*.lisp
     33javadoc.splitindex=true
     34javadoc.encoding=${source.encoding}
     35javac.source=1.6
    636application.vendor=
    7 build.classes.dir=${build.dir}/classes
    8 build.classes.excludes=**/*.java,**/*.form,**/*.lisp
    9 # This directory is removed when the project is cleaned:
    10 build.dir=build
     37junit.selected.version=4
     38debug.classpath=${run.classpath}
     39run.jvmargs=
     40jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api"
    1141build.generated.dir=${build.dir}/generated
    12 build.generated.sources.dir=${build.dir}/generated-sources
    13 # Only compile against the classpath explicitly listed here:
    14 build.sysclasspath=ignore
    15 build.test.classes.dir=${build.dir}/test/classes
    16 build.test.results.dir=${build.dir}/test/results
    17 debug.classpath=\
    18     ${run.classpath}
    19 debug.test.classpath=\
    20     ${run.test.classpath}
    21 # This directory is removed when the project is cleaned:
    22 dist.dir=dist
    23 dist.jar=${dist.dir}/abcl.jar
    24 dist.javadoc.dir=${dist.dir}/javadoc
    25 endorsed.classpath=
    26 excludes=
    27 file.reference.abcl-contrib.jar=dist/abcl-contrib.jar
    28 file.reference.abcl-src=src
    29 includes=org/armedbear/lisp/**/*.java,org/armedbear/lisp/**/*.lisp
    3042jar.compress=true
    31 javac.classpath=
    32 # Space-separated list of extra javac options
    33 javac.compilerargs=
    34 javac.deprecation=false
    35 javac.processorpath=\
    36     ${javac.classpath}
    37 javac.source=1.5
    38 javac.target=1.5
    3943javac.test.classpath=\
    4044    ${javac.classpath}:\
    4145    ${build.classes.dir}:\
    42     ${libs.junit_4.classpath}
    43 javadoc.additionalparam=
    44 javadoc.author=false
    45 javadoc.encoding=${source.encoding}
    46 javadoc.noindex=false
    47 javadoc.nonavbar=false
    48 javadoc.notree=false
     46    ${libs.junit_4.classpath}:\
     47    ${libs.hamcrest.classpath}
    4948javadoc.private=false
    50 javadoc.splitindex=true
    51 javadoc.use=true
     49file.reference.abcl-contrib.jar=dist/abcl-contrib.jar
     50annotation.processing.run.all.processors=true
     51application.title=abcl
     52meta.inf.dir=${src.dir}/META-INF
     53manifest.file=src/manifest-abcl
     54annotation.processing.enabled=true
     55dist.javadoc.dir=${dist.dir}/javadoc
     56src.dir=${file.reference.abcl-src}
     57mkdist.disabled=false
     58jnlp.offline-allowed=false
     59endorsed.classpath=
     60javac.classpath=
     61annotation.processing.enabled.in.editor=false
     62build.generated.sources.dir=${build.dir}/generated-sources
    5263javadoc.version=false
    5364javadoc.windowtitle=
    54 jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api"
     65src.doc.dir=doc
     66javadoc.notree=false
    5567jnlp.codebase.type=local
    56 jnlp.codebase.url=file:/Users/evenson/work/abcl/dist/
    57 jnlp.enabled=false
    58 jnlp.offline-allowed=false
    59 jnlp.signed=false
    60 main.class=org.armedbear.lisp.Main
    61 manifest.file=src/manifest-abcl
    62 meta.inf.dir=${src.dir}/META-INF
    63 mkdist.disabled=false
    64 platform.active=default_platform
    65 run.classpath=\
    66     ${build.classes.dir}:\
    67     ${javac.classpath}:\
    68     ${file.reference.abcl-contrib.jar}
    69 # Space-separated list of JVM arguments used when running the project
    70 # (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
    71 # or test-sys-prop.name=value to set system properties for unit tests):
    72 run.jvmargs=
    73 run.test.classpath=\
    74     ${build.test.classes.dir}:\
    75     ${javac.test.classpath}
    76 source.encoding=UTF-8
    77 src.dir=${file.reference.abcl-src}
    78 src.doc.dir=doc
    79 src.themes.dir=themes
    80 test.src.dir=test/src
     68file.reference.abcl-src=src
Note: See TracChangeset for help on using the changeset viewer.