Pass in some extra jvm options for linux builds.2.0.1.20101106_1831-73ca7af

4 files changed, 9 insertions, 7 deletions

diff --git a/org.eclipse.swtbot.releng/build.xml b/org.eclipse.swtbot.releng/build.xml
index 61d4278b..684341b2 100644
--- a/org.eclipse.swtbot.releng/build.xml
+++ b/org.eclipse.swtbot.releng/build.xml
@@ -40,7 +40,7 @@
 	<property name="plugin.prefix" value="org.eclipse.swtbot" />
 	<property name="feature.id" value="${plugin.prefix}" />
 	<property name="feature.id.test" value="${feature.id}.test" />
-
+	<property name="extra.jvm.options" value="-server" />
 
 	<property name="test-sandbox" value="${basedir}/test-sandbox" />
 
@@ -311,6 +311,7 @@
 			<arg value="-Dos=${os}" />
 			<arg value="-Dws=${ws}" />
 			<arg value="-Darch=${arch}" />
+			<arg value="-Dextra.jvm.options=${extra.jvm.options}" />
 
 			<!-- one each for each feature that is built -->
 			<arg value="-Dfeature.id=${feature.id}" />
diff --git a/org.eclipse.swtbot.releng/make-release.rb b/org.eclipse.swtbot.releng/make-release.rb
index 0e9b9b18..c69e099c 100755
--- a/org.eclipse.swtbot.releng/make-release.rb
+++ b/org.eclipse.swtbot.releng/make-release.rb
@@ -22,10 +22,10 @@ class Release
     puts "Generating revision log since  #{@available_revision} to HEAD(#{@current_head})"
 
     @revision_log = `git log --pretty='%h - by %cn on %cd%n%s%n%b%n' --date=short #{@available_revision}..#{@current_head}`
-    
+
     @revision_log.gsub!(/.*git-svn-id:.*@(\d+).*/, '  svn-revision: \1')
     @revision_log = @revision_log.gsub(/\t/,"     ").gsub(/.{1,72}(?:\s|\Z)/){($& + 5.chr).gsub(/\n\005/,"\n  ").gsub(/\005/,"\n  ")}
-    
+
     @revision_log += "\n\n"
     @revision_log += open(uri).read
 
@@ -62,7 +62,8 @@ class Release
     release_notes("to-upload/#{code_name}/dev-build")
 
     sh("ant materialize-workspace -Declipse.version=#{version} -Dhas.archives=true")
-    sh("ant cruise -Declipse.version=#{version} -Dhas.archives=true")
+    extra_jvm_opts = "-Dextra.jvm.options=#{ENV['JAVA_OPTS']}" if ENV['JAVA_OPTS']
+    sh("ant cruise -Declipse.version=#{version} -Dhas.archives=true #{extra_jvm_opts}")
     FileUtils.rm_rf("to-upload/#{code_name}")
     FileUtils.mkdir_p("to-upload/#{code_name}")
     FileUtils.mv("artifacts/to-upload", "to-upload/#{code_name}/dev-build")
diff --git a/org.eclipse.swtbot.releng/test-sandbox/org.eclipse.swtbot.eclipse.finder.test.xml b/org.eclipse.swtbot.releng/test-sandbox/org.eclipse.swtbot.eclipse.finder.test.xml
index 187df3b8..8d94fdd7 100644
--- a/org.eclipse.swtbot.releng/test-sandbox/org.eclipse.swtbot.eclipse.finder.test.xml
+++ b/org.eclipse.swtbot.releng/test-sandbox/org.eclipse.swtbot.eclipse.finder.test.xml
@@ -57,7 +57,7 @@
             <property name="testApplication" value="org.eclipse.ui.ide.workbench" />
             <property name="plugin-name" value="${plugin-name}" />
             <property name="classname" value="org.eclipse.swtbot.eclipse.finder.AllTests" />
-            <property name="vmargs" value=" -Xms128M -Xmx368M -XX:MaxPermSize=256M ${jvmOption}" />
+            <property name="vmargs" value=" -Xms128M -Xmx368M -XX:MaxPermSize=256M ${jvmOption} ${extra.jvm.options}" />
         </ant>
     </target>
 
diff --git a/org.eclipse.swtbot.releng/test-sandbox/org.eclipse.swtbot.eclipse.ui.test.xml b/org.eclipse.swtbot.releng/test-sandbox/org.eclipse.swtbot.eclipse.ui.test.xml
index e31f1561..bdd2472b 100644
--- a/org.eclipse.swtbot.releng/test-sandbox/org.eclipse.swtbot.eclipse.ui.test.xml
+++ b/org.eclipse.swtbot.releng/test-sandbox/org.eclipse.swtbot.eclipse.ui.test.xml
@@ -55,14 +55,14 @@
 			<property name="data-dir" value="${temp-workspace}" />
 			<property name="plugin-name" value="${plugin-name}" />
 			<property name="classname" value="org.eclipse.swtbot.eclipse.ui.test.AllTests" />
-			<property name="vmargs" value=" -Xms128M -Xmx368M -XX:MaxPermSize=256M ${jvmOption}" />
+			<property name="vmargs" value=" -Xms128M -Xmx368M -XX:MaxPermSize=256M ${jvmOption} ${extra.jvm.options}" />
 		</ant>
 		
 		<ant target="swtbot-test" antfile="${library-file}" dir="${eclipse-home}">
 			<property name="data-dir" value="${temp-workspace}" />
 			<property name="plugin-name" value="${plugin-name}" />
 			<property name="classname" value="org.eclipse.swtbot.eclipse.ui.functional.AllTests" />
-			<property name="vmargs" value=" -Xms128M -Xmx368M -XX:MaxPermSize=256M ${jvmOption}" />
+			<property name="vmargs" value=" -Xms128M -Xmx368M -XX:MaxPermSize=256M ${jvmOption} ${extra.jvm.options}" />
 		</ant>
 	</target>