Commit 1cfcb3af authored by Bonita CI's avatar Bonita CI

Merge branch 'release-7.12.0' into 'master'

parents 7c82a7ef e6533dde

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
<product name="Bonita Studio" uid="org.bonitasoft.studio.product" id="org.bonitasoft.studio.product" application="org.bonitasoft.studio.application.application" version="7.11.5.qualifier" useFeatures="true" includeLaunchers="true">
<product name="Bonita Studio" uid="org.bonitasoft.studio.product" id="org.bonitasoft.studio.product" application="org.bonitasoft.studio.application.application" version="7.12.0.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
......
......@@ -286,60 +286,6 @@
</platformTest>
</conditionRuleList>
</if>
<createDirectory>
<path>${installdir}/@mac.shortcut.name@/Contents/Eclipse/jre</path>
<ruleList>
<platformTest>
<type>osx</type>
</platformTest>
</ruleList>
</createDirectory>
<runProgram>
<program>tar</program>
<programArguments>-xzf "${installdir}/@mac.shortcut.name@/Contents/Eclipse/@jre.osx.archive.name@" -C "${installdir}/@mac.shortcut.name@/Contents/Eclipse/jre"</programArguments>
<progressText>Installing JRE...</progressText>
<ruleList>
<platformTest>
<type>osx</type>
</platformTest>
</ruleList>
</runProgram>
<runProgram>
<program>mkdir</program>
<programArguments>-p "${installdir}/@mac.shortcut.name@/Contents/Eclipse/jre/"</programArguments>
<ruleList>
<platformTest>
<type>osx</type>
</platformTest>
</ruleList>
</runProgram>
<runProgram>
<program>mv</program>
<programArguments>"${installdir}/@mac.shortcut.name@/Contents/Eclipse/jre/@jre.folder.name@/Contents/" "${installdir}/@mac.shortcut.name@/Contents/Eclipse/jre/"</programArguments>
<ruleList>
<platformTest>
<type>osx</type>
</platformTest>
</ruleList>
</runProgram>
<runProgram>
<program>rm</program>
<programArguments>-rf "${installdir}/@mac.shortcut.name@/Contents/Eclipse/jre/@jre.folder.name@"</programArguments>
<ruleList>
<platformTest>
<type>osx</type>
</platformTest>
</ruleList>
</runProgram>
<runProgram>
<program>rm</program>
<programArguments>-rf "${installdir}/@mac.shortcut.name@/Contents/Eclipse/@jre.osx.archive.name@"</programArguments>
<ruleList>
<platformTest>
<type>osx</type>
</platformTest>
</ruleList>
</runProgram>
<substitute>
<encoding>utf-8</encoding>
<files>${installdir}/@mac.shortcut.name@/Contents/Eclipse/@product.short.name@.ini</files>
......@@ -358,6 +304,13 @@ ${installdir}/@mac.shortcut.name@/Contents/Eclipse/jre/Contents/Home/bin/java
</platformTest>
</ruleList>
</substitute>
<changePermissions permissions="0755" files="${installdir}/@mac.shortcut.name@/Contents/Eclipse/jre/Contents/Home/{lib/*,bin/*}">
<ruleList>
<platformTest>
<type>osx</type>