diff options
| author | Damian Minkov <damencho@jitsi.org> | 2014-02-18 10:20:36 +0200 |
|---|---|---|
| committer | Damian Minkov <damencho@jitsi.org> | 2014-02-18 10:21:52 +0200 |
| commit | 7b9ae60ccd94397c243983d8c67f5340ad8915ce (patch) | |
| tree | 66d1e25654ccf8cb7c4b4e5d4d204d9bdb781270 /build.xml | |
| parent | 052f8fba057c8bddb81d06c98c6ae94906092f9e (diff) | |
| download | jitsi-7b9ae60ccd94397c243983d8c67f5340ad8915ce.zip jitsi-7b9ae60ccd94397c243983d8c67f5340ad8915ce.tar.gz jitsi-7b9ae60ccd94397c243983d8c67f5340ad8915ce.tar.bz2 | |
Updates run target in order to be able to start using java 1.7 under macosx without error during initialization of VM.
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 16 |
1 files changed, 11 insertions, 5 deletions
@@ -842,7 +842,7 @@ </target> <!--RUN-JITSI --> - <target name="run" depends="deploy-os-specific-bundles" + <target name="run" depends="deploy-os-specific-bundles,load-properties" description="Starts felix and runs sip-comunicator gui (use latest build)."> <!-- we allow users to pass command line args using the "args" system @@ -851,10 +851,8 @@ the value ${args}--> <property name="args" value=""/> - <!-- Jitsi on Mac OS X uses a JVMTI agent to handle kAEGetURL - AppleScript events. --> <condition property="jvmarg.line" - value="-agentlib:AEGetURLEventHandlerAgent -Xdock:name='Jitsi' -Xdock:icon='resources/images/logo/sc_logo_128x128.icns'" + value="-Xdock:name='${application.name}' -Xdock:icon='resources/images/logo/sc_logo_128x128.icns'" else=""> <isset property="is.running.macos"/> </condition> @@ -865,6 +863,14 @@ <isset property="splashscreen.enable"/> </condition> + <!-- Jitsi on Mac OS X uses a JVMTI agent to handle kAEGetURL + AppleScript events. To enable it use jvmarg.aegeturl property --> + <condition property="jvmarg.aegeturl" + value="-agentlib:AEGetURLEventHandlerAgent" + else=""> + <isset property="aegeturl.enable"/> + </condition> + <condition property="jvm.maxheapsize" value="-Xmx256m" else="" > @@ -934,7 +940,7 @@ detection because -server uses much more memory for 32-bit OS (64-bit always used -server) --> <jvmarg line="${profiler.args} ${jvmarg.line} - -client ${jvm.maxheapsize} ${jvmarg.splash}"/> + -client ${jvm.maxheapsize} ${jvmarg.splash} ${jvmarg.aegeturl}"/> <sysproperty key="apple.laf.useScreenMenuBar" value="true" /> </java> |