Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc-Andre Laperle2018-11-29 22:49:59 -0500
committerMarc-Andre Laperle2018-11-29 23:05:14 -0500
commit499cdbf01d7f48cb674046e706d92c8e5545ed16 (patch)
tree4d7a4443de25f951618f53dd2ac4ab9cd5a32013
parent8f9e8f045c11c786c48a2b11d306cc46010f8836 (diff)
downloadorg.eclipse.cdt-499cdbf01d7f48cb674046e706d92c8e5545ed16.tar.gz
org.eclipse.cdt-499cdbf01d7f48cb674046e706d92c8e5545ed16.tar.xz
org.eclipse.cdt-499cdbf01d7f48cb674046e706d92c8e5545ed16.zip
Remove JVM MaxPermSize arguments (unused since Java 8)
Change-Id: Ie33b44064429f409fa721141f14f4e519014f6aa Signed-off-by: Marc-Andre Laperle <malaperle@gmail.com>
-rw-r--r--debug/org.eclipse.cdt.debug.application.product/debug.product2
-rw-r--r--debug/org.eclipse.cdt.debug.application.tests/StandaloneTests.launch2
-rw-r--r--dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml2
-rw-r--r--jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/pom.xml2
-rw-r--r--releng/CDT.setup9
-rw-r--r--releng/org.eclipse.cdt.target/cdt-latest-platform.target1
-rw-r--r--releng/org.eclipse.cdt.target/cdt.target1
7 files changed, 5 insertions, 14 deletions
diff --git a/debug/org.eclipse.cdt.debug.application.product/debug.product b/debug/org.eclipse.cdt.debug.application.product/debug.product
index 9fb748eada..77d7c6b14d 100644
--- a/debug/org.eclipse.cdt.debug.application.product/debug.product
+++ b/debug/org.eclipse.cdt.debug.application.product/debug.product
@@ -14,7 +14,7 @@
</configIni>
<launcherArgs>
- <programArgs>--launcher.XXMaxPermSize 256m -data @noDefault
+ <programArgs>-data @noDefault
</programArgs>
<programArgsLin>--launcher.GTK_version 2
</programArgsLin>
diff --git a/debug/org.eclipse.cdt.debug.application.tests/StandaloneTests.launch b/debug/org.eclipse.cdt.debug.application.tests/StandaloneTests.launch
index b56608c809..a4b8310485 100644
--- a/debug/org.eclipse.cdt.debug.application.tests/StandaloneTests.launch
+++ b/debug/org.eclipse.cdt.debug.application.tests/StandaloneTests.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 -clean"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.cdt.debug.application.tests"/>
<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.cdt.debug.application.product"/>
<booleanAttribute key="run_in_ui_thread" value="false"/>
diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml
index aba5a1fd24..7dac64b053 100644
--- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml
+++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml
@@ -60,7 +60,7 @@
<version>${tycho-version}</version>
<configuration>
<useUIHarness>false</useUIHarness>
- <argLine>${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M -Dcdt.tests.dsf.gdb.path=${dsf.gdb.tests.gdbPath} -Ddsf.gdb.tests.timeout.multiplier=${dsf.gdb.tests.timeout.multiplier} -Dcdt.tests.dsf.gdb.versions=${cdt.tests.dsf.gdb.versions}</argLine>
+ <argLine>${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -Dcdt.tests.dsf.gdb.path=${dsf.gdb.tests.gdbPath} -Ddsf.gdb.tests.timeout.multiplier=${dsf.gdb.tests.timeout.multiplier} -Dcdt.tests.dsf.gdb.versions=${cdt.tests.dsf.gdb.versions}</argLine>
<appArgLine>-debug ./dsf.debug.options</appArgLine>
<includes>
<include>**/${dsf.gdb.tests.gdbTestSuite}</include>
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/pom.xml b/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/pom.xml
index a83734e5eb..3bc02402a3 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/pom.xml
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/pom.xml
@@ -60,7 +60,7 @@
<version>${tycho-version}</version>
<configuration>
<useUIHarness>false</useUIHarness>
- <argLine>${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M -Dcdt.tests.dsf.gdb.path=${dsf.gdb.tests.gdbPath} -Ddsf.gdb.tests.timeout.multiplier=${dsf.gdb.tests.timeout.multiplier} -Dcdt.tests.dsf.gdb.versions=${cdt.tests.dsf.gdb.versions}</argLine>
+ <argLine>${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -Dcdt.tests.dsf.gdb.path=${dsf.gdb.tests.gdbPath} -Ddsf.gdb.tests.timeout.multiplier=${dsf.gdb.tests.timeout.multiplier} -Dcdt.tests.dsf.gdb.versions=${cdt.tests.dsf.gdb.versions}</argLine>
<appArgLine>-debug ./dsf.debug.options</appArgLine>
<includes>
<include>**/${dsf.gdb.tests.gdbTestSuite}</include>
diff --git a/releng/CDT.setup b/releng/CDT.setup
index 0d6a456972..57ae0324b0 100644
--- a/releng/CDT.setup
+++ b/releng/CDT.setup
@@ -43,13 +43,6 @@
<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:ResourceCreationTask"
excludedTriggers="STARTUP MANUAL"
content="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;section name=&quot;Workbench&quot;>&#xD;&#xA;&#x9;&lt;section name=&quot;org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart&quot;>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;true&quot; key=&quot;group_libraries&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;false&quot; key=&quot;linkWithEditor&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;2&quot; key=&quot;layout&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;2&quot; key=&quot;rootMode&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;packageExplorer configured=&amp;quot;true&amp;quot; group_libraries=&amp;quot;1&amp;quot; layout=&amp;quot;2&amp;quot; linkWithEditor=&amp;quot;0&amp;quot; rootMode=&amp;quot;2&amp;quot; sortWorkingSets=&amp;quot;false&amp;quot; workingSetName=&amp;quot;&amp;quot;&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;workingSet editPageId=&amp;quot;org.eclipse.jdt.internal.ui.OthersWorkingSet&amp;quot; factoryID=&amp;quot;org.eclipse.ui.internal.WorkingSetFactory&amp;quot; id=&amp;quot;1382792884467_1&amp;quot; label=&amp;quot;Other Projects&amp;quot; name=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;activeWorkingSet workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;allWorkingSets workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/packageExplorer&amp;gt;&quot; key=&quot;memento&quot;/>&#xD;&#xA;&#x9;&lt;/section>&#xD;&#xA;&lt;/section>&#xD;&#xA;"
@@ -101,7 +94,7 @@
<setupTask
xsi:type="setup.targlets:TargletTask"
programArguments="-consolelog"
- vmArguments="-Xms40m -Xmx512M -XX:MaxPermSize=256m -ea">
+ vmArguments="-Xms40m -Xmx512M -ea">
<targlet
name="CDT"
activeRepositoryList="${eclipse.target.platform}">
diff --git a/releng/org.eclipse.cdt.target/cdt-latest-platform.target b/releng/org.eclipse.cdt.target/cdt-latest-platform.target
index 120c314fae..83aaba64f5 100644
--- a/releng/org.eclipse.cdt.target/cdt-latest-platform.target
+++ b/releng/org.eclipse.cdt.target/cdt-latest-platform.target
@@ -93,7 +93,6 @@
<launcherArgs>
<vmArgs>-Xms40m&#13;
-Xmx512M&#13;
--XX:MaxPermSize=256m&#13;
-ea</vmArgs>
<programArgs>-consolelog</programArgs>
</launcherArgs>
diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target
index d1cabc1e86..abd786f84c 100644
--- a/releng/org.eclipse.cdt.target/cdt.target
+++ b/releng/org.eclipse.cdt.target/cdt.target
@@ -93,7 +93,6 @@
<launcherArgs>
<vmArgs>-Xms40m&#13;
-Xmx512M&#13;
--XX:MaxPermSize=256m&#13;
-ea</vmArgs>
<programArgs>-consolelog</programArgs>
</launcherArgs>

Back to the top