diff options
| author | Damian Minkov <damencho@jitsi.org> | 2007-08-10 13:42:31 +0000 |
|---|---|---|
| committer | Damian Minkov <damencho@jitsi.org> | 2007-08-10 13:42:31 +0000 |
| commit | bbe43966ff9bf7641f63fcaf7200c336bcd46519 (patch) | |
| tree | fc88872dcadb30c941cf5bb065196b481492f414 /resources/install | |
| parent | 1e3951d98ce1ccb4943882d977a8219b75b9690d (diff) | |
| download | jitsi-bbe43966ff9bf7641f63fcaf7200c336bcd46519.zip jitsi-bbe43966ff9bf7641f63fcaf7200c336bcd46519.tar.gz jitsi-bbe43966ff9bf7641f63fcaf7200c336bcd46519.tar.bz2 | |
1. Installers now include all bundles in lib/bundles except junit.
2. Fix message history finder methods - findFirstAfter and tests for multiple contacts in meta contact.
3. Some threads were not daemon - more to be checked
Diffstat (limited to 'resources/install')
| -rwxr-xr-x | resources/install/generic/installer-generic.xml | 6 | ||||
| -rwxr-xr-x | resources/install/linux/installer-linux.xml | 6 | ||||
| -rwxr-xr-x | resources/install/windows/installer-windows.xml | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/resources/install/generic/installer-generic.xml b/resources/install/generic/installer-generic.xml index 4c0656d..95b3ccb 100755 --- a/resources/install/generic/installer-generic.xml +++ b/resources/install/generic/installer-generic.xml @@ -72,8 +72,10 @@ <fileset targetdir="$INSTALL_PATH/lib" dir="lib" override="true"> <include name="*.jar"/> </fileset> - <file targetdir="$INSTALL_PATH/lib/bundle" src="lib/bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar" override="true"/> - <file targetdir="$INSTALL_PATH/lib/bundle/log4j.jar" src="lib/bundle/log4j.jar" override="true"/> + <fileset targetdir="$INSTALL_PATH/lib/bundle" dir="lib/bundle" override="true"> + <include name="*.jar"/> + <exclude name="junit.jar"/> + </fileset> <file targetdir="$INSTALL_PATH/lib" src="lib/felix.client.run.properties" override="true"/> <file targetdir="$INSTALL_PATH/lib" src="resources/install/logging.properties" override="true"/> </pack> diff --git a/resources/install/linux/installer-linux.xml b/resources/install/linux/installer-linux.xml index e878037..2e018d1 100755 --- a/resources/install/linux/installer-linux.xml +++ b/resources/install/linux/installer-linux.xml @@ -73,8 +73,10 @@ <include name="*.jar"/> <exclude name="jmf.jar"/> </fileset> - <file targetdir="$INSTALL_PATH/lib/bundle" src="lib/bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar" override="true"/> - <file targetdir="$INSTALL_PATH/lib/bundle" src="lib/bundle/log4j.jar" override="true"/> + <fileset targetdir="$INSTALL_PATH/lib/bundle" dir="lib/bundle" override="true"> + <include name="*.jar"/> + <exclude name="junit.jar"/> + </fileset> <file targetdir="$INSTALL_PATH/lib" src="lib/felix.client.run.properties" override="true"/> <file targetdir="$INSTALL_PATH/lib" src="resources/install/logging.properties" override="true"/> </pack> diff --git a/resources/install/windows/installer-windows.xml b/resources/install/windows/installer-windows.xml index 2918053..28296a5 100755 --- a/resources/install/windows/installer-windows.xml +++ b/resources/install/windows/installer-windows.xml @@ -76,8 +76,10 @@ <exclude name="jmf.jar"/> <exclude name="sound.jar"/> </fileset> - <file targetdir="$INSTALL_PATH/lib/bundle" src="lib/bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar" override="true"/> - <file targetdir="$INSTALL_PATH/lib/bundle" src="lib/bundle/log4j.jar" override="true"/> + <fileset targetdir="$INSTALL_PATH/lib/bundle" dir="lib/bundle" override="true"> + <include name="*.jar"/> + <exclude name="junit.jar"/> + </fileset> <file targetdir="$INSTALL_PATH/lib" src="lib/felix.client.run.properties" override="true"/> <file targetdir="$INSTALL_PATH/lib" src="resources/install/logging.properties" override="true"/> </pack> |