From 4631d138dba56559276a0ca096d6e15effa688c7 Mon Sep 17 00:00:00 2001
From: Damian Minkov <damencho@jitsi.org>
Date: Fri, 1 Dec 2006 08:10:32 +0000
Subject: Added Emil recomendations for the package installers

---
 resources/install/generic/installer-generic.xml | 20 +++++++++++++-------
 resources/install/linux/installer-linux.xml     | 21 ++++++++++++++-------
 resources/install/linux/run.sh                  |  4 +++-
 resources/install/windows/installer-windows.xml | 19 +++++++++++++------
 resources/install/windows/run.bat               |  3 ++-
 5 files changed, 45 insertions(+), 22 deletions(-)

(limited to 'resources/install')

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
-- 
cgit v1.1