Browse Source

Blender Mac OS X Build: Finally fix Build Problems (one has to manually change the ant task as well, to support untarring)

MeFisto94 7 years ago
parent
commit
c9e982f083
1 changed files with 4 additions and 1 deletions
  1. 4 1
      nbi/stub/ext/infra/build/products/blender-macosx/build.xml

+ 4 - 1
nbi/stub/ext/infra/build/products/blender-macosx/build.xml

@@ -57,6 +57,9 @@
     <import file="${common.dir}/product.xml" optional="false"/>
     <import file="${common.dir}/product.xml" optional="false"/>
     
     
     <target name="-pre-package">
     <target name="-pre-package">
+        <untar src="${data.directory}/${product.data.tar}" dest="${data.directory}" compression="bzip2"/>
+        <delete file="${data.directory}/${product.data.tar}"/>
+
         <mkdir dir="${data.directory}/__tmpdir__"/>
         <mkdir dir="${data.directory}/__tmpdir__"/>
 
 
         <move todir="${data.directory}/__tmpdir__">
         <move todir="${data.directory}/__tmpdir__">
@@ -65,7 +68,7 @@
             </fileset>
             </fileset>
         </move>
         </move>
         
         
-        <delete dir="${data.directory}/${product.data.root}" includeemptydirs="true"/>
+        <delete dir="${data.directory}/${product.data.sub.dir}" includeemptydirs="true"/>
 
 
         <move todir="${data.directory}">
         <move todir="${data.directory}">
             <fileset dir="${data.directory}/__tmpdir__">
             <fileset dir="${data.directory}/__tmpdir__">