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

Diff of /auto_update_from_upstream.sh

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 129 by william, Fri Sep 10 11:04:39 2010 UTC revision 130 by william, Fri Sep 10 11:49:09 2010 UTC
# Line 21  if [ "$upstream_revision" == "HEAD" ] ; Line 21  if [ "$upstream_revision" == "HEAD" ] ;
21          svn update > /dev/null          svn update > /dev/null
22          echo          echo
23          echo -n "Updated Upstream PCSX2 Repository to Revision: "          echo -n "Updated Upstream PCSX2 Repository to Revision: "
24          svn log -r head:prev --xml | grep "revision=" | sed s/".*revision=\""// | sed s/"\".*"// > "$upstream_trunk/trunk/upstream_repository_revision.txt"          #svn log -r head:prev --xml | grep "revision=" | sed s/".*revision=\""// | sed s/"\".*"// > "$upstream_trunk/trunk/upstream_repository_revision.txt"
25            echo "$PCSX2_REVISION" > "$upstream_trunk/trunk/upstream_repository_revision.txt"      
26          export upstream_revision=`cat "$upstream_trunk/trunk/upstream_repository_revision.txt"`          export upstream_revision=`cat "$upstream_trunk/trunk/upstream_repository_revision.txt"`
27          echo $upstream_revision          echo $upstream_revision
28          upstream_repository_url=`svn info --xml | grep "<url>" | sed s/"^<url>"// | sed s/"<\/url>$"//`          upstream_repository_url=`svn info --xml | grep "<url>" | sed s/"^<url>"// | sed s/"<\/url>$"//`
# Line 33  else Line 34  else
34          svn update -r "$upstream_revision" > /dev/null          svn update -r "$upstream_revision" > /dev/null
35          echo          echo
36          echo -n "Updated Upstream PCSX2 Repository to Revision: "          echo -n "Updated Upstream PCSX2 Repository to Revision: "
37          svn log -r "$upstream_revision" --xml | grep "revision=" | sed s/".*revision=\""// | sed s/"\".*"// > "$upstream_trunk/trunk/upstream_repository_revision.txt"          #svn log -r head:prev --xml | grep "revision=" | sed s/".*revision=\""// | sed s/"\".*"// > "$upstream_trunk/trunk/upstream_repository_revision.txt"
38            echo "$PCSX2_REVISION" > "$upstream_trunk/trunk/upstream_repository_revision.txt"
39          export upstream_revision=`cat "$upstream_trunk/trunk/upstream_repository_revision.txt"`          export upstream_revision=`cat "$upstream_trunk/trunk/upstream_repository_revision.txt"`
40          echo $upstream_revision          echo $upstream_revision
41          upstream_repository_url=`svn info --xml | grep "<url>" | sed s/"^<url>"// | sed s/"<\/url>$"//`          upstream_repository_url=`svn info --xml | grep "<url>" | sed s/"^<url>"// | sed s/"<\/url>$"//`
# Line 49  export current_downstream_revision=`cat Line 51  export current_downstream_revision=`cat
51  export current_local_revision=`cat "$downstream_export_location/trunk/local_repository_revision.txt"`  export current_local_revision=`cat "$downstream_export_location/trunk/local_repository_revision.txt"`
52    
53  if [ "$OVERRIDE_UPDATE_NEEDED_CHECK" != "1" ] ; then  if [ "$OVERRIDE_UPDATE_NEEDED_CHECK" != "1" ] ; then
54          if [ "$current_downstream_revision" == "$PCSX2_REVISION" -a "$current_local_revision" == "$PCSX2_REVISION_LOCAL" ] ; then          if [ "$current_downstream_revision" == "$PCSX2_REVISION" -a $current_local_revision -lt $PCSX2_REVISION_LOCAL ] ; then
55                  echo "UPSTREAM REVISION: $upstream_revision"                  echo "UPSTREAM REVISION: $PCSX2_REVISION"
56                  echo "DOWNSTREAM REVISION: $current_downstream_revision"                  echo "DOWNSTREAM REVISION: $current_downstream_revision"
57                  echo "LOCAL REVISION: $current_local_revision"                  echo "LOCAL REVISION: $current_local_revision"
58                    echo "LOCAL COMMITTED REVISION: $PCSX2_REVISION_LOCAL"
59                  echo                  echo
60                  echo -e "\\tThere is no need to update the local repository. reason: upstream repository has not been updated."                  echo -e "\\tThere is no need to update the local repository. reason: upstream repository has not been updated."
61                  echo                  echo
# Line 65  if [ "$OVERRIDE_UPDATE_NEEDED_CHECK" != Line 68  if [ "$OVERRIDE_UPDATE_NEEDED_CHECK" !=
68                  echo "LOCAL REVISION: $current_local_revision"                            echo "LOCAL REVISION: $current_local_revision"          
69          fi                fi      
70  else  else
71          if [ "$current_downstream_revision" == "$PCSX2_REVISION" -a "$current_local_revision" == "$PCSX2_REVISION_LOCAL" ] ; then          if [ "$current_downstream_revision" == "$PCSX2_REVISION" -a $current_local_revision -lt $PCSX2_REVISION_LOCAL ] ; then
72                  echo "UPSTREAM REVISION: $upstream_revision"                  echo "UPSTREAM REVISION: $PCSX2_REVISION"
73                  echo "DOWNSTREAM REVISION: $current_downstream_revision"                  echo "DOWNSTREAM REVISION: $current_downstream_revision"
74                  echo "LOCAL REVISION: $current_local_revision"                  echo "LOCAL REVISION: $current_local_revision"
75                    echo "LOCAL COMMITTED REVISION: $PCSX2_REVISION_LOCAL"
76                  echo                  echo
77                  echo -e "\\tThere is no need to update the local repository. reason: upstream repository has not been updated."                  echo -e "\\tThere is no need to update the local repository. reason: upstream repository has not been updated."
78                  echo                  echo

Legend:
Removed from v.129  
changed lines
  Added in v.130

  ViewVC Help
Powered by ViewVC 1.1.22