diff options
| author | Ted Gould <ted@gould.cx> | 2008-10-11 15:16:23 +0000 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2008-10-11 15:16:23 +0000 |
| commit | 2f5eb047d9e05be5e68549ef6b75070d2faa7d2f (patch) | |
| tree | ca2e94164b6d7aaebfc17196ca46bfc825a7665a /build.xml | |
| parent | Merge from trunk. (diff) | |
| download | inkscape-2f5eb047d9e05be5e68549ef6b75070d2faa7d2f.tar.gz inkscape-2f5eb047d9e05be5e68549ef6b75070d2faa7d2f.zip | |
Merging from trunk
(bzr r6884)
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -97,7 +97,7 @@ tofile="${src}/helper/sp-marshal.cpp"/> <makefile file="inkscape_version.h"> - #define INKSCAPE_VERSION "${version}" + #define INKSCAPE_VERSION "${version}, revision ${svn.revision}" </makefile> <makefile file="config.h"> #ifndef _CONFIG_H_ @@ -186,10 +186,11 @@ ######################################################################## --> <target name="touchabout" - description="update the modification time of aboutdialog.cpp"> - <!-- not good <touch file="${src}/ui/dialog/aboutdialog.cpp"/> --> + description="update the modification time of aboutbox.cpp"> + <!-- not good <touch file="${src}/ui/dialog/aboutbox.cpp"/> --> <!-- better --> - <delete file="${build}/obj/ui/dialog/aboutdialog.o"/> + <delete file="${build}/obj/ui/dialog/aboutbox.o"/> + <delete file="inkscape_version.h"/> </target> @@ -342,8 +343,8 @@ <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="xml/test-xml.cpp"/> + <!--<exclude name="xml/test-xml-main.cpp"/>--> <exclude name="io/streamtest.cpp"/> <!--JABBER--> <exclude name="pedro/pedrogui.cpp"/> @@ -884,6 +885,7 @@ <delete dir="${dist}"/> <delete file="build.dep"/> <delete file="config.h"/> + <delete file="inkscape_version.h"/> <delete file="${src}/test-main.cpp"/> <delete file="${src}/test-src.cpp"/> |