X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.osgiboot%2Fsrc%2Fmain%2Fant%2Fosgiboot.xml;h=ea7b6a4b0b322e37ca753ba019e60a9b335f7161;hb=3ad913de8ff7b1cb7e2e38d35ae18aab55cea033;hp=c6ba4a96b9aa5899f04621182c0fc3fdda8ead59;hpb=d2f890cfecc56bddcf0fdca9e2c508567a11e498;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.osgiboot/src/main/ant/osgiboot.xml b/runtime/org.argeo.slc.osgiboot/src/main/ant/osgiboot.xml
index c6ba4a96b..ea7b6a4b0 100644
--- a/runtime/org.argeo.slc.osgiboot/src/main/ant/osgiboot.xml
+++ b/runtime/org.argeo.slc.osgiboot/src/main/ant/osgiboot.xml
@@ -45,30 +45,29 @@ osgi.bundles=reference:file:${osgiBootBundle}@start
 		<condition property="starter" value="gnome-terminal">
 			<and>
 				<os family="unix" />
-				<not>
-					<os family="mac" />
-				</not>
 			</and>
 		</condition>
 		<condition property="starterArgs" value="--maximize -x">
 			<and>
 				<os family="unix" />
-				<not>
-					<os family="mac" />
-				</not>
 			</and>
 		</condition>
-		<condition property="starter" value="cmd">
+		<condition property="starter" value="start">
+			<os family="windows" />
+		</condition>
+		<condition property="vmlauncher" value="false">
 			<os family="windows" />
 		</condition>
 		<property name="starterArgs" value="" />
 		<property name="javaCommand" value="java" />
+		<property name="vmlauncher" value="true" />
 
 		<echo message="commandArgs=${commandArgs}"/>
-		<echo message="${javaCommand} ${commandArgs}" file="${equinoxDir}/start.bat"/>
-		<exec executable="${starter}" dir="${equinoxDir}">
+		<echo message="${javaCommand} ${commandArgs}" file="${equinoxDir}/launch.bat"/>
+		<echo message="${javaCommand} ${commandArgs}" file="${equinoxDir}/launch.sh"/>
+		<exec executable="${starter}" dir="${equinoxDir}" vmlauncher="${vmlauncher}">
 			<arg line="${starterArgs}" />
-			<arg value="${javaCommand}" />
+			<arg line="${javaCommand}" />
 			<arg line="${commandArgs}" />
 		</exec>
 	</target>