diff options
author | Damian Minkov <damencho@jitsi.org> | 2006-12-01 08:10:32 +0000 |
---|---|---|
committer | Damian Minkov <damencho@jitsi.org> | 2006-12-01 08:10:32 +0000 |
commit | 4631d138dba56559276a0ca096d6e15effa688c7 (patch) | |
tree | 605cb7e7743f1af78af8ce1cb7e7afabae79be0f /resources/install | |
parent | 1bb3c006a0905533a56d92c4d45d3d5a14e6fb6a (diff) | |
download | jitsi-4631d138dba56559276a0ca096d6e15effa688c7.zip jitsi-4631d138dba56559276a0ca096d6e15effa688c7.tar.gz jitsi-4631d138dba56559276a0ca096d6e15effa688c7.tar.bz2 |
Added Emil recomendations for the package installers
Diffstat (limited to 'resources/install')
-rwxr-xr-x | resources/install/generic/installer-generic.xml | 20 | ||||
-rwxr-xr-x | resources/install/linux/installer-linux.xml | 21 | ||||
-rwxr-xr-x | resources/install/linux/run.sh | 4 | ||||
-rwxr-xr-x | resources/install/windows/installer-windows.xml | 19 | ||||
-rwxr-xr-x | resources/install/windows/run.bat | 3 |
5 files changed, 45 insertions, 22 deletions
diff --git a/resources/install/generic/installer-generic.xml b/resources/install/generic/installer-generic.xml index febf1a9..f972f09 100755 --- a/resources/install/generic/installer-generic.xml +++ b/resources/install/generic/installer-generic.xml @@ -45,16 +45,17 @@ <description>Include all libraries</description> <fileset targetdir="$INSTALL_PATH/lib" dir="lib"> - <include name="**/*.jar"/> - - <exclude name="junit*.jar"/> - <exclude name="**/jmf*/**"/> - <exclude name="native"/> - <exclude name="izpack"/> + <include name="kxml-min.jar"/> + <include name="felix.jar"/> + <include name="servicebinder.jar"/> + </fileset> + <fileset targetdir="$INSTALL_PATH/lib/bundle" dir="lib/bundle"> + <include name="org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar"/> </fileset> + <file targetdir="$INSTALL_PATH/lib" src="lib/felix.client.run.properties"/> - <file targetdir="$INSTALL_PATH/lib" src="lib/logging.properties"/> + <file targetdir="$INSTALL_PATH/lib" src="resources/install/logging.properties"/> </pack> <pack name="util" required="yes"> @@ -141,6 +142,11 @@ <description>SIP Communicator bundle MSN Account Registrattion Wizzard</description> <file targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/msnaccregwizz.jar"/> </pack> + <pack name="version" required="yes"> + <description>SIP Communicator bundle Version</description> + <file targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/version-impl.jar"/> + <file targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/version.jar"/> + </pack> <!-- The executable files --> <pack name="run" required="yes"> diff --git a/resources/install/linux/installer-linux.xml b/resources/install/linux/installer-linux.xml index 3bf38f7..b86f68a 100755 --- a/resources/install/linux/installer-linux.xml +++ b/resources/install/linux/installer-linux.xml @@ -43,16 +43,17 @@ <description>Include all libraries</description> <fileset targetdir="$INSTALL_PATH/lib" dir="lib"> - <include name="**/*.jar"/> - - <exclude name="junit*.jar"/> - <exclude name="**/jmf*/**"/> - <exclude name="native"/> - <exclude name="izpack"/> + <include name="kxml-min.jar"/> + <include name="felix.jar"/> + <include name="servicebinder.jar"/> + </fileset> + <fileset targetdir="$INSTALL_PATH/lib/bundle" dir="lib/bundle"> + <include name="org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar"/> </fileset> + <file targetdir="$INSTALL_PATH/lib" src="lib/felix.client.run.properties"/> - <file targetdir="$INSTALL_PATH/lib" src="lib/logging.properties"/> + <file targetdir="$INSTALL_PATH/lib" src="resources/install/logging.properties"/> </pack> <pack name="native" required="yes"> @@ -145,6 +146,12 @@ <description>SIP Communicator bundle MSN Account Registrattion Wizzard</description> <file targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/msnaccregwizz.jar"/> </pack> + <pack name="version" required="yes"> + <description>SIP Communicator bundle Version</description> + <file targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/version-impl.jar"/> + <file targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/version.jar"/> + </pack> + <!-- The executable files --> <pack name="run" required="yes"> diff --git a/resources/install/linux/run.sh b/resources/install/linux/run.sh index 47f79c9..b93b2e1 100755 --- a/resources/install/linux/run.sh +++ b/resources/install/linux/run.sh @@ -1,3 +1,5 @@ +mkdir -p $HOME/.sip-communicator/log + export PATH=$PATH:native export JAVA_HOME=jre -${JAVA_HOME}/bin/java -classpath "lib/JainSipApi1.1.jar:lib/Stun4J.jar:lib/architectureviewer1.1.jar:lib/bcprov-jdk14-130.jar:lib/joscar-0.9.4-cvs-bin.jar:lib/nist-sdp-1.0.jar:lib/nist-sip-1.2.jar:lib/oscar-aim.jar:lib/felix.jar:lib/kxml-min.jar:lib/retroweaver-rt.jar:lib/retroweaver.jar:lib/servicebinder.jar:lib/BrowserLauncher2.jar:lib/sip-sdp.jar:lib/cindy.jar:lib/commons-logging.jar:lib/jml-1.0a3.jar" -Dicq.custom.message.charset=windows-1251 -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties org.apache.felix.main.Main +${JAVA_HOME}/bin/java -classpath "lib/felix.jar:lib/kxml-min.jar:lib/servicebinder.jar:lib/bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar:sc-bundles/util.jar" -Dicq.custom.message.charset=windows-1251 -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties org.apache.felix.main.Main diff --git a/resources/install/windows/installer-windows.xml b/resources/install/windows/installer-windows.xml index ba204a5..d277dd2 100755 --- a/resources/install/windows/installer-windows.xml +++ b/resources/install/windows/installer-windows.xml @@ -44,15 +44,16 @@ <description>Include all libraries</description> <fileset targetdir="$INSTALL_PATH/lib" dir="lib"> - <include name="**/*.jar"/> - <exclude name="junit*.jar"/> - <exclude name="**/jmf*/**"/> - <exclude name="native"/> - <exclude name="izpack"/> + <include name="kxml-min.jar"/> + <include name="felix.jar"/> + <include name="servicebinder.jar"/> + </fileset> + <fileset targetdir="$INSTALL_PATH/lib/bundle" dir="lib/bundle"> + <include name="org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar"/> </fileset> <file targetdir="$INSTALL_PATH/lib" src="lib/felix.client.run.properties"/> - <file targetdir="$INSTALL_PATH/lib" src="lib/logging.properties"/> + <file targetdir="$INSTALL_PATH/lib" src="resources/install/logging.properties"/> </pack> <pack name="native" required="yes"> @@ -145,6 +146,12 @@ <description>SIP Communicator bundle MSN Account Registrattion Wizzard</description> <file targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/msnaccregwizz.jar"/> </pack> + <pack name="version" required="yes"> + <description>SIP Communicator bundle Version</description> + <file targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/version-impl.jar"/> + <file targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/version.jar"/> + </pack> + <!-- The executable files --> <pack name="run" required="yes"> diff --git a/resources/install/windows/run.bat b/resources/install/windows/run.bat index 2d911bd..a4c6bd1 100755 --- a/resources/install/windows/run.bat +++ b/resources/install/windows/run.bat @@ -1,2 +1,3 @@ +mkdir %UserProfile%/.sip-communicator/log set PATH=%PATH%;native -start javaw -classpath "lib/JainSipApi1.1.jar;lib/Stun4J.jar;lib/architectureviewer1.1.jar;lib/bcprov-jdk14-130.jar;lib/joscar-0.9.4-cvs-bin.jar;lib/nist-sdp-1.0.jar;lib/nist-sip-1.2.jar;lib/oscar-aim.jar;lib/felix.jar;lib/kxml-min.jar;lib/retroweaver-rt.jar;lib/retroweaver.jar;lib/servicebinder.jar;lib/BrowserLauncher2.jar;lib/sip-sdp.jar;lib/cindy.jar;lib/commons-logging.jar;lib/jml-1.0a3.jar" -Dicq.custom.message.charset=windows-1251 -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties org.apache.felix.main.Main +start javaw -classpath "lib/felix.jar;lib/kxml-min.jar;lib/servicebinder.jar;lib/bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar;sc-bundles/util.jar" -Dicq.custom.message.charset=windows-1251 -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties org.apache.felix.main.Main |