Thu, 22 Jan 2015 13:21:57 +0100
Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6
michael@0 | 1 | #!/bin/bash |
michael@0 | 2 | # |
michael@0 | 3 | # This Source Code Form is subject to the terms of the Mozilla Public |
michael@0 | 4 | # License, v. 2.0. If a copy of the MPL was not distributed with this |
michael@0 | 5 | # file, You can obtain one at http://mozilla.org/MPL/2.0/. |
michael@0 | 6 | |
michael@0 | 7 | # assume $1 is the directory with a SVN checkout of the libsrtp source |
michael@0 | 8 | # |
michael@0 | 9 | # srtp source is available (via cvs) at: |
michael@0 | 10 | # cvs -d:pserver:anonymous@srtp.cvs.sourceforge.net:/cvsroot/srtp login |
michael@0 | 11 | # cvs -z3 -d:pserver:anonymous@srtp.cvs.sourceforge.net:/cvsroot/srtp co -P srtp |
michael@0 | 12 | # |
michael@0 | 13 | # also assumes we've made *NO* changes to the SRTP sources! If we do, we have to merge by |
michael@0 | 14 | # hand after this process, or use a more complex one. |
michael@0 | 15 | # |
michael@0 | 16 | # For example, one could update an srtp library import head, and merge back to default. Or keep a |
michael@0 | 17 | # separate repo with this in it, and pull from there to m-c and merge. |
michael@0 | 18 | if [ "$1" ] ; then |
michael@0 | 19 | export date=`date` |
michael@0 | 20 | # export revision=`(cd $1; svnversion -n)` |
michael@0 | 21 | export CVSREAD=0 |
michael@0 | 22 | cp -rf $1/srtp $1/crypto $1/include $1/VERSION $1/LICENSE $1/README $1/configure.in netwerk/srtp/src |
michael@0 | 23 | |
michael@0 | 24 | hg addremove netwerk/srtp/src --include "netwerk/srtp/src/VERSION" --include "netwerk/srtp/src/LICENSE" --include "netwerk/srtp/src/configure.in" --include "netwerk/srtp/src/README" --include "**.c" --include "**.h" --similarity 90 |
michael@0 | 25 | |
michael@0 | 26 | echo "srtp updated from CVS on $date" >> netwerk/srtp/srtp_update.log |
michael@0 | 27 | echo "srtp updated from CVS on $date" |
michael@0 | 28 | echo "WARNING: reapply any local patches!" |
michael@0 | 29 | else |
michael@0 | 30 | echo "usage: $0 path_to_srtp_directory" |
michael@0 | 31 | echo "run from the root of your m-c clone" |
michael@0 | 32 | fi |