MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Normalize memory defaults across products build scripts.

Browse Source
This commit is contained in:
Maxim Shafirov
2011-02-07 00:49:49 +03:00
parent 1694d261da
commit 624c74bd62
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/conf/mac/Contents/Info.plist
+6
View File
@@ -74,6 +74,12 @@
<key>VMOptions</key>
<string>@@vmoptions@@ -Xbootclasspath/a:../lib/boot.jar</string>
<key>VMOptions.i386</key>
<string>@@vmoptions32@@</string>
<key>VMOptions.x86_64</key>
<string>@@vmoptions64@@</string>
<key>WorkingDirectory</key>
<string>$APP_PACKAGE/bin</string>
</dict>
build/scripts/dist.gant
+2 -4
View File
@@ -67,8 +67,6 @@ target('default': 'The default target') {
buildNumber: "IC-104.SNAPSHOT",
version: "IdeaX",
system_selector: "IntelliJIdeaCE10",
jdk_req: "1.6*",
vmoptions: "-Xms128m -Xmx512m -XX:MaxPermSize=250m -ea",
home, out)
}
@@ -102,7 +100,7 @@ private def layoutWin(Map args, String home, Paths paths) {
}
patchPropertiesFile(paths.distWin)
ant.echo(file: "$paths.distWin/bin/idea.exe.vmoptions", message: args.vmoptions.replace(' ', '\n'))
ant.echo(file: "$paths.distWin/bin/idea.exe.vmoptions", message: vmoptions32().replace(' ', '\n'))
def winZipPath = "$paths.artifacts/idea${args.buildNumber}.win.zip"
ant.zip(zipfile: winZipPath) {
@@ -179,7 +177,7 @@ def layoutLinux(Map args, String home, Paths paths) {
patchPropertiesFile(paths.distUnix)
ant.echo(file: "$paths.distUnix/bin/idea.vmoptions", message: args.vmoptions.replace(' ', '\n') )
ant.echo(file: "$paths.distUnix/bin/idea.vmoptions", message: vmoptions32().replace(' ', '\n') )
ant.fixcrlf(srcdir: "$paths.distUnix/bin", includes: "idea.vmoptions", eol: "unix")
ant.fixcrlf(srcdir: "$paths.distUnix/bin", includes: "*.sh", eol: "unix")
build/scripts/utils.gant
+10 -1
View File
@@ -25,6 +25,13 @@ binding.setVariable("isEap", {
return "true" == p("component.version.eap")
})
binding.setVariable("mem32", "-Xms128m -Xmx512m -XX:MaxPermSize=250m")
binding.setVariable("mem64", "-Xms128m -Xmx800m -XX:MaxPermSize=350m")
binding.setVariable("common_vmoptions", "-ea")
binding.setVariable("vmoptions32", {"$mem32 $common_vmoptions"})
binding.setVariable("vmoptions64", {"$mem64 $common_vmoptions"})
binding.setVariable("isDefined", {String key ->
try {
this[key]
@@ -153,7 +160,9 @@ binding.setVariable("layoutMacApp", { String path, String ch, Map args ->
replacefilter(token: "@@year@@", value: "$todayYear")
replacefilter(token: "@@version@@", value: version)
replacefilter(token: "@@vmoptions@@", value: args.vmoptions + " -Xverify:none -XX:+UseCompressedOOPS")
replacefilter(token: "@@vmoptions@@", value: "$common_vmoptions -Xverify:none")
replacefilter(token: "@@vmoptions32@@", value: "$mem32")
replacefilter(token: "@@vmoptions64@@", value: "$mem64 -XX:+UseCompressedOOPS")
replacefilter(token: "@@system_selector@@", value: args.system_selector)
replacefilter(token: "@@platform@@", value: platform)
}