![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/build.xml b/build.xml
index 6940b952dafcf67a5d5d2aea9b9bff21b5835098..486a43d865a5cca29d5157483c4bcab643834209 100644 (file)
--- a/build.xml
+++ b/build.xml
* Bob Jamison
* Others
*
- * Copyright (C) 2006 Inkscape.org
+ * Copyright (C) 2006-2007 Inkscape.org
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
</description>
<!-- set global properties for this build -->
- <property name="version" value="0.46dev"/>
- <property name="arch" value="i686-pc-mingw32-"/>
- <!--<property name="archutil" value="${arch}"/>-->
- <property name="archutil" value=""/>
+ <property environment="env"/>
+ <property name="version" value="0.46+devel"/>
<property name="src" location="src"/>
- <property name="gtk" location="c:/gtk210"/>
<property name="lib" location="lib"/>
<property name="build" location="build"/>
<property name="dist" location="inkscape"/>
+ <!-- Use these settings for the native compiler -->
+ <!-- -->
+ <property name="arch" value="mingw32-"/>
+ <property name="archutil" value=""/>
+ <property name="gtk" location="c:/devlibs"/>
+ <!-- -->
+ <!-- Use these settings for the cross compiler -->
+ <!--
+ <property name="arch" value="i686-pc-mingw32-"/>
+ <property name="archutil" value="${arch}"/>
+ <property name="gtk" location="/target"/>
+ -->
## T A R G E T : I N I T
########################################################################
-->
- <target name="init">
- <!-- Create the build directory structure used by compile -->
+ <target name="init"
+ description=
+ "Do all preparatory tasks, like make directories and copy files">
+
+
+ <!-- example of the <pkg-config> task
+ query can be cflags, libs, or both
+ prefix overrides the value of prefix="" in the file
+ the result of this entry can be later used as ${gtkmm}
+ -->
+ <!--
+ <pkg-config name="gtkmm-2.4" path="${gtk}/lib/pkgconfig"
+ query="both" property="gtkmm" prefix="${gtk}"/>
+ -->
+
+ <mkdir dir="${build}"/>
+ <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"
<copy file="${src}/helper/sp-marshal.cpp.mingw"
tofile="${src}/helper/sp-marshal.cpp"/>
<makefile file="inkscape_version.h">
- #define INKSCAPE_VERSION "${version}+devel"
+ #define INKSCAPE_VERSION "${version}"
</makefile>
<makefile file="config.h">
#ifndef _CONFIG_H_
#define HAVE_MALLOC_H 1
#define HAVE_STDLIB_H 1
#define HAVE_SYS_STAT_H 1
+ #define HAVE_INTTYPES_H 1
#define ENABLE_LCMS 1
#define RENDER_WITH_PANGO_CAIRO 1
#define HAVE_GTK_WINDOW_FULLSCREEN 1
+
+ /* internal interpreter */
+ #define WITH_PYTHON 1
+
+ /* shared whiteboard */
+ #define WITH_INKBOARD 1
+ #define HAVE_SSL 1
+
+ /* use poppler for pdf import? */
+ #define HAVE_POPPLER 1
+ #define HAVE_POPPLER_CAIRO 1
+
+ /* do we want bitmap manipulation? */
+ #define WITH_IMAGE_MAGICK 1
- #define g_ascii_strtod fixed_g_ascii_strtod
+ /* Allow reading WordPerfect? */
+ #define WITH_LIBWPG 1
#endif /* _CONFIG_H_ */
</makefile>
+ <!--
+ ########################################################################
+ ## 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 aboutdialog.cpp">
+ <!-- not good <touch file="${src}/ui/dialog/aboutdialog.cpp"/> -->
+ <!-- better -->
+ <delete file="${build}/obj/ui/dialog/aboutdialog.o"/>
+ </target>
<!--
########################################################################
-->
<target name="compile" depends="init"
- description="compile the source " >
+ description="compile the source to .o" >
+
<!-- Compile from source to build -->
<cc cc="${arch}gcc" cxx="${arch}g++"
destdir="${build}/obj">
- <fileset dir="${src}">
+ <fileset dir="${src}">
<!-- THINGS TO EXCLUDE -->
- <exclude name="ast/.*"/>
- <exclude name="bonobo/.*"/>
- <exclude name="deptool.cpp"/>
- <exclude name="test-all.cpp"/>
- <exclude name="dialogs/filedialog-win32.cpp"/>
- <exclude name="display/testnr.cpp"/>
- <exclude name="display/bezier-utils-test.cpp"/>
- <exclude name="dom/jsdombind.cpp"/>
- <exclude name="dom/work/.*"/>
- <exclude name="dom/odf/SvgOdg.cpp"/>
- <exclude name="extension/api.cpp"/>
- <exclude name="extension/dxf2svg/.*"/>
- <exclude name="extension/internal/gnome.cpp"/>
- <exclude name="extension/script/bindtest.cpp"/>
- <exclude name="extension/script/cpptest.cpp"/>
- <exclude name="extension/plugin/.*"/>
- <exclude name="extract-uri-test.cpp"/>
- <exclude name="helper/units-test.cpp"/>
- <!-- exclude name="inkview.cpp"/-->
- <exclude name="libnr/test-nr.cpp"/>
- <exclude name="libnr/test-nr-main.cpp"/>
- <exclude name="libnr/testnr.cpp"/>
- <exclude name="libnr/in-svg-plane-test.cpp"/>
- <exclude name="libnr/nr-compose-reference.cpp"/>
- <exclude name="libnr/nr-compose-test.cpp"/>
- <exclude name="libnr/nr-matrix-test.cpp"/>
- <exclude name="libnr/nr-point-fns-test.cpp"/>
- <exclude name="libnr/nr-rotate-fns-test.cpp"/>
- <exclude name="libnr/nr-rotate-test.cpp"/>
- <exclude name="libnr/nr-scale-test.cpp"/>
- <exclude name="libnr/nr-translate-test.cpp"/>
- <exclude name="libnr/nr-types-test.cpp"/>
- <exclude name="livarot/Path-test.cpp"/>
- <exclude name="mod360-test.cpp"/>
- <exclude name="trace/potrace/potest.cpp"/>
- <exclude name="round-test.cpp"/>
- <exclude name="sp-gradient-test.cpp"/>
- <exclude name="svg/ftos.cpp"/>
- <exclude name="svg/test-svg.cpp"/>
- <exclude name="svg/test-svg-main.cpp"/>
- <exclude name="utest/.*"/>
- <exclude name="widgets/test-widgets.cpp"/>
- <exclude name="xml/quote-test.cpp"/>
- <exclude name="xml/repr-action-test.cpp"/>
- <exclude name="xml/test-xml.cpp"/>
- <exclude name="xml/test-xml-main.cpp"/>
- <exclude name="io/streamtest.cpp"/>
+ <exclude name="2geom/chebyshev.cpp"/>
+ <exclude name="ast/.*"/>
+ <exclude name="bonobo/.*"/>
+ <exclude name="deptool.cpp"/>
+ <exclude name="test-all.cpp"/>
+ <exclude name="display/testnr.cpp"/>
+ <exclude name="display/bezier-utils-test.cpp"/>
+ <exclude name="dom/jsdombind.cpp"/>
+ <exclude name="dom/work/.*"/>
+ <exclude name="dom/odf/SvgOdg.cpp"/>
+ <exclude name="extension/api.cpp"/>
+ <exclude name="extension/dxf2svg/.*"/>
+ <exclude name="extension/implementation/plugin.cpp"/>
+ <exclude name="extension/script/bindtest.cpp"/>
+ <exclude name="extension/script/cpptest.cpp"/>
+ <exclude name="extension/plugin/.*"/>
+ <exclude name="extract-uri-test.cpp"/>
+ <exclude name="helper/units-test.cpp"/>
+ <!-- exclude name="inkview.cpp"/-->
+ <exclude name="libnr/test-nr.cpp"/>
+ <exclude name="libnr/test-nr-main.cpp"/>
+ <exclude name="libnr/testnr.cpp"/>
+ <exclude name="libnr/in-svg-plane-test.cpp"/>
+ <exclude name="libnr/nr-compose-reference.cpp"/>
+ <exclude name="libnr/nr-compose-test.cpp"/>
+ <exclude name="libnr/nr-matrix-test.cpp"/>
+ <exclude name="libnr/nr-point-fns-test.cpp"/>
+ <exclude name="libnr/nr-rotate-fns-test.cpp"/>
+ <exclude name="libnr/nr-rotate-test.cpp"/>
+ <exclude name="libnr/nr-scale-test.cpp"/>
+ <exclude name="libnr/nr-translate-test.cpp"/>
+ <exclude name="libnr/nr-types-test.cpp"/>
+ <exclude name="livarot/Path-test.cpp"/>
+ <exclude name="mod360-test.cpp"/>
+ <exclude name="trace/potrace/potest.cpp"/>
+ <exclude name="round-test.cpp"/>
+ <exclude name="sp-gradient-test.cpp"/>
+ <exclude name="svg/ftos.cpp"/>
+ <exclude name="svg/test-svg.cpp"/>
+ <exclude name="svg/test-svg-main.cpp"/>
+ <exclude name="utest/.*"/>
+ <exclude name="widgets/test-widgets.cpp"/>
+ <exclude name="xml/quote-test.cpp"/>
+ <exclude name="xml/repr-action-test.cpp"/>
+ <exclude name="xml/test-xml.cpp"/>
+ <exclude name="xml/test-xml-main.cpp"/>
+ <exclude name="io/streamtest.cpp"/>
<!--JABBER-->
- <exclude name="pedro/pedrogui.cpp"/>
- <exclude name="pedro/pedrogui.h"/>
- <exclude name="pedro/work/.*"/>
+ <exclude name="pedro/pedrogui.cpp"/>
+ <exclude name="pedro/pedrogui.h"/>
+ <exclude name="pedro/work/.*"/>
<!--WHITEBOARD-->
- <exclude name="ui/dialog/session-player.cpp"/>
- <exclude name="ui/dialog/whiteboard-connect.cpp"/>
- <exclude name="ui/dialog/whiteboard-sharewithchat.cpp"/>
- <exclude name="ui/dialog/whiteboard-sharewithuser.cpp"/>
- <exclude name="dialogs/whiteboard-connect-dialog.cpp"/>
- <exclude name="dialogs/whiteboard-common-dialog.cpp"/>
- <exclude name="dialogs/whiteboard-sharewithchat-dialog.cpp"/>
- <exclude name="dialogs/whiteboard-sharewithuser-dialog.cpp"/>
- <exclude name="jabber_whiteboard/node-tracker.cpp"/>
- <exclude name="jabber_whiteboard/node-utilities.cpp"/>
- <!--WHITEBOARD-->
- <exclude name="removeoverlap/placement_SolveVPSC.cpp"/>
- <exclude name="removeoverlap/placement_SolveVPSC.h"/>
- <exclude name="removeoverlap/test.cpp"/>
- <exclude name="removeoverlap/remove_rectangle_overlap-test.cpp"/>
- <exclude name="removeoverlap/remove_rectangle_overlap-test.h"/>
- </fileset>
+ <exclude name="ui/dialog/session-player.cpp"/>
+ <exclude name="ui/dialog/whiteboard-connect.cpp"/>
+ <exclude name="ui/dialog/whiteboard-sharewithchat.cpp"/>
+ <exclude name="ui/dialog/whiteboard-sharewithuser.cpp"/>
+ <exclude name="dialogs/whiteboard-connect-dialog.cpp"/>
+ <exclude name="dialogs/whiteboard-common-dialog.cpp"/>
+ <exclude name="dialogs/whiteboard-sharewithchat-dialog.cpp"/>
+ <exclude name="dialogs/whiteboard-sharewithuser-dialog.cpp"/>
+ <exclude name="jabber_whiteboard/node-tracker.cpp"/>
+ <exclude name="jabber_whiteboard/node-utilities.cpp"/>
+ <!--OVERLAP-->
+ <exclude name="removeoverlap/placement_SolveVPSC.cpp"/>
+ <exclude name="removeoverlap/placement_SolveVPSC.h"/>
+ <exclude name="removeoverlap/test.cpp"/>
+ <exclude name="removeoverlap/remove_rectangle_overlap-test.cpp"/>
+ <exclude name="removeoverlap/remove_rectangle_overlap-test.h"/>
+ </fileset>
<flags>
- -Wall -O3
+ -Wall -Wformat-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch
+ -O2
-mms-bitfields
</flags>
<defines>
-DVERSION=\"${version}\"
-DHAVE_CONFIG_H
-DXP_WIN <!-- for JS -->
- -D_INTL_REDIRECT_INLINE
+ -D_INTL_REDIRECT_INLINE
+ -DHAVE_SSL
-DRELAYTOOL_SSL="static const int libssl_is_present=1; static int __attribute__((unused)) libssl_symbol_is_present(char *s){ return 1; }" <!-- inkboard -->
- -DWITH_INKBOARD -DHAVE_SSL <!-- inkboard -->
</defines>
<includes>
-I${gtk}/include
- <!-- GTK / GTKMM -->
+ <!-- GTK / GTKMM -->
-I${gtk}/include/glibmm-2.4
- -I${gtk}/lib/glibmm-2.4/include
+ -I${gtk}/lib/glibmm-2.4/include
-I${gtk}/include/gtkmm-2.4
- -I${gtk}/lib/gtkmm-2.4/include
+ -I${gtk}/lib/gtkmm-2.4/include
-I${gtk}/include/gdkmm-2.4
- -I${gtk}/lib/gdkmm-2.4/include
+ -I${gtk}/lib/gdkmm-2.4/include
-I${gtk}/include/pangomm-1.4
-I${gtk}/include/atkmm-1.6
-I${gtk}/include/cairomm-1.0
-I${gtk}/include/sigc++-2.0
- -I${gtk}/lib/sigc++-2.0/include
+ -I${gtk}/lib/sigc++-2.0/include
-I${gtk}/include/gtk-2.0
- -I${gtk}/lib/gtk-2.0/include
+ -I${gtk}/lib/gtk-2.0/include
-I${gtk}/include/atk-1.0
- -I${gtk}/include/pango-1.0
+ -I${gtk}/include/pango-1.0
-I${gtk}/include/glib-2.0
- -I${gtk}/lib/glib-2.0/include
- <!-- OTHER -->
+ -I${gtk}/lib/glib-2.0/include
+ <!-- OTHER -->
-I${gtk}/include/libxml2
- -I${gtk}/include/freetype2
- -I${gtk}/include/cairo
- <!-- PERL -->
- -Wno-comment -I${gtk}/perl/lib/CORE
- <!-- PYTHON -->
- -I${gtk}/python/include
+ -I${gtk}/include/freetype2
+ -I${gtk}/include/cairo
+ -I${gtk}/include/poppler
+ -I${gtk}/include/gc
+ -I${gtk}/include/libwpg-0.1
+ -I${gtk}/include/libwpd-0.8
+ <!-- PERL -->
+ <!-- -Wno-comment -I${gtk}/perl/lib/CORE -->
+ <!-- PYTHON -->
+ -I${gtk}/python/include
+ <!-- JAVA -->
+ -I${src}/bind/javainc -I${src}/bind/javainc/win32
</includes>
- </cc>
+ </cc>
</target>
+ <!--
+ ########################################################################
+ ## T A R G E T : JAVA
+ ########################################################################
+ -->
+ <target name="java" depends="init"
+ description="compile java binding classes">
+ <javac srcdir="${src}/bind/java" destdir="${build}/java/classes"/>
+ </target>
+
+
<!--
########################################################################
## T A R G E T : L I B
########################################################################
-->
- <target name="lib" depends="compile">
+ <!-- set depends to "compile,java" if you want to test that -->
+ <target name="lib" depends="compile"
+ description="create a static library">
<staticlib command="${archutil}ar crsv"
file="${build}/libinkscape.a">
- <fileset dir="${build}/obj">
- <exclude name="main,o"/>
- <exclude name="winmain,o"/>
- <exclude name="inkview,o"/>
- </fileset>
- </staticlib>
+ <fileset dir="${build}/obj">
+ <exclude name="main.o"/>
+ <exclude name="winmain.o"/>
+ <exclude name="inkview.o"/>
+ </fileset>
+ </staticlib>
</target>
## T A R G E T : I 1 8 N
########################################################################
-->
- <target name="i18n" depends="compile">
+ <target name="i18n" depends="compile"
+ description="compile gettext .po files to .mo">
+
<msgfmt todir="${build}/locale" owndir="true"
out="LC_MESSAGES/inkscape.mo">
- <fileset dir="po">
- </fileset>
- </msgfmt>
+ <fileset dir="po">
+ </fileset>
+ </msgfmt>
</target>
## T A R G E T : L I N K
########################################################################
-->
- <target name="link" depends="lib">
+ <target name="link" depends="lib"
+ description="link objects and library to create executable">
+
<rc command="${archutil}windres"
- file="${src}/inkscape.rc"
- out="${build}/inkres.o">
- <flags>
- --include-dir=${src}
- </flags>
- </rc>
+ file="${src}/inkscape.rc"
+ out="${build}/inkres.o">
+ <flags>
+ --include-dir=${src}
+ </flags>
+ </rc>
<link command="${arch}g++" out="${build}/inkscape.exe"
strip="true" symfile="${build}/inkscape.dbg"
stripcommand="${archutil}strip"
- objcopycommand="${archutil}objcopy"
- >
+ objcopycommand="${archutil}objcopy">
<flags>
+ -mwindows
</flags>
- <fileset dir="${build}">
- <include name="inkres.o"/>
- <include name="obj/main.o"/>
- <include name="obj/winmain.o"/>
- <include name="libinkscape.a"/>
- </fileset>
- <libs>
- -L${gtk}/lib
- -lgtkmm-2.4 -lgdkmm-2.4 -lglibmm-2.4
+ <fileset dir="${build}">
+ <include name="inkres.o"/>
+ <include name="obj/main.o"/>
+ <include name="obj/winmain.o"/>
+ <include name="libinkscape.a"/>
+ </fileset>
+ <libs>
+ -L${gtk}/lib
+ -lpoppler-cairo -lpoppler-glib -lpoppler.dll
+ -lgtkmm-2.4 -lgdkmm-2.4 -lglibmm-2.4
-latkmm-1.6 -lpangomm-1.4 -lsigc-2.0
-lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0
-lgdk_pixbuf-2.0
-lpangocairo-1.0 -lpangoft2-1.0 -lpangowin32-1.0 -lpango-1.0
- -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lcairo
+ -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0
<!-- PERL -->
- -L${gtk}/perl/lib/CORE -lperl58
+ -L${gtk}/perl/lib/CORE -lperl58
<!-- PYTHON -->
- -L${gtk}/python/libs -lpython24
+ -L${gtk}/python/libs -lpython25
${gtk}/bin/libxml2.dll
+ ${gtk}/bin/libxslt.dll
+ -lcairo.dll
+ -lcairomm-1.0.dll
+ -lwpg-0.1.dll -lwpg-stream-0.1.dll
+ -lwpd-0.8.dll -lwpd-stream-0.8.dll
${gtk}/lib/iconv.lib
+ -lMagick++ -lWand -lMagick
-lfreetype.dll -lfontconfig.dll
- -llcms.dll
-lssl -lcrypto
- -lpng -lpopt ${gtk}/lib/zdll.lib
- -lgc -mwindows -lws2_32 -lintl -lm
- </libs>
- </link>
+ -llcms.dll
+ -lpng -ljpeg.dll -ltiff.dll -lpopt ${gtk}/lib/zdll.lib
+ -lgc
+ -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
+ <!-- 2geom -->
+ <!-- -l2geom -->
+ </libs>
+ </link>
</target>
## T A R G E T : L I N K I N K V I E W
########################################################################
-->
- <target name="linkinkview" depends="lib">
+ <target name="linkinkview" depends="lib"
+ description="link objects and library to create Inkview executable">
+
<rc command="${archutil}windres"
- file="${src}/inkview.rc"
- out="${build}/inkviewres.o">
- <flags>
- --include-dir=${src}
- </flags>
- </rc>
+ file="${src}/inkview.rc"
+ out="${build}/inkviewres.o">
+ <flags>
+ --include-dir=${src}
+ </flags>
+ </rc>
<link command="${arch}g++" out="${build}/inkview.exe"
strip="true" symfile="${build}/inkview.dbg"
stripcommand="${archutil}strip"
- objcopycommand="${archutil}objcopy"
- >
+ objcopycommand="${archutil}objcopy">
<flags>
</flags>
- <fileset dir="${build}">
- < include name="inkviewres.o"/ >
- <include name="obj/inkview.o"/>
- <include name="libinkscape.a"/>
- </fileset>
- <libs>
- -L${gtk}/lib
+ <fileset dir="${build}">
+ <include name="inkviewres.o"/>
+ <include name="obj/inkview.o"/>
+ <include name="libinkscape.a"/>
+ </fileset>
+ <libs>
+ -L${gtk}/lib
+ -lpoppler-cairo -lpoppler-glib -lpoppler.dll
-lgtkmm-2.4 -lgdkmm-2.4 -lglibmm-2.4
-latkmm-1.6 -lpangomm-1.4 -lsigc-2.0
-lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0
-lgdk_pixbuf-2.0
-lpangocairo-1.0 -lpangoft2-1.0 -lpangowin32-1.0 -lpango-1.0
- -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lcairo
+ -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lcairo -lcairomm-1.0
<!-- PERL -->
- -L${gtk}/perl/lib/CORE -lperl58
+ -L${gtk}/perl/lib/CORE -lperl58
<!-- PYTHON -->
- -L${gtk}/python/libs -lpython24
+ -L${gtk}/python/libs -lpython25
${gtk}/bin/libxml2.dll
+ ${gtk}/bin/libxslt.dll
${gtk}/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
-lssl -lcrypto
- -lpng -lpopt ${gtk}/lib/zdll.lib
- -lgc -mwindows -lws2_32 -lintl -lm
- </libs>
- </link>
+ -lpng -ljpeg.dll -ltiff.dll -lpopt ${gtk}/lib/zdll.lib
+ -lgc -mwindows
+ -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
+ </libs>
+ </link>
</target>
########################################################################
-->
<target name="dist" depends="link,i18n"
- description="generate the distribution" >
+ description="generate the distribution directory with all needed files">
+
<!-- Create the distribution directory -->
<copy file="${build}/inkscape.exe" todir="${dist}"/>
- <copy file="${build}/inkscape.dbg" todir="${dist}"/>
+ <copy file="${build}/inkscape.dbg" todir="${dist}"/>
<copy file="AUTHORS" todir="${dist}"/>
<copy file="COPYING" todir="${dist}"/>
<copy file="COPYING.LIB" todir="${dist}"/>
<copy file="${gtk}/bin/libgtk-win32-2.0-0.dll" todir="${dist}"/>
<copy file="${gtk}/bin/libgthread-2.0-0.dll" todir="${dist}"/>
<copy file="${gtk}/bin/libcairo-2.dll" todir="${dist}"/>
+ <copy file="${gtk}/bin/libpoppler-2.dll" todir="${dist}"/>
<copy file="${gtk}/bin/libpangocairo-1.0-0.dll" todir="${dist}"/>
<copy file="${gtk}/bin/libpango-1.0-0.dll" todir="${dist}"/>
<copy file="${gtk}/bin/libpangoft2-1.0-0.dll" todir="${dist}"/>
<copy file="${gtk}/bin/freetype6.dll" todir="${dist}"/>
<copy file="${gtk}/bin/libfontconfig-1.dll" todir="${dist}"/>
<copy file="${gtk}/bin/libxml2.dll" todir="${dist}"/>
- <copy file="${gtk}/bin/xmlparse.dll" todir="${dist}"/>
+ <copy file="${gtk}/bin/libxslt.dll" todir="${dist}"/>
+ <copy file="${gtk}/bin/libexpat.dll" todir="${dist}"/>
+ <!--<copy file="${gtk}/bin/libexpat.dll" tofile="${dist}/xmlparse.dll"/>-->
+ <copy file="${gtk}/bin/libwpg-0.1.dll" todir="${dist}"/>
+ <copy file="${gtk}/bin/libwpg-stream-0.1.dll" todir="${dist}"/>
+ <copy file="${gtk}/bin/libwpd-0.8.dll" todir="${dist}"/>
+ <copy file="${gtk}/bin/libwpd-stream-0.8.dll" todir="${dist}"/>
<copy file="${gtk}/bin/jpeg62.dll" todir="${dist}"/>
<copy file="${gtk}/bin/libpng13.dll" todir="${dist}"/>
<copy file="${gtk}/bin/libtiff3.dll" todir="${dist}"/>
<copy file="${gtk}/bin/msvcr71.dll" todir="${dist}"/>
<copy file="${gtk}/bin/zlib1.dll" todir="${dist}"/>
<copy file="${gtk}/bin/iconv.dll" todir="${dist}"/>
- <copy file="${gtk}/bin/popt1.dll" todir="${dist}"/>
+ <copy file="${gtk}/bin/libpopt-0.dll" todir="${dist}"/>
<copy file="${gtk}/bin/liblcms-1.dll" todir="${dist}"/>
<copy file="${gtk}/bin/intl.dll" todir="${dist}"/>
<copy file="${gtk}/bin/intl.dll" tofile="${dist}/libintl-2.dll"/>
<!-- MSGFMT files -->
<copy todir="${dist}">
- <fileset dir="${build}/locale">
- <exclude name=".*\.am"/>
- </fileset>
- </copy>
+ <fileset dir="${build}/locale">
+ <exclude name=".*\.am"/>
+ </fileset>
+ </copy>
<!-- GTK -->
<copy todir="${dist}"> <fileset dir="${gtk}/etc"/> </copy>
- <copy file="${gtk}/share/themes/MS-Windows/gtk-2.0/gtkrc" todir="${dist}/etc/gtk-2.0"/>
<copy todir="${dist}/lib"> <fileset dir="${gtk}/lib/gtk-2.0"/> </copy>
<copy todir="${dist}/lib"> <fileset dir="${gtk}/lib/glib-2.0"/> </copy>
<copy todir="${dist}/lib"> <fileset dir="${gtk}/lib/locale"/> </copy>
<copy todir="${dist}">
- <fileset dir="share">
- <exclude name=".*\.am"/>
- </fileset>
- </copy>
+ <fileset dir="share">
+ <exclude name=".*\.am"/>
+ </fileset>
+ </copy>
<copy todir="${dist}/share"> <fileset dir="${gtk}/share/themes"/> </copy>
<mkdir dir="${dist}/data"/>
<mkdir dir="${dist}/locale"/>
<mkdir dir="${dist}/plugins"/>
<copy file="${gtk}/bin/gdb.exe" todir="${dist}"/>
+ <!-- Necessary to run extensions on windows if it is not in the path -->
+ <copy file="${gtk}/bin/gspawn-win32-helper.exe" todir="${dist}"/>
+ <copy file="${gtk}/bin/gspawn-win32-helper-console.exe" todir="${dist}"/>
+
+ <!-- Java - copying this dir is ok even if you dont use it -->
+ <copy todir="${dist}/share"> <fileset dir="${build}/java"/> </copy>
+
<!-- PERL -->
<copy file="${gtk}/perl/bin/perl58.dll" todir="${dist}"/>
<!-- PYTHON -->
- <copy file="${gtk}/python/python24.dll" todir="${dist}"/>
+ <copy file="${gtk}/python/python25.dll" todir="${dist}"/>
<copy file="${gtk}/python/python.exe" todir="${dist}/python"/>
+ <copy file="${gtk}/python/pythonw.exe" todir="${dist}/python"/>
<copy todir="${dist}/python"> <fileset dir="${gtk}/python/Lib"/> </copy>
<copy todir="${dist}/python"> <fileset dir="${gtk}/python/DLLs"/> </copy>
<copy todir="${dist}/python"> <fileset dir="${gtk}/python/Scripts"/> </copy>
+ <!--<copy file="${gtk}/share/themes/MS-Windows/gtk-2.0/gtkrc" todir="${dist}/etc/gtk-2.0"/>-->
+ <makefile file="${dist}/etc/gtk-2.0/gtkrc">
+ gtk-icon-sizes = "gtk-menu=16,16:gtk-small-toolbar=16,16:gtk-large-toolbar=24,24:gtk-dnd=32,32:inkscape-decoration=16,16"
+ gtk-toolbar-icon-size = small-toolbar
+
+ # disable images in buttons. i've only seen ugly delphi apps use this feature.
+ gtk-button-images = 0
+
+ # enable/disable images in menus. most "stock" microsoft apps don't use these, except sparingly.
+ # the office apps use them heavily, though.
+ gtk-menu-images = 1
+
+ # use the win32 button ordering instead of the GNOME HIG one, where applicable
+ gtk-alternative-button-order = 1
+
+ style "msw-default"
+ {
+ GtkWidget::interior-focus = 1
+ GtkOptionMenu::indicator-size = { 9, 5 }
+ GtkOptionMenu::indicator-spacing = { 7, 5, 2, 2 }
+ GtkSpinButton::shadow-type = in
+
+ # Owen and I disagree that these should be themable
+ #GtkUIManager::add-tearoffs = 0
+ #GtkComboBox::add-tearoffs = 0
+
+ GtkComboBox::appears-as-list = 1
+ GtkComboBox::focus-on-click = 0
+
+ GOComboBox::add_tearoffs = 0
+
+ GtkTreeView::allow-rules = 0
+ GtkTreeView::expander-size = 12
+
+ GtkExpander::expander-size = 12
+
+ GtkScrolledWindow::scrollbar_spacing = 1
+
+ GtkSeparatorMenuItem::horizontal-padding = 2
+
+ engine "wimp"
+ {
+ }
+ }
+ class "*" style "msw-default"
+ </makefile>
+
</target>
## T A R G E T : D I S T - A L L
########################################################################
-->
- <target name="dist-all" depends="dist,linkinkview"
+ <target name="dist-all" depends="dist"
description="generate the distribution, along with inkview" >
+
<copy file="${build}/inkview.exe" todir="${dist}"/>
<copy file="${build}/inkview.dbg" todir="${dist}"/>
</target>
########################################################################
-->
<target name="clean"
- description="clean up" >
- <!-- Delete the ${build} and ${dist} directory trees -->
+ description="clean up. deleting build and distro dirs" >
+
<delete dir="${build}"/>
<delete dir="${dist}"/>
+ <delete file="build.dep"/>
+ <delete file="config.h"/>
+
</target>