Skip to content

Commit 23fa1fe

Browse files
jindrapetrikjindrapetrik
committed
Correctly set classpath for Netbeans Actions - libs suffixed -fix first
1 parent 4df71d6 commit 23fa1fe

2 files changed

Lines changed: 28 additions & 14 deletions

File tree

‎nbproject/ide-file-targets.xml‎

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
<fail unless="run.class">Must set property 'run.class'</fail>
66
<java classname="${run.class}" failonerror="true" fork="true">
77
<classpath>
8-
<fileset dir="${basedir}" includes="lib/**/*.jar"/>
8+
<fileset dir="${basedir}" includes="lib/**/*-fix.jar"/>
9+
<fileset dir="${basedir}" includes="lib/**/*.jar" excludes="lib/**/*-fix.jar"/>
910
<pathelement location="build/classes"/>
1011
</classpath>
1112
</java>
@@ -14,7 +15,8 @@
1415
<fail unless="run.class">Must set property 'run.class'</fail>
1516
<java classname="${run.class}" failonerror="true" fork="true">
1617
<classpath>
17-
<fileset dir="${basedir}" includes="lib/**/*.jar"/>
18+
<fileset dir="${basedir}" includes="lib/**/*-fix.jar"/>
19+
<fileset dir="${basedir}" includes="lib/**/*.jar" excludes="lib/**/*-fix.jar"/>
1820
<pathelement location="build/classes"/>
1921
<pathelement location="build/test"/>
2022
</classpath>
@@ -34,7 +36,8 @@
3436
<pathelement path="${compile.test.dir}"/>
3537
<pathelement path="${instr.dir}"/>
3638
<pathelement path="${compile.dir}"/>
37-
<fileset dir="${lib.dir}" includes="**/*.jar"/>
39+
<fileset dir="${lib.dir}" includes="**/*-fix.jar"/>
40+
<fileset dir="${lib.dir}" includes="**/*.jar" excludes="**/*-fix.jar"/>
3841
<fileset dir="${test.lib.dir}" includes="**/*.jar"/>
3942
</classpath>
4043
<jvmarg value="-noverify"/>
@@ -56,7 +59,8 @@
5659
<pathelement path="${compile.test.dir}"/>
5760
<pathelement path="${instr.dir}"/>
5861
<pathelement path="${compile.dir}"/>
59-
<fileset dir="${lib.dir}" includes="**/*.jar"/>
62+
<fileset dir="${lib.dir}" includes="**/*-fix.jar"/>
63+
<fileset dir="${lib.dir}" includes="**/*.jar" excludes="**/*-fix.jar"/>
6064
<fileset dir="${test.lib.dir}" includes="**/*.jar"/>
6165
</classpath>
6266
<jvmarg value="-noverify"/>
@@ -72,7 +76,8 @@
7276
<nbjpdastart addressproperty="jpda.address" name="ffdec" transport="dt_socket">
7377
<classpath id="cp">
7478
<pathelement path="${compile.dir}"/>
75-
<fileset dir="${lib.dir}" includes="**/*.jar"/>
79+
<fileset dir="${lib.dir}" includes="**/*-fix.jar"/>
80+
<fileset dir="${lib.dir}" includes="**/*.jar" excludes="**/*-fix.jar"/>
7681
<fileset dir="${test.lib.dir}" includes="**/*.jar"/>
7782
</classpath>
7883
</nbjpdastart>
@@ -87,7 +92,8 @@
8792
<classpath>
8893
<pathelement path="${compile.test.dir}"/>
8994
<pathelement path="${compile.dir}"/>
90-
<fileset dir="${lib.dir}" includes="**/*.jar"/>
95+
<fileset dir="${lib.dir}" includes="**/*-fix.jar"/>
96+
<fileset dir="${lib.dir}" includes="**/*.jar" excludes="**/*-fix.jar"/>
9197
<fileset dir="${test.lib.dir}" includes="**/*.jar"/>
9298
</classpath>
9399
<jvmarg value="-noverify"/>
@@ -105,7 +111,8 @@
105111
<nbjpdastart addressproperty="jpda.address" name="ffdec" transport="dt_socket">
106112
<classpath id="cp">
107113
<pathelement path="${compile.dir}"/>
108-
<fileset dir="${lib.dir}" includes="**/*.jar"/>
114+
<fileset dir="${lib.dir}" includes="**/*-fix.jar"/>
115+
<fileset dir="${lib.dir}" includes="**/*.jar" excludes="**/*-fix.jar"/>
109116
<fileset dir="${test.lib.dir}" includes="**/*.jar"/>
110117
</classpath>
111118
</nbjpdastart>
@@ -120,7 +127,8 @@
120127
<classpath>
121128
<pathelement path="${compile.test.dir}"/>
122129
<pathelement path="${compile.dir}"/>
123-
<fileset dir="${lib.dir}" includes="**/*.jar"/>
130+
<fileset dir="${lib.dir}" includes="**/*-fix.jar"/>
131+
<fileset dir="${lib.dir}" includes="**/*.jar" excludes="**/*-fix.jar"/>
124132
<fileset dir="${test.lib.dir}" includes="**/*.jar"/>
125133
</classpath>
126134
<jvmarg value="-noverify"/>
@@ -139,15 +147,17 @@
139147
<classpath>
140148
<pathelement path="${compile.dir}"/>
141149
<pathelement path="${compile.test.dir}"/>
142-
<fileset dir="${lib.dir}" includes="**/*.jar"/>
150+
<fileset dir="${lib.dir}" includes="**/*-fix.jar"/>
151+
<fileset dir="${lib.dir}" includes="**/*.jar" excludes="**/*-fix.jar"/>
143152
<fileset dir="${test.lib.dir}" includes="**/*.jar"/>
144153
</classpath>
145154
</nbjpdastart>
146155
<java classname="${debug.class}" fork="true">
147156
<classpath>
148157
<pathelement path="${compile.dir}"/>
149158
<pathelement path="${compile.test.dir}"/>
150-
<fileset dir="${lib.dir}" includes="**/*.jar"/>
159+
<fileset dir="${lib.dir}" includes="**/*-fix.jar"/>
160+
<fileset dir="${lib.dir}" includes="**/*.jar" excludes="**/*-fix.jar"/>
151161
<fileset dir="${test.lib.dir}" includes="**/*.jar"/>
152162
</classpath>
153163
<jvmarg value="-Xdebug"/>
@@ -159,13 +169,15 @@
159169
<ant antfile="build.xml" inheritall="false" target="build"/>
160170
<nbjpdastart addressproperty="jpda.address" name="jxar" transport="dt_socket">
161171
<classpath>
162-
<fileset dir="${basedir}" includes="lib/**/*.jar"/>
172+
<fileset dir="${basedir}" includes="lib/**/*-fix.jar"/>
173+
<fileset dir="${basedir}" includes="lib/**/*.jar" excludes="lib/**/*-fix.jar"/>
163174
<pathelement location="build/classes"/>
164175
</classpath>
165176
</nbjpdastart>
166177
<java classname="${debug.class}" fork="true">
167178
<classpath>
168-
<fileset dir="${basedir}" includes="lib/**/*.jar"/>
179+
<fileset dir="${basedir}" includes="lib/**/*-fix.jar"/>
180+
<fileset dir="${basedir}" includes="lib/**/*.jar" excludes="lib/**/*-fix.jar"/>
169181
<pathelement location="build/classes"/>
170182
</classpath>
171183
<jvmarg value="-Xdebug"/>
@@ -179,7 +191,8 @@
179191
<fail unless="profile.class">Must set property 'profile.class'</fail>
180192
<java classname="${profile.class}" fork="true">
181193
<classpath>
182-
<fileset dir="${basedir}" includes="lib/**/*.jar"/>
194+
<fileset dir="${basedir}" includes="lib/**/*-fix.jar"/>
195+
<fileset dir="${basedir}" includes="lib/**/*.jar" excludes="lib/**/*-fix.jar"/>
183196
<pathelement location="build/classes"/>
184197
</classpath>
185198
<jvmarg line="${agent.jvmargs}"/>

‎nbproject/ide-targets.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
<target depends="compile" name="debug-nb">
55
<path id="cp">
66
<pathelement path="${basedir}/build/classes"/>
7-
<fileset dir="${basedir}/lib" includes="**/*.jar"/>
7+
<fileset dir="${basedir}/lib" includes="**/*-fix.jar"/>
8+
<fileset dir="${basedir}/lib" includes="**/*.jar" excludes="**/*-fix.jar"/>
89
</path>
910
<nbjpdastart addressproperty="jpda.address" name="ffdec" transport="dt_socket">
1011
<classpath refid="cp"/>

0 commit comments

Comments
 (0)