![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/build.xml b/build.xml
--- 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-inkscape" basedir=".">
+<project name="Inkscape" default="dist-all" basedir=".">
<description>
Build file for the Inkscape SVG editor. This file
was written for GTK-2.10 on Win32, but it should work
well for other types of builds with only minor adjustments.
- Note that the default target is 'dist'. You can execute other
+ Note that the default target is 'dist-all'. You can execute other
targets instead, by "btool {target}", like "btool compile", if
- you want to save time.
+ you want to save time, or "dist-inkscape" if you don't want inkview.
</description>
<!-- set global properties for this build -->
- <property name="version" value="0.46+devel"/>
+ <property name="version" value="0.48+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" location="${env.MINGW_PATH}"/>
+ <property name="mingw_bin" location="${env.MINGW_PATH}/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}";
+ }
+ </makefile-->
+ <makefile file="${src}/inkscape-version.cpp">
+ namespace Inkscape {
+ char const *version_string = "${version} ${bzr.revision}";
+ }
</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 HAVE_TR1_UNORDERED_SET 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="extension/dbus/.*"/>
<exclude name="extension/dxf2svg/.*"/>
<exclude name="extension/implementation/plugin.cpp"/>
<exclude name="extension/script/bindtest.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"/>
<!-- GTK / GTKMM -->
${pcc.gtkmm-2.4}
<!-- OTHER -->
- -I${devlibs}/include/libxml2
+ ${pcc.Magick++}
+ ${pcc.libxml-2.0}
${pcc.freetype2}
${pcc.cairo}
${pcc.poppler}
${devlibs}/bin/libxslt.dll
${pcl.cairo} ${pcl.cairomm-1.0}
${pcl.libwpg-0.1} ${pcl.libwpg-stream-0.1}
- ${devlibs}/lib/iconv.lib
- ${pcl.ImageMagick++}
+ -liconv
+ ${pcl.Magick++}
${pcl.fontconfig} ${pcl.freetype2}
- -lssl -lcrypto
${pcl.lcms}
${pcl.gsl}
- -lpng -ljpeg.dll -ltiff.dll -lpopt ${devlibs}/lib/zdll.lib
+ -lpng -ljpeg -ltiff -lpopt -lz
-lgc
-lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
- -lgomp -lpthreadGC2
+ -lgomp -lpthreadGC2 -laspell
+ -lmscms <!-- required for color profiles -->
</libs>
</link>
</target>
+<!--
+ ########################################################################
+ ## T A R G E T : L I N K C O N S O L E
+ ########################################################################
+ -->
+ <target name="linkconsole" depends="compile"
+ description="link console helper">
-
-
+ <link command="${arch}g++" out="${build}/inkscape-console.exe"
+ strip="true" stripcommand="${archutil}strip">
+ <flags>
+ -mconsole
+ -mthreads
+ </flags>
+ <fileset dir="${build}">
+ <include name="obj/winconsole.o"/>
+ </fileset>
+ <libs></libs>
+ </link>
+ </target>
<!--
########################################################################
${devlibs}/bin/libxslt.dll
${pcl.cairo} ${pcl.cairomm-1.0}
${pcl.libwpg-0.1} ${pcl.libwpg-stream-0.1}
- ${devlibs}/lib/iconv.lib
- ${pcl.ImageMagick++}
+ -liconv
+ ${pcl.Magick++}
${pcl.fontconfig} ${pcl.freetype2}
- -lssl -lcrypto
${pcl.lcms}
${pcl.gsl}
- -lpng -ljpeg.dll -ltiff.dll -lpopt ${devlibs}/lib/zdll.lib
+ -lpng -ljpeg -ltiff -lpopt -lz
-lgc
-lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
- -lgomp -lpthreadGC2
+ -lgomp -lpthreadGC2 -laspell
+ -lmscms <!-- required for color profiles -->
</libs>
</link>
</target>
${devlibs}/bin/libxslt.dll
${pcl.cairo} ${pcl.cairomm-1.0}
${pcl.libwpg-0.1} ${pcl.libwpg-stream-0.1}
- ${devlibs}/lib/iconv.lib
- ${pcl.ImageMagick++}
+ -liconv
+ ${pcl.Magick++}
${pcl.fontconfig} ${pcl.freetype2}
- -lssl -lcrypto
${pcl.lcms}
${pcl.gsl}
- -lpng -ljpeg.dll -ltiff.dll -lpopt ${devlibs}/lib/zdll.lib
+ -lpng -ljpeg -ltiff -lpopt -lz
-lgc
-lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
- -lgomp -lpthreadGC2
+ -lgomp -lpthreadGC2 -laspell
+ -lmscms <!-- required for color profiles -->
</libs>
</link>
</target>
<copy todir="${dist}" file="TRANSLATORS"/>
<copy todir="${dist}" file="${devlibs}/bin/libatkmm-1.6-1.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/libglibmm-2.4-1.dll"/>
+ <copy todir="${dist}" file="${devlibs}/bin/libgiomm-2.4-1.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/libgtkmm-2.4-1.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/libgdkmm-2.4-1.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/libpangomm-1.4-1.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/libpoppler-5.dll"/>
+ <copy todir="${dist}" file="${devlibs}/bin/libpoppler-glib-4.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/libpangocairo-1.0-0.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/libpango-1.0-0.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/libpangoft2-1.0-0.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/libfontconfig-1.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/libxml2.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/libxslt.dll"/>
- <copy todir="${dist}" file="${devlibs}/bin/libexpat.dll"/>
- <!--<copy file="${devlibs}/bin/libexpat.dll" tofile="${dist}/xmlparse.dll"/>-->
+ <copy todir="${dist}" file="${devlibs}/bin/libexpat-1.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/libwpg-0.1.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/libwpg-stream-0.1.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/libwpd-0.8.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/libwpd-stream-0.8.dll"/>
- <copy todir="${dist}" file="${devlibs}/bin/jpeg62.dll"/>
- <copy todir="${dist}" file="${devlibs}/bin/libpng13.dll"/>
- <!-- GTK changed their dep file name for PNG! :-( -->
+ <copy todir="${dist}" file="${devlibs}/bin/libjpeg-7.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/libpng12-0.dll"/>
- <copy todir="${dist}" file="${devlibs}/bin/libtiff3.dll"/>
+ <copy todir="${dist}" file="${devlibs}/bin/libtiff-3.dll"/>
+ <copy todir="${dist}" file="${devlibs}/bin/libopenjpeg-2.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/msvcr70.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/msvcr71.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/zlib1.dll"/>
+ <copy todir="${dist}" file="${devlibs}/bin/bzip2.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/iconv.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/libpopt-0.dll"/>
<copy todir="${dist}" file="${devlibs}/bin/liblcms-1.dll"/>
+ <copy todir="${dist}" file="${devlibs}/bin/libMagick++-3.dll"/>
+ <copy todir="${dist}" file="${devlibs}/bin/libMagickCore-3.dll"/>
+ <copy todir="${dist}" file="${devlibs}/bin/libMagickWand-3.dll"/>
<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 support DLLs needed for openmp support -->
+ <copy todir="${dist}" file="${mingw_bin}/mingwm10.dll"/>
+ <copy todir="${dist}" file="${mingw}/lib/gcc/mingw32/bin/libgomp-1.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"/>
<copy todir="${dist}" file="${devlibs}/perl/bin/perl58.dll"/>
<!-- PYTHON -->
- <copy todir="${dist}" file="${devlibs}/python/python25.dll"/>
+ <copy todir="${dist}" file="${devlibs}/python/python26.dll"/>
<copy todir="${dist}/python" file="${devlibs}/python/python.exe" />
<copy todir="${dist}/python" file="${devlibs}/python/pythonw.exe"/>
<copy todir="${dist}/python"> <fileset dir="${devlibs}/python/Lib"/> </copy>
<copy todir="${dist}/python"> <fileset dir="${devlibs}/python/DLLs"/> </copy>
- <copy todir="${dist}/python"> <fileset dir="${devlibs}/python/Scripts"/> </copy>
+ <!-- <copy todir="${dist}/python"> <fileset dir="${devlibs}/python/Scripts"/> </copy> -->
<!--<copy file="${devlibs}/share/themes/MS-Windows/gtk-2.0/gtkrc" todir="${dist}/etc/gtk-2.0"/>-->
<makefile file="${dist}/etc/gtk-2.0/gtkrc">
## 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"
+ <target name="dist-inkscape" depends="link,linkconsole,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"/>
+ <copy file="${build}/inkscape-console.exe" tofile="${dist}/inkscape.com"/>
</target>
<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"/>