Commit dbf6d64c authored by Dennis Hendriks's avatar Dennis Hendriks
Browse files

Merge branch 'develop' into 'master'

#131 Merge develop to master for v0.2-RC1, with #138 fix.

See merge request !113
parents e9e02e7d 5c0ee258
Pipeline #602 passed with stage
in 0 seconds
......@@ -155,8 +155,8 @@
<phase>package</phase>
<configuration>
<signFiles>
<signFile>${project.build.directory}/products/${project.name}/win32/win32/x86_64/eclipse.exe</signFile>
<signFile>${project.build.directory}/products/${project.name}/win32/win32/x86_64/eclipsec.exe</signFile>
<signFile>${project.build.directory}/products/${project.name}/win32/win32/x86_64/eclipse-escet-${escet.version.enduser}/eclipse.exe</signFile>
<signFile>${project.build.directory}/products/${project.name}/win32/win32/x86_64/eclipse-escet-${escet.version.enduser}/eclipsec.exe</signFile>
</signFiles>
</configuration>
</execution>
......@@ -177,7 +177,7 @@
<phase>package</phase>
<configuration>
<signFiles>
<signFile>${project.build.directory}/products/${project.name}/macosx/cocoa/x86_64/Eclipse.app</signFile>
<signFile>${project.build.directory}/products/${project.name}/macosx/cocoa/x86_64/EclipseESCET-${escet.version.enduser}.app</signFile>
</signFiles>
<timeoutMillis>300000</timeoutMillis>
<continueOnFail>${macSigner.forceContinue}</continueOnFail>
......
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