Changeset 14890
- Timestamp:
- 10/07/16 17:32:48 (6 years ago)
- Location:
- trunk/abcl/nbproject
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/abcl/nbproject/build-impl.xml
r14878 r14890 47 47 <!-- The two properties below are usually overridden --> 48 48 <!-- 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"/> 51 51 </target> 52 52 <target depends="-pre-init,-init-private,-init-user" name="-init-project"> … … 77 77 <isset property="javac.profile"/> 78 78 <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}"/> 80 80 </and> 81 81 </condition> … … 157 157 <property name="source.encoding" value="${file.encoding}"/> 158 158 <property name="runtime.encoding" value="${source.encoding}"/> 159 <property name="manifest.encoding" value="${source.encoding}"/> 159 160 <condition property="javadoc.encoding.used" value="${javadoc.encoding}"> 160 161 <and> … … 841 842 </pathconvert> 842 843 <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}"> 844 845 <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/> 845 846 <manifest> … … 853 854 <target name="-init-presetdef-jar"> 854 855 <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"> 856 857 <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/> 857 858 </jar> … … 976 977 <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest"> 977 978 <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}"/> 979 980 </target> 980 981 <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"> 982 983 <attribute name="Main-Class" value="${main.class}"/> 983 984 </manifest> 984 985 </target> 985 986 <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"> 987 988 <attribute name="Profile" value="${javac.profile}"/> 988 989 </manifest> … … 992 993 <mkdir dir="${build.classes.dir}/META-INF"/> 993 994 <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"> 995 996 <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/> 996 997 </manifest> … … 1187 1188 <fail unless="run.class">Must select one file in the IDE or set run.class</fail> 1188 1189 <startprofiler/> 1189 <antcal target="run-test-with-main"/>1190 <antcall target="run-test-with-main"/> 1190 1191 </target> 1191 1192 <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 5 5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. 6 6 nbproject/build-impl.xml.data.CRC32=742204ce 7 nbproject/build-impl.xml.script.CRC32= 4c2b716d8 nbproject/build-impl.xml.stylesheet.CRC32= 05530350@1.79.1.487 nbproject/build-impl.xml.script.CRC32=dc81b4ba 8 nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48 9 9 nbproject/profiler-build-impl.xml.data.CRC32=71623fcd 10 10 nbproject/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 2 excludes= 3 javac.deprecation=false 4 jnlp.enabled=false 5 build.test.results.dir=${build.dir}/test/results 6 run.classpath=${build.classes.dir}\:${javac.classpath}\:${file.reference.abcl-contrib.jar} 7 javadoc.nonavbar=false 8 run.test.classpath=${build.test.classes.dir}\:${javac.test.classpath} 9 javac.processorpath=${javac.classpath} 10 jnlp.signed=false 11 javac.target=1.6 3 12 annotation.processing.processors.list= 4 annotation.processing.run.all.processors=true 5 application.title=abcl 13 javadoc.noindex=false 14 src.themes.dir=themes 15 javadoc.additionalparam= 16 includes=org/armedbear/lisp/**/*.java,org/armedbear/lisp/**/*.lisp 17 build.classes.dir=${build.dir}/classes 18 source.encoding=UTF-8 19 javadoc.author=false 20 test.src.dir=test/src 21 build.dir=build 22 build.test.classes.dir=${build.dir}/test/classes 23 platform.active=default_platform 24 javac.compilerargs= 25 main.class=org.armedbear.lisp.Main 26 dist.jar=${dist.dir}/abcl.jar 27 jnlp.codebase.url=file\:/Users/evenson/work/abcl/dist/ 28 javadoc.use=true 29 build.sysclasspath=ignore 30 debug.test.classpath=${run.test.classpath} 31 dist.dir=dist 32 build.classes.excludes=**/*.java,**/*.form,**/*.lisp 33 javadoc.splitindex=true 34 javadoc.encoding=${source.encoding} 35 javac.source=1.6 6 36 application.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 37 junit.selected.version=4 38 debug.classpath=${run.classpath} 39 run.jvmargs= 40 jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api" 11 41 build.generated.dir=${build.dir}/generated 12 build.generated.sources.dir=${build.dir}/generated-sources13 # Only compile against the classpath explicitly listed here:14 build.sysclasspath=ignore15 build.test.classes.dir=${build.dir}/test/classes16 build.test.results.dir=${build.dir}/test/results17 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=dist23 dist.jar=${dist.dir}/abcl.jar24 dist.javadoc.dir=${dist.dir}/javadoc25 endorsed.classpath=26 excludes=27 file.reference.abcl-contrib.jar=dist/abcl-contrib.jar28 file.reference.abcl-src=src29 includes=org/armedbear/lisp/**/*.java,org/armedbear/lisp/**/*.lisp30 42 jar.compress=true 31 javac.classpath=32 # Space-separated list of extra javac options33 javac.compilerargs=34 javac.deprecation=false35 javac.processorpath=\36 ${javac.classpath}37 javac.source=1.538 javac.target=1.539 43 javac.test.classpath=\ 40 44 ${javac.classpath}:\ 41 45 ${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} 49 48 javadoc.private=false 50 javadoc.splitindex=true 51 javadoc.use=true 49 file.reference.abcl-contrib.jar=dist/abcl-contrib.jar 50 annotation.processing.run.all.processors=true 51 application.title=abcl 52 meta.inf.dir=${src.dir}/META-INF 53 manifest.file=src/manifest-abcl 54 annotation.processing.enabled=true 55 dist.javadoc.dir=${dist.dir}/javadoc 56 src.dir=${file.reference.abcl-src} 57 mkdist.disabled=false 58 jnlp.offline-allowed=false 59 endorsed.classpath= 60 javac.classpath= 61 annotation.processing.enabled.in.editor=false 62 build.generated.sources.dir=${build.dir}/generated-sources 52 63 javadoc.version=false 53 64 javadoc.windowtitle= 54 jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api" 65 src.doc.dir=doc 66 javadoc.notree=false 55 67 jnlp.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 68 file.reference.abcl-src=src
Note: See TracChangeset
for help on using the changeset viewer.