# HG changeset patch
# User František Kučera <franta-hg@frantovo.cz>
# Date 1402949037 -7200
# Node ID 99a8b70a79890e7c8bf66ea7c5a96c3f471dbf4b
# Parent d9846288aded9d1da6a3945e45b418fdf8d028fb
xslt, xpath: config dirs
diff -r d9846288aded -r 99a8b70a7989 java/alt2xml-out-xpath/nbproject/build-impl.xml
--- a/java/alt2xml-out-xpath/nbproject/build-impl.xml Mon Jun 16 21:23:04 2014 +0200
+++ b/java/alt2xml-out-xpath/nbproject/build-impl.xml Mon Jun 16 22:03:57 2014 +0200
@@ -127,6 +127,7 @@
</condition>
<condition property="have.sources">
<or>
+ <available file="${src.config.dir}"/>
<available file="${src.dir}"/>
</or>
</condition>
@@ -223,6 +224,7 @@
<!-- You can override this target in the ../build.xml file. -->
</target>
<target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
+ <fail unless="src.config.dir">Must set src.config.dir</fail>
<fail unless="src.dir">Must set src.dir</fail>
<fail unless="test.src.dir">Must set test.src.dir</fail>
<fail unless="build.dir">Must set build.dir</fail>
@@ -245,7 +247,7 @@
</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.dir}" name="srcdir"/>
+ <attribute default="${src.config.dir}:${src.dir}" name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<attribute default="${javac.processorpath}" name="processorpath"/>
@@ -286,7 +288,7 @@
</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.dir}" name="srcdir"/>
+ <attribute default="${src.config.dir}:${src.dir}" name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<attribute default="${javac.processorpath}" name="processorpath"/>
@@ -319,7 +321,7 @@
</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.dir}" name="srcdir"/>
+ <attribute default="${src.config.dir}:${src.dir}" name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<sequential>
@@ -917,11 +919,12 @@
<include name="*"/>
</dirset>
</pathconvert>
- <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
+ <j2seproject3:depend srcdir="${src.config.dir}:${src.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.config.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
</copy>
</target>
@@ -943,7 +946,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.config.dir}:${src.dir}"/>
</target>
<target name="-post-compile-single">
<!-- Empty placeholder for easier customization. -->
@@ -1209,6 +1212,9 @@
<classpath>
<path path="${javac.classpath}"/>
</classpath>
+ <fileset dir="${src.config.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
+ <filename name="**/*.java"/>
+ </fileset>
<fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
<filename name="**/*.java"/>
</fileset>
@@ -1219,6 +1225,9 @@
<arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
</javadoc>
<copy todir="${dist.javadoc.dir}">
+ <fileset dir="${src.config.dir}" excludes="${excludes}" includes="${includes}">
+ <filename name="**/doc-files/**"/>
+ </fileset>
<fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
<filename name="**/doc-files/**"/>
</fileset>
diff -r d9846288aded -r 99a8b70a7989 java/alt2xml-out-xpath/nbproject/genfiles.properties
--- a/java/alt2xml-out-xpath/nbproject/genfiles.properties Mon Jun 16 21:23:04 2014 +0200
+++ b/java/alt2xml-out-xpath/nbproject/genfiles.properties Mon Jun 16 22:03:57 2014 +0200
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=551ec7ee
+build.xml.data.CRC32=01b9f7b0
build.xml.script.CRC32=a84b87c3
build.xml.stylesheet.CRC32=8064a381@1.74.2.48
# 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=551ec7ee
-nbproject/build-impl.xml.script.CRC32=5b5733f2
+nbproject/build-impl.xml.data.CRC32=01b9f7b0
+nbproject/build-impl.xml.script.CRC32=9e677625
nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.74.2.48
diff -r d9846288aded -r 99a8b70a7989 java/alt2xml-out-xpath/nbproject/project.properties
--- a/java/alt2xml-out-xpath/nbproject/project.properties Mon Jun 16 21:23:04 2014 +0200
+++ b/java/alt2xml-out-xpath/nbproject/project.properties Mon Jun 16 22:03:57 2014 +0200
@@ -1,9 +1,10 @@
annotation.processing.enabled=true
annotation.processing.enabled.in.editor=false
-annotation.processing.processor.options=
annotation.processing.processors.list=
annotation.processing.run.all.processors=true
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+application.title=alt2xml-out-xpath
+application.vendor=fiki
build.classes.dir=${build.dir}/classes
build.classes.excludes=**/*.java,**/*.form
# This directory is removed when the project is cleaned:
@@ -26,6 +27,7 @@
dist.dir=dist
dist.jar=${dist.dir}/alt2xml-out-xpath.jar
dist.javadoc.dir=${dist.dir}/javadoc
+endorsed.classpath=
excludes=
includes=**
jar.compress=false
@@ -67,5 +69,6 @@
${javac.test.classpath}:\
${build.test.classes.dir}
source.encoding=UTF-8
+src.config.dir=config
src.dir=src
test.src.dir=test
diff -r d9846288aded -r 99a8b70a7989 java/alt2xml-out-xpath/nbproject/project.xml
--- a/java/alt2xml-out-xpath/nbproject/project.xml Mon Jun 16 21:23:04 2014 +0200
+++ b/java/alt2xml-out-xpath/nbproject/project.xml Mon Jun 16 22:03:57 2014 +0200
@@ -5,6 +5,7 @@
<data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>alt2xml-out-xpath</name>
<source-roots>
+ <root id="src.config.dir" name="Config"/>
<root id="src.dir"/>
</source-roots>
<test-roots>
diff -r d9846288aded -r 99a8b70a7989 java/alt2xml-out-xslt/nbproject/build-impl.xml
--- a/java/alt2xml-out-xslt/nbproject/build-impl.xml Mon Jun 16 21:23:04 2014 +0200
+++ b/java/alt2xml-out-xslt/nbproject/build-impl.xml Mon Jun 16 22:03:57 2014 +0200
@@ -128,6 +128,7 @@
<condition property="have.sources">
<or>
<available file="${src.dir}"/>
+ <available file="${src.config.dir}"/>
</or>
</condition>
<condition property="netbeans.home+have.tests">
@@ -224,6 +225,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.config.dir">Must set src.config.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>
@@ -245,7 +247,7 @@
</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.dir}" name="srcdir"/>
+ <attribute default="${src.dir}:${src.config.dir}" name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<attribute default="${javac.processorpath}" name="processorpath"/>
@@ -286,7 +288,7 @@
</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.dir}" name="srcdir"/>
+ <attribute default="${src.dir}:${src.config.dir}" name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<attribute default="${javac.processorpath}" name="processorpath"/>
@@ -319,7 +321,7 @@
</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.dir}" name="srcdir"/>
+ <attribute default="${src.dir}:${src.config.dir}" name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<sequential>
@@ -917,12 +919,13 @@
<include name="*"/>
</dirset>
</pathconvert>
- <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
+ <j2seproject3:depend srcdir="${src.dir}:${src.config.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.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+ <fileset dir="${src.config.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
</copy>
</target>
<target if="has.persistence.xml" name="-copy-persistence-xml">
@@ -943,7 +946,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.config.dir}"/>
</target>
<target name="-post-compile-single">
<!-- Empty placeholder for easier customization. -->
@@ -1212,6 +1215,9 @@
<fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
<filename name="**/*.java"/>
</fileset>
+ <fileset dir="${src.config.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
+ <filename name="**/*.java"/>
+ </fileset>
<fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
<include name="**/*.java"/>
<exclude name="*.java"/>
@@ -1222,6 +1228,9 @@
<fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
<filename name="**/doc-files/**"/>
</fileset>
+ <fileset dir="${src.config.dir}" excludes="${excludes}" includes="${includes}">
+ <filename name="**/doc-files/**"/>
+ </fileset>
<fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
<include name="**/doc-files/**"/>
</fileset>
diff -r d9846288aded -r 99a8b70a7989 java/alt2xml-out-xslt/nbproject/genfiles.properties
--- a/java/alt2xml-out-xslt/nbproject/genfiles.properties Mon Jun 16 21:23:04 2014 +0200
+++ b/java/alt2xml-out-xslt/nbproject/genfiles.properties Mon Jun 16 22:03:57 2014 +0200
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=3085b5e5
+build.xml.data.CRC32=d092df7a
build.xml.script.CRC32=f8a73b6d
build.xml.stylesheet.CRC32=8064a381@1.74.2.48
# 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=3085b5e5
-nbproject/build-impl.xml.script.CRC32=474ceb26
+nbproject/build-impl.xml.data.CRC32=d092df7a
+nbproject/build-impl.xml.script.CRC32=395aa85c
nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.74.2.48
diff -r d9846288aded -r 99a8b70a7989 java/alt2xml-out-xslt/nbproject/project.properties
--- a/java/alt2xml-out-xslt/nbproject/project.properties Mon Jun 16 21:23:04 2014 +0200
+++ b/java/alt2xml-out-xslt/nbproject/project.properties Mon Jun 16 22:03:57 2014 +0200
@@ -1,9 +1,10 @@
annotation.processing.enabled=true
annotation.processing.enabled.in.editor=false
-annotation.processing.processor.options=
annotation.processing.processors.list=
annotation.processing.run.all.processors=true
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+application.title=alt2xml-out-xslt
+application.vendor=fiki
build.classes.dir=${build.dir}/classes
build.classes.excludes=**/*.java,**/*.form
# This directory is removed when the project is cleaned:
@@ -26,6 +27,7 @@
dist.dir=dist
dist.jar=${dist.dir}/alt2xml-out-xslt.jar
dist.javadoc.dir=${dist.dir}/javadoc
+endorsed.classpath=
excludes=
includes=**
jar.compress=false
@@ -67,5 +69,6 @@
${javac.test.classpath}:\
${build.test.classes.dir}
source.encoding=UTF-8
+src.config.dir=config
src.dir=src
test.src.dir=test
diff -r d9846288aded -r 99a8b70a7989 java/alt2xml-out-xslt/nbproject/project.xml
--- a/java/alt2xml-out-xslt/nbproject/project.xml Mon Jun 16 21:23:04 2014 +0200
+++ b/java/alt2xml-out-xslt/nbproject/project.xml Mon Jun 16 22:03:57 2014 +0200
@@ -6,6 +6,7 @@
<name>alt2xml-out-xslt</name>
<source-roots>
<root id="src.dir"/>
+ <root id="src.config.dir" name="Config"/>
</source-roots>
<test-roots>
<root id="test.src.dir"/>