368e23a390
In dmake jfreereport build system an intermediate directory classes was used. All artefacts that created during build were copied there, including external apache-commons-logging.jar. Finally java system property was used -Dlib=classes. In gbuild we don't want to mess with copying artefacts around. The artefacts are packaging in $(OUTDIR)/bin and java system property points to -Dlib=$(OUTDIR)/bin. However the dependencies must be set inside jfreereport module, because of jar interdependency: liblayout depends on other jars and flow-engine depends on liblayout. This is achived with new function gb_ExternalProject_use_packages. Special treatment is necessary when system apache-commons library is used, in which case it is not reside in $(OUTDIR)/bin, but in /usr/share/java/commons-logging.jar or in custom location. For that purpose the both patches: flow-engine.patch and liblayout.patch were extended and new java system property was introduced -Dcommons-logging.jar and passed to the build.xml. A dependency from liblayout to apache-commons-logging is set. jfreereport was moved to tail_build module. Change-Id: I32e39bb5f4f825f182c3bd3cfc1a13ea1c38321e Reviewed-on: https://gerrit.libreoffice.org/761 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
64 lines
No EOL
1.7 KiB
XML
64 lines
No EOL
1.7 KiB
XML
<project name="sac" default="all" basedir=".">
|
|
|
|
<!-- Properties -->
|
|
|
|
<property name="name" value="sac"/>
|
|
<property name="src" value="src"/>
|
|
<property name="build" value="build"/>
|
|
<property name="build.classes" value="${build}/classes"/>
|
|
<property name="build.doc" value="${build}/api"/>
|
|
<property name="build.lib" value="${build}/lib"/>
|
|
<property name="packagenames" value="org.w3c.css.sac.*"/>
|
|
|
|
<!-- Targets -->
|
|
|
|
<!-- Prepare build directories -->
|
|
<target name="prepare">
|
|
<mkdir dir="${src}"/>
|
|
<mkdir dir="${build}"/>
|
|
<mkdir dir="${build.classes}"/>
|
|
<mkdir dir="${build.lib}"/>
|
|
<mkdir dir="${build.doc}"/>
|
|
<copy todir="${src}/org">
|
|
<fileset dir="org"/>
|
|
</copy>
|
|
</target>
|
|
|
|
<!-- Kill all the created directories -->
|
|
<target name="clean">
|
|
<delete dir="${build}"/>
|
|
<delete dir="${src}"/>
|
|
</target>
|
|
|
|
<!-- Build classes -->
|
|
<target name="classes" depends="prepare">
|
|
<javac srcdir="${src}" destdir="${build.classes}" debug="off" optimize="on"/>
|
|
<copy todir="${build.classes}">
|
|
<fileset dir="${src}">
|
|
<include name="**/*.properties"/>
|
|
</fileset>
|
|
</copy>
|
|
</target>
|
|
|
|
<!-- Build jar archives -->
|
|
<target name="jar" depends="classes">
|
|
<jar jarfile="${build.lib}/${name}.jar" basedir="${build.classes}"/>
|
|
</target>
|
|
|
|
<!-- Build the full JavaDocs -->
|
|
<target name="javadoc" depends="prepare">
|
|
<javadoc sourcepath="${src}"
|
|
destdir="${build.doc}"
|
|
doctitle="${name} JavaDoc"
|
|
windowtitle="${name} JavaDoc"
|
|
package="true"
|
|
author="true"
|
|
version="true"
|
|
packagenames="${packagenames}"
|
|
/>
|
|
</target>
|
|
|
|
<!-- Build everything -->
|
|
<target name="all" depends="jar,javadoc"/>
|
|
|
|
</project> |