Increase max heap size to 1024m
- Fix build ID to always be lexigraphically higher that upstream
This commit is contained in:
parent
2224bc232e
commit
3f218dd8e2
14
eclipse-config-ini-tweaks.patch
Normal file
14
eclipse-config-ini-tweaks.patch
Normal file
@ -0,0 +1,14 @@
|
||||
--- eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product.orig 2014-11-18 10:35:37.607672861 +0000
|
||||
+++ eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product 2014-11-18 10:45:15.633420274 +0000
|
||||
@@ -7,9 +7,9 @@
|
||||
</configIni>
|
||||
|
||||
<launcherArgs>
|
||||
- <programArgs>-showsplash org.eclipse.platform --launcher.XXMaxPermSize 256m --launcher.defaultAction openFile --launcher.appendVmargs
|
||||
+ <programArgs>-showsplash org.eclipse.platform --launcher.XXMaxPermSize 256m --launcher.defaultAction openFile --launcher.appendVmargs -protect master
|
||||
</programArgs>
|
||||
- <vmArgs>-Xms40m -Xmx512m
|
||||
+ <vmArgs>-Xms128m -Xmx1024m -Dorg.eclipse.swt.browser.UseWebKitGTK=true -Dhelp.lucene.tokenizer=standard -Declipse.p2.skipMovedInstallDetection=true
|
||||
</vmArgs>
|
||||
<vmArgsMac>-Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
|
||||
</vmArgsMac>
|
20
eclipse.spec
20
eclipse.spec
@ -38,7 +38,7 @@ Epoch: 1
|
||||
Summary: An open, extensible IDE
|
||||
Name: %{?scl_prefix}eclipse
|
||||
Version: %{eclipse_version}
|
||||
Release: 7%{?dist}
|
||||
Release: 8%{?dist}
|
||||
License: EPL
|
||||
Group: Development/Tools
|
||||
URL: http://www.eclipse.org/
|
||||
@ -125,6 +125,9 @@ Patch26: %{pkg_name}-feature-plugins-to-category-ius.patch
|
||||
# Make workspace selection dialog visible in the task manager of the OS
|
||||
Patch27: eclipse-workspace-chooser.patch
|
||||
|
||||
# Tweaks to the eclipse.ini file
|
||||
Patch28: eclipse-config-ini-tweaks.patch
|
||||
|
||||
BuildRequires: rsync
|
||||
BuildRequires: make, gcc
|
||||
BuildRequires: gtk2-devel
|
||||
@ -340,6 +343,7 @@ tar --strip-components=1 -xf %{SOURCE1}
|
||||
%patch25
|
||||
%patch26
|
||||
%patch27 -p1
|
||||
%patch28
|
||||
|
||||
#Disable as many things as possible to make the build faster. We care only for Eclipse.
|
||||
%pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder
|
||||
@ -505,7 +509,7 @@ xmvn -o clean verify \
|
||||
-Dmaven.test.skip=true -Dnative=gtk.linux.%{eclipse_arch} \
|
||||
-Dtycho.local.keepTarget -Ddirector.running.env.only=true \
|
||||
-Dfedora.p2.repos=`pwd`/.m2/p2/repo-sdk/plugins \
|
||||
-Dtargets=install
|
||||
-Dtargets=install -DbuildType=Z
|
||||
|
||||
#ant again
|
||||
dependencies/fake_ant_dependency.sh \
|
||||
@ -540,11 +544,6 @@ pushd p2/org.eclipse.equinox.p2.engine/.settings
|
||||
sed -i "/repositories\/memory/d" *.prefs ../profileRegistry/SDKProfile.profile/.data/.settings/*.prefs
|
||||
popd
|
||||
|
||||
#ini file adjustements
|
||||
sed -i "s|-Xms40m|-Xms128m|g" eclipse.ini
|
||||
sed -i "s|-Xmx384m|-Xmx512m|g" eclipse.ini
|
||||
sed -i '1i-protect\nmaster' eclipse.ini
|
||||
|
||||
# Use GTK3 by default on F22 or newer
|
||||
%if 0%{?fedora} >= 22
|
||||
sed -i '5i--launcher.GTK_version\n3' eclipse.ini
|
||||
@ -554,8 +553,6 @@ sed -i '5i--launcher.GTK_version\n2' eclipse.ini
|
||||
|
||||
# Temporary fix until https://bugs.eclipse.org/294877 is resolved
|
||||
cat >> eclipse.ini <<EOF
|
||||
-Dorg.eclipse.swt.browser.UseWebKitGTK=true
|
||||
-Dhelp.lucene.tokenizer=standard
|
||||
-XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith
|
||||
-XX:CompileCommand=exclude,org/eclipse/jdt/internal/compiler/lookup/ParameterizedMethodBinding,<init>
|
||||
-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates,instantiateTemplate
|
||||
@ -563,7 +560,6 @@ cat >> eclipse.ini <<EOF
|
||||
-XX:CompileCommand=exclude,org/python/pydev/editor/codecompletion/revisited/PythonPathHelper,isValidSourceFile
|
||||
-XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState
|
||||
-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=%{?_scl_root}/usr/share/eclipse/dropins
|
||||
-Declipse.p2.skipMovedInstallDetection=true
|
||||
EOF
|
||||
|
||||
popd #eclipse
|
||||
@ -1026,6 +1022,10 @@ fi
|
||||
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
|
||||
|
||||
%changelog
|
||||
* Mon Nov 17 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.1-8
|
||||
- Increase max heap size to 1024m
|
||||
- Fix build ID to always be lexigraphically higher that upstream
|
||||
|
||||
* Wed Nov 12 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.1-7
|
||||
- Backport patch to make workspace selection dialog visible in the task manager
|
||||
- Tidy up SWT symlinks
|
||||
|
Loading…
Reference in New Issue
Block a user