From d195886a7017a2502e50d1819cba7c5f5d57c22d Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Thu, 14 Apr 2016 15:29:44 -0400
Subject: [PATCH] Remove MaxPermSize from all launchers

The Permanent Generation space was completely removed from Java 8,
using the MaxPermSize parameter only prints a warning and has no
effect on the JVM.

Change-Id: I1d378c0c09a9d8a2861e0d39bfe3bbdf37df0bad
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Reviewed-on: https://git.eclipse.org/r/70700
Reviewed-by: Hudson CI
Reviewed-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Tested-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
---
 TraceCompass.setup                                         | 7 -------
 rcp/org.eclipse.tracecompass.rcp.product/tracing.product   | 2 +-
 .../TraceCompassAUT.launch/TraceCompass.launch             | 2 +-
 .../RunAllCoreTests.launch                                 | 2 +-
 .../tracecompass-e4.5.target                               | 3 +--
 .../tracecompass-e4.6.target                               | 3 +--
 .../tracecompass-eStaging.target                           | 3 +--
 7 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/TraceCompass.setup b/TraceCompass.setup
index f71010880d..784888d6c5 100644
--- a/TraceCompass.setup
+++ b/TraceCompass.setup
@@ -45,13 +45,6 @@
       vm="true">
     <description>Set the heap space needed to work with the projects of ${scope.project.label}</description>
   </setupTask>
-  <setupTask
-      xsi:type="setup:EclipseIniTask"
-      option="-XX:MaxPermSize="
-      value="256m"
-      vm="true">
-    <description>Set the perm size needed to work with the projects of ${scope.project.label}</description>
-  </setupTask>
   <setupTask
       xsi:type="setup:EclipseIniTask"
       option="-Doomph.redirection.tracecompass="
diff --git a/rcp/org.eclipse.tracecompass.rcp.product/tracing.product b/rcp/org.eclipse.tracecompass.rcp.product/tracing.product
index e79aba2f30..d8fddd1780 100644
--- a/rcp/org.eclipse.tracecompass.rcp.product/tracing.product
+++ b/rcp/org.eclipse.tracecompass.rcp.product/tracing.product
@@ -23,7 +23,7 @@ http://www.eclipse.org/legal/epl-v10.html
    </configIni>
 
    <launcherArgs>
-      <programArgs>--launcher.XXMaxPermSize 256m -data @noDefault
+      <programArgs>-data @noDefault
       </programArgs>
       <programArgsLin>--launcher.GTK_version 2
       </programArgsLin>
diff --git a/rcp/org.eclipse.tracecompass.rcp.rcptt.tests/TraceCompassAUT.launch/TraceCompass.launch b/rcp/org.eclipse.tracecompass.rcp.rcptt.tests/TraceCompassAUT.launch/TraceCompass.launch
index 2dcc26a55e..3412a87fd7 100644
--- a/rcp/org.eclipse.tracecompass.rcp.rcptt.tests/TraceCompassAUT.launch/TraceCompass.launch
+++ b/rcp/org.eclipse.tracecompass.rcp.rcptt.tests/TraceCompassAUT.launch/TraceCompass.launch
@@ -20,7 +20,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch x86_64 -consoleLog"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms512m -Xmx1024m -Dosgi.requiredJavaVersion=1.8 -XX:MaxPermSize=128m -DdataPath=${workspace_loc:/org.eclipse.tracecompass.rcp.rcptt.tests/target/dependency/tracecompass-test-traces-ctf-jar}"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms512m -Xmx1024m -Dosgi.requiredJavaVersion=1.8 -DdataPath=${workspace_loc:/org.eclipse.tracecompass.rcp.rcptt.tests/target/dependency/tracecompass-test-traces-ctf-jar}"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.tracecompass.rcp.rcptt.tests/target/aut/trace-compass}"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.tracecompass.rcp.branding.product"/>
diff --git a/releng/org.eclipse.tracecompass.alltests/RunAllCoreTests.launch b/releng/org.eclipse.tracecompass.alltests/RunAllCoreTests.launch
index 2136d505e3..cd5bdebee7 100644
--- a/releng/org.eclipse.tracecompass.alltests/RunAllCoreTests.launch
+++ b/releng/org.eclipse.tracecompass.alltests/RunAllCoreTests.launch
@@ -28,7 +28,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -consolelog"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.tracecompass.alltests"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m&#10;-Xmx512M&#10;-XX:MaxPermSize=256m"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m&#10;-Xmx512M"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.platform.ide"/>
 <booleanAttribute key="run_in_ui_thread" value="false"/>
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.5.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.5.target
index 822c26b2c7..864c7ba62f 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.5.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.5.target
@@ -61,8 +61,7 @@
 <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 <launcherArgs>
 <vmArgs>-Xms40m
--Xmx512M
--XX:MaxPermSize=256m</vmArgs>
+-Xmx512M</vmArgs>
 <programArgs>-consolelog</programArgs>
 </launcherArgs>
 </target>
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.6.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.6.target
index 992e0da0d9..e936189d48 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.6.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.6.target
@@ -65,8 +65,7 @@
 <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 <launcherArgs>
 <vmArgs>-Xms40m
--Xmx512M
--XX:MaxPermSize=256m</vmArgs>
+-Xmx512M</vmArgs>
 <programArgs>-consolelog</programArgs>
 </launcherArgs>
 </target>
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target b/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target
index 0cd2acf225..52e8016a1d 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target
@@ -65,8 +65,7 @@
 <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 <launcherArgs>
 <vmArgs>-Xms40m
--Xmx512M
--XX:MaxPermSize=256m</vmArgs>
+-Xmx512M</vmArgs>
 <programArgs>-consolelog</programArgs>
 </launcherArgs>
 </target>
-- 
2.34.1