Author: devinhan
Date: Mon Sep 19 05:30:55 2011
New Revision: 1172431
URL: http://svn.apache.org/viewvc?rev=1172431&view=rev
Log:
changeset: 1:bc360f843e3e
user: mb93740@x42-so29
date: Tue Nov 04 14:15:52 2008 +0100
Adapted dependencies from OODFDOM.
Modified:
incubator/odf/trunk/validator/nbproject/build-impl.xml
incubator/odf/trunk/validator/nbproject/genfiles.properties
incubator/odf/trunk/validator/nbproject/project.properties
incubator/odf/trunk/validator/nbproject/project.xml
Modified: incubator/odf/trunk/validator/nbproject/build-impl.xml
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/validator/nbproject/build-impl.xml?rev=1172431&r1=1172430&r2=1172431&view=diff
==============================================================================
--- incubator/odf/trunk/validator/nbproject/build-impl.xml (original)
+++ incubator/odf/trunk/validator/nbproject/build-impl.xml Mon Sep 19 05:30:55 2011
@@ -308,7 +308,9 @@ is divided into following sections:
COMPILATION SECTION
===================
-->
- <target depends="init" name="deps-jar" unless="no.deps"/>
+ <target depends="init" name="deps-jar" unless="no.deps">
+ <ant antfile="${project.odfdom}/build.xml" inheritall="false" target="jar"/>
+ </target>
<target depends="init,deps-jar" name="-pre-pre-compile">
<mkdir dir="${build.classes.dir}"/>
</target>
@@ -614,7 +616,9 @@ is divided into following sections:
CLEANUP SECTION
===============
-->
- <target depends="init" name="deps-clean" unless="no.deps"/>
+ <target depends="init" name="deps-clean" unless="no.deps">
+ <ant antfile="${project.odfdom}/build.xml" inheritall="false" target="clean"/>
+ </target>
<target depends="init" name="-do-clean">
<delete dir="${build.dir}"/>
<delete dir="${dist.dir}"/>
Modified: incubator/odf/trunk/validator/nbproject/genfiles.properties
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/validator/nbproject/genfiles.properties?rev=1172431&r1=1172430&r2=1172431&view=diff
==============================================================================
--- incubator/odf/trunk/validator/nbproject/genfiles.properties (original)
+++ incubator/odf/trunk/validator/nbproject/genfiles.properties Mon Sep 19 05:30:55 2011
@@ -3,6 +3,6 @@ build.xml.script.CRC32=729450ca
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=cec7d023
-nbproject/build-impl.xml.script.CRC32=98e5e355
+nbproject/build-impl.xml.data.CRC32=56466648
+nbproject/build-impl.xml.script.CRC32=53e87954
nbproject/build-impl.xml.stylesheet.CRC32=f1d9da08
Modified: incubator/odf/trunk/validator/nbproject/project.properties
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/validator/nbproject/project.properties?rev=1172431&r1=1172430&r2=1172431&view=diff
==============================================================================
--- incubator/odf/trunk/validator/nbproject/project.properties (original)
+++ incubator/odf/trunk/validator/nbproject/project.properties Mon Sep 19 05:30:55 2011
@@ -1,5 +1,5 @@
application.desc=This tools validates ODF documents.
-application.homepage=http://odftoolkit.openoffice.org/
+application.homepage=http://odftoolkit.org/projects/odftoolkit/pages/ODFValidator
application.title=ODF Validator
application.vendor=Sun Microsystems, Inc.
build.classes.dir=${build.dir}/classes
@@ -23,7 +23,6 @@ excludes=
file.reference.isorelax-jaxp-bridge-1.0.jar=lib/isorelax-jaxp-bridge-1.0.jar
file.reference.isorelax.jar=lib/isorelax.jar
file.reference.msv.jar=lib/msv.jar
-file.reference.odfdom.jar=lib/odfdom.jar
file.reference.relaxngDatatype.jar=lib/relaxngDatatype.jar
file.reference.xercesImpl.jar=lib/xercesImpl.jar
file.reference.xsdlib.jar=lib/xsdlib.jar
@@ -33,9 +32,8 @@ javac.classpath=\
${file.reference.isorelax-jaxp-bridge-1.0.jar}:\
${file.reference.isorelax.jar}:\
${file.reference.msv.jar}:\
- ${file.reference.odfdom.jar}:\
+ ${reference.odfdom.jar}:\
${file.reference.relaxngDatatype.jar}:\
- ${file.reference.xercesImpl.jar}:\
${file.reference.xsdlib.jar}
# Space-separated list of extra javac options
javac.compilerargs=-Xlint:unchchecked
@@ -62,7 +60,10 @@ main.class=odfvalidator.Main
manifest.file=manifest.mf
meta.inf.dir=${src.dir}/META-INF
platform.active=default_platform
+project.odfdom=../odfdom
+reference.odfdom.jar=${project.odfdom}/dist/odfdom.jar
run.classpath=\
+ ${file.reference.xercesImpl.jar}:\
${javac.classpath}:\
${build.classes.dir}
# Space-separated list of JVM arguments used when running the project
Modified: incubator/odf/trunk/validator/nbproject/project.xml
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/validator/nbproject/project.xml?rev=1172431&r1=1172430&r2=1172431&view=diff
==============================================================================
--- incubator/odf/trunk/validator/nbproject/project.xml (original)
+++ incubator/odf/trunk/validator/nbproject/project.xml Mon Sep 19 05:30:55 2011
@@ -12,5 +12,15 @@
<root id="test.src.dir"/>
</test-roots>
</data>
+ <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
+ <reference>
+ <foreign-project>odfdom</foreign-project>
+ <artifact-type>jar</artifact-type>
+ <script>build.xml</script>
+ <target>jar</target>
+ <clean-target>clean</clean-target>
+ <id>jar</id>
+ </reference>
+ </references>
</configuration>
</project>
|