Commit 619e0793 authored by Romain Bioteau's avatar Romain Bioteau

tr(installer) fix macosx installer

parent 154a99d5
......@@ -35,6 +35,8 @@
<replace file="${updated.project.file}" token="@mac.shortcut.name@" value="${mac.shortcut.name}"/>
<replace file="${updated.project.file}" token="@windows.shortcut.name@" value="${windows.shortcut.name}"/>
<replace file="${updated.project.file}" token="@linux.shortcut.name@" value="${linux.shortcut.name}"/>
<replace file="${updated.project.file}" token="@mac.studio.dir@" value="${mac.studio.dir}"/>
<replace file="${updated.project.file}" token="@enable.uninstaller@" value="${enable.uninstaller}"/>
<replace file="${updated.project.file}" token="@slide1@" value="${slide1}"/>
<replace file="${updated.project.file}" token="@slide2@" value="${slide2}"/>
<replace file="${updated.project.file}" token="@slide3@" value="${slide3}"/>
......
......@@ -5,6 +5,8 @@ shortcut.base=BonitaStudioCommunity
##### Properties used by build file #####
project.file=${basedir}/installer/installer_project_template.xml
##### Properties used by the project file #####
enable.uninstaller=${enable.uninstaller}
#Product
vendor=Bonitasoft
......@@ -27,7 +29,6 @@ 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=${mac.studio.dir}/${mac.shortcut.name}
#Resources
license=${studio.dir}/gpl-2.0.txt
......
......@@ -13,6 +13,7 @@
<wmImage>@titlebar.image@</wmImage>
<windowsExecutableIcon>@windows.ico@</windowsExecutableIcon>
<osxApplicationBundleIcon>@mac.installer.icns@</osxApplicationBundleIcon>
<createUninstaller>@enable.uninstaller@</createUninstaller>
<slideShowLoop>1</slideShowLoop>
<slideShowTiming>8</slideShowTiming>
<slideShowImageList>
......@@ -75,16 +76,6 @@
</substitutionList>
</substitute>
</preBuildActionList>
<preShowHelpActionList>
<setInstallerVariable>
<!-- Set default path to C: on Windows -->
<name>installdir</name>
<value>${env(SYSTEMDRIVE)}/@product.short.name@-${product_version}</value>
<ruleList>
<platformTest type="windows" />
</ruleList>
</setInstallerVariable>
</preShowHelpActionList>
<preInstallationActionList>
<setInstallerVariable>
<name>continue</name>
......@@ -129,6 +120,14 @@
<ruleList>
<platformTest type="windows" />
</ruleList>
</setInstallerVariable>
<setInstallerVariable>
<!-- Set default path to /Applications on OSX -->
<name>installdir</name>
<value>${platform_install_prefix}</value>
<ruleList>
<platformTest type="osx" />
</ruleList>
</setInstallerVariable>
<setInstallerVariable>
<!-- 32 bits -->
......@@ -140,7 +139,23 @@
</setInstallerVariable>
</preInstallationActionList>
<postInstallationActionList>
<setInstallerVariable name="ini_file" value="${installdir}/configuration/config.ini" persist="1" />
<setInstallerVariable persist="1">
<name>ini_file</name>
<value>${installdir}/configuration/config.ini</value>
<ruleList>
<platformTest>
<negate>1</negate>
<type>osx</type>
</platformTest>
</ruleList>
</setInstallerVariable>
<setInstallerVariable persist="1">
<name>ini_file</name>
<value>${installdir}/@mac.shortcut.name@/Contents/Eclipse/configuration/config.ini</value>
<ruleList>
<platformTest type="osx" />
</ruleList>
</setInstallerVariable>
<iniFileSet>
<file>${ini_file}</file>
<section>Language</section>
......@@ -237,7 +252,7 @@
</conditionRuleList>
</if>
<createDirectory>
<path>${installdir}/@product.short.name@.app/Contents/Eclipse/jre</path>
<path>${installdir}/@mac.shortcut.name@/Contents/Eclipse/jre</path>
<ruleList>
<platformTest>
<type>osx</type>
......@@ -246,7 +261,7 @@
</createDirectory>
<runProgram>
<program>tar</program>
<programArguments>-xzf "${installdir}/@product.short.name@.app/Contents/Eclipse/jre-8u112-macosx-x64.tar.gz" -C "${installdir}/@product.short.name@.app/Contents/Eclipse/jre"</programArguments>
<programArguments>-xzf "${installdir}/@mac.shortcut.name@/Contents/Eclipse/jre-8u112-macosx-x64.tar.gz" -C "${installdir}/@mac.shortcut.name@/Contents/Eclipse/jre"</programArguments>
<progressText>Installing JRE...</progressText>
<ruleList>
<platformTest>
......@@ -256,7 +271,7 @@
</runProgram>
<runProgram>
<program>mv</program>
<programArguments>"${installdir}/@product.short.name@.app/Contents/Eclipse/jre/jre1.8.0_112.jre/Contents" "${installdir}/@product.short.name@.app/Contents/Eclipse/jre"</programArguments>
<programArguments>"${installdir}/@mac.shortcut.name@/Contents/Eclipse/jre/jre1.8.0_112.jre/Contents" "${installdir}/@mac.shortcut.name@/Contents/Eclipse/jre"</programArguments>
<ruleList>
<platformTest>
<type>osx</type>
......@@ -265,7 +280,7 @@
</runProgram>
<runProgram>
<program>rm</program>
<programArguments>-rf "${installdir}/@product.short.name@.app/Contents/Eclipse/jre-8u112-macosx-x64.tar.gz"</programArguments>
<programArguments>-rf "${installdir}/@mac.shortcut.name@/Contents/Eclipse/jre-8u112-macosx-x64.tar.gz"</programArguments>
<ruleList>
<platformTest>
<type>osx</type>
......@@ -274,15 +289,14 @@
</runProgram>
<substitute>
<encoding>utf-8</encoding>
<files>${installdir}/@product.short.name@.app/Contents/Eclipse/@product.short.name@.ini</files>
<files>${installdir}/@mac.shortcut.name@/Contents/Eclipse/@product.short.name@.ini</files>
<type>exact</type>
<substitutionList>
<substitution>
<pattern>--launcher.XXMaxPermSize512m</pattern>
<value>--launcher.XXMaxPermSize512m
-vm
./jre/Contents/Home/bin/java
</value>
-vm
${installdir}/@mac.shortcut.name@/Contents/Eclipse/jre/Contents/Home/bin/java</value>
</substitution>
</substitutionList>
<ruleList>
......@@ -437,6 +451,17 @@
<origin>@studio.dir@/**</origin>
</distributionDirectory>
</distributionFileList>
</folder>
<folder>
<description>Linux Program Files x64</description>
<destination>${installdir}</destination>
<name>linux_programfiles_64</name>
<platforms>linux-x64</platforms>
<distributionFileList>
<distributionDirectory allowWildcards="1">
<origin>@studio.dir@/**</origin>
</distributionDirectory>
</distributionFileList>
</folder>
<folder>
<description>Windows Program Files</description>
......
......@@ -396,6 +396,7 @@
value="${project.build.directory}/products/${productId}/linux/gtk/x86" />
<property name="bitrock.install" value="${project.build.directory}/installers" />
<property name="os_arch" value="32" />
<property name="enable.uninstaller" value="1" />
<property file="installer/installer.properties" />
<property name="installer.name" value="${product.short.name}-${product.version}-x86.run" />
<property name="updated.project.file" value="${basedir}/installer/installer_project_linux_x86.xml" />
......@@ -414,6 +415,7 @@
<property name="studio.dir" value="${project.build.directory}/products/${productId}/linux/gtk/x86_64" />
<property name="bitrock.install" value="${project.build.directory}/installers" />
<property name="os_arch" value="64" />
<property name="enable.uninstaller" value="1" />
<property file="installer/installer.properties" />
<property name="installer.name" value="${product.short.name}-${product.version}-x86_64.run" />
<property name="updated.project.file" value="${basedir}/installer/installer_project_linux_x86_64.xml" />
......@@ -429,14 +431,15 @@
<phase>generate-resources</phase>
<configuration>
<target>
<property name="macs.studio.dir"
value="${project.build.directory}/products/${productId}/macosx/cocoa/x86_64/" />
<property name="mac.studio.dir"
value="${project.build.directory}/products/${productId}/macosx/cocoa/x86_64" />
<property name="studio.dir"
value="${project.build.directory}/products/${productId}/macosx/cocoa/x86_64/${product.short.name}.app/Contents/Eclipse" />
<property name="enable.uninstaller" value="0" />
<property name="bitrock.install" value="${project.build.directory}/installers" />
<property name="os_arch" value="64" />
<property file="installer/installer.properties" />
<property name="installer.name" value="${product.short.name}-${product.version}-x86_64" />
<property name="installer.name" value="${product.short.name}-${product.version}-osx" />
<property name="updated.project.file" value="${basedir}/installer/installer_project_macosx_x86_64.xml" />
<ant antfile="createInstallerProject.xml" />
</target>
......@@ -454,6 +457,7 @@
value="${project.build.directory}/products/${productId}/win32/win32/x86" />
<property name="bitrock.install" value="${project.build.directory}/installers" />
<property name="os_arch" value="32" />
<property name="enable.uninstaller" value="1" />
<property file="installer/installer.properties" />
<property name="installer.name" value="${product.short.name}-${product.version}-x86.exe" />
<property name="updated.project.file" value="${basedir}/installer/installer_project_win_x86.xml" />
......@@ -473,6 +477,7 @@
value="${project.build.directory}/products/${productId}/win32/win32/x86_64" />
<property name="bitrock.install" value="${project.build.directory}/installers" />
<property name="os_arch" value="64" />
<property name="enable.uninstaller" value="1" />
<property file="installer/installer.properties" />
<property name="installer.name" value="${product.short.name}-${product.version}-x86_64.exe" />
<property name="updated.project.file" value="${basedir}/installer/installer_project_win_x86_64.xml" />
......
......@@ -541,21 +541,21 @@ along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.
unpack="false"/>
<plugin
id="org.eclipse.ui.views.properties.tabbed"
id="org.bonitasoft.studio.ui"
download-size="0"
install-size="0"
version="3.8.0.v20170516-1617"
version="0.0.0"
unpack="false"/>
<plugin
id="org.bonitasoft.studio.ui"
id="org.bonitasoft.studio.la"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.bonitasoft.studio.la"
id="org.eclipse.ui.views.properties.tabbed"
download-size="0"
install-size="0"
version="0.0.0"
......
......@@ -16,7 +16,7 @@
<tomcat.bundle.dir>${basedir}/tomcat</tomcat.bundle.dir>
<javadoc.dir>${basedir}/javadoc</javadoc.dir>
<lib.dir>lib</lib.dir>
<tomcat.version>7.0.76</tomcat.version>
<tomcat.version>8.5.16</tomcat.version>
<security.config.file>${basedir}/tomcat/setup/platform_conf/initial/tenant_template_portal/security-config.properties</security.config.file>
<console.config.file>${basedir}/tomcat/setup/platform_conf/initial/tenant_template_portal/console-config.properties</console.config.file>
</properties>
......
......@@ -30,7 +30,7 @@ import org.bonitasoft.studio.preferences.BonitaPreferenceConstants;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jst.server.tomcat.core.internal.Tomcat70Configuration;
import org.eclipse.jst.server.tomcat.core.internal.Tomcat85Configuration;
import org.eclipse.jst.server.tomcat.core.internal.TomcatServer;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.IServerWorkingCopy;
......@@ -62,7 +62,7 @@ public class PortConfiguratorTest {
@Mock
private IServerWorkingCopy serverWC;
@Mock
private Tomcat70Configuration tomcatConfiguration;
private Tomcat85Configuration tomcatConfiguration;
/**
* @throws java.lang.Exception
......@@ -81,7 +81,8 @@ public class PortConfiguratorTest {
public void should_update_client_home_property_with_tomcat_port() throws Exception {
//Given
doReturn(false).when(portConfigurator).isPortInUse(anyInt());
when(tomcatServer.getServerPorts()).thenReturn(toArray(newArrayList(new ServerPort("0", "p1", 8080, "")), ServerPort.class));
when(tomcatServer.getServerPorts())
.thenReturn(toArray(newArrayList(new ServerPort("0", "p1", 8080, "")), ServerPort.class));
//When
portConfigurator.configureServerPort(monitor);
......@@ -96,7 +97,8 @@ public class PortConfiguratorTest {
//Given
doReturn(false).when(portConfigurator).isPortInUse(anyInt());
doThrow(IOException.class).when(clientBonitaHomeBuilder).writeClientProperties();
when(tomcatServer.getServerPorts()).thenReturn(toArray(newArrayList(new ServerPort("0", "p1", 8080, "")), ServerPort.class));
when(tomcatServer.getServerPorts())
.thenReturn(toArray(newArrayList(new ServerPort("0", "p1", 8080, "")), ServerPort.class));
//When
portConfigurator.configureServerPort(monitor);
......@@ -106,7 +108,8 @@ public class PortConfiguratorTest {
public void should_update_port_preference() throws Exception {
//Given
doReturn(false).when(portConfigurator).isPortInUse(anyInt());
when(tomcatServer.getServerPorts()).thenReturn(toArray(newArrayList(new ServerPort("0", "p1", 8182, "")), ServerPort.class));
when(tomcatServer.getServerPorts())
.thenReturn(toArray(newArrayList(new ServerPort("0", "p1", 8182, "")), ServerPort.class));
//When
portConfigurator.configureServerPort(monitor);
......@@ -120,8 +123,10 @@ public class PortConfiguratorTest {
public void should_update_port_if_current_port_is_not_available() throws Exception {
//Given
doReturn(true).when(portConfigurator).isPortInUse(8080);
doReturn(8081).when(portConfigurator).findUnusedPort(PortConfigurator.MIN_PORT_NUMBER, PortConfigurator.MAX_PORT_NUMBER);
when(tomcatServer.getServerPorts()).thenReturn(toArray(newArrayList(new ServerPort("0", "p1", 8080, "")), ServerPort.class));
doReturn(8081).when(portConfigurator).findUnusedPort(PortConfigurator.MIN_PORT_NUMBER,
PortConfigurator.MAX_PORT_NUMBER);
when(tomcatServer.getServerPorts())
.thenReturn(toArray(newArrayList(new ServerPort("0", "p1", 8080, "")), ServerPort.class));
//When
portConfigurator.configureServerPort(monitor);
......
......@@ -90,8 +90,8 @@ public class BOSWebServerManager {
public static final String SERVER_CONFIGURATION_PROJECT = "server_configuration";
private static final String LOGINSERVICE_PATH = "/bonita/loginservice?";
protected static final String WEBSERVERMANAGER_EXTENSION_ID = "org.bonitasoft.studio.engine.bonitaWebServerManager";
protected static final String TOMCAT_SERVER_TYPE = "org.eclipse.jst.server.tomcat.70";
protected static final String TOMCAT_RUNTIME_TYPE = "org.eclipse.jst.server.tomcat.runtime.70";
protected static final String TOMCAT_SERVER_TYPE = "org.eclipse.jst.server.tomcat.85";
protected static final String TOMCAT_RUNTIME_TYPE = "org.eclipse.jst.server.tomcat.runtime.85";
protected static final String START_TIMEOUT = "start-timeout";
protected static final String TMP_DIR = ProjectUtil.getBonitaStudioWorkFolder().getAbsolutePath();
......
......@@ -26,3 +26,4 @@ Require-Bundle: org.eclipse.ui,
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: org.bonitasoft.studio.validation.common.operation
Bundle-Vendor: Bonitasoft S.A.
......@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ManifestVersion: 2
Bundle-Vendor: %providerName
Bundle-Vendor: Bonitasoft S.A.
Export-Package: org.eclipse.emf.edapt.internal.migration;version="1.2.
2",org.eclipse.emf.edapt.internal.migration.impl;version="1.2.2";x-in
ternal:="true",org.eclipse.emf.edapt.internal.migration.internal;vers
......
......@@ -17,7 +17,7 @@ Eclipse-SourceReferences: scm:git:git://git.eclipse.org/gitroot/platfo
rm/eclipse.platform.ui.git;path="bundles/org.eclipse.ui.views.propert
ies.tabbed";tag="I20170516-2000";commitId=d786bd652250609bcd4dbff6a92
91e3ba1824dd9
Bundle-Vendor: %Plugin.providerName
Bundle-Vendor: Bonitasoft S.A.
Import-Package: com.ibm.icu.text
Export-Package: org.eclipse.ui.internal.views.properties.tabbed;x-inte
rnal:=true,org.eclipse.ui.internal.views.properties.tabbed.l10n;x-int
......
......@@ -8,8 +8,8 @@
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
Plugin.name = Tabbed Properties View
Plugin.providerName = Eclipse.org - Bonitasoft
Plugin.name= Tabbed Properties View
Plugin.providerName=Bonitasoft
ExtPoint.propertyContributor = Property Contributor
ExtPoint.propertyTabs = Property Tabs
......
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