Show
Ignore:
Timestamp:
17.09.2014 21:25:48 (5 years ago)
Author:
ak19
Message:

The OS-specific formatconverter binaries are now in their own GS3/bin/OS folders. For the nightly and release binaries, remove the OS subfolders including their formatconvert binaries that are for other OS than the platform of the nightly/release. Also setting the permissions on the remaining bin/OS folder, in order to have exec permissions on the remaining formatconverter binary.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/release-kits/kits/rk3/ant-scripts/compile.xml

    r29242 r29303  
    175175        <antcall target="strip-svn-dirs"><param name="dir" value="compiled"/></antcall> 
    176176 
    177         <!-- get rid of bin/formatconverter on windows and get rid of bin/formatconverter.exe on linux/mac --> 
     177        <!-- get rid of bin/formatconverter on windows and get rid of bin/formatconverter.exe on linux/mac. Now we have specific OS dirs, so get rid of the irrelevant OS dirs instead --> 
    178178        <if> 
    179179            <bool><equals arg1="${rk.os}" arg2="windows"/></bool> 
    180                 <delete file="compiled/bin/formatconverter"/> 
    181             <else> 
    182                 <delete file="compiled/bin/formatconverter.exe"/> 
    183             </else> 
     180                <delete dir="compiled/bin/darwin"/> 
     181                <delete dir="compiled/bin/linux"/> 
     182            <else><if><bool><equals arg1="${rk.os}" arg2="mac"/></bool> 
     183                <delete dir="compiled/bin/windows"/> 
     184                <delete dir="compiled/bin/linux"/> 
     185                <chmod dir="compiled/bin/darwin" includes="*" perm="775"/> 
     186            <else><if><bool><equals arg1="${rk.os}" arg2="linux"/></bool> 
     187                <delete dir="compiled/bin/windows"/> 
     188                <delete dir="compiled/bin/darwin"/> 
     189                <chmod dir="compiled/bin/linux" includes="*" perm="775"/> 
     190            </if></else> 
     191            </if></else> 
    184192        </if>        
    185193