diff --git a/releng.wtpbuilder/scripts/build/buildutilities.xml b/releng.wtpbuilder/scripts/build/buildutilities.xml index f439ce7d1469276e65f54a6a2e4e3a9496e92b2d..2960015839edb8d98fb737e9f2bbbae0e04edf36 100644 --- a/releng.wtpbuilder/scripts/build/buildutilities.xml +++ b/releng.wtpbuilder/scripts/build/buildutilities.xml @@ -101,9 +101,8 @@ <!-- --> <!-- ================================================================================== --> <echo message="unzip normalized update jars to a holding place" /> - <!-- previous 'normalize' step (in init) may have set archiveDir, but if not ... --> - <property name="archiveDir" - value="${buildDirectory}/${buildLabel}" /> + + <echo level="info" message="archiveDir: ${archiveDir}" /> <unzip dest="${tmpsite}" @@ -229,6 +228,10 @@ value="${tmpsite}/normalized"> <istrue value="${doPack}" /> </condition> + <condition property="archiveDir" + value="${buildDirectory}/${buildLabel}"> + <isfalse value="${doPack}" /> + </condition> </target>