sipwise
/
jitsi
mirror of https://github.com/sipwise/jitsi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Installation package name and application name moved to a properties file. Use it in generic, linux and windows installers.

Browse Source
cusax-fix
Damian Minkov 18 years ago
parent c81b7cc499
commit 0d204958a4
11 changed files with 107 additions and 38 deletions
Show Stats Download Patch File Download Diff File

2
resources/install/ant-build-config.properties
Unescape View File

@ -1,2 +1,4 @@
application.name=SIP Communicator
application.web=http://sip-communicator.org/
application.email=sc@sip-communicator.org
package.name=sip-communicator

86
resources/install/build.xml
Unescape View File

@ -99,11 +99,26 @@
<filter token="VERSION" value="${sip-communicator.version}" />
<filter token="BUILDDATE" value="${build.date}" />
<filter token="PKG_NAME" value="${package.name}" />
<filter token="APP_NAME" value="${application.name}" />
<filter token="APP_EMAIL" value="${application.email}" />
<filter token="APP_WEB" value="${application.web}" />
<filter token="DEST_DIR" value="${release}" />
<copy
tofile="${generic.app.dir}/tmp-installer-generic.xml"
file="${inst.resrc}/generic/installer-generic.xml"
filtering="yes"
/>
<copy
tofile="${generic.app.dir}/tmp-windows_shortcut_specification.xml"
file="${inst.resrc}/windows/windows_shortcut_specification.xml"
filtering="yes"
/>
<copy
tofile="${generic.app.dir}/tmp-linux_shortcut_specification.xml"
file="${inst.resrc}/linux/linux_shortcut_specification.xml"
filtering="yes"
/>
<izpack
input="${generic.app.dir}/tmp-installer-generic.xml"
@ -111,6 +126,12 @@
installerType="standard"
izPackDir="${izpack.dir}/"
basedir="${sc.basedir}"/>
<delete quiet="yes" failonerror="false">
<fileset dir="${generic.app.dir}">
<include name="tmp-*"/>
</fileset>
</delete>
</target>
<target name="clean-install-linux">
@ -121,26 +142,38 @@
<target name="build-installation-linux"
depends="clean-install-linux,define-izpack-task,version">
<copy todir="${linux.app.dir}/tmp">
<filter token="VERSION" value="${sip-communicator.version}" />
<filter token="BUILDDATE" value="${build.date}" />
<filter token="PKG_NAME" value="${package.name}" />
<filter token="APP_NAME" value="${application.name}" />
<filter token="APP_EMAIL" value="${application.email}" />
<filter token="APP_WEB" value="${application.web}" />
<filter token="DEST_DIR" value="${release}" />
<copy todir="${linux.app.dir}/tmp" filtering="yes" >
<fileset dir="${inst.resrc}/linux">
<include name="setup.sh"/>
<include name="inst_path"/>
</fileset>
</copy>
</copy>
<!-- copy the jre -->
<copy todir="${linux.app.dir}/tmp/jre">
<fileset dir="${linux.jre.path}">
<include name="**/*"/>
</fileset>
</copy>
</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="${inst.resrc}/linux/installer-linux.xml"
filtering="yes"
/>
<copy
tofile="${linux.app.dir}/tmp-linux_shortcut_specification.xml"
file="${inst.resrc}/linux/linux_shortcut_specification.xml"
filtering="yes"
/>
<!-- create izpack installer jar file -->
<izpack input="${linux.app.dir}/tmp/tmp-installer-linux.xml"
@ -167,6 +200,11 @@
<!-- Delete the temp directory-->
<delete dir="${linux.app.dir}/tmp"/>
<delete quiet="yes" failonerror="false">
<fileset dir="${linux.app.dir}">
<include name="tmp-*"/>
</fileset>
</delete>
</target>
<target name="clean-install-windows">
@ -178,7 +216,22 @@
<target name="build-installation-windows"
depends="clean-install-windows,define-izpack-task,version">
<copy todir="${windows.app.dir}/tmp">
<filter token="VERSION" value="${sip-communicator.version}" />
<filter token="BUILDDATE" value="${build.date}" />
<filter token="PKG_NAME" value="${package.name}" />
<filter token="APP_NAME" value="${application.name}" />
<filter token="APP_EMAIL" value="${application.email}" />
<filter token="APP_WEB" value="${application.web}" />
<filter token="DEST_DIR" value="${release}" />
<copy
tofile="${windows.app.dir}/tmp-windows_shortcut_specification.xml"
file="${inst.resrc}/windows/windows_shortcut_specification.xml"
filtering="yes"
/>
<copy todir="${windows.app.dir}/tmp" filtering="yes">
<fileset dir="${inst.resrc}/windows">
<include name="launcher.ini"/>
<include name="setup-sip-communicator.exe"/>
@ -189,8 +242,6 @@
<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="${inst.resrc}/windows/installer-windows.xml"
@ -207,25 +258,36 @@
<zip destfile="${windows.app.dir}/${package.name}-${sip-communicator.version}-windows.zip"
basedir="${windows.app.dir}/tmp"/>
<!--exec dir="${windows.app.dir}/tmp" executable="${7zip.executable}" failifexecutionfails="false">
<exec dir="${windows.app.dir}/tmp" executable="${7zip.executable}" failifexecutionfails="false">
<arg line="a -y data.7z *"/>
</exec>
<concat destfile="${windows.app.dir}/sip-communicator-${sip-communicator.version}.exe"
<copy
tofile="${windows.app.dir}/tmp/7zip.conf"
file="${inst.resrc}/windows/7zip.conf"
filtering="yes"
/>
<concat destfile="${windows.app.dir}/${package.name}-${sip-communicator.version}.exe"
binary="true">
<fileset dir="${inst.resrc}/windows">
<include name="7zS.sfx"/>
</fileset>
<fileset dir="${inst.resrc}/windows">
<fileset dir="${windows.app.dir}/tmp">
<include name="7zip.conf"/>
</fileset>
<fileset dir="${windows.app.dir}/tmp">
<include name="data.7z"/>
</fileset>
</concat-->
</concat>
<!-- Delete the temp directory-->
<delete dir="${windows.app.dir}/tmp"/>
<delete quiet="yes" failonerror="false">
<fileset dir="${windows.app.dir}">
<include name="tmp-*"/>
</fileset>
</delete>
</target>
<!-- - - - - - - - - - - BUILDING RELEASE PACKAGES - - - - - - - - - - - -->

14
resources/install/generic/installer-generic.xml
Unescape View File

@ -1,11 +1,11 @@
<installation version="1.0">
<info>
<appname>sip-communicator</appname>
<appname>@PKG_NAME@</appname>
<appversion>@VERSION@</appversion>
<authors>
<author name="SIP Communicator" email="sc@sip-communicator.org" />
<author name="@APP_NAME@" email="@APP_EMAIL@" />
</authors>
<url>http://sip-communicator.org/</url>
<url>@APP_WEB@</url>
<javaversion>1.4</javaversion>
<uninstaller/>
</info>
@ -48,8 +48,8 @@
<resources>
<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 src="resources/install/linux/linux_shortcut_specification.xml" id="Unix_shortcutSpec.xml"/>
<res src="@DEST_DIR@/generic/tmp-windows_shortcut_specification.xml" id="shortcutSpec.xml"/>\
<res src="@DEST_DIR@/generic/tmp-linux_shortcut_specification.xml" id="Unix_shortcutSpec.xml"/>
<res id="Installer.image.0" src="resources/install/doc/welcome.png" />
</resources>
@ -93,8 +93,12 @@
<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"/>
<file targetdir="$INSTALL_PATH" src="resources/install/generic/uninstall.sh" os="linux" override="true"/>
<file targetdir="$INSTALL_PATH" src="resources/install/windows/uninstall.bat" os="windows" override="true"/>
<executable targetfile="$INSTALL_PATH/run.sh" stage="never" os="linux"/>
<executable targetfile="$INSTALL_PATH/uninstall.sh" stage="never" os="linux"/>
<executable targetfile="$INSTALL_PATH/run.bat" stage="never" os="windows"/>
<executable targetfile="$INSTALL_PATH/uninstall.bat" stage="never" os="windows"/>
</pack>
</packs>

1
resources/install/generic/uninstall.sh
Unescape View File

@ -0,0 +1 @@
java -jar Uninstaller/uninstaller.jar

8
resources/install/linux/installer-linux.xml
Unescape View File

@ -1,11 +1,11 @@
<installation version="1.0">
<info>
<appname>sip-communicator</appname>
<appname>@PKG_NAME@</appname>
<appversion>@VERSION@</appversion>
<authors>
<author name="SIP Communicator" email="sc@sip-communicator.org" />
<author name="@APP_NAME@" email="@APP_EMAIL@" />
</authors>
<url>http://sip-communicator.org/</url>
<url>@APP_WEB@</url>
<javaversion>1.4</javaversion>
<uninstaller/>
</info>
@ -49,7 +49,7 @@
<resources>
<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 src="@DEST_DIR@/linux/tmp-linux_shortcut_specification.xml" id="Unix_shortcutSpec.xml"/>
<res id="Installer.image.0" src="resources/install/doc/welcome.png" />
</resources>

10
resources/install/linux/linux_shortcut_specification.xml
Unescape View File

@ -1,11 +1,11 @@
<shortcuts>
<!--skipIfNotSupported/-->
<programGroup defaultName="SIPCommunicator" location="applications"/>
<programGroup defaultName="@APP_NAME@" location="applications"/>
<shortcut
name="SIP Communicator"
name="@APP_NAME@"
target="$INSTALL_PATH\run.sh"
workingDirectory="$INSTALL_PATH"
description="This starts SIP Communicator Application"
description="This starts @APP_NAME@ Application"
iconFile="$INSTALL_PATH\sc-logo.png"
iconIndex="0"
initialState="noShow"
@ -21,10 +21,10 @@
<createForPack name="run" />
</shortcut>
<shortcut
name="Uninstall SIP Communicator"
name="Uninstall @APP_NAME@"
target="$INSTALL_PATH\uninstall.sh"
workingDirectory="$INSTALL_PATH"
description="This uninstalls SIP Communicator"
description="This uninstalls @APP_NAME@"
iconFile="$INSTALL_PATH\sc-logo.png"
iconIndex="0"
initialState="noShow"

2
resources/install/linux/setup.sh
Unescape View File

@ -1,2 +1,2 @@
export JAVA_HOME=./jre
${JAVA_HOME}/bin/java -jar sip-communicator-*.jar
${JAVA_HOME}/bin/java -jar @PKG_NAME@-*.jar

2
resources/install/linux/uninstall.sh
Unescape View File

@ -1,2 +1,2 @@
export JAVA_HOME=jre
${JAVA_HOME}/bin/java -jar -jar Uninstaller/uninstaller.jar
${JAVA_HOME}/bin/java -jar Uninstaller/uninstaller.jar

2
resources/install/windows/7zip.conf
Unescape View File

@ -1,5 +1,5 @@
;!@Install@!UTF-8!
Title="SIP Communicator Installation"
Title="@APP_NAME@ Installation"
BeginPrompt="Do you want to install this software?"
ExecuteFile="setup-sip-communicator.exe"
;!@InstallEnd@!

8
resources/install/windows/installer-windows.xml
Unescape View File

@ -1,11 +1,11 @@
<installation version="1.0">
<info>
<appname>sip-communicator</appname>
<appname>@PKG_NAME@</appname>
<appversion>@VERSION@</appversion>
<authors>
<author name="SIP Communicator" email="sc@sip-communicator.org" />
<author name="@APP_NAME@" email="@APP_EMAIL@" />
</authors>
<url>http://sip-communicator.org/</url>
<url>@APP_WEB@</url>
<javaversion>1.4</javaversion>
<uninstaller/>
</info>
@ -48,7 +48,7 @@
<resources>
<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 src="@DEST_DIR@/windows/tmp-windows_shortcut_specification.xml" id="shortcutSpec.xml"/>
<res id="Installer.image.0" src="resources/install/doc/welcome.png" />
</resources>

10
resources/install/windows/windows_shortcut_specification.xml
Unescape View File

@ -1,11 +1,11 @@
<shortcuts>
<!--skipIfNotSupported/-->
<programGroup defaultName="SIP Communicator" location="applications"/>
<programGroup defaultName="@APP_NAME@" location="applications"/>
<shortcut
name="SIP Communicator"
name="@APP_NAME@"
target="$INSTALL_PATH\run.bat"
workingDirectory="$INSTALL_PATH"
description="This starts SIP Communicator Application"
description="This starts @APP_NAME@ Application"
iconFile="$INSTALL_PATH\sc-logo.ico"
iconIndex="0"
initialState="noShow"
@ -17,10 +17,10 @@
<createForPack name="run" />
</shortcut>
<shortcut
name="Uninstall SIP Communicator"
name="Uninstall @APP_NAME@"
target="$INSTALL_PATH\uninstall.bat"
workingDirectory="$INSTALL_PATH"
description="This uninstalls SIP Communicator"
description="This uninstalls @APP_NAME@"
iconFile="$INSTALL_PATH\sc-logo.ico"
iconIndex="0"
initialState="noShow"

Write Preview
Loading…
Cancel
Save