Adds jitsi-default-overrides.properties to installers if file exist.

cusax-fix 5066
Damian Minkov 12 years ago
parent 1ecdbde30a
commit 999e658691

@ -452,6 +452,7 @@
</fileset>
<fileset dir="${sc.basedir}/lib">
<include name="jitsi-defaults.properties" />
<include name="jitsi-default-overrides.properties" />
</fileset>
<fileset dir="${sc.basedir}/resources/install">
<include name="logging.properties" />
@ -1183,6 +1184,8 @@
files="felix.client.run.properties"/>
<javafilelist dir="${lib}"
files="jitsi-defaults.properties"/>
<javafilelist dir="${lib}"
files="jitsi-default-overrides.properties"/>
</jarbundler>
<!-- -->
@ -1983,6 +1986,10 @@
token="_PACKAGE_NAME_"
value="${package.name}"/>
<available property="jitsi-default-overrides.exists"
file="${lib}/jitsi-default-overrides.properties"/>
<antcall target="-deb-manage-jitsi-default-overrides"/>
<!-- change the package.install file if used from deb target -->
<antcall target="-deb-package.install-file-update"/>
@ -2071,6 +2078,21 @@
</copy>
</target>
<target name="-deb-manage-jitsi-default-overrides"
if="${jitsi-default-overrides.exists}">
<copy file="${lib}/jitsi-default-overrides.properties"
tofile="${debianize.dir}/../lib/jitsi-default-overrides.properties"
overwrite="true"
failonerror="false"/>
<!-- append to -->
<concat destfile="${debianize.dir}/${package.name}.install"
append="true"
eol="lf"
fixlastline="true">lib/jitsi-default-overrides.properties usr/share/${package.name}/lib/&#010;</concat>
</target>
<!-- sets custom build target or a custom one -->
<target name="-deb-build-target-replace"
depends="-deb-build-replace-custom,-deb-build-replace"/>

@ -98,6 +98,10 @@ cp resources/install/logging.properties $RPM_BUILD_ROOT/usr/share/jitsi/lib/
cp lib/felix.client.run.properties $RPM_BUILD_ROOT/usr/share/jitsi/lib/
cp lib/jitsi-defaults.properties $RPM_BUILD_ROOT/usr/share/jitsi/lib/
cp resources/install/resources/splash.gif $RPM_BUILD_ROOT/usr/share/jitsi/
if [ -f lib/jitsi-default-overrides.properties ]
then
cp lib/jitsi-default-overrides.properties $RPM_BUILD_ROOT/usr/share/jitsi/lib/
fi
# Make felix deploy its bundles in ~/.felix/sip-communicator.bin
sed -i -e "s/felix.cache.profiledir=sip-communicator.bin/felix.cache.profile=sip-communicator.bin/" $RPM_BUILD_ROOT/usr/share/jitsi/lib/felix.client.run.properties

Loading…
Cancel
Save