hchar 2005/01/19 03:15:48
Modified: auxiliary-builds/jdk15/yajcache/cache/nbproject
build-impl.xml genfiles.properties
project.properties project.xml
Log:
specify explicite jdk1.5.0_01
Revision Changes Path
1.3 +90 -15
jakarta-turbine-jcs/auxiliary-builds/jdk15/yajcache/cache/nbproject/build-impl.xml
Index: build-impl.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/auxiliary-builds/jdk15/yajcache/cache/nbproject/build-impl.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-impl.xml 19 Jan 2005 11:07:57 -0000 1.2
+++ build-impl.xml 19 Jan 2005 11:15:48 -0000 1.3
@@ -37,13 +37,37 @@
<property file="${user.properties.file}"/>
<!-- The two properties below are usually overridden -->
<!-- by the active platform. Just a fallback. -->
- <property name="default.javac.source" value="1.5"/>
- <property name="default.javac.target" value="1.5"/>
+ <property name="default.javac.source" value="1.4"/>
+ <property name="default.javac.target" value="1.4"/>
</target>
<target name="-init-project"
depends="-pre-init,-init-private,-init-user">
<property file="nbproject/project.properties"/>
</target>
<target name="-do-init"
depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property">
+ <j2seproject:property name="platform.home"
value="platforms.${platform.active}.home"
xmlns:j2seproject="http://www.netbeans.org/ns/j2se-project/1"/>
+ <j2seproject:property name="platform.bootcp"
value="platforms.${platform.active}.bootclasspath"
xmlns:j2seproject="http://www.netbeans.org/ns/j2se-project/1"/>
+ <j2seproject:property name="platform.compiler"
value="platforms.${platform.active}.compile"
xmlns:j2seproject="http://www.netbeans.org/ns/j2se-project/1"/>
+ <j2seproject:property name="platform.javac.tmp"
value="platforms.${platform.active}.javac"
xmlns:j2seproject="http://www.netbeans.org/ns/j2se-project/1"/>
+ <condition property="platform.javac"
value="${platform.home}/bin/javac">
+ <equals arg1="${platform.javac.tmp}"
arg2="$${platforms.${platform.active}.javac}"/>
+ </condition>
+ <property name="platform.javac" value="${platform.javac.tmp}"/>
+ <j2seproject:property name="platform.java.tmp"
value="platforms.${platform.active}.java"
xmlns:j2seproject="http://www.netbeans.org/ns/j2se-project/1"/>
+ <condition property="platform.java"
value="${platform.home}/bin/java">
+ <equals arg1="${platform.java.tmp}"
arg2="$${platforms.${platform.active}.java}"/>
+ </condition>
+ <property name="platform.java" value="${platform.java.tmp}"/>
+ <condition property="platform.invalid" value="true">
+ <or>
+ <contains string="${platform.javac}"
substring="$${platforms."/>
+ <contains string="${platform.java}"
substring="$${platforms."/>
+ </or>
+ </condition>
+ <fail unless="platform.home">Must set platform.home</fail>
+ <fail unless="platform.bootcp">Must set platform.bootcp</fail>
+ <fail unless="platform.java">Must set platform.java</fail>
+ <fail unless="platform.javac">Must set platform.javac</fail>
+ <fail if="platform.invalid">Platform is not correctly set up</fail>
<available file="${manifest.file}" property="manifest.available"/>
<condition property="manifest.available+main.class">
<and>
@@ -106,7 +130,7 @@
<attribute name="debug" default="${javac.debug}"/>
<element name="customize" optional="true"/>
<sequential>
- <javac srcdir="@{srcdir}" destdir="@{destdir}"
debug="@{debug}" deprecation="${javac.deprecation}" source="${javac.source}"
target="${javac.target}" includeantruntime="false">
+ <javac srcdir="@{srcdir}" destdir="@{destdir}"
debug="@{debug}" deprecation="${javac.deprecation}" source="${javac.source}"
target="${javac.target}" fork="yes" executable="${platform.javac}"
includeantruntime="false">
<classpath>
<path path="@{classpath}"/>
</classpath>
@@ -120,7 +144,7 @@
<macrodef name="junit"
uri="http://www.netbeans.org/ns/j2se-project/1";>
<attribute name="includes" default="**/*Test.java"/>
<sequential>
- <junit showoutput="true" fork="true" dir="${basedir}"
failureproperty="tests.failed" errorproperty="tests.failed">
+ <junit showoutput="true" fork="true" dir="${basedir}"
failureproperty="tests.failed" errorproperty="tests.failed"
jvm="${platform.java}">
<batchtest todir="${build.test.results.dir}">
<fileset dir="${test.src.dir}"
includes="@{includes}"/>
</batchtest>
@@ -146,6 +170,9 @@
<classpath>
<path path="@{classpath}"/>
</classpath>
+ <bootclasspath>
+ <path path="${platform.bootcp}"/>
+ </bootclasspath>
</nbjpdastart>
</sequential>
</macrodef>
@@ -164,7 +191,7 @@
<attribute name="classpath" default="${debug.classpath}"/>
<attribute name="args" default="${application.args}"/>
<sequential>
- <java fork="true" classname="@{classname}" dir="${work.dir}">
+ <java fork="true" classname="@{classname}" dir="${work.dir}"
jvm="${platform.java}">
<jvmarg value="-Xdebug"/>
<jvmarg value="-Xnoagent"/>
<jvmarg value="-Djava.compiler=none"/>
@@ -187,7 +214,7 @@
<attribute name="classname" default="${main.class}"/>
<element name="customize" optional="true"/>
<sequential>
- <java fork="true" classname="@{classname}" dir="${work.dir}">
+ <java fork="true" classname="@{classname}" dir="${work.dir}"
jvm="${platform.java}">
<jvmarg line="${run.jvmargs}"/>
<classpath>
<path path="${run.classpath}"/>
@@ -333,15 +360,63 @@
-->
<target name="-javadoc-build" depends="init">
<mkdir dir="${dist.javadoc.dir}"/>
- <javadoc destdir="${dist.javadoc.dir}" source="${javac.source}"
notree="${javadoc.notree}" use="${javadoc.use}" nonavbar="${javadoc.nonavbar}"
noindex="${javadoc.noindex}" splitindex="${javadoc.splitindex}"
author="${javadoc.author}" version="${javadoc.version}"
windowtitle="${javadoc.windowtitle}" private="${javadoc.private}"
failonerror="true">
- <classpath>
- <path path="${javac.classpath}"/>
- </classpath>
- <sourcepath>
- <pathelement location="${src.dir}"/>
- </sourcepath>
- <fileset dir="${src.dir}"/>
- </javadoc>
+ <j2seproject:property name="platform.javadoc.tmp"
value="platforms.${platform.active}.javadoc"
xmlns:j2seproject="http://www.netbeans.org/ns/j2se-project/1"/>
+ <condition property="platform.javadoc"
value="${platform.home}/bin/javadoc">
+ <equals arg1="${platform.javadoc.tmp}"
arg2="$${platforms.${platform.active}.javadoc}"/>
+ </condition>
+ <property name="platform.javadoc" value="${platform.javadoc.tmp}"/>
+ <condition property="javadoc.notree.opt" value="-notree">
+ <istrue value="${javadoc.notree}"/>
+ </condition>
+ <property name="javadoc.notree.opt" value=""/>
+ <condition property="javadoc.use.opt" value="-use">
+ <istrue value="${javadoc.use}"/>
+ </condition>
+ <property name="javadoc.use.opt" value=""/>
+ <condition property="javadoc.nonavbar.opt" value="-nonavbar">
+ <istrue value="${javadoc.nonavbar}"/>
+ </condition>
+ <property name="javadoc.nonavbar.opt" value=""/>
+ <condition property="javadoc.noindex.opt" value="-noindex">
+ <istrue value="${javadoc.noindex}"/>
+ </condition>
+ <property name="javadoc.noindex.opt" value=""/>
+ <condition property="javadoc.splitindex.opt" value="-splitindex">
+ <istrue value="${javadoc.splitindex}"/>
+ </condition>
+ <property name="javadoc.splitindex.opt" value=""/>
+ <condition property="javadoc.author.opt" value="-author">
+ <istrue value="${javadoc.author}"/>
+ </condition>
+ <property name="javadoc.author.opt" value=""/>
+ <condition property="javadoc.version.opt" value="-version">
+ <istrue value="${javadoc.version}"/>
+ </condition>
+ <property name="javadoc.version.opt" value=""/>
+ <condition property="javadoc.private.opt" value="-private">
+ <istrue value="${javadoc.private}"/>
+ </condition>
+ <property name="javadoc.private.opt" value=""/>
+ <condition property="javadoc.classpath.opt"
value="${javac.classpath}">
+ <not>
+ <equals arg1="${javac.classpath}" arg2=""/>
+ </not>
+ </condition>
+ <property name="javadoc.classpath.opt" value=""""/>
+ <apply executable="${platform.javadoc}" failonerror="true"
parallel="true">
+ <arg value="-d"/>
+ <arg file="${dist.javadoc.dir}"/>
+ <arg value="-source"/>
+ <arg value="${javac.source}"/>
+ <arg value="-windowtitle"/>
+ <arg value="${javadoc.windowtitle}"/>
+ <arg line="${javadoc.notree.opt} ${javadoc.use.opt}
${javadoc.nonavbar.opt} ${javadoc.noindex.opt} ${javadoc.splitindex.opt}
${javadoc.author.opt} ${javadoc.version.opt} ${javadoc.private.opt}"/>
+ <arg value="-classpath"/>
+ <arg path="${javadoc.classpath.opt}"/>
+ <arg value="-sourcepath"/>
+ <arg file="${src.dir}"/>
+ <fileset dir="${src.dir}" includes="**/*.java"/>
+ </apply>
</target>
<target name="-javadoc-browse" if="netbeans.home"
unless="no.javadoc.preview" depends="init,-javadoc-build">
<nbbrowse file="${dist.javadoc.dir}/index.html"/>
1.2 +3 -3
jakarta-turbine-jcs/auxiliary-builds/jdk15/yajcache/cache/nbproject/genfiles.properties
Index: genfiles.properties
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/auxiliary-builds/jdk15/yajcache/cache/nbproject/genfiles.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- genfiles.properties 19 Jan 2005 10:59:51 -0000 1.1
+++ genfiles.properties 19 Jan 2005 11:15:48 -0000 1.2
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=d51177da
+build.xml.data.CRC32=c4462312
build.xml.script.CRC32=9563408f
build.xml.stylesheet.CRC32=ba5d3624
# This file is used by a NetBeans-based IDE to track changes in generated
files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never
regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=d51177da
-nbproject/build-impl.xml.script.CRC32=4ac1d5f2
+nbproject/build-impl.xml.data.CRC32=c4462312
+nbproject/build-impl.xml.script.CRC32=8a2bf3ca
nbproject/build-impl.xml.stylesheet.CRC32=1cf0b40c
1.2 +3 -3
jakarta-turbine-jcs/auxiliary-builds/jdk15/yajcache/cache/nbproject/project.properties
Index: project.properties
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/auxiliary-builds/jdk15/yajcache/cache/nbproject/project.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.properties 19 Jan 2005 10:59:51 -0000 1.1
+++ project.properties 19 Jan 2005 11:15:48 -0000 1.2
@@ -30,8 +30,8 @@
# Space-separated list of extra javac options
javac.compilerargs=-Xlint
javac.deprecation=false
-javac.source=${default.javac.source}
-javac.target=${default.javac.target}
+javac.source=1.5
+javac.target=1.5
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}:\
@@ -46,7 +46,7 @@
javadoc.use=true
javadoc.version=false
javadoc.windowtitle=
-platform.active=default_platform
+platform.active=Java_HotSpot_TM__Client_VM_1.5.0_01-b08
run.classpath=\
${javac.classpath};\
${build.classes.dir}
1.2 +1 -0
jakarta-turbine-jcs/auxiliary-builds/jdk15/yajcache/cache/nbproject/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/auxiliary-builds/jdk15/yajcache/cache/nbproject/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 19 Jan 2005 10:59:51 -0000 1.1
+++ project.xml 19 Jan 2005 11:15:48 -0000 1.2
@@ -5,6 +5,7 @@
<data xmlns="http://www.netbeans.org/ns/j2se-project/1";>
<name>cache</name>
<minimum-ant-version>1.6</minimum-ant-version>
+ <explicit-platform explicit-source-supported="true"/>
</data>
</configuration>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
