From: Joonas Lehtinen <joonas.lehtinen@itmill.com>
Date: Mon, 22 Dec 2008 09:49:03 +0000 (+0000)
Subject: Build special OOPHM version of hosted mode launch -file for Linux. Fixes #2403
X-Git-Tag: 6.7.0.beta1~3464
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0db2288bb05caf2a86d8425a083961b20954a0f7;p=vaadin-framework.git

Build special OOPHM version of hosted mode launch -file for Linux. Fixes #2403

svn changeset:6325/svn branch:trunk
---

diff --git a/build/build.xml b/build/build.xml
index 2af01b8806..131f73a56d 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -358,6 +358,15 @@
 				</replacetokens>
 			</filterchain>
 		</copy>
+		<if> <!-- use oophm for hosted mode in Linux only -->
+			<equals arg1="${package-platform}" arg2="linux" />
+			<then> 
+				<var name="hostedmode-platform" value="oophm" />
+			</then>
+			<else>
+				<var name="hostedmode-platform" value="${hostedmode-platform}" />
+			</else>
+		</if>
 		<copy todir="${output-dir}">
 			<filterchain>
 				<expandproperties />
@@ -371,11 +380,16 @@
 					<token key="platform-specific-entries" value="&lt;classpathentry kind=&quot;lib&quot; path=&quot;gwt/gwt-dev-${package-platform}.jar&quot; /&gt;" />
 					<token key="/platform-specific-entries" value="" />
 				</replacetokens>
-				<!-- .classpath, HostedMode.launch, build-widgetset.xml -->
+				<!-- .classpath, build-widgetset.xml -->
 				<replacetokens begintoken="&lt;" endtoken=">">
 					<token key="platform" value="${package-platform}" />
 					<token key="/platform" value="" />
 				</replacetokens>
+				<!-- HostedMode.launch -->
+				<replacetokens begintoken="&lt;" endtoken=">">
+					<token key="hostedmode-platform" value="${hostedmode-platform}" />
+					<token key="/hostedmode-platform" value="" />
+				</replacetokens>
 				<!-- .project, *.launch -->
 				<replacetokens begintoken="&lt;" endtoken=">">
 					<token key="eclipse-workspace-name" value="${eclipse-workspace-name}" />
diff --git a/build/package/eclipse-IT Mill Toolkit Hosted Mode-launch b/build/package/eclipse-IT Mill Toolkit Hosted Mode-launch
index 3ae558420a..a4cb659f4c 100644
--- a/build/package/eclipse-IT Mill Toolkit Hosted Mode-launch	
+++ b/build/package/eclipse-IT Mill Toolkit Hosted Mode-launch	
@@ -2,7 +2,7 @@
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
 <stringAttribute key="bad_container_name" value="/<eclipse-workspace-name></eclipse-workspace-name>/IT Mill Toolkit Hosted Mode.launch"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/<eclipse-workspace-name></eclipse-workspace-name>/gwt/gwt-dev-<platform></platform>.jar"/>
+<listEntry value="/<eclipse-workspace-name></eclipse-workspace-name>/gwt/gwt-dev-<hostedmode-platform></hostedmode-platform>.jar"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>