Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

fixed netbeans project files.

git-svn-id: https://svn.apache.org/repos/asf/river/jtsk/trunk@1396199 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
commit f93a0c92a2cfa08303fe6eebe8d5899644d67da6 1 parent ea230d0
authored October 09, 2012
4  netbeans/onebigjar/nbproject/project.properties
@@ -56,8 +56,8 @@ javac.compilerargs=
56 56
 javac.deprecation=true
57 57
 javac.processorpath=\
58 58
     ${javac.classpath}
59  
-javac.source=1.7
60  
-javac.target=1.7
  59
+javac.source=1.6
  60
+javac.target=1.6
61 61
 javac.test.classpath=\
62 62
     ${javac.classpath}:\
63 63
     ${build.classes.dir}:\
19  netbeans/qa-testing/nbproject/build-impl.xml
@@ -140,7 +140,6 @@ is divided into following sections:
140 140
         </condition>
141 141
         <condition property="have.sources">
142 142
             <or>
143  
-                <available file="${src.src.dir}"/>
144 143
                 <available file="${src.dir}"/>
145 144
             </or>
146 145
         </condition>
@@ -229,7 +228,6 @@ is divided into following sections:
229 228
         <!-- You can override this target in the ../build.xml file. -->
230 229
     </target>
231 230
     <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
232  
-        <fail unless="src.src.dir">Must set src.src.dir</fail>
233 231
         <fail unless="src.dir">Must set src.dir</fail>
234 232
         <fail unless="test.src.dir">Must set test.src.dir</fail>
235 233
         <fail unless="build.dir">Must set build.dir</fail>
@@ -252,7 +250,7 @@ is divided into following sections:
252 250
     </target>
253 251
     <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
254 252
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
255  
-            <attribute default="${src.src.dir}:${src.dir}" name="srcdir"/>
  253
+            <attribute default="${src.dir}" name="srcdir"/>
256 254
             <attribute default="${build.classes.dir}" name="destdir"/>
257 255
             <attribute default="${javac.classpath}" name="classpath"/>
258 256
             <attribute default="${javac.processorpath}" name="processorpath"/>
@@ -292,7 +290,7 @@ is divided into following sections:
292 290
     </target>
293 291
     <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
294 292
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
295  
-            <attribute default="${src.src.dir}:${src.dir}" name="srcdir"/>
  293
+            <attribute default="${src.dir}" name="srcdir"/>
296 294
             <attribute default="${build.classes.dir}" name="destdir"/>
297 295
             <attribute default="${javac.classpath}" name="classpath"/>
298 296
             <attribute default="${javac.processorpath}" name="processorpath"/>
@@ -324,7 +322,7 @@ is divided into following sections:
324 322
     </target>
325 323
     <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
326 324
         <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
327  
-            <attribute default="${src.src.dir}:${src.dir}" name="srcdir"/>
  325
+            <attribute default="${src.dir}" name="srcdir"/>
328 326
             <attribute default="${build.classes.dir}" name="destdir"/>
329 327
             <attribute default="${javac.classpath}" name="classpath"/>
330 328
             <sequential>
@@ -918,12 +916,11 @@ is divided into following sections:
918 916
                 <include name="*"/>
919 917
             </dirset>
920 918
         </pathconvert>
921  
-        <j2seproject3:depend srcdir="${src.src.dir}:${src.dir}:${build.generated.subdirs}"/>
  919
+        <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
922 920
     </target>
923 921
     <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
924 922
         <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
925 923
         <copy todir="${build.classes.dir}">
926  
-            <fileset dir="${src.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
927 924
             <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
928 925
         </copy>
929 926
     </target>
@@ -945,7 +942,7 @@ is divided into following sections:
945 942
     <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
946 943
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
947 944
         <j2seproject3:force-recompile/>
948  
-        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.src.dir}:${src.dir}"/>
  945
+        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
949 946
     </target>
950 947
     <target name="-post-compile-single">
951 948
         <!-- Empty placeholder for easier customization. -->
@@ -1206,9 +1203,6 @@ is divided into following sections:
1206 1203
             <classpath>
1207 1204
                 <path path="${javac.classpath}"/>
1208 1205
             </classpath>
1209  
-            <fileset dir="${src.src.dir}" excludes="*.java,${excludes}" includes="${includes}">
1210  
-                <filename name="**/*.java"/>
1211  
-            </fileset>
1212 1206
             <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}">
1213 1207
                 <filename name="**/*.java"/>
1214 1208
             </fileset>
@@ -1219,9 +1213,6 @@ is divided into following sections:
1219 1213
             <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
1220 1214
         </javadoc>
1221 1215
         <copy todir="${dist.javadoc.dir}">
1222  
-            <fileset dir="${src.src.dir}" excludes="${excludes}" includes="${includes}">
1223  
-                <filename name="**/doc-files/**"/>
1224  
-            </fileset>
1225 1216
             <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
1226 1217
                 <filename name="**/doc-files/**"/>
1227 1218
             </fileset>
6  netbeans/qa-testing/nbproject/genfiles.properties
... ...
@@ -1,8 +1,8 @@
1  
-build.xml.data.CRC32=ddcdaa0c
  1
+build.xml.data.CRC32=6d283e84
2 2
 build.xml.script.CRC32=792afd5c
3 3
 build.xml.stylesheet.CRC32=28e38971@1.53.1.46
4 4
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
5 5
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
6  
-nbproject/build-impl.xml.data.CRC32=ddcdaa0c
7  
-nbproject/build-impl.xml.script.CRC32=90f4c757
  6
+nbproject/build-impl.xml.data.CRC32=6d283e84
  7
+nbproject/build-impl.xml.script.CRC32=2b3c5e05
8 8
 nbproject/build-impl.xml.stylesheet.CRC32=6ddba6b6@1.53.1.46
7  netbeans/qa-testing/nbproject/project.properties
@@ -39,8 +39,8 @@ javac.compilerargs=
39 39
 javac.deprecation=true
40 40
 javac.processorpath=\
41 41
     ${javac.classpath}
42  
-javac.source=1.7
43  
-javac.target=1.7
  42
+javac.source=1.6
  43
+javac.target=1.6
44 44
 javac.test.classpath=\
45 45
     ${javac.classpath}:\
46 46
     ${build.classes.dir}
@@ -82,6 +82,5 @@ run.test.classpath=\
82 82
     ${javac.test.classpath}:\
83 83
     ${build.test.classes.dir}
84 84
 source.encoding=UTF-8
85  
-src.dir=src
86  
-src.src.dir=${file.reference.qa-src}
  85
+src.dir=${file.reference.qa-src}
87 86
 test.src.dir=test
1  netbeans/qa-testing/nbproject/project.xml
@@ -5,7 +5,6 @@
5 5
         <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
6 6
             <name>qa-testing</name>
7 7
             <source-roots>
8  
-                <root id="src.src.dir"/>
9 8
                 <root id="src.dir"/>
10 9
             </source-roots>
11 10
             <test-roots>

0 notes on commit f93a0c9

Please sign in to comment.
Something went wrong with that request. Please try again.