/[pcsx2_0.9.7]/auto_branch_latest_upstream.sh
ViewVC logotype

Annotation of /auto_branch_latest_upstream.sh

Parent Directory Parent Directory | Revision Log Revision Log


Revision 98 - (hide annotations) (download) (as text)
Thu Sep 9 17:49:17 2010 UTC (10 years, 1 month ago) by william
File MIME type: application/x-sh
File size: 2829 byte(s)
fix double call of prebuild, can call auto_build.sh from auto_branch_latest_upstream.sh
1 william 93 #!/bin/bash
2 william 94 . ./auto_defs.sh
3 william 93
4    
5     export OVERRIDE_UPDATE_NEEDED_CHECK="0"
6     if [ "$1" == "--force-update" ] ; then
7     OVERRIDE_UPDATE_NEEDED_CHECK="1"
8     fi
9    
10     export current_downstream_revision=`cat "$BRANCH_LOCATION/$BRANCH_NAME/upstream_repository_revision.txt"`
11    
12     if [ "$OVERRIDE_UPDATE_NEEDED_CHECK" != "1" ] ; then
13     if [ "$current_downstream_revision" == "$upstream_revision" ] ; then
14     echo "UPSTREAM REVISION: $upstream_revision"
15     echo "DOWNSTREAM REVISION: $current_downstream_revision"
16     echo
17     echo -e "\\tThere is no need to update the local repository. reason: upstream repository has not been updated."
18     echo
19     echo -e "\\tAborting update of $BRANCH_LOCATION/$BRANCH_NAME"
20     echo
21     exit 0
22     fi
23     else
24     if [ "$current_downstream_revision" == "$upstream_revision" ] ; then
25     echo "UPSTREAM REVISION: $upstream_revision"
26     echo "DOWNSTREAM REVISION: $current_downstream_revision"
27     echo
28     echo -e "\\tThere is no need to update the local repository. reason: upstream repository has not been updated."
29     echo
30     echo -e "\\tDetected the use of: --force-update ... forcing update ..."
31     fi
32    
33     fi
34    
35     echo $BRANCH_COMMIT_MESSAGE
36    
37     rm -Rf "$BRANCH_LOCATION/$BRANCH_NAME"
38     #remove the latest branch from the base repository
39     #svn delete "$BRANCH_LOCATION/$BRANCH_NAME" --non-interactive --trust-server-cert
40     svn delete "$BRANCH_LOCATION/$BRANCH_NAME" --non-interactive --trust-server-cert >/dev/null 2>/dev/null
41    
42     #update the working copy
43     #svn commit "$BRANCH_LOCATION" --non-interactive --trust-server-cert --depth immediates -m "remove latest branch for re-branching"
44     svn commit "$BRANCH_LOCATION" --non-interactive --trust-server-cert --depth immediates -m "remove latest branch for re-branching" >/dev/null 2>/dev/null
45    
46     echo
47     echo -n "EXPORTING: $downstream_export_location/trunk to $BRANCH_LOCATION/$BRANCH_NAME ... "
48     #svn export --force $downstream_export_location/trunk "$BRANCH_LOCATION/$BRANCH_NAME"
49     svn export --force $downstream_export_location/trunk "$BRANCH_LOCATION/$BRANCH_NAME" 2>/dev/null
50    
51    
52     # add new branch to svn
53     echo
54     echo -n "Adding latest branch to svn ... "
55     #svn add "$BRANCH_LOCATION/$BRANCH_NAME"
56     svn add "$BRANCH_LOCATION/$BRANCH_NAME" >/dev/null 2>/dev/null
57     echo "Done."
58    
59     cd "$BRANCH_LOCATION/$BRANCH_NAME"
60     # commit the newly created branch
61     #svn commit -m "$BRANCH_COMMIT_MESSAGE" "$BRANCH_LOCATION" --non-interactive --trust-server-cert
62     svn commit -m "$BRANCH_COMMIT_MESSAGE" "$BRANCH_LOCATION" --non-interactive --trust-server-cert >/dev/null 2>/dev/null
63    
64    
65     # call auto_build_latest_upstream.sh
66 william 94 "$downstream_export_location/auto_import_patches.sh"
67 william 98 "$downstream_export_location/auto_build.sh"

  ViewVC Help
Powered by ViewVC 1.1.22