svn commit: r616651 - in /logging/log4cxx/trunk: build.xml src/ant/common.xml

[ca...@apache.org]

Author: carnold
Date: Tue Jan 29 22:26:43 2008
New Revision: 616651

URL: http://svn.apache.org/viewvc?rev=616651&view=rev
Log:
LOGCXX-230: Drop extra shared from executable.dir

Modified:
    logging/log4cxx/trunk/build.xml
    logging/log4cxx/trunk/src/ant/common.xml

Modified: logging/log4cxx/trunk/build.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/build.xml?rev=616651&r1=616650&r2=616651&view=diff
==============================================================================
--- logging/log4cxx/trunk/build.xml (original)
+++ logging/log4cxx/trunk/build.xml Tue Jan 29 22:26:43 2008
@@ -141,7 +141,7 @@
 
 <target name="init" depends="common-init">
 
-        <property name="log4cxx.lib.dir" value="${executable.dir}/${lib.type}"/>
+        <property name="log4cxx.lib.dir" value="${executable.dir}"/>
         <mkdir dir="${log4cxx.lib.dir}"/>
 
         <condition property="with-logchar" value="wchar_t">

Modified: logging/log4cxx/trunk/src/ant/common.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/ant/common.xml?rev=616651&r1=616650&r2=616651&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/ant/common.xml (original)
+++ logging/log4cxx/trunk/src/ant/common.xml Tue Jan 29 22:26:43 2008
@@ -155,25 +155,21 @@
         <condition property="is-shared" value="1">
               <equals arg1="${lib.type}" arg2="shared"/>
         </condition>
-        <condition property="static.shared" value="static">
-              <equals arg1="${lib.type}" arg2="static"/>
-        </condition>
-        <property name="static.shared" value="shared"/>
 
-        <property name="executable.dir" value="${target.dir}/${debug.release}/${static.shared}"/>
+        <property name="executable.dir" value="${target.dir}/${debug.release}/${lib.type}"/>
 
         <property name="projectsOnly" value="false"/>
         
 </target>
 
 
-<target name="copy-if-changed-checksum" unless="force-copy">
+<target name="copy-if-changed-compare" unless="force-copy">
     <condition property="force-copy" value="2">
          <not><filesmatch file1="${tofile}" file2="${file}"/></not>
     </condition>
 </target>
 
-<target name="copy-if-changed" depends="copy-if-changed-checksum" if="force-copy">
+<target name="copy-if-changed" depends="copy-if-changed-compare" if="force-copy">
     <copy tofile="${tofile}" file="${file}" overwrite="true"/>
 </target>