Update IDE, Eclipse and NetBeans, classpaths for tests

patch by Mick Semb Wever, Berenguer Blasi; reviewd by Ekaterina Dimitrova, Benjamin Lerer for CASSANDRA-16560
This commit is contained in:
Mick Semb Wever 2021-04-05 11:28:13 +02:00
parent 6a45728b08
commit c65500e8a1
No known key found for this signature in database
GPG Key ID: E91335D77E3E87CB
3 changed files with 13 additions and 4 deletions

View File

@ -2159,17 +2159,25 @@
<fileset dir="build/lib/jars"> <fileset dir="build/lib/jars">
<include name="**/*.jar" /> <include name="**/*.jar" />
</fileset> </fileset>
<fileset dir="build/test/lib/jars">
<include name="**/*.jar" />
</fileset>
</path> </path>
<property name="eclipse-project-libs" refid="eclipse-project-libs-path"/> <property name="eclipse-project-libs" refid="eclipse-project-libs-path"/>
<script language="javascript" classpathref="cassandra.classpath"> <![CDATA[ <script language="javascript">
var File = java.io.File; <classpath>
<path refid="cassandra.classpath"/>
<path refid="cassandra.classpath.test"/>
</classpath>
<![CDATA[
var File = java.io.File;
var FilenameUtils = Packages.org.apache.commons.io.FilenameUtils; var FilenameUtils = Packages.org.apache.commons.io.FilenameUtils;
jars = project.getProperty("eclipse-project-libs").split(project.getProperty("path.separator")); jars = project.getProperty("eclipse-project-libs").split(project.getProperty("path.separator"));
cp = ""; cp = "";
for (i=0; i< jars.length; i++) { for (i=0; i< jars.length; i++) {
srcjar = FilenameUtils.getBaseName(jars[i]) + '-sources.jar'; srcjar = FilenameUtils.getBaseName(jars[i]) + '-sources.jar';
srcdir = FilenameUtils.concat(project.getProperty("build.dir.lib"), 'sources'); srcdir = FilenameUtils.concat(project.getProperty("build.test.dir"), 'sources');
srcfile = new File(FilenameUtils.concat(srcdir, srcjar)); srcfile = new File(FilenameUtils.concat(srcdir, srcjar));
cp += ' <classpathentry kind="lib" path="' + jars[i] + '"'; cp += ' <classpathentry kind="lib" path="' + jars[i] + '"';

View File

@ -66,6 +66,7 @@
<root url="file://$MODULE_DIR$/build/lib/sources" /> <root url="file://$MODULE_DIR$/build/lib/sources" />
</SOURCES> </SOURCES>
<jarDirectory url="file://$MODULE_DIR$/build/lib/jars" recursive="false" /> <jarDirectory url="file://$MODULE_DIR$/build/lib/jars" recursive="false" />
<jarDirectory url="file://$MODULE_DIR$/build/test/lib/jars" recursive="false" />
<jarDirectory url="file://$MODULE_DIR$/build/lib/sources" recursive="false" type="SOURCES" /> <jarDirectory url="file://$MODULE_DIR$/build/lib/sources" recursive="false" type="SOURCES" />
</library> </library>
</orderEntry> </orderEntry>

File diff suppressed because one or more lines are too long