![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/build.xml b/build.xml
index ac34d71f475c8a7a918f0d96375da28c5541b491..32f34feb8d0dfc79aa31040f166b9be4eda13ea7 100644 (file)
--- a/build.xml
+++ b/build.xml
## P R O J E C T : I N K S C A P E
########################################################################
-->
-<project name="Inkscape" default="dist" basedir=".">
+<project name="Inkscape" default="dist-inkscape" basedir=".">
<description>
Build file for the Inkscape SVG editor. This file
was written for GTK-2.10 on Win32, but it should work
<!-- -->
<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>
description="generate test files" >
<!-- Generate CxxTest files -->
- <cxxtestpart command="python ${cxxtest}/cxxtestgen.py"
+ <cxxtestpart command="python ${cxxtest}/cxxtestgen.py --have-eh"
out="${src}/test-src.cpp">
<fileset dir="${src}">
<include name="attributes-test.h"/>
<include name="verbs-test.h"/>
</fileset>
</cxxtestpart>
- <cxxtestpart command="python ${cxxtest}/cxxtestgen.py"
+ <cxxtestpart command="python ${cxxtest}/cxxtestgen.py --have-eh"
out="${src}/display/test-display.cpp">
<fileset dir="${src}/display">
<include name="bezier-utils-test.h"/>
+ <include name="curve-test.h"/>
</fileset>
</cxxtestpart>
- <cxxtestpart command="python ${cxxtest}/cxxtestgen.py"
+ <cxxtestpart command="python ${cxxtest}/cxxtestgen.py --have-eh"
out="${src}/helper/test-helper.cpp">
<fileset dir="${src}/helper">
<include name="units-test.h"/>
</fileset>
</cxxtestpart>
- <cxxtestpart command="python ${cxxtest}/cxxtestgen.py"
+ <cxxtestpart command="python ${cxxtest}/cxxtestgen.py --have-eh"
out="${src}/libnr/test-nr.cpp">
<fileset dir="${src}/libnr">
<include name="nr-compose-test.h"/>
<include name="nr-matrix-test.h"/>
</fileset>
</cxxtestpart>
- <cxxtestpart command="python ${cxxtest}/cxxtestgen.py"
+ <cxxtestpart command="python ${cxxtest}/cxxtestgen.py --have-eh"
out="${src}/svg/test-svg.cpp">
<fileset dir="${src}/svg">
<include name="css-ostringstream-test.h"/>
<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"/>
</fileset>
</cxxtestpart>
- <cxxtestpart command="python ${cxxtest}/cxxtestgen.py"
+ <cxxtestpart command="python ${cxxtest}/cxxtestgen.py --have-eh"
out="${src}/util/test-util.cpp">
<fileset dir="${src}/util">
<include name="list-container-test.h"/>
</fileset>
</cxxtestpart>
- <cxxtestpart command="python ${cxxtest}/cxxtestgen.py"
+ <cxxtestpart command="python ${cxxtest}/cxxtestgen.py --have-eh"
out="${src}/xml/test-xml.cpp">
<fileset dir="${src}/xml">
<include name="repr-action-test.h"/>
<!-- 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"/>
<exclude name="winmain.o"/>
<exclude name="inkview.o"/>
<!-- CxxTest -->
- <exclude name="obj/test-main.o"/>
- <exclude name="obj/test-src.o"/>
- <exclude name="obj/display/test-display.o"/>
- <exclude name="obj/helper/test-helper.o"/>
- <exclude name="obj/libnr/nr-compose-reference.o"/>
- <exclude name="obj/libnr/test-nr.o"/>
- <exclude name="obj/svg/test-svg.o"/>
- <exclude name="obj/util/test-util.o"/>
- <exclude name="obj/xml/test-xml.o"/>
+ <exclude name="test-main.o"/>
+ <exclude name="test-src.o"/>
+ <exclude name="display/test-display.o"/>
+ <exclude name="helper/test-helper.o"/>
+ <exclude name="libnr/nr-compose-reference.o"/>
+ <exclude name="libnr/test-nr.o"/>
+ <exclude name="svg/test-svg.o"/>
+ <exclude name="util/test-util.o"/>
+ <exclude name="xml/test-xml.o"/>
</fileset>
</staticlib>
</target>
stripcommand="${archutil}strip"
objcopycommand="${archutil}objcopy">
<flags>
+ -mwindows
</flags>
<fileset dir="${build}">
<include name="inkviewres.o"/>
</fileset>
<libs>
-L${devlibs}/lib
- -lpoppler-cairo -lpoppler-glib -lpoppler.dll
- ${pcl.gtkmm-2.4}
- <!-- PERL -->
- -L${devlibs}/perl/lib/CORE -lperl58
- <!-- PYTHON -->
- -L${devlibs}/python/libs -lpython25
+ ${pcl.poppler-cairo} ${pcl.poppler-glib} ${pcl.poppler}
+ ${pcl.gtkmm-2.4} ${pcl.pangoft2} ${pcl.gthread-2.0}
${devlibs}/bin/libxml2.dll
${devlibs}/bin/libxslt.dll
+ ${pcl.cairo} ${pcl.cairomm-1.0}
+ ${pcl.libwpg-0.1} ${pcl.libwpg-stream-0.1}
${devlibs}/lib/iconv.lib
- -lcairo.dll -lcairomm-1.0.dll
- -lwpg-0.1.dll -lwpg-stream-0.1.dll
- -lMagick++ -lWand -lMagick
- -lfreetype.dll -lfontconfig.dll
- -llcms.dll
+ ${pcl.ImageMagick++}
+ ${pcl.fontconfig} ${pcl.freetype2}
-lssl -lcrypto
+ ${pcl.lcms}
+ ${pcl.gsl}
-lpng -ljpeg.dll -ltiff.dll -lpopt ${devlibs}/lib/zdll.lib
- -lgc -mwindows
+ -lgc
-lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
</libs>
</link>
<!--
########################################################################
- ## T A R G E T : D I S T
+ ## T A R G E T : D I S T B A S E
########################################################################
-->
- <target name="dist" depends="link,i18n"
+ <target name="distbase" depends="i18n"
description="generate the distribution directory with all needed files">
<!-- Create the distribution directory -->
- <copy todir="${dist}" file="${build}/inkscape.exe"/>
- <copy todir="${dist}" file="${build}/inkscape.dbg"/>
<copy todir="${dist}" file="AUTHORS"/>
<copy todir="${dist}" file="COPYING"/>
<copy todir="${dist}" file="COPYING.LIB"/>
<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"/>
# disable images in buttons. i've only seen ugly delphi apps use this feature.
gtk-button-images = 0
+
+ # disable the annoying beep in editable controls
+ gtk-error-bell = 0
# enable/disable images in menus. most "stock" microsoft apps don't use these, except sparingly.
# the office apps use them heavily, though.
</target>
+ <!--
+ ########################################################################
+ ## T A R G E T : D I S T - I N K S C A P E
+ ########################################################################
+ -->
+ <target name="dist-inkscape" depends="link,distbase"
+ description="copy inkscape to the distribution directory">
+
+ <!-- Create the distribution directory -->
+ <copy todir="${dist}" file="${build}/inkscape.exe"/>
+ <copy todir="${dist}" file="${build}/inkscape.dbg"/>
+ </target>
+
+
+ <!--
+ ########################################################################
+ ## T A R G E T : D I S T - I N K V I E W
+ ########################################################################
+ -->
+ <target name="dist-inkview" depends="linkinkview,distbase"
+ description="copy inkview to the distribution directory">
+
+ <!-- Create the distribution directory -->
+ <copy todir="${dist}" file="${build}/inkview.exe"/>
+ <copy todir="${dist}" file="${build}/inkview.dbg"/>
+ </target>
+
+
+ <!--
+ ########################################################################
+ ## T A R G E T : C H E C K
+ ########################################################################
+ -->
+ <target name="check" depends="linkcxxtests,distbase"
+ description="perform unit tests">
+ <cxxtestrun command="${build}/cxxtests" workingdir="${dist}" />
+ </target>
+
+
<!--
########################################################################
## T A R G E T : JAVAC
## T A R G E T : D I S T - A L L
########################################################################
-->
- <target name="dist-all" depends="dist"
+ <target name="dist-all" depends="dist-inkscape,dist-inkview"
description="generate the distribution, along with inkview" >
+ </target>
+
- <copy file="${build}/inkview.exe" todir="${dist}"/>
- <copy file="${build}/inkview.dbg" todir="${dist}"/>
+
+
+ <!--
+ ########################################################################
+ ## T A R G E T : D I S T - A L L - C H E C K
+ ########################################################################
+ -->
+ <target name="dist-all-check" depends="dist-all,check"
+ description="generate the distribution, along with inkview and run cxxtests" >
</target>