![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/build.xml b/build.xml
index f65b6e20fa4497a17a5fb2171a5b74a8acd2a5e9..d8c62e5f27333eb7485c32b7e29e3f4ad7c293c0 100644 (file)
--- a/build.xml
+++ b/build.xml
</description>
<!-- set global properties for this build -->
- <property name="version" value="0.46+devel"/>
+ <property name="version" value="0.47+devel"/>
<property name="src" location="src"/>
<property name="lib" location="lib"/>
<property name="build" location="build"/>
<property name="arch" value="mingw32-"/>
<property name="archutil" value=""/>
<property name="devlibs" location="${env.DEVLIBS_PATH}"/>
+ <property name="mingw_bin" location="${env.MINGW_BIN}"/>
<property name="cxxtest" location="cxxtest"/>
+ <property name="python" location="${devlibs}/python/python.exe"/>
<!-- -->
<!-- Use these settings for the cross compiler -->
<property name="arch" value="i686-pc-mingw32-"/>
<property name="archutil" value="${arch}"/>
<property name="devlibs" location="/target"/>
+ <property name="mingw_bin" location="${env.MINGW_BIN}"/>
+ <property name="cxxtest" location="cxxtest"/>
+ <property name="python" location="python"/>
-->
<!-- Extra properties -->
<copy file="${src}/helper/sp-marshal.cpp.mingw"
tofile="${src}/helper/sp-marshal.cpp"/>
- <makefile file="inkscape_version.h">
- #define INKSCAPE_VERSION "${version}, revision ${svn.revision}"
+ <!--makefile file="${src}/inkscape-version.cpp">
+ namespace Inkscape {
+ char const *version_string = "${version} ${svn.revision}";
+ }
+ </makefile-->
+ <makefile file="${src}/inkscape-version.cpp">
+ namespace Inkscape {
+ char const *version_string = "${version}";
+ }
</makefile>
<makefile file="config.h">
#ifndef _CONFIG_H_
#define HAVE_STDLIB_H 1
#define HAVE_SYS_STAT_H 1
#define HAVE_INTTYPES_H 1
+ #define HAVE_OPENMP 1
#define ENABLE_LCMS 1
#define WITH_PYTHON 1
/* shared whiteboard */
- #define WITH_INKBOARD 1
- #define HAVE_SSL 1
+ #undef WITH_INKBOARD
+ #undef HAVE_SSL
/* use poppler for pdf import? */
#define HAVE_POPPLER 1
/* Do we support SVG Fonts? */
#define ENABLE_SVG_FONTS 1
- #endif /* _CONFIG_H_ */
- </makefile>
- </target>
+ /* Do we want experimental, unsupported, unguaranteed, etc., LivePathEffects enabled? */
+ #define LPE_ENABLE_TEST_EFFECTS 1
+ #define HAVE_ASPELL 1
-
- <!--
- ########################################################################
- ## T A R G E T : T O U C H A B O U T
- ########################################################################
- -->
- <target name="touchabout"
- description="update the modification time of aboutbox.cpp">
- <!-- not good <touch file="${src}/ui/dialog/aboutbox.cpp"/> -->
- <!-- better -->
- <delete file="${build}/obj/ui/dialog/aboutbox.o"/>
- <delete file="inkscape_version.h"/>
+ #endif /* _CONFIG_H_ */
+ </makefile>
</target>
-
<!--
########################################################################
## T A R G E T : C X X T E S T
description="generate test files" >
<!-- Generate CxxTest files -->
- <cxxtestpart command="python ${cxxtest}/cxxtestgen.py --have-eh"
+ <cxxtestpart command="${python} ${cxxtest}/cxxtestgen.py --have-eh"
out="${src}/test-src.cpp">
<fileset dir="${src}">
<include name="attributes-test.h"/>
<include name="color-profile-test.h"/>
<include name="dir-util-test.h"/>
<include name="extract-uri-test.h"/>
+ <include name="marker-test.h"/>
<include name="mod360-test.h"/>
+ <include name="preferences-test.h"/>
<include name="round-test.h"/>
<include name="sp-gradient-test.h"/>
<include name="sp-style-elem-test.h"/>
<include name="verbs-test.h"/>
</fileset>
</cxxtestpart>
- <cxxtestpart command="python ${cxxtest}/cxxtestgen.py --have-eh"
+ <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 --have-eh"
+ <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 --have-eh"
+ <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 --have-eh"
+ <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-path-geom-test.h"/>
</fileset>
</cxxtestpart>
- <cxxtestpart command="python ${cxxtest}/cxxtestgen.py --have-eh"
+ <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 --have-eh"
+ <cxxtestpart command="${python} ${cxxtest}/cxxtestgen.py --have-eh"
out="${src}/xml/test-xml.cpp">
<fileset dir="${src}/xml">
<include name="repr-action-test.h"/>
<include name="quote-test.h"/>
</fileset>
</cxxtestpart>
- <cxxtestroot command="python ${cxxtest}/cxxtestgen.py"
+ <cxxtestroot command="${python} ${cxxtest}/cxxtestgen.py"
out="${src}/test-main.cpp"
- template="${src}/selfname.tpl">
+ template="${src}/cxxtest-template.tpl">
<fileset dir="${src}">
<include name="MultiPrinter.h"/>
<include name="PylogFormatter.h"/>
<exclude name="ast/.*"/>
<exclude name="bonobo/.*"/>
<exclude name="deptool.cpp"/>
+ <exclude name="cxxtests.cpp"/>
<!--<exclude name="test-main.cpp"/>-->
<!--<exclude name="test-src.cpp"/>-->
<exclude name="display/test-display.cpp"/>
<exclude name="display/testnr.cpp"/>
- <exclude name="display/bezier-utils-test.cpp"/>
<exclude name="dom/work/.*"/>
<exclude name="dom/odf/SvgOdg.cpp"/>
<exclude name="extension/api.cpp"/>
<exclude name="svg/ftos.cpp"/>
<!--<exclude name="svg/test-svg.cpp"/>-->
<exclude name="svg/test-svg-main.cpp"/>
- <exclude name="svg/test-stubs.cpp"/>
- <exclude name="utest/.*"/>
<exclude name="util/list-container-test.cpp"/>
<exclude name="widgets/test-widgets.cpp"/>
<exclude name="xml/quote-test.cpp"/>
stripcommand="${archutil}strip"
objcopycommand="${archutil}objcopy">
<flags>
- -mwindows
+ -mconsole
-mthreads
</flags>
<fileset dir="${build}">
-lpng -ljpeg.dll -ltiff.dll -lpopt ${devlibs}/lib/zdll.lib
-lgc
-lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
- -lgomp -lpthreadGC2
+ -lgomp -lpthreadGC2 -laspell
+ -lmscms <!-- required for color profiles -->
</libs>
</link>
</target>
stripcommand="${archutil}strip"
objcopycommand="${archutil}objcopy">
<flags>
- -mwindows
+ -mconsole
-mthreads
</flags>
<fileset dir="${build}">
-lpng -ljpeg.dll -ltiff.dll -lpopt ${devlibs}/lib/zdll.lib
-lgc
-lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
- -lgomp -lpthreadGC2
+ -lgomp -lpthreadGC2 -laspell
+ -lmscms <!-- required for color profiles -->
</libs>
</link>
</target>
-lpng -ljpeg.dll -ltiff.dll -lpopt ${devlibs}/lib/zdll.lib
-lgc
-lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
- -lgomp -lpthreadGC2
+ -lgomp -lpthreadGC2 -laspell
+ -lmscms <!-- required for color profiles -->
</libs>
</link>
</target>
<copy todir="${dist}" file="${devlibs}/bin/intl.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/pthreadGC2.dll"/>
<copy file="${devlibs}/bin/intl.dll" tofile="${dist}/libintl-2.dll"/>
+ <!-- MINGW dll needed, I think for openmp support -->
+ <copy todir="${dist}" file="${mingw_bin}/mingwm10.dll"/>
<!-- MSGFMT files -->
<copy todir="${dist}">
<copy todir="${dist}">
<fileset dir="share">
<exclude name=".*\.am"/>
+ <exclude name=".*\.in"/>
+ <exclude name=".*\.sh"/>
</fileset>
</copy>
<copy todir="${dist}/share"> <fileset dir="${devlibs}/share/locale"/> </copy>
<copy todir="${dist}/share"> <fileset dir="${devlibs}/share/poppler"/> </copy>
<copy todir="${dist}" file="${devlibs}/bin/gdb.exe"/>
+ <!-- Aspell dictionaries -->
+ <copy todir="${dist}/lib"> <fileset dir="${devlibs}/lib/aspell-0.60"/> </copy>
+
<!-- Necessary to run extensions on windows if it is not in the path -->
<copy todir="${dist}" file="${devlibs}/bin/gspawn-win32-helper.exe"/>
<copy todir="${dist}" file="${devlibs}/bin/gspawn-win32-helper-console.exe"/>
<delete dir="${dist}"/>
<delete file="build.dep"/>
<delete file="config.h"/>
- <delete file="inkscape_version.h"/>
-
+ <delete file="${src}/inkscape-version.cpp"/>
<delete file="${src}/test-main.cpp"/>
<delete file="${src}/test-src.cpp"/>
<delete file="${src}/display/test-display.cpp"/>