Adapt for windows

[gpl/argeo-slc.git] / runtime / org.argeo.slc.osgiboot / src / main / ant / osgiboot.xml

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 c6ba4a96b9aa5899f04621182c0fc3fdda8ead59..ea7b6a4b0b322e37ca753ba019e60a9b335f7161 100644 (file)
--- 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>