Commit 74bb17eb authored by Romain Bioteau's avatar Romain Bioteau Committed by GitHub

tr(tycho) update to tycho 1.0.0 (#643)

* update macosx packaging
* update target platform
* update installer

Closes BS-16931
parent 8b73cb9e
......@@ -41,23 +41,6 @@
<destName>${product.short.name}64.ini</destName>
<outputDirectory />
</file>
<file>
<source>${project.build.directory}/products/${productId}/macosx/cocoa/x86_64/${product.short.name}.app/Contents/MacOS/${product.short.name}.ini</source>
<outputDirectory>./${product.short.name}.app/Contents/MacOS/</outputDirectory>
</file>
<file>
<source>${project.build.directory}/products/${productId}/macosx/cocoa/x86_64/${product.short.name}.app/Contents/MacOS/${product.short.name}</source>
<outputDirectory>./${product.short.name}.app/Contents/MacOS/</outputDirectory>
<fileMode>0755</fileMode>
</file>
<file>
<source>${project.build.directory}/products/${productId}/macosx/cocoa/x86_64/${product.short.name}.app/Contents/Resources/bonitasoft-icon-128-128-transparent.icns</source>
<outputDirectory>./${product.short.name}.app/Contents/Resources/</outputDirectory>
</file>
<file>
<source>${project.build.directory}/products/${productId}/macosx/cocoa/x86_64/${product.short.name}.app/Contents/Info.plist</source>
<outputDirectory>./${product.short.name}.app/Contents/</outputDirectory>
</file>
</files>
<fileSets>
......@@ -101,15 +84,5 @@
</excludes>
<outputDirectory />
</fileSet>
<fileSet>
<directory>${project.build.directory}/products/${productId}/macosx/cocoa/x86_64</directory>
<includes>
<include>**</include>
</includes>
<excludes>
<exclude>${product.short.name}.app</exclude>
</excludes>
<outputDirectory />
</fileSet>
</fileSets>
</assembly>
\ No newline at end of file
......@@ -16,7 +16,7 @@
</vmArgs>
<vmArgsLin>-Djava.endorsed.dirs=endorsed
</vmArgsLin>
<vmArgsMac>-XstartOnFirstThread -Djava.endorsed.dirs=../../../endorsed
<vmArgsMac>-XstartOnFirstThread -Djava.endorsed.dirs=./endorsed
</vmArgsMac>
<vmArgsWin>-Dgreclipse.nonlocking=true -Djava.endorsed.dirs=endorsed
</vmArgsWin>
......
......@@ -27,7 +27,7 @@ linux.shortcut.name=${shortcut.base}
linux.shortcut=${studio.dir}/${linux.shortcut.name}
windows.shortcut=${studio.dir}/${windows.shortcut.name}
windows64.shortcut=${studio.dir}/${windows64.shortcut.name}
mac.shortcut=${studio.dir}/${mac.shortcut.name}
mac.shortcut=${mac.studio.dir}/${mac.shortcut.name}
#Resources
license=${studio.dir}/gpl-2.0.txt
......@@ -37,7 +37,7 @@ leftImage=${img.folder}/leftImage.png
splash=${img.folder}/splash.png
titlebar.image=${img.folder}/icon-installer-48.png
windows.ico=${img.folder}/windows.ico
mac.icns=${studio.dir}/${mac.shortcut.name}/Contents/Resources/icons.icns
mac.icns=${mac.studio.dir}/${mac.shortcut.name}/Contents/Resources/bonitasoft-icon-128-128-transparent.icns
mac.installer.icns=${img.folder}/install.icns
slide1=${img.folder}/slide01-01.png
slide2=${img.folder}/slide02-01.png
......
This diff is collapsed.
......@@ -65,6 +65,14 @@ along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.
id="org.eclipse.emf.edapt.runtime.feature"
version="1.2.2.201705070604"/>
<includes
id="org.eclipse.equinox.p2.extras.feature"
version="0.0.0"/>
<includes
id="org.eclipse.e4.rcp"
version="0.0.0"/>
<requires>
<import feature="org.eclipse.rcp" version="4.7.0.v20170612-1255" match="greaterOrEqual"/>
<import feature="platform-specific-feature" version="7.6.0" match="equivalent"/>
......
......@@ -14,6 +14,8 @@
*/
package org.bonitasoft.studio.designer.ui.property.section.control;
import java.util.Objects;
import org.bonitasoft.studio.common.ExpressionConstants;
import org.bonitasoft.studio.common.emf.tools.ExpressionHelper;
import org.bonitasoft.studio.designer.core.command.UpdateFormMappingCommand;
......@@ -81,7 +83,7 @@ public class FormReferenceExpressionViewer extends ExpressionViewer {
return "";
}
final String displayName = webPageFileStore.getDisplayName();
if (!displayName.equals(fromObject)) {
if (!Objects.equals(displayName,fromObject)) {
updateName(displayName);
}
return displayName;
......
......@@ -702,7 +702,7 @@ public class IterationPropertySection extends AbstractBonitaDescriptionSection {
final Expression expression = (Expression) iteratorObservable.getValue();
final EditingDomainEObjectObservableValueWithRefactoring innerObservableValue = (EditingDomainEObjectObservableValueWithRefactoring) ((DetailObservableValueWithRefactor) expressionReturnTypeDetailValue)
.getInnerObservableValue();
if (expression != null && returnType != null) {
if (expression != null && returnType != null && innerObservableValue != null) {
final MultiInstantiable parentFlowElement = (MultiInstantiable) ModelHelper
.getParentFlowElement(expression);
final Data oldItem = ExpressionHelper.dataFromIteratorExpression(parentFlowElement, expression,
......@@ -712,7 +712,7 @@ public class IterationPropertySection extends AbstractBonitaDescriptionSection {
final Data newItem = ExpressionHelper.dataFromIteratorExpression(parentFlowElement, expressionCopy,
mainProcess(parentFlowElement));
innerObservableValue.setRefactoringCommand(getRefactorCommand(oldItem, newItem, parentFlowElement));
} else {
} else if(innerObservableValue != null) {
innerObservableValue.setRefactoringCommand(null);
}
return value;
......
......@@ -94,6 +94,8 @@
<unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="1.1.0.v20170110-1317"/>
<unit id="org.eclipse.ecf.discovery.feature.feature.group" version="1.0.0.v20170110-1317"/>
<unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.13.7.v20170516-2248"/>
<unit id="org.eclipse.ecf.filetransfer.httpclient4.feature.feature.group" version="3.13.7.v20170516-2248"/>
<unit id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.feature.group" version="1.1.0.v20170110-1317"/>
<unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="1.1.0.v20170110-1317"/>
<unit id="org.eclipse.ecf.provider.generic.feature.feature.group" version="1.0.0.v20170110-1317"/>
<unit id="org.eclipse.ecf.remoteservice.sdk.feature.feature.group" version="3.13.7.v20170517-0201"/>
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?><target includeMode="feature" name="remote_platform" sequenceNumber="229">
<?pde version="3.8"?><target includeMode="feature" name="remote_platform" sequenceNumber="230">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
......@@ -117,6 +117,10 @@
<repository location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.4.0.v20140610-1621"/>
<repository location="http://download.eclipse.org/mmt/qvto/updates/releases"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.birt.feature.group" version="4.7.0.v201706142203"/>
<unit id="org.eclipse.buildship.feature.group" version="2.0.2.v20170420-0909"/>
<unit id="org.eclipse.datatools.enablement.sdk.feature.feature.group" version="1.14.0.201701131441"/>
......@@ -127,6 +131,8 @@
<unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="1.1.0.v20170110-1317"/>
<unit id="org.eclipse.ecf.discovery.feature.feature.group" version="1.0.0.v20170110-1317"/>
<unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.13.7.v20170516-2248"/>
<unit id="org.eclipse.ecf.filetransfer.httpclient4.feature.feature.group" version="3.13.7.v20170516-2248"/>
<unit id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.feature.group" version="1.1.0.v20170110-1317"/>
<unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="1.1.0.v20170110-1317"/>
<unit id="org.eclipse.ecf.provider.generic.feature.feature.group" version="1.0.0.v20170110-1317"/>
<unit id="org.eclipse.ecf.remoteservice.sdk.feature.feature.group" version="3.13.7.v20170517-0201"/>
......@@ -189,10 +195,6 @@
<unit id="org.eclipse.xtext.sdk.feature.group" version="2.12.0.v20170519-1412"/>
<repository location="http://download.eclipse.org/releases/oxygen/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.4.0.v20140610-1621"/>
<repository location="http://download.eclipse.org/mmt/qvto/updates/releases"/>
</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
</target>
......@@ -94,6 +94,8 @@
<unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="1.1.0.v20170110-1317"/>
<unit id="org.eclipse.ecf.discovery.feature.feature.group" version="1.0.0.v20170110-1317"/>
<unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.13.7.v20170516-2248"/>
<unit id="org.eclipse.ecf.filetransfer.httpclient4.feature.feature.group" version="3.13.7.v20170516-2248"/>
<unit id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.feature.group" version="1.1.0.v20170110-1317"/>
<unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="1.1.0.v20170110-1317"/>
<unit id="org.eclipse.ecf.provider.generic.feature.feature.group" version="1.0.0.v20170110-1317"/>
<unit id="org.eclipse.ecf.remoteservice.sdk.feature.feature.group" version="3.13.7.v20170517-0201"/>
......
......@@ -10,8 +10,8 @@
<name>Bonita Studio</name>
<properties>
<!--forceContextQualifier -->
<tychoVersion>0.22.0</tychoVersion>
<tychoExtrasVersion>0.22.0</tychoExtrasVersion>
<tychoVersion>1.0.0</tychoVersion>
<tychoExtrasVersion>1.0.0</tychoExtrasVersion>
<os-jvm-flags></os-jvm-flags>
<bundle.version>${project.version}</bundle.version>
<ui.designer.version>1.6.10</ui.designer.version>
......@@ -33,7 +33,7 @@
<plugin>
<groupId>org.bonitasoft.maven</groupId>
<artifactId>image-overlay-plugin</artifactId>
<version>1.0.2</version>
<version>1.0.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment