merge
authorc100726
Tue, 29 Sep 2009 15:45:28 +0100
changeset 542 6003c5f7f4c7
parent 541 d101baab394b (current diff)
parent 539 b8d92de47238 (diff)
child 543 9b1066086d2e
merge
--- a/common/build.postbuild.xml	Tue Sep 29 15:44:48 2009 +0100
+++ b/common/build.postbuild.xml	Tue Sep 29 15:45:28 2009 +0100
@@ -547,7 +547,7 @@
     
     <target name="sf-publish" depends="prep-publish">
         <copy todir="${publish.dir}" preservelastmodified="true" failonerror="false">
-           <fileset dir="${build.log.dir}"><include name="*.zip"/></fileset>
+           <fileset dir="${build.output.dir}/zips/release/"><include name="build_*.zip"/></fileset>
         </copy>
     </target>
 
--- a/sf-platform/build.xml	Tue Sep 29 15:44:48 2009 +0100
+++ b/sf-platform/build.xml	Tue Sep 29 15:45:28 2009 +0100
@@ -303,7 +303,7 @@
 				</antcall>
 			</else>
 		</if>
-		<if><isset property="sf.os.compile.iterate"/>
+		<if><istrue value="${sf.os.compile.iterate}"/>
       <then>
         <for list="${sf.spec.sbs.config}" delimiter="," param="sf.spec.sbs.splitconfig">
           <sequential>