From 9551fc304e04f5014746eb4631aadf7953b46a83 Mon Sep 17 00:00:00 2001
From: kitfox
Date: Thu, 28 Feb 2008 06:46:15 +0000
Subject: Added Base64 stream codecs.  Added Main-Class attribute to generated
 jars.

git-svn-id: https://svn.java.net/svn/svgsalamander~svn/trunk/svg-core@52 7dc7fa77-23fb-e6ad-8e2e-c86bd48ed22b
---
 nbproject/build-impl.xml      | 12 +++++++++---
 nbproject/genfiles.properties |  4 ++--
 nbproject/project.properties  |  2 ++
 nbproject/project.xml         |  1 +
 4 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'nbproject')

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 1bf7540..02bb0a6 100755
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -90,6 +90,7 @@ is divided into following sections:
         </condition>
         <condition property="have.sources">
             <or>
+                <available file="${src.www.dir}"/>
                 <available file="${src.dir}"/>
                 <available file="${src.java.dir}"/>
                 <available file="${src.res.dir}"/>
@@ -147,6 +148,7 @@ is divided into following sections:
         <!-- You can override this target in the ../build.xml file. -->
     </target>
     <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init" name="-init-check">
+        <fail unless="src.www.dir">Must set src.www.dir</fail>
         <fail unless="src.dir">Must set src.dir</fail>
         <fail unless="src.java.dir">Must set src.java.dir</fail>
         <fail unless="src.res.dir">Must set src.res.dir</fail>
@@ -173,7 +175,7 @@ is divided into following sections:
     </target>
     <target name="-init-macrodef-javac">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}:${src.java.dir}:${src.res.dir}:${res.dir}" name="srcdir"/>
+            <attribute default="${src.www.dir}:${src.dir}:${src.java.dir}:${src.res.dir}:${res.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <attribute default="${includes}" name="includes"/>
@@ -192,7 +194,7 @@ is divided into following sections:
             </sequential>
         </macrodef>
         <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}:${src.java.dir}:${src.res.dir}:${res.dir}" name="srcdir"/>
+            <attribute default="${src.www.dir}:${src.dir}:${src.java.dir}:${src.res.dir}:${res.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <sequential>
@@ -352,6 +354,7 @@ is divided into following sections:
     <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile">
         <j2seproject3:javac/>
         <copy todir="${build.classes.dir}">
+            <fileset dir="${src.www.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.java.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.res.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
@@ -370,7 +373,7 @@ is divided into following sections:
     <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="" includes="${javac.includes}" sourcepath="${src.dir}:${src.java.dir}:${src.res.dir}:${res.dir}"/>
+        <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${src.www.dir}:${src.dir}:${src.java.dir}:${src.res.dir}:${res.dir}"/>
     </target>
     <target name="-post-compile-single">
         <!-- Empty placeholder for easier customization. -->
@@ -504,6 +507,9 @@ is divided into following sections:
             <classpath>
                 <path path="${javac.classpath}"/>
             </classpath>
+            <fileset dir="${src.www.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
             <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 345b3d4..9d45de5 100755
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -3,6 +3,6 @@ build.xml.script.CRC32=91ddbaab
 build.xml.stylesheet.CRC32=be360661
 # 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=f852a4d9
-nbproject/build-impl.xml.script.CRC32=7235f0eb
+nbproject/build-impl.xml.data.CRC32=478066e1
+nbproject/build-impl.xml.script.CRC32=a04a2883
 nbproject/build-impl.xml.stylesheet.CRC32=e327d66c
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 5bb10d9..e09d66c 100755
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -22,6 +22,7 @@ file.reference.ant.jar=..\\libraries\\ant.jar
 file.reference.javacc.jar=..\\libraries\\javacc.jar
 file.reference.main-java=src/main/java
 file.reference.main-res=src/main/res
+file.reference.svgsalamander-www=../www
 file.reference.test-java=src/test/java
 file.reference.test-res=src/test/res
 includes=**
@@ -74,5 +75,6 @@ source.encoding=UTF-8
 src.dir=${file.reference.main-java}
 src.java.dir=src\\gen\\java
 src.res.dir=src\\gen\\res
+src.www.dir=${file.reference.svgsalamander-www}
 test.res.dir=${file.reference.test-res}
 test.src.dir=${file.reference.test-java}
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 289b995..3253810 100755
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -6,6 +6,7 @@
             <name>svg-salamander-core</name>
             <minimum-ant-version>1.6.5</minimum-ant-version>
             <source-roots>
+                <root id="src.www.dir" name="www"/>
                 <root id="src.dir"/>
                 <root id="src.java.dir" name="Generated Source"/>
                 <root id="src.res.dir"/>
-- 
cgit v1.2.3-55-g7522