diff options
| author | Damian Minkov <damencho@jitsi.org> | 2014-01-31 18:46:30 +0200 |
|---|---|---|
| committer | Damian Minkov <damencho@jitsi.org> | 2014-01-31 18:46:30 +0200 |
| commit | 999e65869142610ff9d6860a0e0e74fe221ffcd7 (patch) | |
| tree | 86d6b9ed9d8ae4ad80de13fcd6836a2909aa5764 | |
| parent | 1ecdbde30aac59989e71c19cb63ac7eec3136940 (diff) | |
| download | jitsi-999e65869142610ff9d6860a0e0e74fe221ffcd7.zip jitsi-999e65869142610ff9d6860a0e0e74fe221ffcd7.tar.gz jitsi-999e65869142610ff9d6860a0e0e74fe221ffcd7.tar.bz2 | |
Adds jitsi-default-overrides.properties to installers if file exist.
| -rw-r--r-- | resources/install/build.xml | 22 | ||||
| -rw-r--r-- | resources/install/rpm/SPECS/jitsi.spec | 4 |
2 files changed, 26 insertions, 0 deletions
diff --git a/resources/install/build.xml b/resources/install/build.xml index a6e3196..801a502 100644 --- a/resources/install/build.xml +++ b/resources/install/build.xml @@ -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/
</concat> + + </target> + <!-- sets custom build target or a custom one --> <target name="-deb-build-target-replace" depends="-deb-build-replace-custom,-deb-build-replace"/> diff --git a/resources/install/rpm/SPECS/jitsi.spec b/resources/install/rpm/SPECS/jitsi.spec index c49242b..a106e84 100644 --- a/resources/install/rpm/SPECS/jitsi.spec +++ b/resources/install/rpm/SPECS/jitsi.spec @@ -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 |