[cc-commits] [CC SVN] r14577 - ccooo/branches/akila-gsoc-2010/nbproject

webmaster at creativecommons.org webmaster at creativecommons.org
Fri Jul 16 14:48:26 EDT 2010


Author: akila87
Date: 2010-07-16 18:48:26 +0000 (Fri, 16 Jul 2010)
New Revision: 14577

Modified:
   ccooo/branches/akila-gsoc-2010/nbproject/build-impl.xml
   ccooo/branches/akila-gsoc-2010/nbproject/genfiles.properties
   ccooo/branches/akila-gsoc-2010/nbproject/project.properties
   ccooo/branches/akila-gsoc-2010/nbproject/project.xml
Log:


Modified: ccooo/branches/akila-gsoc-2010/nbproject/build-impl.xml
===================================================================
--- ccooo/branches/akila-gsoc-2010/nbproject/build-impl.xml	2010-07-16 18:29:14 UTC (rev 14576)
+++ ccooo/branches/akila-gsoc-2010/nbproject/build-impl.xml	2010-07-16 18:48:26 UTC (rev 14577)
@@ -109,6 +109,7 @@
         <condition property="have.sources">
             <or>
                 <available file="${src.dir}"/>
+                <available file="${src.resources.dir}"/>
             </or>
         </condition>
         <condition property="netbeans.home+have.tests">
@@ -163,6 +164,7 @@
     </target>
     <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
         <fail unless="src.dir">Must set src.dir</fail>
+        <fail unless="src.resources.dir">Must set src.resources.dir</fail>
         <fail unless="test.src.dir">Must set test.src.dir</fail>
         <fail unless="build.dir">Must set build.dir</fail>
         <fail unless="dist.dir">Must set dist.dir</fail>
@@ -184,7 +186,7 @@
     </target>
     <target name="-init-macrodef-javac">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${src.dir}:${src.resources.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <attribute default="${includes}" name="includes"/>
@@ -212,7 +214,7 @@
             </sequential>
         </macrodef>
         <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${src.dir}:${src.resources.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <sequential>
@@ -407,12 +409,13 @@
                 <include name="*"/>
             </dirset>
         </pathconvert>
-        <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
+        <j2seproject3:depend srcdir="${src.dir}:${src.resources.dir}:${build.generated.subdirs}"/>
     </target>
     <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile">
         <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
         <copy todir="${build.classes.dir}">
             <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+            <fileset dir="${src.resources.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
     </target>
     <target name="-post-compile">
@@ -427,7 +430,7 @@
     <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile/>
-        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
+        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}:${src.resources.dir}"/>
     </target>
     <target name="-post-compile-single">
         <!-- Empty placeholder for easier customization. -->
@@ -618,6 +621,9 @@
             <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
+            <fileset dir="${src.resources.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
             <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
                 <include name="**/*.java"/>
             </fileset>

Modified: ccooo/branches/akila-gsoc-2010/nbproject/genfiles.properties
===================================================================
--- ccooo/branches/akila-gsoc-2010/nbproject/genfiles.properties	2010-07-16 18:29:14 UTC (rev 14576)
+++ ccooo/branches/akila-gsoc-2010/nbproject/genfiles.properties	2010-07-16 18:48:26 UTC (rev 14577)
@@ -3,8 +3,8 @@
 build.xml.stylesheet.CRC32=d5b6853a
 # 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=617f9abb
-nbproject/build-impl.xml.script.CRC32=be892b6e
+nbproject/build-impl.xml.data.CRC32=9e9df389
+nbproject/build-impl.xml.script.CRC32=d28f6934
 nbproject/build-impl.xml.stylesheet.CRC32=576378a2 at 1.32.1.45
 nbproject/profiler-build-impl.xml.data.CRC32=617f9abb
 nbproject/profiler-build-impl.xml.script.CRC32=abda56ed

Modified: ccooo/branches/akila-gsoc-2010/nbproject/project.properties
===================================================================
--- ccooo/branches/akila-gsoc-2010/nbproject/project.properties	2010-07-16 18:29:14 UTC (rev 14576)
+++ ccooo/branches/akila-gsoc-2010/nbproject/project.properties	2010-07-16 18:48:26 UTC (rev 14577)
@@ -117,4 +117,5 @@
     ${build.test.classes.dir}
 src.dir=src
 images.dir=images
+src.resources.dir=resources
 test.src.dir=test

Modified: ccooo/branches/akila-gsoc-2010/nbproject/project.xml
===================================================================
--- ccooo/branches/akila-gsoc-2010/nbproject/project.xml	2010-07-16 18:29:14 UTC (rev 14576)
+++ ccooo/branches/akila-gsoc-2010/nbproject/project.xml	2010-07-16 18:48:26 UTC (rev 14577)
@@ -1,16 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.java.j2seproject</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-            <name>ccooo</name>
-            <minimum-ant-version>1.6.5</minimum-ant-version>
-            <source-roots>
-                <root id="src.dir"/>
-            </source-roots>
-            <test-roots>
-                <root id="test.src.dir"/>
-            </test-roots>
-        </data>
-    </configuration>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.java.j2seproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
+            <name>ccooo</name>
+            <minimum-ant-version>1.6.5</minimum-ant-version>
+            <source-roots>
+                <root id="src.dir"/>
+                <root id="src.resources.dir" name="Resource Bundles"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.src.dir"/>
+            </test-roots>
+        </data>
+    </configuration>
+</project>




More information about the cc-commits mailing list