318288 Have just one script to run batch mode on 32-bit and 64-bit AIX

3 files changed, 16 insertions, 14 deletions

diff --git a/features/org.eclipse.mat.ui.rcp.feature/build.properties b/features/org.eclipse.mat.ui.rcp.feature/build.properties
index 00a70915..c860d391 100644
--- a/features/org.eclipse.mat.ui.rcp.feature/build.properties
+++ b/features/org.eclipse.mat.ui.rcp.feature/build.properties
@@ -23,8 +23,8 @@ root.linux.gtk.ppc.permissions.755=ParseHeapDump.sh
 root.solaris.gtk.sparc=file:rootfiles/linux/ParseHeapDump.sh

 root.solaris.gtk.sparc.permissions.755=ParseHeapDump.sh

 

-root.aix.motif.ppc=file:rootfiles/linux/ParseHeapDump.sh,file:rootfiles/aix/ParseHeapDump2.sh

-root.aix.motif.ppc.permissions.755=ParseHeapDump.sh,ParseHeapDump2.sh

+root.aix.motif.ppc=file:rootfiles/aix/ParseHeapDump.sh

+root.aix.motif.ppc.permissions.755=ParseHeapDump.sh

 

 root.hpux.motif.ia64_32=file:rootfiles/linux/ParseHeapDump.sh

 root.hpux.motif.ia64_32.permissions.755=ParseHeapDump.sh

diff --git a/features/org.eclipse.mat.ui.rcp.feature/rootfiles/aix/ParseHeapDump.sh b/features/org.eclipse.mat.ui.rcp.feature/rootfiles/aix/ParseHeapDump.sh
new file mode 100644
index 00000000..918bd8ee
--- /dev/null
+++ b/features/org.eclipse.mat.ui.rcp.feature/rootfiles/aix/ParseHeapDump.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# This script parses a heap dump.
+# Adjust the path to java, version 5 or later, and the heap size as required.
+# Suitable for 64-bit and 32-bit Java, but a 64-bit Java is required
+# for larger heap sizes.
+#
+# Usage: ParseHeapDump.sh <path/to/dump.dmp.zip> [report]*
+#
+# The leak report has the id org.eclipse.mat.api:suspects
+# The top component report has the id org.eclipse.mat.api:top_components
+#
+
+java -Xmx3072M -jar "`dirname "$0"`"/plugins/org.eclipse.equinox.launcher_1*.jar -consoleLog -application org.eclipse.mat.api.parse "$@"
diff --git a/features/org.eclipse.mat.ui.rcp.feature/rootfiles/aix/ParseHeapDump2.sh b/features/org.eclipse.mat.ui.rcp.feature/rootfiles/aix/ParseHeapDump2.sh
deleted file mode 100644
index bcc5da75..00000000
--- a/features/org.eclipse.mat.ui.rcp.feature/rootfiles/aix/ParseHeapDump2.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# This script parses a heap dump.
-# Suitable for 64-bit and 32-bit Java
-#
-# Usage: ParseHeapDump2.sh <path/to/dump.dmp.zip> [report]*
-#
-# The leak report has the id org.eclipse.mat.api:suspects
-# The top component report has the id org.eclipse.mat.api:top_components
-#
-
-java -Xmx1024m -jar "`dirname "$0"`"/plugins/org.eclipse.equinox.launcher_1*.jar -consoleLog -application org.eclipse.mat.api.parse "$@"