You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by si...@apache.org on 2012/10/05 12:37:28 UTC
svn commit: r1394437 - in /river/jtsk/trunk/netbeans/onebigjar: build.xml
nbproject/build-impl.xml nbproject/genfiles.properties
nbproject/project.properties nbproject/project.xml
Author: sijskes
Date: Fri Oct 5 10:37:27 2012
New Revision: 1394437
URL: http://svn.apache.org/viewvc?rev=1394437&view=rev
Log:
added river-extra src root.
Modified:
river/jtsk/trunk/netbeans/onebigjar/build.xml
river/jtsk/trunk/netbeans/onebigjar/nbproject/build-impl.xml
river/jtsk/trunk/netbeans/onebigjar/nbproject/genfiles.properties
river/jtsk/trunk/netbeans/onebigjar/nbproject/project.properties
river/jtsk/trunk/netbeans/onebigjar/nbproject/project.xml
Modified: river/jtsk/trunk/netbeans/onebigjar/build.xml
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/netbeans/onebigjar/build.xml?rev=1394437&r1=1394436&r2=1394437&view=diff
==============================================================================
--- river/jtsk/trunk/netbeans/onebigjar/build.xml (original)
+++ river/jtsk/trunk/netbeans/onebigjar/build.xml Fri Oct 5 10:37:27 2012
@@ -1,4 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- You may freely edit this file. See commented blocks below for --><!-- some examples of how to customize the build. --><!-- (If you delete it and reopen the project it will be recreated.) --><!-- By default, only the Clean and Build commands use this build script. --><!-- Commands such as Run, Debug, and Test only use this build script if --><!-- the Compile on Save feature is turned off for the project. --><!-- You can turn off the Compile on Save (or Deploy on Save) setting --><!-- in the project's Project Properties dialog box.--><project name="onebigjar" default="default" basedir=".">
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See commented blocks below for -->
+<!-- some examples of how to customize the build. -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
+<!-- By default, only the Clean and Build commands use this build script. -->
+<!-- Commands such as Run, Debug, and Test only use this build script if -->
+<!-- the Compile on Save feature is turned off for the project. -->
+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
+<!-- in the project's Project Properties dialog box.-->
+<project name="onebigjar" default="default" basedir=".">
<description>Builds, tests, and runs the project onebigjar.</description>
<import file="nbproject/build-impl.xml"/>
<!--
Modified: river/jtsk/trunk/netbeans/onebigjar/nbproject/build-impl.xml
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/netbeans/onebigjar/nbproject/build-impl.xml?rev=1394437&r1=1394436&r2=1394437&view=diff
==============================================================================
--- river/jtsk/trunk/netbeans/onebigjar/nbproject/build-impl.xml (original)
+++ river/jtsk/trunk/netbeans/onebigjar/nbproject/build-impl.xml Fri Oct 5 10:37:27 2012
@@ -141,6 +141,7 @@ is divided into following sections:
<condition property="have.sources">
<or>
<available file="${src.src.dir}"/>
+ <available file="${src.src-extra.dir}"/>
</or>
</condition>
<condition property="netbeans.home+have.tests">
@@ -229,6 +230,7 @@ is divided into following sections:
</target>
<target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
<fail unless="src.src.dir">Must set src.src.dir</fail>
+ <fail unless="src.src-extra.dir">Must set src.src-extra.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>
@@ -250,7 +252,7 @@ is divided into following sections:
</target>
<target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
<macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute default="${src.src.dir}" name="srcdir"/>
+ <attribute default="${src.src.dir}:${src.src-extra.dir}" name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<attribute default="${javac.processorpath}" name="processorpath"/>
@@ -290,7 +292,7 @@ is divided into following sections:
</target>
<target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
<macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute default="${src.src.dir}" name="srcdir"/>
+ <attribute default="${src.src.dir}:${src.src-extra.dir}" name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<attribute default="${javac.processorpath}" name="processorpath"/>
@@ -322,7 +324,7 @@ is divided into following sections:
</target>
<target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
<macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute default="${src.src.dir}" name="srcdir"/>
+ <attribute default="${src.src.dir}:${src.src-extra.dir}" name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<sequential>
@@ -909,12 +911,13 @@ is divided into following sections:
<include name="*"/>
</dirset>
</pathconvert>
- <j2seproject3:depend srcdir="${src.src.dir}:${build.generated.subdirs}"/>
+ <j2seproject3:depend srcdir="${src.src.dir}:${src.src-extra.dir}:${build.generated.subdirs}"/>
</target>
<target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
<j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
<copy todir="${build.classes.dir}">
<fileset dir="${src.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+ <fileset dir="${src.src-extra.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
</copy>
</target>
<target if="has.persistence.xml" name="-copy-persistence-xml">
@@ -935,7 +938,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="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.src.dir}"/>
+ <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.src.dir}:${src.src-extra.dir}"/>
</target>
<target name="-post-compile-single">
<!-- Empty placeholder for easier customization. -->
@@ -1199,6 +1202,9 @@ is divided into following sections:
<fileset dir="${src.src.dir}" excludes="*.java,${excludes}" includes="${includes}">
<filename name="**/*.java"/>
</fileset>
+ <fileset dir="${src.src-extra.dir}" excludes="*.java,${excludes}" includes="${includes}">
+ <filename name="**/*.java"/>
+ </fileset>
<fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
<include name="**/*.java"/>
<exclude name="*.java"/>
@@ -1209,6 +1215,9 @@ is divided into following sections:
<fileset dir="${src.src.dir}" excludes="${excludes}" includes="${includes}">
<filename name="**/doc-files/**"/>
</fileset>
+ <fileset dir="${src.src-extra.dir}" excludes="${excludes}" includes="${includes}">
+ <filename name="**/doc-files/**"/>
+ </fileset>
<fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
<include name="**/doc-files/**"/>
</fileset>
Modified: river/jtsk/trunk/netbeans/onebigjar/nbproject/genfiles.properties
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/netbeans/onebigjar/nbproject/genfiles.properties?rev=1394437&r1=1394436&r2=1394437&view=diff
==============================================================================
--- river/jtsk/trunk/netbeans/onebigjar/nbproject/genfiles.properties (original)
+++ river/jtsk/trunk/netbeans/onebigjar/nbproject/genfiles.properties Fri Oct 5 10:37:27 2012
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=02dddf57
-build.xml.script.CRC32=6f3406f4
-build.xml.stylesheet.CRC32=28e38971@1.50.3.46
+build.xml.data.CRC32=e5875abd
+build.xml.script.CRC32=06b6437d
+build.xml.stylesheet.CRC32=28e38971@1.53.1.46
# 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=02dddf57
-nbproject/build-impl.xml.script.CRC32=846c333e
+nbproject/build-impl.xml.data.CRC32=e5875abd
+nbproject/build-impl.xml.script.CRC32=0873d4c0
nbproject/build-impl.xml.stylesheet.CRC32=6ddba6b6@1.53.1.46
Modified: river/jtsk/trunk/netbeans/onebigjar/nbproject/project.properties
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/netbeans/onebigjar/nbproject/project.properties?rev=1394437&r1=1394436&r2=1394437&view=diff
==============================================================================
--- river/jtsk/trunk/netbeans/onebigjar/nbproject/project.properties (original)
+++ river/jtsk/trunk/netbeans/onebigjar/nbproject/project.properties Fri Oct 5 10:37:27 2012
@@ -37,10 +37,13 @@ file.reference.high-scale-lib.jar=../../
file.reference.mockito-all-1.7.jar=../../test/lib/mockito-all-1.7.jar
file.reference.reference-collections-1.0.1.jar=../../dep-libs/rc-libs/reference-collections-1.0.1.jar
file.reference.river-jstk-trunk-src=../../src
+file.reference.river-jstk-trunk-src-extra=../../src-extra
file.reference.test-src=../../test/src
file.reference.velocity-1.7.jar=../../dep-libs/velocity/velocity-1.7.jar
includes=**
+jar.archive.disabled=${jnlp.enabled}
jar.compress=false
+jar.index=${jnlp.enabled}
javac.classpath=\
${file.reference.reference-collections-1.0.1.jar}:\
${file.reference.asm-3.2.jar}:\
@@ -73,6 +76,15 @@ javadoc.splitindex=true
javadoc.use=true
javadoc.version=false
javadoc.windowtitle=
+jnlp.codebase.type=no.codebase
+jnlp.descriptor=application
+jnlp.enabled=false
+jnlp.mixed.code=default
+jnlp.offline-allowed=false
+jnlp.signed=false
+jnlp.signing=
+jnlp.signing.alias=
+jnlp.signing.keystore=
meta.inf.dir=${src.dir}/META-INF
mkdist.disabled=true
platform.active=default_platform
@@ -87,5 +99,6 @@ run.test.classpath=\
${javac.test.classpath}:\
${build.test.classes.dir}
source.encoding=UTF-8
+src.src-extra.dir=${file.reference.river-jstk-trunk-src-extra}
src.src.dir=${file.reference.river-jstk-trunk-src}
test.src.dir=${file.reference.test-src}
Modified: river/jtsk/trunk/netbeans/onebigjar/nbproject/project.xml
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/netbeans/onebigjar/nbproject/project.xml?rev=1394437&r1=1394436&r2=1394437&view=diff
==============================================================================
--- river/jtsk/trunk/netbeans/onebigjar/nbproject/project.xml (original)
+++ river/jtsk/trunk/netbeans/onebigjar/nbproject/project.xml Fri Oct 5 10:37:27 2012
@@ -6,9 +6,10 @@
<name>onebigjar</name>
<source-roots>
<root id="src.src.dir" name="Source packages"/>
+ <root id="src.src-extra.dir" name="Extra packages"/>
</source-roots>
<test-roots>
- <root id="test.src.dir" name="Test packages" />
+ <root id="test.src.dir" name="Test packages"/>
</test-roots>
</data>
</configuration>