X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.osgiboot%2Fsrc%2Fmain%2Fant%2Fosgiboot.xml;h=7c89176817d6036e858bf805dc6d629062c840a5;hb=c5f6b86200d9ffb2ea3afcc143b46ac177741e31;hp=3e17370c2ce10dbde789a5ff8e8d2ea73615af36;hpb=370e17b89b62de8a5af827a209a9aaf07e2f0842;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 3e17370c2..7c8917681 100644
--- a/runtime/org.argeo.slc.osgiboot/src/main/ant/osgiboot.xml
+++ b/runtime/org.argeo.slc.osgiboot/src/main/ant/osgiboot.xml
@@ -1,4 +1,5 @@
 <project default="launch">
+	<dirname property="baseDir" file="${ant.file}" />
 	<dirname property="equinoxDir" file="${ant.file}" />
 	<property name="equinoxJar" location="${equinoxDir}/org.eclipse.osgi.jar" />
 	<property name="equinoxArgs" value="-console -clean -noExit" />
@@ -6,14 +7,26 @@
 	<property name="configurationDir" location="${equinoxDir}/configuration" />
 	<property name="configurationFile" location="${configurationDir}/config.ini" />
 
-	<target name="launch" depends="writeConfiguration,start">
+	<path id="slc.osgi.locations.raw.default">
+		<fileset dir="${baseDir}/lib">
+			<include name="*.jar" />
+		</fileset>
+	</path>
 
+	<target name="launch" description="Launch Equinox" depends="prepareDefault,writeConfiguration,start">
+
+	</target>
+
+	<target name="prepareDefault" unless="noDefault">
+		<pathconvert dirsep="/" property="slc.osgi.locations" refid="slc.osgi.locations.raw.default" />
+
+		<property name="slc.osgi.start" value="org.springframework.osgi.extender" />
 	</target>
 
 	<target name="writeConfiguration" description="Generate configuration based on properties">
 		<echo message="equinoxJar=${equinoxJar}" />
 		<echo message="configurationDir=${configurationDir}" />
-		<mkdir dir="${configurationDir}"/>
+		<mkdir dir="${configurationDir}" />
 		<echo message="osgiBootBundle=${osgiBootBundle}" />
 		<echo file="${configurationFile}">
 			<![CDATA[
@@ -45,29 +58,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="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}"/>
-		<exec executable="${starter}" dir="${equinoxDir}">
+		<echo message="commandArgs=${commandArgs}" />
+		<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>
@@ -78,7 +91,8 @@ osgi.bundles=reference:file:${osgiBootBundle}@start
 			<property name="@{name}" value="" />
 			<echo message="@{name}=${@{name}}" />
 			<echo file="${configurationFile}" append="true">
-<![CDATA[@{name}=${@{name}}]]></echo>
+				<![CDATA[@{name}=${@{name}}]]>
+			</echo>
 		</sequential>
 	</macrodef>
 </project>
\ No newline at end of file