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>

diff --git a/TraceCompass.setup b/TraceCompass.setup
index f71010880df6194bf2f03a9bb219db57899d94b5..784888d6c5fb42f7d1b0a786ef7d7cfc3038a9b6 100644 (file)
--- 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 e79aba2f30bc449adc46a37ea3cb6203bbf587d0..d8fddd1780f269ff992dbb04ffff0133f7a85ccb 100644 (file)
--- 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 2dcc26a55e1b2ec5c36c01bcf439c39ba6bfacd0..3412a87fd7f9c664328758f5b0b00b5f4ab2eaf7 100644 (file)
--- 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 2136d505e3afeda3378cfa9e70773ff8e6262c6b..cd5bdebee7fe131fce0cc5846577d7a2dec91a65 100644 (file)
--- 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 822c26b2c73bb4c5a4948ef6fffe2d0e7c56022a..864c7ba62fc8581846d502c21a6831adfdc3286c 100644 (file)
--- 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 992e0da0d93cc131b49063e1c132525c4bd546bf..e936189d48a4a2d992ace035be769da22eb3851f 100644 (file)
--- 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 0cd2acf2250f11945901916ff7002e804d4c7bb9..52e8016a1d8c29b153ff1e51098046c2ae329211 100644 (file)
--- 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>