diff options
| author | Bob Jamison <ishmalius@gmail.com> | 2006-12-02 15:32:37 +0000 |
|---|---|---|
| committer | ishmal <ishmal@users.sourceforge.net> | 2006-12-02 15:32:37 +0000 |
| commit | d3f3e3efa56746154da0cfd8eaa3b0a5ceae3696 (patch) | |
| tree | 01cee0a7e889a33fe008c92fb3c9f7288d7b6db5 | |
| parent | fix minutes/seconds calc. oops. (diff) | |
| download | inkscape-d3f3e3efa56746154da0cfd8eaa3b0a5ceae3696.tar.gz inkscape-d3f3e3efa56746154da0cfd8eaa3b0a5ceae3696.zip | |
allow 0-length properties
(bzr r2062)
| -rw-r--r-- | build.xml | 16 | ||||
| -rw-r--r-- | buildtool.cpp | 9 |
2 files changed, 13 insertions, 12 deletions
@@ -7,7 +7,9 @@ <!-- set global properties for this build --> <property name="version" value="0.45"/> - <property name="arch" value="i686-pc-mingw32"/> + <property name="arch" value="i686-pc-mingw32-"/> + <!--<property name="archutil" value="${arch}"/>--> + <property name="archutil" value=""/> <property name="src" location="src"/> <property name="gtk" location="c:/gtk210"/> <property name="lib" location="lib"/> @@ -88,7 +90,7 @@ <target name="compile" depends="init" description="compile the source " > <!-- Compile from source to build --> - <cc cc="${arch}-gcc" cxx="${arch}-g++" + <cc cc="${arch}gcc" cxx="${arch}g++" destdir="${build}/obj"> <fileset dir="${src}"> <!-- THINGS TO EXCLUDE --> @@ -197,7 +199,7 @@ </target> <target name="lib" depends="compile"> - <staticlib command="${arch}-ar crsv" + <staticlib command="${archutil}ar crsv" file="${build}/libinkscape.a"> <fileset dir="${build}/obj"> <exclude name="main,o"/> @@ -214,17 +216,17 @@ </target> <target name="link" depends="lib"> - <rc command="${arch}-windres" + <rc command="${archutil}windres" file="${src}/inkscape.rc" out="${build}/inkres.o"> <flags> --include-dir=${src} </flags> </rc> - <link command="${arch}-g++" out="${build}/inkscape.exe" + <link command="${arch}g++" out="${build}/inkscape.exe" strip="true" symfile="${build}/inkscape.dbg" - stripcommand="${arch}-strip" - objcopycommand="${arch}-objcopy" + stripcommand="${archutil}strip" + objcopycommand="${archutil}objcopy" > <flags> </flags> diff --git a/buildtool.cpp b/buildtool.cpp index e61caf9c7..747e9577e 100644 --- a/buildtool.cpp +++ b/buildtool.cpp @@ -7945,8 +7945,9 @@ bool Make::parsePropertyFile(const String &fileName, return false; } val = s.substr(p); - if (key.size()==0 || val.size()==0) + if (key.size()==0) continue; + //allow property to be set, even if val="" //trace("key:'%s' val:'%s'", key.c_str(), val.c_str()); //See if we wanted to overload this property @@ -7991,10 +7992,8 @@ bool Make::parseProperty(Element *elem) { if (!getAttribute(elem, "location", val)) return false; - if (val.size() > 0) - { - properties[attrVal] = val; - } + //let the property exist, even if not defined + properties[attrVal] = val; } //See if we wanted to overload this property std::map<String, String>::iterator iter = |