sip-communicator.version prop in build.xml (attn: package maintainers)

Hello Romain and please excuse the delay,

I have applied and committed your patch.

Thanks for following up!

Emil

Romain KUNTZ wrote:
> Hi Emil,
> 
> Thanks, I think this is useful for automatic packaging.
Please find
> enclosed a patch for the build.xml to use
{sip-communicator.version}
> instead of {macosx.app.ver} (for MacOSX packages). The
patch also
> reduces the MacOSX package size by removing useless
jar.
> 
> regards,
> romain
> 
> Emil Ivov wrote:
>> Hello all,
>>
>> I've just added a new version service and its
implementation. All 
>> bundles (such as the Help->About dialog) can now
query the current 
>> version of SIP Communicator.
>>
>> I've also crafted an ant "version" task
that sets a 
>> sip-communicator.version property. Package
maintainers could now use 
>> this property to complete the name of their
packages.
>>
>> When executed by cruisecontrol the ant version
target also takes into 
>> account the build number and includes it inside the
value of the version 
>> property. This way nightly builds would
automatically include it.
>>
>> The next successful nightly build should therefore
carry a version label 
>> that looks like this:
>>
>> 1.0-alpha1-nightly.build.447
>>
>> Let me know if you encounter any problems using it.
>>
>> Cheers
>> Emil
>>
>>
------------------------------------------------------------
---------
>> To unsubscribe, e-mail: dev-unsubscribesip-communicator.dev.java.net
>> For additional commands, e-mail: dev-helpsip-communicator.dev.java.net
>>
> 
> 
>
------------------------------------------------------------
------------
> 
> --- sip-communicator-20061207/build.xml	2006-12-05
01:47:54.000000000 +0900
> +++
sip-communicator-20061207-version/build.xml	2006-12-07
16:00:46.000000000 +0900
>  -40,8 +40,6 
>      <property name="macosx.resrc.dir"
value="${inst.resrc}/macosx"/>
>      <!-- Put here the Application name -->
>      <property name="macosx.app.name"
value="SIP Communicator"/>
> -    <!-- Put here the Application version -->
> -    <property name="macosx.app.ver"
value="1.0.rc1"/>
>  
>      <!-- The release directory for Debian packages
-->
>      <property name="debian.dir"
value="$/debian"/>
>  -297,7 +295,7 
>      </target>
>  
>      <!-- - - - - - - - - - - BUILDING RELEASE
PACKAGES - - - - - - - - - - - -->
> -    <target name="macosx"
depends="make"
> +    <target name="macosx"
depends="make,version"
>              description="Create an .app package
for MACOSX">
>  
>        <taskdef name="jarbundler"
>  -316,18 +314,18 
>        </condition>
>  
>        <!-- Delete the old .app if it exists -->
> -      <delete
dir="${macosx.app.dir}/${macosx.app.name}-${macosx.app.
ver}.app"
> +      <delete
dir="${macosx.app.dir}/${macosx.app.name}-${sip-communi
cator.version}.app"
>                quiet="yes"
failonerror="false"/>
>  
>        <!-- This creates the .app for MacOSX -->
>        <jarbundler dir="${macosx.app.dir}"
> -                 
name="${macosx.app.name}-${macosx.app.ver}"
> +                 
name="${macosx.app.name}-${sip-communicator.version}&qu
ot;
>                    shortname="SIP
Communicator"
>                    signature="sipc"
>                   
mainclass="org.apache.felix.main.Main"
>                   
icon="src/net/java/sip/communicator/impl/gui/resources/
common/logo/sc_logo_128x128.icns"
>                    jvmversion="1.4+"
> -                 
version="${macosx.app.ver}"
> +                 
version="${sip-communicator.version}"
>                    build="draft"
>                    infostring="SIP
Communicator"
>                   
bundleid="org.sip-communicator"
>  -346,8 +344,10 
>                       
value="logging.properties"/>
>  
>          <jarfileset dir=".">
> -          <include name="$/*.jar"
/>
> -          <exclude
name="$/junit.jar" />
> +          <include
name="$/kxml-min.jar" />
> +          <include
name="$/felix.jar" />
> +          <include
name="$/BrowserLauncher2.jar" />
> +          <include
name="$/servicebinder.jar" />
>            <include
name="$/bundle/*.jar" />
>            <exclude
name="$/bundle/junit.jar" />
>            <include
name="${jmf.home}/*.jar" />
>  -363,15 +363,15 
>      <target name="dmg"
depends="macosx"
>              description="Create a .dmg package
for MACOSX (only works on MACOSX)">
>        <property name="macosx.dmg.name"
> -               
value="${macosx.app.name}-${macosx.app.ver}.dmg"/&
gt;
> +               
value="${macosx.app.name}-${sip-communicator.version}.d
mg"/>
>  
>        <!-- This is executed only if the OS is
MacOSX -->
>        <exec executable="/usr/bin/hdiutil"
os="Mac OS X">
>          <arg value="create"/>
>          <arg value="-srcfolder"/>
> -        <arg
value="${macosx.app.dir}/${macosx.app.name}-${macosx.ap
p.ver}.app"/>
> +        <arg
value="${macosx.app.dir}/${macosx.app.name}-${sip-commu
nicator.version}.app"/>
>          <arg value="-volname"/>
> -        <arg value="${macosx.app.name}
${macosx.app.ver}"/>
> +        <arg value="${macosx.app.name}
${sip-communicator.version}"/>
>          <arg value="-ov"/>
>          <arg
value="${macosx.app.dir}/${macosx.dmg.name}"/>
>        </exec>
> 
> 
> 
> 
>
------------------------------------------------------------
------------
> 
>
------------------------------------------------------------
---------
> To unsubscribe, e-mail: dev-unsubscribesip-communicator.dev.java.net
> For additional commands, e-mail: dev-helpsip-communicator.dev.java.net

------------------------------------------------------------
---------
To unsubscribe, e-mail: dev-unsubscribesip-communicator.dev.java.net
For additional commands, e-mail: dev-helpsip-communicator.dev.java.net