Bug 201904 - fixing duplicated eclipse.ini in Mac packages

6 files changed, 21 insertions, 6 deletions

diff --git a/plugins/org.eclipse.epp.packaging.core/src/org/eclipse/epp/packaging/core/assembly/CustomTargetsWriter.java b/plugins/org.eclipse.epp.packaging.core/src/org/eclipse/epp/packaging/core/assembly/CustomTargetsWriter.java
index 10111bd6..17fce40b 100644
--- a/plugins/org.eclipse.epp.packaging.core/src/org/eclipse/epp/packaging/core/assembly/CustomTargetsWriter.java
+++ b/plugins/org.eclipse.epp.packaging.core/src/org/eclipse/epp/packaging/core/assembly/CustomTargetsWriter.java
@@ -77,7 +77,8 @@ public class CustomTargetsWriter {
     
     this.writer.append( "    <echo file=\"${tempDirectory}/"  //$NON-NLS-1$
                         + platform.toString( '.' )  
-                        + "/eclipse/eclipse.ini\">" ); //$NON-NLS-1$
+                        + platform.getEclipseIniFilePath()
+                        + "eclipse.ini\">" ); //$NON-NLS-1$
     this.writer.append( platform.getEclipseIniFileContent() );
     this.writer.append( "    </echo>\n" ); //$NON-NLS-1$
     
diff --git a/plugins/org.eclipse.epp.packaging.core/src/org/eclipse/epp/packaging/core/configuration/IModifiablePackagerConfiguration.java b/plugins/org.eclipse.epp.packaging.core/src/org/eclipse/epp/packaging/core/configuration/IModifiablePackagerConfiguration.java
index b8347d52..de5a6ce6 100644
--- a/plugins/org.eclipse.epp.packaging.core/src/org/eclipse/epp/packaging/core/configuration/IModifiablePackagerConfiguration.java
+++ b/plugins/org.eclipse.epp.packaging.core/src/org/eclipse/epp/packaging/core/configuration/IModifiablePackagerConfiguration.java
@@ -39,7 +39,8 @@ public interface IModifiablePackagerConfiguration
   public Platform addTargetPlatform( final String os,
                                      final String ws,
                                      final String arch,
-                                     final String eclipseIniFileContent );
+                                     final String eclipseIniFileContent,
+                                     final String eclipseIniFilePath );
 
   /**Sets the RCP version to use.*/
   public void setRcpVersion( final String version );
diff --git a/plugins/org.eclipse.epp.packaging.core/src/org/eclipse/epp/packaging/core/configuration/IPlatform.java b/plugins/org.eclipse.epp.packaging.core/src/org/eclipse/epp/packaging/core/configuration/IPlatform.java
index f2f7254e..a18977af 100644
--- a/plugins/org.eclipse.epp.packaging.core/src/org/eclipse/epp/packaging/core/configuration/IPlatform.java
+++ b/plugins/org.eclipse.epp.packaging.core/src/org/eclipse/epp/packaging/core/configuration/IPlatform.java
@@ -48,4 +48,7 @@ public interface IPlatform {
   
   /** Returns a string with the content of the eclipse.ini file */
   public String getEclipseIniFileContent();
+
+  /** Returns a string with the internal path to eclipse.ini */
+  public String getEclipseIniFilePath();
 }
diff --git a/plugins/org.eclipse.epp.packaging.core/src/org/eclipse/epp/packaging/core/configuration/PackagerConfiguration.java b/plugins/org.eclipse.epp.packaging.core/src/org/eclipse/epp/packaging/core/configuration/PackagerConfiguration.java
index 5a1751c6..06b485d5 100644
--- a/plugins/org.eclipse.epp.packaging.core/src/org/eclipse/epp/packaging/core/configuration/PackagerConfiguration.java
+++ b/plugins/org.eclipse.epp.packaging.core/src/org/eclipse/epp/packaging/core/configuration/PackagerConfiguration.java
@@ -81,9 +81,10 @@ public class PackagerConfiguration implements IModifiablePackagerConfiguration {
   public Platform addTargetPlatform( final String os,
                                      final String ws,
                                      final String arch,
-                                     final String eclipseIniFileContent )
+                                     final String eclipseIniFileContent, 
+                                     final String eclipseIniFilePath )
   {
-    Platform platform = new Platform( os, ws, arch, eclipseIniFileContent );
+    Platform platform = new Platform( os, ws, arch, eclipseIniFileContent, eclipseIniFilePath );
     this.targetPlatforms.add( platform );
     return platform;
   }
diff --git a/plugins/org.eclipse.epp.packaging.core/src/org/eclipse/epp/packaging/core/configuration/Platform.java b/plugins/org.eclipse.epp.packaging.core/src/org/eclipse/epp/packaging/core/configuration/Platform.java
index d95d5fa9..befcb660 100644
--- a/plugins/org.eclipse.epp.packaging.core/src/org/eclipse/epp/packaging/core/configuration/Platform.java
+++ b/plugins/org.eclipse.epp.packaging.core/src/org/eclipse/epp/packaging/core/configuration/Platform.java
@@ -28,17 +28,20 @@ public class Platform implements IPlatform {
   private final String ws;
   private final String arch;
   private final String eclipseIniFileContent;
+  private final String eclipseIniFilePath;
   private ArchiveFormat archiveFormat = ArchiveFormat.antZip;
 
   public Platform( final String os,
                    final String ws,
                    final String arch,
-                   final String eclipseIniFileContent )
+                   final String eclipseIniFileContent, 
+                   final String eclipseIniFilePath )
   {
     this.os = os;
     this.ws = ws;
     this.arch = arch;
     this.eclipseIniFileContent = eclipseIniFileContent;
+    this.eclipseIniFilePath = eclipseIniFilePath;
   }
 
   @Override
@@ -128,4 +131,8 @@ public class Platform implements IPlatform {
   public String getEclipseIniFileContent() {
     return eclipseIniFileContent;
   }
+  
+  public String getEclipseIniFilePath() {
+    return eclipseIniFilePath;
+  }
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.epp.packaging.core/src/org/eclipse/epp/packaging/core/configuration/xml/ConfigurationParser.java b/plugins/org.eclipse.epp.packaging.core/src/org/eclipse/epp/packaging/core/configuration/xml/ConfigurationParser.java
index 54539547..f014067c 100644
--- a/plugins/org.eclipse.epp.packaging.core/src/org/eclipse/epp/packaging/core/configuration/xml/ConfigurationParser.java
+++ b/plugins/org.eclipse.epp.packaging.core/src/org/eclipse/epp/packaging/core/configuration/xml/ConfigurationParser.java
@@ -53,6 +53,7 @@ public class ConfigurationParser {
   private static final String ATTRIB_ECLIPSE_PRODUCT_ID = "eclipseProductId"; //$NON-NLS-1$
   private static final String ATTRIB_INITIAL_PERSPECTIVE_ID = "initialPerspectiveId"; //$NON-NLS-1$
   private static final String TAG_ECLIPSE_INI_FILE = "eclipseIniFileContent"; //$NON-NLS-1$
+  private static final String ATTRIB_ECLIPSE_INI_PATH = "path"; //$NON-NLS-1$
 
   /**
    * Parses the configuration contained in xmlFile.
@@ -127,7 +128,8 @@ public class ConfigurationParser {
       String arch = platformElement.getAttributeValue( ATTRIB_ARCH );
       IXmlElement eclipseIniFileElement = platformElement.getElement( TAG_ECLIPSE_INI_FILE );
       String eclipseIniFileContent = eclipseIniFileElement.getText();
-      Platform platform = configuration.addTargetPlatform( os, ws, arch, eclipseIniFileContent );
+      String eclipseIniFilePath = eclipseIniFileElement.getAttributeValue( ATTRIB_ECLIPSE_INI_PATH );
+      Platform platform = configuration.addTargetPlatform( os, ws, arch, eclipseIniFileContent, eclipseIniFilePath );
       IXmlElement archiveFormat = platformElement.getElement( TAG_ARCHIVE_FORMAT );
       if( archiveFormat != null ) {
         platform.setArchiveFormat( archiveFormat.getAttributeValue( ATTRIB_FORMAT ) );