This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new 192a639088 Update netbeans project files: new src/test paths, new
dependencies classpath, and removal of jdk selection
192a639088 is described below
commit 192a639088c94ad820bb7475d3970d705c101e67
Author: Mick Semb Wever <[email protected]>
AuthorDate: Tue Jul 25 15:08:10 2023 +0200
Update netbeans project files: new src/test paths, new dependencies
classpath, and removal of jdk selection
WRT to the "jdk selection" removal, which no longer appears to be working
for freeform projects, you now have to start netbeans with the jdk you want to
run contextual actions with.
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-18687
---
ide/nbproject/ide-actions.xml | 18 +----
ide/nbproject/jdk.xml | 157 -----------------------------------------
ide/nbproject/nbjdk.properties | 1 -
ide/nbproject/project.xml | 81 +++++++++++++++++++--
4 files changed, 77 insertions(+), 180 deletions(-)
diff --git a/ide/nbproject/ide-actions.xml b/ide/nbproject/ide-actions.xml
index 7a02dcc21c..a53cd96071 100644
--- a/ide/nbproject/ide-actions.xml
+++ b/ide/nbproject/ide-actions.xml
@@ -1,18 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project basedir=".." name="apache-cassandra">
- <condition property="java.version.8">
- <equals arg1="${ant.java.version}" arg2="1.8"/>
- </condition>
-
- <target name="_check_java8_home_defined" unless="java.version.8">
- <property environment="env"/>
- <!-- Copied from build.xml and used here for a fail-fast error check
-->
- <fail message="JAVA8_HOME env variable must be set when building with
java >= 11">
- <condition><not><isset
property="env.JAVA8_HOME"/></not></condition>
- </fail>
- </target>
-
<target name="build">
<ant antfile="../build.xml" inheritall="false" target="build"/>
<ant antfile="../build.xml" inheritall="false" target="build-test"/>
@@ -22,7 +10,7 @@
<target name="clean">
<ant antfile="../build.xml" inheritall="false" target="clean"/>
</target>
- <target name="run" depends="_check_java8_home_defined">
+ <target name="run">
<ant antfile="../build.xml" inheritall="false"
target="_artifacts-init">
<property name="no-javadoc" value="true"/>
<property name="ant.gen-doc.skip" value="true"/>
@@ -33,7 +21,7 @@
<arg value="-f"/>
</exec>
</target>
- <target name="debug" depends="_check_java8_home_defined">
+ <target name="debug">
<ant antfile="../build.xml" inheritall="false"
target="_artifacts-init">
<property name="no-javadoc" value="true"/>
<property name="ant.gen-doc.skip" value="true"/>
@@ -45,7 +33,7 @@
<arg value="-f"/>
</exec>
</target>
- <target name="profile" depends="_check_java8_home_defined">
+ <target name="profile">
<ant antfile="../build.xml" inheritall="false"
target="_artifacts-init">
<property name="no-javadoc" value="true"/>
<property name="ant.gen-doc.skip" value="true"/>
diff --git a/ide/nbproject/jdk.xml b/ide/nbproject/jdk.xml
deleted file mode 100644
index 237e529b44..0000000000
--- a/ide/nbproject/jdk.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project name="jdk" basedir=".">
-
-
- <description>
- Permits selection of a JDK to use when building and running project.
- See: http://www.netbeans.org/issues/show_bug.cgi?id=64160
- </description>
-
- <target name="-jdk-pre-preinit">
- <condition property="nbjdk.active-or-nbjdk.home">
- <or>
- <and>
- <isset property="nbjdk.active"/>
- <not>
- <equals arg1="${nbjdk.active}"
arg2="default_platform"/>
- </not>
- </and>
- <and>
- <isset property="nbjdk.home"/>
- <not>
- <isset property="nbjdk.home.defaulted"/>
- </not>
- </and>
- </or>
- </condition>
- </target>
-
- <target xmlns:common="http://java.netbeans.org/freeform/jdk.xml";
name="-jdk-preinit" depends="-jdk-pre-preinit" if="nbjdk.active-or-nbjdk.home">
- <macrodef name="property"
uri="http://java.netbeans.org/freeform/jdk.xml";>
- <attribute name="name"/>
- <attribute name="value"/>
- <sequential>
- <property name="@{name}" value="${@{value}}"/>
- </sequential>
- </macrodef>
- <common:property name="nbjdk.home"
value="platforms.${nbjdk.active}.home"/>
- <common:property name="nbjdk.javac.tmp"
value="platforms.${nbjdk.active}.javac"/>
- <condition property=".exe" value=".exe">
- <os family="windows"/>
- </condition>
- <property name=".exe" value=""/>
- <condition property="nbjdk.javac"
value="${nbjdk.home}/bin/javac${.exe}">
- <equals arg1="${nbjdk.javac.tmp}"
arg2="$${platforms.${nbjdk.active}.javac}"/>
- </condition>
- <property name="nbjdk.javac" value="${nbjdk.javac.tmp}"/>
- <common:property name="nbjdk.java.tmp"
value="platforms.${nbjdk.active}.java"/>
- <condition property="nbjdk.java" value="${nbjdk.home}/bin/java${.exe}">
- <equals arg1="${nbjdk.java.tmp}"
arg2="$${platforms.${nbjdk.active}.java}"/>
- </condition>
- <property name="nbjdk.java" value="${nbjdk.java.tmp}"/>
- <common:property name="nbjdk.javadoc.tmp"
value="platforms.${nbjdk.active}.javadoc"/>
- <condition property="nbjdk.javadoc"
value="${nbjdk.home}/bin/javadoc${.exe}">
- <equals arg1="${nbjdk.javadoc.tmp}"
arg2="$${platforms.${nbjdk.active}.javadoc}"/>
- </condition>
- <property name="nbjdk.javadoc" value="${nbjdk.javadoc.tmp}"/>
- <common:property name="nbjdk.bootclasspath.tmp"
value="platforms.${nbjdk.active}.bootclasspath"/>
- <condition property="nbjdk.bootclasspath"
value="${nbjdk.home}/jre/lib/rt.jar">
- <equals arg1="${nbjdk.bootclasspath.tmp}"
arg2="$${platforms.${nbjdk.active}.bootclasspath}"/>
- </condition>
- <property name="nbjdk.bootclasspath"
value="${nbjdk.bootclasspath.tmp}"/>
- <condition property="nbjdk.valid">
- <and>
- <available file="${nbjdk.home}" type="dir"/>
- <available file="${nbjdk.javac}" type="file"/>
- <available file="${nbjdk.java}" type="file"/>
- <available file="${nbjdk.javadoc}" type="file"/>
-
- </and>
- </condition>
- <echo level="verbose">nbjdk.active=${nbjdk.active}
nbjdk.home=${nbjdk.home} nbjdk.java=${nbjdk.java} nbjdk.javac=${nbjdk.javac}
nbjdk.javadoc=${nbjdk.javadoc} nbjdk.bootclasspath=${nbjdk.bootclasspath}
nbjdk.valid=${nbjdk.valid} have-jdk-1.4=${have-jdk-1.4}
have-jdk-1.5=${have-jdk-1.5}</echo>
- </target>
-
- <target name="-jdk-warn" depends="-jdk-preinit"
if="nbjdk.active-or-nbjdk.home" unless="nbjdk.valid">
- <property name="jdkhome.presumed" location="${java.home}/.."/>
- <echo level="warning">Warning: nbjdk.active=${nbjdk.active} or
nbjdk.home=${nbjdk.home} is an invalid Java platform; ignoring and using
${jdkhome.presumed}</echo>
- </target>
-
- <target name="-jdk-presetdef-basic" depends="-jdk-preinit"
if="nbjdk.valid" unless="nbjdk.presetdef.basic.done">
-
-
- <macrodef name="javac-presetdef">
- <attribute name="javacval"/>
- <sequential>
- <presetdef name="javac">
- <javac fork="yes" executable="@{javacval}"/>
- </presetdef>
- </sequential>
- </macrodef>
- <javac-presetdef javacval="${nbjdk.javac}"/>
- <macrodef name="java-presetdef">
- <attribute name="javaval"/>
- <sequential>
- <presetdef name="java">
- <java fork="yes" jvm="@{javaval}"/>
- </presetdef>
- </sequential>
- </macrodef>
- <java-presetdef javaval="${nbjdk.java}"/>
- <macrodef name="javadoc-presetdef">
- <attribute name="javadocval"/>
- <sequential>
- <presetdef name="javadoc">
- <javadoc executable="@{javadocval}"/>
- </presetdef>
- </sequential>
- </macrodef>
- <javadoc-presetdef javadocval="${nbjdk.javadoc}"/>
- <macrodef name="junit-presetdef">
- <attribute name="javaval"/>
- <sequential>
- <presetdef name="junit">
- <junit fork="yes" jvm="@{javaval}"/>
- </presetdef>
- </sequential>
- </macrodef>
- <junit-presetdef javaval="${nbjdk.java}"/>
- <property name="nbjdk.presetdef.basic.done" value="true"/>
- </target>
-
- <target name="-jdk-presetdef-nbjpdastart" depends="-jdk-preinit"
if="nbjdk.valid" unless="nbjdk.presetdef.nbjpdastart.done">
- <macrodef name="nbjpdastart-presetdef">
- <attribute name="bootcpval"/>
- <sequential>
- <presetdef name="nbjpdastart">
- <nbjpdastart>
- <bootclasspath>
- <path path="@{bootcpval}"/>
- </bootclasspath>
- </nbjpdastart>
- </presetdef>
- </sequential>
- </macrodef>
- <nbjpdastart-presetdef bootcpval="${nbjdk.bootclasspath}"/>
- <property name="nbjdk.presetdef.nbjpdastart.done" value="true"/>
- </target>
-
- <target name="-jdk-default" unless="nbjdk.active-or-nbjdk.home">
-
- <property name="java.home.parent" location="${java.home}/.."/>
- <condition property="nbjdk.home" value="${java.home.parent}">
- <available file="${java.home.parent}/lib/tools.jar" type="file"/>
- </condition>
- <condition property="nbjdk.home" value="${java.home}">
- <available file="${java.home}/lib/tools.jar" type="file"/>
- </condition>
-
- <condition property="nbjdk.home" value="/Library/Java/Home">
- <available file="/Library/Java/Home" type="dir"/>
- </condition>
-
- <property name="nbjdk.home" location="${java.home.parent}"/>
- <property name="nbjdk.home.defaulted" value="true"/>
- </target>
-
- <target name="-jdk-init"
depends="-jdk-preinit,-jdk-warn,-jdk-presetdef-basic,-jdk-default"/>
-
-</project>
\ No newline at end of file
diff --git a/ide/nbproject/nbjdk.properties b/ide/nbproject/nbjdk.properties
deleted file mode 100644
index 2ac925db83..0000000000
--- a/ide/nbproject/nbjdk.properties
+++ /dev/null
@@ -1 +0,0 @@
-nbjdk.active=JDK_1.8
diff --git a/ide/nbproject/project.xml b/ide/nbproject/project.xml
index 4a5461371a..3250cb78db 100644
--- a/ide/nbproject/project.xml
+++ b/ide/nbproject/project.xml
@@ -7,7 +7,7 @@
<properties>
<property name="project.dir">..</property>
<!-- the compile classpaths should be distinct per compilation
unit… but it is kept simple and the build will catch errors -->
- <property
name="cassandra.classpath.jars">${project.dir}/build/lib/jars/HdrHistogram-2.1.9.jar:${project.dir}/build/lib/jars/ST4-4.0.8.jar:${project.dir}/build/lib/jars/agrona-1.17.1.jar:${project.dir}/build/lib/jars/airline-0.8.jar:${project.dir}/build/lib/jars/antlr-3.5.2.jar:${project.dir}/build/lib/jars/antlr-runtime-3.5.2.jar:${project.dir}/build/lib/jars/asm-9.3.jar:${project.dir}/build/lib/jars/assertj-core-3.15.0.jar:${project.dir}/build/lib/jars/big-math-2.3.0.ja
[...]
+ <property
name="cassandra.classpath.jars">${project.dir}/build/lib/jars/AmazonCorrettoCryptoProvider-2.2.0-linux-x86_64.jar:${project.dir}/build/lib/jars/HdrHistogram-2.1.9.jar:${project.dir}/build/lib/jars/ST4-4.0.8.jar:${project.dir}/build/lib/jars/affinity-3.23.3.jar:${project.dir}/build/lib/jars/agrona-1.17.1.jar:${project.dir}/build/lib/jars/airline-0.8.jar:${project.dir}/build/lib/jars/antlr-3.5.2.jar:${project.dir}/build/lib/jars/antlr-runtime-3.5.2.jar:${project.d
[...]
</properties>
<folders>
<source-folder>
@@ -22,6 +22,12 @@
<location>${project.dir}/src/java</location>
<encoding>UTF-8</encoding>
</source-folder>
+ <source-folder>
+ <label>src/anttasks</label>
+ <type>java</type>
+ <location>${project.dir}/test/anttasks</location>
+ <encoding>UTF-8</encoding>
+ </source-folder>
<source-folder>
<label>src/fqltool</label>
<type>java</type>
@@ -76,6 +82,36 @@
<location>${project.dir}/test/microbench</location>
<encoding>UTF-8</encoding>
</source-folder>
+ <source-folder>
+ <label>test/memory</label>
+ <type>java</type>
+ <location>${project.dir}/test/memory</location>
+ <encoding>UTF-8</encoding>
+ </source-folder>
+ <source-folder>
+ <label>test/simulator/asm</label>
+ <type>java</type>
+ <location>${project.dir}/test/simulator/asm</location>
+ <encoding>UTF-8</encoding>
+ </source-folder>
+ <source-folder>
+ <label>test/simulator/bootstrap</label>
+ <type>java</type>
+
<location>${project.dir}/test/simulator/bootstrap</location>
+ <encoding>UTF-8</encoding>
+ </source-folder>
+ <source-folder>
+ <label>test/simulator/main</label>
+ <type>java</type>
+ <location>${project.dir}/test/simulator/main</location>
+ <encoding>UTF-8</encoding>
+ </source-folder>
+ <source-folder>
+ <label>test/simulator/test</label>
+ <type>java</type>
+ <location>${project.dir}/test/simulator/test</location>
+ <encoding>UTF-8</encoding>
+ </source-folder>
<source-folder>
<label>apache-cassandra</label>
<location>${project.dir}</location>
@@ -127,6 +163,18 @@
<script>../build.xml</script>
<build-target>stress-build</build-target>
</export>
+ <export>
+ <type>folder</type>
+ <location>${project.dir}/build/classes/simulator-asm</location>
+ <script>../build.xml</script>
+ <build-target>simulator-asm-build</build-target>
+ </export>
+ <export>
+ <type>folder</type>
+
<location>${project.dir}/build/classes/simulator-bootstrap</location>
+ <script>../build.xml</script>
+ <build-target>simulator-bootstrap-build</build-target>
+ </export>
<export>
<type>folder</type>
<location>${project.dir}/build/test/classes</location>
@@ -191,6 +239,26 @@
<label>test/microbench</label>
<location>${project.dir}/test/microbench</location>
</source-folder>
+ <source-folder style="packages">
+ <label>test/memory</label>
+ <location>${project.dir}/test/memory</location>
+ </source-folder>
+ <source-folder style="packages">
+ <label>test/simulator/asm</label>
+ <location>${project.dir}/test/simulator/asm</location>
+ </source-folder>
+ <source-folder style="packages">
+ <label>test/simulator/bootstrap</label>
+
<location>${project.dir}/test/simulator/bootstrap</location>
+ </source-folder>
+ <source-folder style="packages">
+ <label>test/simulator/main</label>
+ <location>${project.dir}/test/simulator/main</location>
+ </source-folder>
+ <source-folder style="packages">
+ <label>test/simulator/test</label>
+ <location>${project.dir}/test/simulator/test</location>
+ </source-folder>
<source-file>
<location>${project.dir}/build.xml</location>
</source-file>
@@ -210,44 +278,43 @@
<package-root>${project.dir}/src/java</package-root>
<classpath
mode="compile">${cassandra.classpath.jars}</classpath>
<built-to>${project.dir}/build/classes/main</built-to>
- <source-level>11</source-level>
</compilation-unit>
<compilation-unit>
<package-root>${project.dir}/tools/fqltool/src</package-root>
<classpath
mode="compile">${cassandra.classpath.jars}:${project.dir}/build/classes/main</classpath>
<built-to>${project.dir}/build/classes/fqltool</built-to>
- <source-level>11</source-level>
</compilation-unit>
<compilation-unit>
<package-root>${project.dir}/tools/stress/src</package-root>
<classpath
mode="compile">${cassandra.classpath.jars}:${project.dir}/build/classes/main</classpath>
<built-to>${project.dir}/build/classes/stress</built-to>
- <source-level>11</source-level>
</compilation-unit>
<compilation-unit>
<package-root>${project.dir}/test/unit</package-root>
<package-root>${project.dir}/test/distributed</package-root>
<package-root>${project.dir}/test/long</package-root>
<package-root>${project.dir}/test/microbench</package-root>
+ <package-root>${project.dir}/test/memory</package-root>
<package-root>${project.dir}/test/burn</package-root>
+ <package-root>${project.dir}/test/simulator/asm</package-root>
+
<package-root>${project.dir}/test/simulator/bootstrap</package-root>
+ <package-root>${project.dir}/test/simulator/main</package-root>
+ <package-root>${project.dir}/test/simulator/test</package-root>
<unit-tests/>
<classpath
mode="compile">${cassandra.classpath.jars}:${project.dir}/build/classes/main:${project.dir}/build/classes/fqltool/:${project.dir}/build/classes/stress/</classpath>
<built-to>${project.dir}/build/test/classes</built-to>
- <source-level>11</source-level>
</compilation-unit>
<compilation-unit>
<package-root>${project.dir}/tools/fqltool/test/unit</package-root>
<unit-tests/>
<classpath
mode="compile">${cassandra.classpath.jars}:${project.dir}/build/classes/main:${project.dir}/build/classes/fqltool/</classpath>
<built-to>${project.dir}/build/test/fqltool-classes</built-to>
- <source-level>11</source-level>
</compilation-unit>
<compilation-unit>
<package-root>${project.dir}/tools/stress/test/unit</package-root>
<unit-tests/>
<classpath
mode="compile">${cassandra.classpath.jars}:${project.dir}/build/classes/main:${project.dir}/build/classes/stress/</classpath>
<built-to>${project.dir}/build/test/stress-classes</built-to>
- <source-level>11</source-level>
</compilation-unit>
</java-data>
</configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
