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

Generation of wix delta updates.

Browse Source
cusax-fix
Damian Minkov 15 years ago
parent e4bc6f0ce8
commit 50d645a9b7
4 changed files with 84 additions and 19 deletions
Show Stats Download Patch File Download Diff File

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

@ -20,6 +20,6 @@ link.updates.macosx=http\://download.jitsi.org/jitsi/macosx/sparkle/updates.xml
link.update.changelog.prefix=http://bluejimp.com/sip-communicator/changelogs
# The private_key file (sparkle_dsa_priv.pem)
#sparkle.signiture.location=/Users/damencho/dev/sparkle-files/dsa_sign/sparkle_dsa_priv.pem
#sparkle.delta.history.location=/Users/damencho/dev/build-history
#sparkle.delta.history.size=10
#delta.history.location=/Users/damencho/dev/build-history
#delta.history.size=10
#sparkle.delta.download.location=http\://download.jitsi.org/jitsi/macosx/

88
resources/install/build.xml
Unescape View File

@ -289,7 +289,7 @@
<isset property="windows.jre.zip" />
</condition>
<property name="windows.download.link" value="${link.download.windows32}"/>
<property name="windows.package.name" value="${package.name}-${sip-communicator.version}-x86.exe"/>
<property name="windows.package.name.suffix" value="x86.exe"/>
<property name="windows.arch" value="32"/>
<property name="mingw.home" value="C:/mingw/x86" />
<antcall target="build-installation-wix-base" />
@ -303,7 +303,7 @@
<isset property="windows.jre64.zip" />
</condition>
<property name="windows.download.link" value="${link.download.windows64}"/>
<property name="windows.package.name" value="${package.name}-${sip-communicator.version}-x64.exe"/>
<property name="windows.package.name.suffix" value="x64.exe"/>
<property name="windows.arch" value="64"/>
<property name="mingw.home" value="C:/mingw/x64" />
<antcall target="build-installation-wix-base" />
@ -365,6 +365,7 @@
<target name="build-installation-wix-base"
depends="clean-install-windows">
<property name="windows.package.name" value="${package.name}-${sip-communicator.version}-${windows.package.name.suffix}"/>
<!--
Provide access to the environment variables via the prefix "env."
because we will modify at least the PATH.
@ -690,6 +691,9 @@
preservelastmodified="true"
tofile="${windows.app.dir}\${windows.package.name}" />
<!-- before deleting try building the deltas -->
<antcall target="build-wix-delta-updates"/>
<delete dir="${light.dir}" />
<delete dir="${windows.app.dir}/tmp" />
</target>
@ -745,6 +749,64 @@
</exec>
</target>
<target name="build-wix-delta-updates"
if="delta.history.location"
depends="define-ant-contrib-task">
<!-- Find all previous builds we have to build deltas for them -->
<foreach param="build-location" target="-make-wix-delta"
inheritall="true" inheritrefs="true">
<path>
<dirset dir="${delta.history.location}">
<include name="*"/>
</dirset>
</path>
</foreach>
<!-- copy data for next delta builds-->
<mkdir dir="${delta.history.location}/${build.label}/${windows.arch}"/>
<copy file="${windows.app.dir}\tmp\setup.msi"
todir="${delta.history.location}/${build.label}/${windows.arch}"/>
<!-- now delete old one -->
<antcall target="-delete-oldest-delta-data"/>
</target>
<target name="-make-wix-delta">
<basename property="old.wix.build" file="${build-location}"/>
<echo message="Creating msi delta for ${old.wix.build}-${build.label}"/>
<!-- make the actual diff -->
<exec executable="${inst.resrc}\windows\bsdiff.exe" failonerror="true">
<arg value="${build-location}\${windows.arch}\setup.msi"/>
<arg value="${windows.app.dir}\tmp\setup.msi"/>
<arg value="${windows.app.dir}\tmp\setup.bspatch"/>
</exec>
<exec
executable="cscript.exe"
dir="${light.dir}"
outputproperty="old.packagecode"
failonerror="true">
<arg value="${inst.resrc}\windows\WiSumInf.vbs" />
<arg value="${build-location}\${windows.arch}\setup.msi" />
</exec>
<exec
dir="${src}/native/windows/setup"
executable="make.exe"
failonerror="true">
<env key="PATH" path="${mingw.home}/bin;${env.PATH}" />
<arg value="MINGW_HOME=${mingw.home}" />
<arg value="TARGET_DIR=${windows.app.dir}/tmp" />
<arg value="PACKAGECODE=${old.packagecode}" />
</exec>
<move
file="${windows.app.dir}/tmp/setup.exe"
preservelastmodified="true"
tofile="${windows.app.dir}\${package.name}-${sip-communicator.version}-delta-${old.wix.build}-${windows.package.name.suffix}" />
</target>
<!-- - - - - - - - - - - BUILDING RELEASE PACKAGES - - - - - - - - - - - -->
<!-- Internal target called by the "clean target" - removes the macosx-specific file -->
<!-- we only execute if at least one (in this case the first) of the links we are
@ -1167,7 +1229,7 @@
</target>
<target name="macosx-sparkle-delta-updates"
if="sparkle.delta.history.location"
if="delta.history.location"
depends="define-ant-contrib-task">
<!-- create temp dir for making delta diffs -->
@ -1193,7 +1255,7 @@
<foreach param="build-location" target="-make-sparkle-delta"
inheritall="true" inheritrefs="true">
<path>
<dirset dir="${sparkle.delta.history.location}">
<dirset dir="${delta.history.location}">
<include name="*"/>
</dirset>
</path>
@ -1209,12 +1271,12 @@
<delete dir="${macosx.app.dir}/tmp"/>
<!-- copy data for next delta builds-->
<mkdir dir="${sparkle.delta.history.location}/${sparkle.build}"/>
<mkdir dir="${delta.history.location}/${sparkle.build}"/>
<copy file="${macosx.app.dir}/${macosx.dmg.name}"
tofile="${sparkle.delta.history.location}/${sparkle.build}/${package.name}.dmg"/>
tofile="${delta.history.location}/${sparkle.build}/${package.name}.dmg"/>
<!-- now delete old one -->
<antcall target="-make-sparkle-delta-delete-oldest-data"/>
<antcall target="-delete-oldest-delta-data"/>
</target>
<target name="-make-sparkle-delta">
@ -1282,34 +1344,34 @@
</target>
<target name="-make-sparkle-delta-delete-oldest-data">
<target name="-delete-oldest-delta-data">
<resourcecount property="build.history.current.size">
<dirset dir="${sparkle.delta.history.location}">
<dirset dir="${delta.history.location}">
<include name="*"/>
</dirset>
</resourcecount>
<math result="build.history.to.delete"
operand1="${build.history.current.size}"
operation="-"
operand2="${sparkle.delta.history.size}"
operand2="${delta.history.size}"
datatype="int"/>
<timestampselector outputsetid="oldest.builds"
count="${build.history.to.delete}"
age="eldest">
<path>
<dirset dir="${sparkle.delta.history.location}">
<dirset dir="${delta.history.location}">
<include name="*" />
</dirset>
</path>
</timestampselector>
<foreach param="build.to.delete"
target="-make-sparkle-delta-delete-data-folder">
target="-delete-oldest-delta-data-folder">
<path refid="oldest.builds"/>
</foreach>
</target>
<target name="-make-sparkle-delta-delete-data-folder">
<target name="-delete-oldest-delta-data-folder">
<echo message="!!! Deleting old data dir ${build.to.delete} !!! " />
<delete dir="${build.to.delete}" failonerror="false"/>
</target>

BIN
resources/install/windows/bsdiff.exe
View File

Binary file not shown.

11
src/net/java/sip/communicator/plugin/update/Update.java
Unescape View File

@ -396,14 +396,14 @@ private static synchronized void exitCheckForUpdates(
*
* @return the current (software) version
*/
private static String getCurrentVersion()
private static Version getCurrentVersion()
{
VersionService verService
= ServiceUtils.getService(
UpdateActivator.bundleContext,
VersionService.class);
return verService.getCurrentVersion().toString();
return verService.getCurrentVersion();
}
/**
@ -460,7 +460,8 @@ private static boolean isLatestVersion()
updateLink.lastIndexOf("/") + 1)
+ props.getProperty("changes_html");
return latestVersion.compareTo(getCurrentVersion()) <= 0;
return latestVersion.compareTo(
getCurrentVersion().toString()) <= 0;
}
}
}
@ -847,7 +848,9 @@ private static void windowsUpdate()
String deltaLink
= downloadLink.replace(
latestVersion,
latestVersion + "-delta-" + getCurrentVersion());
latestVersion
+ "-delta-"
+ getCurrentVersion().getNightlyBuildID());
/*
* TODO Download the delta update regardless of the logging level

Write Preview
Loading…
Cancel
Save