diff --git a/build28.xml b/build28.xml
index dcd2813f7c622637408e3aeec28c32a81c12121e..f0bff1ce22c8ad127c63b49aad3f997b1353b234 100644 (file)
--- a/build28.xml
+++ b/build28.xml
<cc cc="gcc" cxx="g++" destdir="${build}/obj">\r
<fileset dir="${src}">\r
<!-- THINGS TO EXCLUDE -->\r
<cc cc="gcc" cxx="g++" destdir="${build}/obj">\r
<fileset dir="${src}">\r
<!-- THINGS TO EXCLUDE -->\r
- <exclude name="ast"/>\r
- <exclude name="bonobo"/>\r
+ <exclude name="ast/.*"/>\r
+ <exclude name="bonobo/.*"/>\r
<exclude name="deptool.cpp"/>\r
<exclude name="dialogs/filedialog-win32.cpp"/>\r
<exclude name="display/testnr.cpp"/>\r
<exclude name="display/bezier-utils-test.cpp"/>\r
<exclude name="dom/jsdombind.cpp"/>\r
<exclude name="deptool.cpp"/>\r
<exclude name="dialogs/filedialog-win32.cpp"/>\r
<exclude name="display/testnr.cpp"/>\r
<exclude name="display/bezier-utils-test.cpp"/>\r
<exclude name="dom/jsdombind.cpp"/>\r
- <exclude name="dom/work"/>\r
+ <exclude name="dom/work/.*"/>\r
<exclude name="dom/odf/SvgOdg.cpp"/>\r
<exclude name="extension/api.cpp"/>\r
<exclude name="dom/odf/SvgOdg.cpp"/>\r
<exclude name="extension/api.cpp"/>\r
- <exclude name="extension/dxf2svg"/>\r
+ <exclude name="extension/dxf2svg/.*"/>\r
<exclude name="extension/internal/gnome.cpp"/>\r
<exclude name="extension/script/bindtest.cpp"/>\r
<exclude name="extension/script/cpptest.cpp"/>\r
<exclude name="extension/internal/gnome.cpp"/>\r
<exclude name="extension/script/bindtest.cpp"/>\r
<exclude name="extension/script/cpptest.cpp"/>\r
- <exclude name="extension/plugin"/>\r
+ <exclude name="extension/plugin/.*"/>\r
<exclude name="extract-uri-test.cpp"/>\r
<exclude name="helper/units-test.cpp"/>\r
<exclude name="inkview.cpp"/>\r
<exclude name="extract-uri-test.cpp"/>\r
<exclude name="helper/units-test.cpp"/>\r
<exclude name="inkview.cpp"/>\r
<exclude name="round-test.cpp"/>\r
<exclude name="sp-gradient-test.cpp"/>\r
<exclude name="svg/ftos.cpp"/>\r
<exclude name="round-test.cpp"/>\r
<exclude name="sp-gradient-test.cpp"/>\r
<exclude name="svg/ftos.cpp"/>\r
- <exclude name="utest"/>\r
+ <exclude name="utest/.*"/>\r
<exclude name="widgets/test-widgets.cpp"/>\r
<exclude name="xml/quote-test.cpp"/>\r
<exclude name="xml/repr-action-test.cpp"/>\r
<exclude name="widgets/test-widgets.cpp"/>\r
<exclude name="xml/quote-test.cpp"/>\r
<exclude name="xml/repr-action-test.cpp"/>\r
<!--JABBER-->\r
<exclude name="pedro/pedrogui.cpp"/>\r
<exclude name="pedro/pedrogui.h"/>\r
<!--JABBER-->\r
<exclude name="pedro/pedrogui.cpp"/>\r
<exclude name="pedro/pedrogui.h"/>\r
- <exclude name="pedro/work"/>\r
+ <exclude name="pedro/work/.*"/>\r
<!--WHITEBOARD-->\r
<exclude name="ui/dialog/session-player.cpp"/>\r
<exclude name="ui/dialog/whiteboard-connect.cpp"/>\r
<!--WHITEBOARD-->\r
<exclude name="ui/dialog/session-player.cpp"/>\r
<exclude name="ui/dialog/whiteboard-connect.cpp"/>\r
-DHAVE_CONFIG_H\r
-DXP_WIN <!-- for JS -->\r
-D_INTL_REDIRECT_INLINE\r
-DHAVE_CONFIG_H\r
-DXP_WIN <!-- for JS -->\r
-D_INTL_REDIRECT_INLINE\r
+ -DRELAYTOOL_SSL="static const int libssl_is_present=1; static int __attribute__((unused)) libssl_symbol_is_present(char *s){ return 1; }" <!-- inkboard -->\r
-DWITH_INKBOARD -DHAVE_SSL <!-- inkboard -->\r
</defines>\r
<includes>\r
-DWITH_INKBOARD -DHAVE_SSL <!-- inkboard -->\r
</defines>\r
<includes>\r
</target>\r
\r
<target name="lib" depends="compile">\r
</target>\r
\r
<target name="lib" depends="compile">\r
- <ar file="${build}/libinkscape.a">\r
+ <staticlib file="${build}/libinkscape.a">\r
<fileset dir="${build}/obj">\r
<exclude name="main,o"/>\r
<exclude name="winmain,o"/>\r
</fileset>\r
<fileset dir="${build}/obj">\r
<exclude name="main,o"/>\r
<exclude name="winmain,o"/>\r
</fileset>\r
- </ar>\r
+ </staticlib>\r
</target>\r
\r
<target name="i18n" depends="compile">\r
</target>\r
\r
<target name="i18n" depends="compile">\r
<strip file="${build}/inkscape.exe"/>\r
</target>\r
\r
<strip file="${build}/inkscape.exe"/>\r
</target>\r
\r
- <target name="dist" depends="link"\r
+ <target name="dist" depends="link,i18n"\r
description="generate the distribution" >\r
<!-- Create the distribution directory -->\r
<copy file="${build}/inkscape.exe" todir="${dist}"/>\r
description="generate the distribution" >\r
<!-- Create the distribution directory -->\r
<copy file="${build}/inkscape.exe" todir="${dist}"/>\r
<copy file="${gtk}/bin/libgmodule-2.0-0.dll" todir="${dist}"/>\r
<copy file="${gtk}/bin/libgobject-2.0-0.dll" todir="${dist}"/>\r
<copy file="${gtk}/bin/libgtk-win32-2.0-0.dll" todir="${dist}"/>\r
<copy file="${gtk}/bin/libgmodule-2.0-0.dll" todir="${dist}"/>\r
<copy file="${gtk}/bin/libgobject-2.0-0.dll" todir="${dist}"/>\r
<copy file="${gtk}/bin/libgtk-win32-2.0-0.dll" todir="${dist}"/>\r
- <copy file="${gtk}/bin/libgthread-2.0-0.dlll" todir="${dist}"/>\r
+ <copy file="${gtk}/bin/libgthread-2.0-0.dll" todir="${dist}"/>\r
<copy file="${gtk}/bin/libcairo-2.dll" todir="${dist}"/>\r
<copy file="${gtk}/bin/libpangocairo-1.0-0.dll" todir="${dist}"/>\r
<copy file="${gtk}/bin/libpango-1.0-0.dll" todir="${dist}"/>\r
<copy file="${gtk}/bin/libcairo-2.dll" todir="${dist}"/>\r
<copy file="${gtk}/bin/libpangocairo-1.0-0.dll" todir="${dist}"/>\r
<copy file="${gtk}/bin/libpango-1.0-0.dll" todir="${dist}"/>\r
<copy file="${gtk}/bin/libxml2.dll" todir="${dist}"/>\r
<copy file="${gtk}/bin/xmlparse.dll" todir="${dist}"/>\r
<copy file="${gtk}/bin/jpeg62.dll" todir="${dist}"/>\r
<copy file="${gtk}/bin/libxml2.dll" todir="${dist}"/>\r
<copy file="${gtk}/bin/xmlparse.dll" todir="${dist}"/>\r
<copy file="${gtk}/bin/jpeg62.dll" todir="${dist}"/>\r
- <copy file="${gtk}/bin/libintl-2.dll" todir="${dist}"/>\r
- <copy file="${gtk}/bin/libintl-2.dll" tofile="${dist}/intl.dll"/>\r
- <copy file="${gtk}/bin/libpng13.dlll" todir="${dist}"/>\r
+ <copy file="${gtk}/bin/libpng13.dll" todir="${dist}"/>\r
<copy file="${gtk}/bin/msvcr70.dll" todir="${dist}"/>\r
<copy file="${gtk}/bin/msvcr71.dll" todir="${dist}"/>\r
<copy file="${gtk}/bin/zlib1.dll" todir="${dist}"/>\r
<copy file="${gtk}/bin/iconv.dll" todir="${dist}"/>\r
<copy file="${gtk}/bin/popt1.dll" todir="${dist}"/>\r
<copy file="${gtk}/bin/liblcms-1.dll" todir="${dist}"/>\r
<copy file="${gtk}/bin/msvcr70.dll" todir="${dist}"/>\r
<copy file="${gtk}/bin/msvcr71.dll" todir="${dist}"/>\r
<copy file="${gtk}/bin/zlib1.dll" todir="${dist}"/>\r
<copy file="${gtk}/bin/iconv.dll" todir="${dist}"/>\r
<copy file="${gtk}/bin/popt1.dll" todir="${dist}"/>\r
<copy file="${gtk}/bin/liblcms-1.dll" todir="${dist}"/>\r
+ <copy file="${gtk}/bin/intl.dll" todir="${dist}"/>\r
+ <copy file="${gtk}/bin/intl.dll" tofile="${dist}/libintl-2.dll"/>\r
\r
<!-- MSGFMT files -->\r
<copy todir="${dist}"> <fileset dir="${build}/po"/> </copy>\r
\r
<!-- MSGFMT files -->\r
<copy todir="${dist}"> <fileset dir="${build}/po"/> </copy>\r