[465476] Name of the Eclipse Installer executable: oomph?

https://bugs.eclipse.org/bugs/show_bug.cgi?id=465476

11 files changed, 25 insertions, 37 deletions

diff --git a/plugins/org.eclipse.oomph.extractor.lib.tests/src/org/eclipse/oomph/extractor/lib/tests/BINDescriptorTest.java b/plugins/org.eclipse.oomph.extractor.lib.tests/src/org/eclipse/oomph/extractor/lib/tests/BINDescriptorTest.java
index 527667818..d06bed732 100644
--- a/plugins/org.eclipse.oomph.extractor.lib.tests/src/org/eclipse/oomph/extractor/lib/tests/BINDescriptorTest.java
+++ b/plugins/org.eclipse.oomph.extractor.lib.tests/src/org/eclipse/oomph/extractor/lib/tests/BINDescriptorTest.java
@@ -31,8 +31,8 @@ public class BINDescriptorTest
     int micro = 0;
     int bitness = 64;
     int jdk = 0;
-    String launcherPath = "oomph.exe";
-    String iniPath = "oomph.ini";
+    String launcherPath = "eclipse-installer.exe";
+    String iniPath = "eclipse-installer.ini";
 
     String content = major + " " + minor + " " + micro + " " + bitness + " " + jdk + " " + launcherPath + " " + iniPath;
     InputStream stream = new ByteArrayInputStream(content.getBytes());
diff --git a/plugins/org.eclipse.oomph.extractor/Concat/descriptor-32.txt b/plugins/org.eclipse.oomph.extractor/Concat/descriptor-32.txt
index 81ddb121b..6a9e518c6 100644
--- a/plugins/org.eclipse.oomph.extractor/Concat/descriptor-32.txt
+++ b/plugins/org.eclipse.oomph.extractor/Concat/descriptor-32.txt
@@ -4,8 +4,8 @@
 0
 32
 0
-oomph.exe
-oomph.ini
+eclipse-installer.exe
+eclipse-installer.ini
 Eclipse Installer
 http://wiki.eclipse.org/Eclipse_Installer
 http://download.eclipse.org/oomph/jre/128x128.png
diff --git a/plugins/org.eclipse.oomph.extractor/Concat/descriptor-64.txt b/plugins/org.eclipse.oomph.extractor/Concat/descriptor-64.txt
index fef854019..e2b558b01 100644
--- a/plugins/org.eclipse.oomph.extractor/Concat/descriptor-64.txt
+++ b/plugins/org.eclipse.oomph.extractor/Concat/descriptor-64.txt
@@ -4,8 +4,8 @@
 0
 64
 0
-oomph.exe
-oomph.ini
+eclipse-installer.exe
+eclipse-installer.ini
 Eclipse Installer
 http://wiki.eclipse.org/Eclipse_Installer
 http://download.eclipse.org/oomph/jre/128x128.png
diff --git a/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/KeepInstallerDialog.java b/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/KeepInstallerDialog.java
index 2d6902121..87ff404ad 100644
--- a/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/KeepInstallerDialog.java
+++ b/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/KeepInstallerDialog.java
@@ -49,8 +49,6 @@ public final class KeepInstallerDialog extends AbstractSetupDialog
 
   private Button desktopButton;
 
-  private Button quickLaunchButton;
-
   public KeepInstallerDialog(Shell parentShell, boolean startPermanentInstaller)
   {
     super(parentShell, SHELL_TEXT, 560, 270, SetupInstallerPlugin.INSTANCE, false);
@@ -170,11 +168,7 @@ public final class KeepInstallerDialog extends AbstractSetupDialog
       desktopButton = new Button(parent, SWT.CHECK);
       desktopButton.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false, 2, 1));
       desktopButton.setText("Create desktop shortcut");
-
-      new Label(parent, SWT.NONE);
-      quickLaunchButton = new Button(parent, SWT.CHECK);
-      quickLaunchButton.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false, 2, 1));
-      quickLaunchButton.setText("Pin to task bar");
+      desktopButton.setSelection(true);
     }
 
     getShell().getDisplay().asyncExec(new Runnable()
@@ -205,7 +199,6 @@ public final class KeepInstallerDialog extends AbstractSetupDialog
     {
       final boolean startMenu = startMenuButton == null ? false : startMenuButton.getSelection();
       final boolean desktop = desktopButton == null ? false : desktopButton.getSelection();
-      final boolean quickLaunch = quickLaunchButton == null ? false : quickLaunchButton.getSelection();
 
       ProgressMonitorDialog progressMonitorDialog = new ProgressMonitorDialog((Shell)getShell().getParent());
 
@@ -216,7 +209,7 @@ public final class KeepInstallerDialog extends AbstractSetupDialog
           public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException
           {
             monitor.beginTask("Copying installer to " + location, IProgressMonitor.UNKNOWN);
-            KeepInstallerUtil.keepInstaller(location, startPermanentInstaller, launcher, startMenu, desktop, quickLaunch);
+            KeepInstallerUtil.keepInstaller(location, startPermanentInstaller, launcher, startMenu, desktop, false);
             monitor.done();
           }
         });
diff --git a/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/SimpleKeepInstallerPage.java b/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/SimpleKeepInstallerPage.java
index 4d06f37d1..1b0fd3a16 100644
--- a/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/SimpleKeepInstallerPage.java
+++ b/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/SimpleKeepInstallerPage.java
@@ -52,8 +52,6 @@ public class SimpleKeepInstallerPage extends SimpleInstallerPage
 
   private SimpleCheckbox desktopButton;
 
-  private SimpleCheckbox quickLaunchButton;
-
   private boolean startPermanentInstaller;
 
   public SimpleKeepInstallerPage(Composite parent, SimpleInstallerDialog dialog)
@@ -180,9 +178,7 @@ public class SimpleKeepInstallerPage extends SimpleInstallerPage
 
       new Label(varContainer, SWT.NONE);
       desktopButton = createCheckbox(varContainer, "create desktop shortcut");
-
-      new Label(varContainer, SWT.NONE);
-      quickLaunchButton = createCheckbox(varContainer, "pin to task bar");
+      desktopButton.setChecked(true);
     }
 
     new Label(varContainer, SWT.NONE);
@@ -205,7 +201,6 @@ public class SimpleKeepInstallerPage extends SimpleInstallerPage
         {
           final boolean startMenu = startMenuButton == null ? false : startMenuButton.isChecked();
           final boolean desktop = desktopButton == null ? false : desktopButton.isChecked();
-          final boolean quickLaunch = quickLaunchButton == null ? false : quickLaunchButton.isChecked();
 
           ProgressMonitorDialog progressMonitorDialog = new ProgressMonitorDialog((Shell)getShell().getParent());
 
@@ -216,7 +211,7 @@ public class SimpleKeepInstallerPage extends SimpleInstallerPage
               public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException
               {
                 monitor.beginTask("Copying installer to " + location, IProgressMonitor.UNKNOWN);
-                KeepInstallerUtil.keepInstaller(location, startPermanentInstaller, launcher, startMenu, desktop, quickLaunch);
+                KeepInstallerUtil.keepInstaller(location, startPermanentInstaller, launcher, startMenu, desktop, false);
 
                 UIUtil.getDisplay().asyncExec(new Runnable()
                 {
diff --git a/products/org.eclipse.oomph.setup.installer.product/Installer.product b/products/org.eclipse.oomph.setup.installer.product/Installer.product
index aea87f01c..34a1041e3 100644
--- a/products/org.eclipse.oomph.setup.installer.product/Installer.product
+++ b/products/org.eclipse.oomph.setup.installer.product/Installer.product
@@ -27,12 +27,12 @@ Eclipse Installer
 
    <splash
       location="org.eclipse.oomph.setup.installer" />
-   <launcher name="oomph">
-      <linux icon="icons/oomph.xpm"/>
-      <macosx icon="icons/oomph.icns"/>
+   <launcher name="eclipse-installer">
+      <linux icon="icons/eclipse-installer.xpm"/>
+      <macosx icon="icons/eclipse-installer.icns"/>
       <solaris/>
       <win useIco="true">
-         <ico path="icons/oomph.ico"/>
+         <ico path="icons/eclipse-installer.ico"/>
          <bmp/>
       </win>
    </launcher>
diff --git a/products/org.eclipse.oomph.setup.installer.product/icons/oomph.icns b/products/org.eclipse.oomph.setup.installer.product/icons/eclipse-installer.icns
index 395f61156..395f61156 100644
--- a/products/org.eclipse.oomph.setup.installer.product/icons/oomph.icns
+++ b/products/org.eclipse.oomph.setup.installer.product/icons/eclipse-installer.icns
diff --git a/products/org.eclipse.oomph.setup.installer.product/icons/oomph.ico b/products/org.eclipse.oomph.setup.installer.product/icons/eclipse-installer.ico
index 727c209a0..727c209a0 100644
--- a/products/org.eclipse.oomph.setup.installer.product/icons/oomph.ico
+++ b/products/org.eclipse.oomph.setup.installer.product/icons/eclipse-installer.ico
diff --git a/products/org.eclipse.oomph.setup.installer.product/icons/oomph.xpm b/products/org.eclipse.oomph.setup.installer.product/icons/eclipse-installer.xpm
index 4b7657c2e..4b7657c2e 100644
--- a/products/org.eclipse.oomph.setup.installer.product/icons/oomph.xpm
+++ b/products/org.eclipse.oomph.setup.installer.product/icons/eclipse-installer.xpm
diff --git a/releng/org.eclipse.oomph.releng/deploy.ant b/releng/org.eclipse.oomph.releng/deploy.ant
index 54659805c..fe3c57104 100644
--- a/releng/org.eclipse.oomph.releng/deploy.ant
+++ b/releng/org.eclipse.oomph.releng/deploy.ant
@@ -18,18 +18,18 @@
 	<property name="source" location="${git.clone.location}\products\org.eclipse.oomph.setup.installer.product\target\products\org.eclipse.oomph.setup.installer.product-${platform.suffix}.zip" />
 
 	<target name="init.win32" if="os.win32">
-		<property name="launcher.exe" location="${target}/oomph.exe" />
-		<property name="launcher.ini" location="${target}/oomph.ini" />
+		<property name="launcher.exe" location="${target}/eclipse-installer.exe" />
+		<property name="launcher.ini" location="${target}/eclipse-installer.ini" />
 	</target>
 
 	<target name="init.macosx" if="os.macosx">
-		<property name="launcher.exe" location="${target}/oomph.app/Contents/MacOS/oomph" />
-		<property name="launcher.ini" location="${target}/oomph.app/Contents/MacOS/oomph.ini" />
+		<property name="launcher.exe" location="${target}/Eclipse Installer.app/Contents/MacOS/eclipse-installer" />
+		<property name="launcher.ini" location="${target}/Eclipse Installer.app/Contents/Eclipse/eclipse-installer.ini" />
 	</target>
 
 	<target name="init.linux" if="os.linux">
-		<property name="launcher.exe" location="${target}/oomph" />
-		<property name="launcher.ini" location="${target}/oomph.ini" />
+		<property name="launcher.exe" location="${target}/eclipse-installer" />
+		<property name="launcher.ini" location="${target}/eclipse-installer.ini" />
 	</target>
 
 	<target name="init" depends="init.win32,init.macosx,init.linux">
diff --git a/releng/org.eclipse.oomph.releng/hudson/repackage.sh b/releng/org.eclipse.oomph.releng/hudson/repackage.sh
index efa49d7ab..27b47d10c 100644
--- a/releng/org.eclipse.oomph.releng/hudson/repackage.sh
+++ b/releng/org.eclipse.oomph.releng/hudson/repackage.sh
@@ -47,7 +47,7 @@ for f in *.zip; do
   unzip -qq $SOURCE/$f
   #zip --delete -qq plugins/com.ibm.icu_*.jar 'com/*'
 
-  inifile=oomph.ini
+  inifile=eclipse-installer.ini
   if [[ $f == *macosx* ]]; then
     inifile="Eclipse Installer.app/Contents/Eclipse/$inifile"
   fi
@@ -68,16 +68,16 @@ for f in *.zip; do
       rm -f unsigned.zip signed.zip
     fi
 
-    chmod a+x "Eclipse Installer.app/Contents/MacOS/oomph"
+    chmod a+x "Eclipse Installer.app/Contents/MacOS/eclipse-installer"
     tar -czf $PRODUCTS/eclipse-installer-mac$bitness.tar.gz "Eclipse Installer.app"
 
   elif [[ $f == *win32* ]]; then
     rm -f eclipsec.exe
 
     if [[ "$PACK_AND_SIGN" == true ]]; then
-      echo "  Signing oomph.exe"
-      curl -o signed.exe -F filedata=@oomph.exe http://build.eclipse.org:31338/winsign.php
-      mv signed.exe oomph.exe
+      echo "  Signing eclipse-installer.exe"
+      curl -o signed.exe -F filedata=@eclipse-installer.exe http://build.eclipse.org:31338/winsign.php
+      mv signed.exe eclipse-installer.exe
     fi
 
     zip -r -9 -qq --symlinks $PRODUCTS/$f *