Fix some problems with installers - linux os-specific content, generic installer run.sh script.

Added correct version and date in installers.

7 files changed, 49 insertions, 16 deletions

diff --git a/resources/install/build.xml b/resources/install/build.xml
index 3b7fbf1..8a167b8 100644
--- a/resources/install/build.xml
+++ b/resources/install/build.xml
@@ -78,8 +78,17 @@
 
     <target name="build-installation-generic"
             depends="clean-install-generic,define-izpack-task,version">
+                
+        <filter token="VERSION" value="${sip-communicator.version}" />
+        <filter token="BUILDDATE" value="${build.date}" />
+        <copy 
+            tofile="${generic.app.dir}/tmp-installer-generic.xml" 
+            file="${basedir}/${inst.resrc}/generic/installer-generic.xml" 
+            filtering="yes" 
+        />
+
         <izpack
-               input="${basedir}/${inst.resrc}/generic/installer-generic.xml"
+               input="${generic.app.dir}/tmp-installer-generic.xml"
                output="${generic.app.dir}/sip-communicator-${sip-communicator.version}.jar"
                installerType="standard"
                izPackDir="${izpack.dir}/"
@@ -106,8 +115,17 @@
                 <include name="**/*"/>
             </fileset>
     </copy>
+    
+        <filter token="VERSION" value="${sip-communicator.version}" />
+        <filter token="BUILDDATE" value="${build.date}" />
+        <copy 
+            tofile="${linux.app.dir}/tmp/tmp-installer-linux.xml" 
+            file="${basedir}/${inst.resrc}/linux/installer-linux.xml" 
+            filtering="yes" 
+        />
+    
         <!-- create izpack installer jar file -->
-        <izpack input="${basedir}/${inst.resrc}/linux/installer-linux.xml"
+        <izpack input="${linux.app.dir}/tmp/tmp-installer-linux.xml"
                 output="${linux.app.dir}/tmp/sip-communicator-${sip-communicator.version}-linux.jar"
                 installerType="standard"
                 basedir="${basedir}"
@@ -153,8 +171,16 @@
         <copy file="${windows.jre.file}"
               tofile="${windows.app.dir}/tmp/jre/jre-windows.exe"/>
 
+        <filter token="VERSION" value="${sip-communicator.version}" />
+        <filter token="BUILDDATE" value="${build.date}" />
+        <copy 
+            tofile="${windows.app.dir}/tmp/tmp-installer-windows.xml" 
+            file="${basedir}/${inst.resrc}/windows/installer-windows.xml" 
+            filtering="yes" 
+        />
+              
         <izpack
-               input="${basedir}/${inst.resrc}/windows/installer-windows.xml"
+               input="${windows.app.dir}/tmp/tmp-installer-windows.xml"
                output="${windows.app.dir}/tmp/sip-communicator-windows.jar"
                installerType="standard"
                basedir="${basedir}"
diff --git a/resources/install/doc/welcome.png b/resources/install/doc/welcome.png
new file mode 100644
index 0000000..73c2c4a
--- /dev/null
+++ b/resources/install/doc/welcome.png
diff --git a/resources/install/generic/installer-generic.xml b/resources/install/generic/installer-generic.xml
index 4188c56..000a374 100755
--- a/resources/install/generic/installer-generic.xml
+++ b/resources/install/generic/installer-generic.xml
@@ -1,7 +1,7 @@
 <installation version="1.0">
 	<info>
-		<appname>SIPCommunicator</appname>
-		<appversion>1.0.cvs</appversion>
+		<appname>sip-communicator</appname>
+		<appversion>@VERSION@</appversion>
 		<authors>
 			<author name="SIP Communicator" email="sc@sip-communicator.org" />
 		</authors>
@@ -10,8 +10,8 @@
 		<uninstaller/>
 	</info>
 	<variables>
-		<variable name="app-version" value="1.0.cvs"/>
-		<variable name="released-on" value="01/08/2006"/>
+		<variable name="app-version" value="@VERSION@"/>
+		<variable name="released-on" value="@BUILDDATE@"/>
 	</variables>
 
 	<guiprefs height="600" resizable="yes" width="800"/>
@@ -24,6 +24,7 @@
             <res id="LicencePanel.licence" src="resources/install/doc/License.txt"/>
             <res src="resources/install/windows/windows_shortcut_specification.xml" id="shortcutSpec.xml"/>\
             <res src="resources/install/linux/linux_shortcut_specification.xml" id="Unix_shortcutSpec.xml"/>
+            <res id="Installer.image.0" src="resources/install/doc/welcome.png" />
 	</resources>
 
 	<native type="izpack" name="ShellLink.dll"/>
@@ -59,7 +60,7 @@
 		<!-- The executable files -->
 		<pack name="run" required="yes">
                     <description>Exceutable</description>
-                    <file targetdir="$INSTALL_PATH" src="resources/install/linux/run.sh" os="linux" override="true"/>
+                    <file targetdir="$INSTALL_PATH" src="resources/install/generic/run.sh" os="linux" override="true"/>
                     <file targetdir="$INSTALL_PATH" src="resources/install/linux/sc-logo.png" os="linux" override="true"/>
                     <file targetdir="$INSTALL_PATH" src="resources/install/windows/run.bat" os="windows" override="true"/>
                     <file targetdir="$INSTALL_PATH" src="resources/install/windows/sc-logo.ico" os="windows" override="true"/>
diff --git a/resources/install/generic/run.sh b/resources/install/generic/run.sh
new file mode 100644
index 0000000..5496f63
--- /dev/null
+++ b/resources/install/generic/run.sh
@@ -0,0 +1,4 @@
+mkdir -p $HOME/.sip-communicator/log
+
+export PATH=$PATH:native
+java -classpath "lib/jdic-all.jar:lib/jdic_stub.jar: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" -Djava.library.path=native -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/linux/installer-linux.xml b/resources/install/linux/installer-linux.xml
index 6caffb3..689e15a 100755
--- a/resources/install/linux/installer-linux.xml
+++ b/resources/install/linux/installer-linux.xml
@@ -1,7 +1,7 @@
 <installation version="1.0">
 	<info>
 		<appname>sip-communicator</appname>
-		<appversion>1.0.draft</appversion>
+		<appversion>@VERSION@</appversion>
 		<authors>
 			<author name="SIP Communicator" email="sc@sip-communicator.org" />
 		</authors>
@@ -10,8 +10,8 @@
 		<uninstaller/>
 	</info>
 	<variables>
-		<variable name="app-version" value="1.0.draft"/>
-		<variable name="released-on" value="01/08/2006"/>
+		<variable name="app-version" value="@VERSION@"/>
+		<variable name="released-on" value="@BUILDDATE@"/>
 	</variables>
 
 	<guiprefs height="600" resizable="yes" width="800"/>
@@ -23,6 +23,7 @@
             <res id="InfoPanel.info" src="resources/install/doc/readme.txt" parse="yes"/>
             <res id="LicencePanel.licence" src="resources/install/doc/License.txt"/>
             <res src="resources/install/linux/linux_shortcut_specification.xml" id="Unix_shortcutSpec.xml"/>
+            <res id="Installer.image.0" src="resources/install/doc/welcome.png" />
 	</resources>
 
 	<panels>
@@ -66,7 +67,7 @@
                 
                 <pack name="bundles-os-specific" required="yes">
                     <description>SIP Communicator linux bundles</description>
-                    <fileset  targetdir="$INSTALL_PATH/sc-bundles/os-specific/linux" dir="sc-bundles" override="true">
+                    <fileset  targetdir="$INSTALL_PATH/sc-bundles" dir="sc-bundles/os-specific/linux" override="true">
                         <include name="*.jar"/>
                         <exclude name="*slick.jar"/>
                     </fileset>
diff --git a/resources/install/linux/run.sh b/resources/install/linux/run.sh
index dcff40a..eb14454 100755
--- a/resources/install/linux/run.sh
+++ b/resources/install/linux/run.sh
@@ -2,4 +2,4 @@ mkdir -p $HOME/.sip-communicator/log
 
 export PATH=$PATH:native
 export JAVA_HOME=jre
-${JAVA_HOME}/bin/java -classpath "lib/jdic-all.jar:lib/jdic_stub.jar: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
+${JAVA_HOME}/bin/java -classpath "lib/jdic-all.jar:lib/jdic_stub.jar: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" -Djava.library.path=native -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 f3de99d..e1e47ab 100755
--- a/resources/install/windows/installer-windows.xml
+++ b/resources/install/windows/installer-windows.xml
@@ -1,7 +1,7 @@
 <installation version="1.0">
 	<info>
 		<appname>sip-communicator</appname>
-		<appversion>1.0.draft</appversion>
+		<appversion>@VERSION@</appversion>
 		<authors>
 			<author name="SIP Communicator" email="sc@sip-communicator.org" />
 		</authors>
@@ -10,8 +10,8 @@
 		<uninstaller/>
 	</info>
 	<variables>
-		<variable name="app-version" value="1.0.draft"/>
-		<variable name="released-on" value="01/08/2006"/>
+		<variable name="app-version" value="@VERSION@"/>
+		<variable name="released-on" value="@BUILDDATE@"/>
 	</variables>
 
 	<guiprefs height="600" resizable="yes" width="800"/>
@@ -23,6 +23,7 @@
             <res id="InfoPanel.info" src="resources/install/doc/readme.txt" parse="yes"/>
             <res id="LicencePanel.licence" src="resources/install/doc/License.txt"/>
             <res src="resources/install/windows/windows_shortcut_specification.xml" id="shortcutSpec.xml"/>
+            <res id="Installer.image.0" src="resources/install/doc/welcome.png" />
 	</resources>
 
 	<native type="izpack" name="ShellLink.dll"/>