Changeset 9746

Show
Ignore:
Timestamp:
05/25/10 09:32:08 (2 years ago)
Author:
p_lindheimer
Message:

Merged revisions 9715,9717-9744 via svnmerge from
http://www.freepbx.org/v2/svn/freepbx/branches/2.8

........

r9719 | p_lindheimer | 2010-05-24 13:57:12 -0700 (Mon, 24 May 2010) | 1 line


create 2.8.0beta2 upgrade directory to bump version

........

r9723 | p_lindheimer | 2010-05-24 14:00:26 -0700 (Mon, 24 May 2010) | 1 line


updated CHANGES

........

r9724 | p_lindheimer | 2010-05-24 14:00:56 -0700 (Mon, 24 May 2010) | 1 line


remove ChangeLog? not used anymore

........

r9728 | p_lindheimer | 2010-05-24 14:24:10 -0700 (Mon, 24 May 2010) | 1 line


updated generate-release.sh with proper svn url

........

r9733 | p_lindheimer | 2010-05-24 14:32:35 -0700 (Mon, 24 May 2010) | 1 line


Creating release 2.8.0beta2

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/trunk

    • Property svnmerge-integrated changed from /freepbx/branches/2.8:1-9714 to /freepbx/branches/2.8:1-9745

  • freepbx/trunk/CHANGES

    r9043 r9746  
     12.8.0 (Highlights) 
     2 
     3 * see overview and full list of tickets available at: 
     4   http://www.freepbx.org/trac/milestone/2.8 
     5 
    162.7.0 (Highlights) 
    27 

  • freepbx/trunk/buildtools/generate-release.sh

    r9280 r9746  
    77# TODO: SHOULD CHECK THE VERSION OF THE MODULES BEFORE PROCEEDING 
    88# 
    9 module_url="http://svn.freepbx.org/modules/branches/2.7" 
     9module_url="http://www.freepbx.org/v2/svn/modules/branches/2.8" 
    1010core_url=${module_url}/core 
    1111framework_url=${module_url}/framework 
    …… 
    6161cd .. 
    6262cur=`svn info | grep URL | awk ' { print $2 }'` 
    63 svn cp -m "Automatic tag of $ver" $cur http://svn.freepbx.org/freepbx/tags/$ver 
     63svn cp -m "Automatic tag of $ver" $cur http://www.freepbx.org/v2/svn/freepbx/tags/$ver 
    6464 
    6565# Now that the tag is made, we want to add core and framework to the tag so that 
    6666# the tag reflects the tarball. Then we will use the tag to generate the releases 
    6767# 
    68 svn cp -m "Automatic packaging of core with $ver"             $core_url             http://svn.freepbx.org/freepbx/tags/${ver}/amp_conf/htdocs/admin/modules/ 
    69 svn cp -m "Automatic packaging of framework with $ver"        $framework_url        http://svn.freepbx.org/freepbx/tags/${ver}/amp_conf/htdocs/admin/modules/ 
    70 svn cp -m "Automatic packaging of dashboard with $ver"        $dashboard_url        http://svn.freepbx.org/freepbx/tags/${ver}/amp_conf/htdocs/admin/modules/ 
    71 svn cp -m "Automatic packaging of customappsreg with $ver"    $customappsreg_url    http://svn.freepbx.org/freepbx/tags/${ver}/amp_conf/htdocs/admin/modules/ 
    72 svn cp -m "Automatic packaging of voicemail with $ver"        $voicemail_url        http://svn.freepbx.org/freepbx/tags/${ver}/amp_conf/htdocs/admin/modules/ 
    73 svn cp -m "Automatic packaging of recordings with $ver"       $recordings_url       http://svn.freepbx.org/freepbx/tags/${ver}/amp_conf/htdocs/admin/modules/ 
    74 svn cp -m "Automatic packaging of music with $ver"            $music_url            http://svn.freepbx.org/freepbx/tags/${ver}/amp_conf/htdocs/admin/modules/ 
    75 svn cp -m "Automatic packaging of featurecodeadmin with $ver" $featurecodeadmin_url http://svn.freepbx.org/freepbx/tags/${ver}/amp_conf/htdocs/admin/modules/ 
    76 svn cp -m "Automatic packaging of infoservices with $ver"     $infoservices_url     http://svn.freepbx.org/freepbx/tags/${ver}/amp_conf/htdocs/admin/modules/ 
     68svn cp -m "Automatic packaging of core with $ver"             $core_url             http://www.freepbx.org/v2/svn/freepbx/tags/${ver}/amp_conf/htdocs/admin/modules/ 
     69svn cp -m "Automatic packaging of framework with $ver"        $framework_url        http://www.freepbx.org/v2/svn/freepbx/tags/${ver}/amp_conf/htdocs/admin/modules/ 
     70svn cp -m "Automatic packaging of dashboard with $ver"        $dashboard_url        http://www.freepbx.org/v2/svn/freepbx/tags/${ver}/amp_conf/htdocs/admin/modules/ 
     71svn cp -m "Automatic packaging of customappsreg with $ver"    $customappsreg_url    http://www.freepbx.org/v2/svn/freepbx/tags/${ver}/amp_conf/htdocs/admin/modules/ 
     72svn cp -m "Automatic packaging of voicemail with $ver"        $voicemail_url        http://www.freepbx.org/v2/svn/freepbx/tags/${ver}/amp_conf/htdocs/admin/modules/ 
     73svn cp -m "Automatic packaging of recordings with $ver"       $recordings_url       http://www.freepbx.org/v2/svn/freepbx/tags/${ver}/amp_conf/htdocs/admin/modules/ 
     74svn cp -m "Automatic packaging of music with $ver"            $music_url            http://www.freepbx.org/v2/svn/freepbx/tags/${ver}/amp_conf/htdocs/admin/modules/ 
     75svn cp -m "Automatic packaging of featurecodeadmin with $ver" $featurecodeadmin_url http://www.freepbx.org/v2/svn/freepbx/tags/${ver}/amp_conf/htdocs/admin/modules/ 
     76svn cp -m "Automatic packaging of infoservices with $ver"     $infoservices_url     http://www.freepbx.org/v2/svn/freepbx/tags/${ver}/amp_conf/htdocs/admin/modules/ 
    7777 
    7878# Now clear out the release diretory where we will build the tarballs and grab it from the tag to get core and framework 
    …… 
    8383# Use the tag to build the tarball 
    8484# 
    85 svn export http://svn.freepbx.org/freepbx/tags/$ver /usr/src/freepbx-release/freepbx-$ver 
     85svn export http://www.freepbx.org/v2/svn/freepbx/tags/$ver /usr/src/freepbx-release/freepbx-$ver 
    8686 
    8787cd /usr/src/freepbx-release