diff --git a/build.xml b/build.xml
index c8a65cab3625a2f1219c56a374e026754187cf41..e76307b2c8520c3d538f798bd2753a6da6972432 100644 (file)
--- a/build.xml
+++ b/build.xml
<!-- -->
<property name="arch" value="mingw32-"/>
<property name="archutil" value=""/>
- <property name="devlibs" location="c:/devlibs"/>
+ <property name="devlibs" location="${env.DEVLIBS_PATH}"/>
<property name="cxxtest" location="cxxtest"/>
<!-- -->
<mkdir dir="${build}/java"/>
<mkdir dir="${build}/java/classes"/>
<mkdir dir="${build}/java/lib"/>
-
- <mkdir dir="${build}"/>
<mkdir dir="${dist}"/>
+
<copy file="${src}/helper/sp-marshal.h.mingw"
tofile="${src}/helper/sp-marshal.h"/>
<copy file="${src}/helper/sp-marshal.cpp.mingw"
tofile="${src}/helper/sp-marshal.cpp"/>
+
<makefile file="inkscape_version.h">
#define INKSCAPE_VERSION "${version}"
</makefile>
/* Allow reading WordPerfect? */
#define WITH_LIBWPG 1
+ /* Do we support SVG Fonts? */
+ #define ENABLE_SVG_FONTS 1
+
#endif /* _CONFIG_H_ */
</makefile>
</target>
<include name="svg-affine-test.h"/>
<include name="svg-color-test.h"/>
<include name="svg-length-test.h"/>
- <include name="svg-path-test.h"/>
+ <include name="svg-path-geom-test.h"/>
+ <include name="svg-path-nr-test.h"/>
</fileset>
</cxxtestpart>
<cxxtestpart command="python ${cxxtest}/cxxtestgen.py --have-eh"
<!-- Compile from source to build -->
<cc cc="${arch}gcc" cxx="${arch}g++"
destdir="${build}/obj"
- continueOnError="true"
- refreshCache="${refresh}">
+ continueOnError="true"
+ refreshCache="${refresh}">
<fileset dir="${src}">
<!-- THINGS TO EXCLUDE -->
<exclude name="2geom/chebyshev.cpp"/>
<copy todir="${dist}" file="${devlibs}/bin/libgobject-2.0-0.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/libgtk-win32-2.0-0.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/libgthread-2.0-0.dll"/>
+ <copy todir="${dist}" file="${devlibs}/bin/libgio-2.0-0.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/libcairo-2.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/libpoppler-3.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/libpangocairo-1.0-0.dll"/>
<!--
########################################################################
- ## T A R G E T : D I S T - C X X T E S T S
+ ## T A R G E T : C H E C K
########################################################################
-->
- <target name="dist-cxxtests" depends="linkcxxtests,distbase"
- description="copy cxxtests to the distribution directory">
-
- <!-- Create the distribution directory -->
- <copy todir="${dist}" file="${build}/cxxtests.exe"/>
- <copy todir="${dist}" file="${build}/cxxtests.dbg"/>
+ <target name="check" depends="linkcxxtests,distbase"
+ description="perform unit tests">
+ <cxxtestrun command="${build}/cxxtests" workingdir="${dist}" />
</target>
<!--
########################################################################
- ## T A R G E T : D I S T - A L L - E X T R A
+ ## T A R G E T : D I S T - A L L - C H E C K
########################################################################
-->
- <target name="dist-all-extra" depends="dist-all,dist-cxxtests"
- description="generate the distribution, along with inkview and cxxtests" >
+ <target name="dist-all-check" depends="dist-all,check"
+ description="generate the distribution, along with inkview and run cxxtests" >
</target>