fixing mac p2installer.properties error (location)
diff --git a/plugins/org.eclipse.epp.wizard.installerbuilder/src/org/eclipse/epp/wizard/installerbuilder/BuildInstaller.java b/plugins/org.eclipse.epp.wizard.installerbuilder/src/org/eclipse/epp/wizard/installerbuilder/BuildInstaller.java
index 3b0ad88..850609a 100644
--- a/plugins/org.eclipse.epp.wizard.installerbuilder/src/org/eclipse/epp/wizard/installerbuilder/BuildInstaller.java
+++ b/plugins/org.eclipse.epp.wizard.installerbuilder/src/org/eclipse/epp/wizard/installerbuilder/BuildInstaller.java
@@ -43,6 +43,8 @@
/**
* @author Jordi Boehme Lopez <jboehme@innoopract.com>
+ *
+ * TODO Beyhan: BuildInstaller and InstallerCache have redundant. Should be cleaned
*/
public class BuildInstaller extends HttpServlet {
@@ -158,9 +160,10 @@
entry = tis.getNextEntry();
}
String entryName = "eclipse/installer.properties";
- if( os == "macosx" ) {
+ //Bug (Beyhan): installer.properties under macosx should be also in in eclipse/ directory
+ /*if( os == "macosx" ) {
entryName = "eclipse/p2installer.app/Contents/MacOS/installer.properties";
- }
+ }*/
TarEntry tarEntry = new TarEntry( entryName );
ByteArrayInputStream confStream = new ByteArrayInputStream( bytes );
tarEntry.setSize( bytes.length );
diff --git a/plugins/org.eclipse.epp.wizard.installerbuilder/src/org/eclipse/epp/wizard/installerbuilder/InstallerCache.java b/plugins/org.eclipse.epp.wizard.installerbuilder/src/org/eclipse/epp/wizard/installerbuilder/InstallerCache.java
index 4a36173..1d2ffdf 100644
--- a/plugins/org.eclipse.epp.wizard.installerbuilder/src/org/eclipse/epp/wizard/installerbuilder/InstallerCache.java
+++ b/plugins/org.eclipse.epp.wizard.installerbuilder/src/org/eclipse/epp/wizard/installerbuilder/InstallerCache.java
@@ -263,9 +263,10 @@
entry = tis.getNextEntry();
}
String entryName = "eclipse/installer.properties";
- if( key.getOs().equals( "macosx" ) ) {
- entryName = "eclipse/p2installer.app/Contents/MacOS/installer.properties";
- }
+ //Bug (Beyhan): installer.properties under macosx should be also in in eclipse/ directory
+// if( key.getOs().equals( "macosx" ) ) {
+// entryName = "eclipse/p2installer.app/Contents/MacOS/installer.properties";
+// }
TarEntry tarEntry = new TarEntry( entryName );
ByteArrayInputStream confStream = new ByteArrayInputStream( bytes );
tarEntry.setSize( bytes.length );
