diff options
| author | Bob Jamison <ishmalius@gmail.com> | 2009-03-06 17:12:51 +0000 |
|---|---|---|
| committer | ishmal <ishmal@users.sourceforge.net> | 2009-03-06 17:12:51 +0000 |
| commit | 47c590da20671504dd7e8f5d40b5f2d772793d09 (patch) | |
| tree | b5e80a64f591677315eaf33d1b7d1316c8ca0175 | |
| parent | Zero page size, to accommodate stricter GTK+ API. Fixes bug #338196. (diff) | |
| download | inkscape-47c590da20671504dd7e8f5d40b5f2d772793d09.tar.gz inkscape-47c590da20671504dd7e8f5d40b5f2d772793d09.zip | |
fix several non-portable hacks
(bzr r7430)
| -rw-r--r-- | build.xml | 20 |
1 files changed, 12 insertions, 8 deletions
@@ -55,6 +55,7 @@ <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 --> @@ -62,6 +63,9 @@ <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 --> @@ -196,7 +200,7 @@ description="generate test files" > <!-- Generate CxxTest files --> - <cxxtestpart command="${devlibs}/python/python.exe ${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"/> @@ -213,19 +217,19 @@ <include name="verbs-test.h"/> </fileset> </cxxtestpart> - <cxxtestpart command="${devlibs}/python/python.exe ${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="curve-test.h"/> </fileset> </cxxtestpart> - <cxxtestpart command="${devlibs}/python/python.exe ${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="${devlibs}/python/python.exe ${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"/> @@ -239,7 +243,7 @@ <include name="nr-matrix-test.h"/> </fileset> </cxxtestpart> - <cxxtestpart command="${devlibs}/python/python.exe ${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"/> @@ -250,20 +254,20 @@ <include name="svg-path-geom-test.h"/> </fileset> </cxxtestpart> - <cxxtestpart command="${devlibs}/python/python.exe ${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="${devlibs}/python/python.exe ${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="${devlibs}/python/python.exe ${cxxtest}/cxxtestgen.py" + <cxxtestroot command="${python} ${cxxtest}/cxxtestgen.py" out="${src}/test-main.cpp" template="${src}/cxxtest-template.tpl"> <fileset dir="${src}"> |