/[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 115 by william, Thu Sep 9 23:53:30 2010 UTC revision 129 by william, Fri Sep 10 11:04:39 2010 UTC
# Line 28  if [ "$upstream_revision" == "HEAD" ] ; Line 28  if [ "$upstream_revision" == "HEAD" ] ;
28          echo "$upstream_repository_url" > "$upstream_trunk/trunk/upstream_repository_url.txt"          echo "$upstream_repository_url" > "$upstream_trunk/trunk/upstream_repository_url.txt"
29          mkdir -p "$upstream_trunk/trunk/bin"          mkdir -p "$upstream_trunk/trunk/bin"
30          echo "$PCSX2_VERSION" > "$upstream_trunk/trunk/bin/pcsx2-version.txt"          echo "$PCSX2_VERSION" > "$upstream_trunk/trunk/bin/pcsx2-version.txt"
31            #echo "$PCSX2_REVISION_LOCAL" > "$upstream_trunk/trunk/local_repository_revision.txt"
32  else  else
33          svn update -r "$upstream_revision" > /dev/null          svn update -r "$upstream_revision" > /dev/null
34          echo          echo
# Line 40  else Line 40  else
40          echo "$upstream_repository_url" > "$upstream_trunk/trunk/upstream_repository_url.txt"          echo "$upstream_repository_url" > "$upstream_trunk/trunk/upstream_repository_url.txt"
41          mkdir -p "$upstream_trunk/trunk/bin"          mkdir -p "$upstream_trunk/trunk/bin"
42          echo "$PCSX2_VERSION" > "$upstream_trunk/trunk/bin/pcsx2-version.txt"          echo "$PCSX2_VERSION" > "$upstream_trunk/trunk/bin/pcsx2-version.txt"
43            #echo "$PCSX2_REVISION_LOCAL" > "$upstream_trunk/trunk/local_repository_revision.txt"
44  fi  fi
45    
46    
47    
48  export current_downstream_revision=`cat "$downstream_export_location/trunk/upstream_repository_revision.txt"`  export current_downstream_revision=`cat "$downstream_export_location/trunk/upstream_repository_revision.txt"`
49    export current_local_revision=`cat "$downstream_export_location/trunk/local_repository_revision.txt"`
50    
51  if [ "$OVERRIDE_UPDATE_NEEDED_CHECK" != "1" ] ; then  if [ "$OVERRIDE_UPDATE_NEEDED_CHECK" != "1" ] ; then
52          if [ "$current_downstream_revision" == "$upstream_revision" ] ; then          if [ "$current_downstream_revision" == "$PCSX2_REVISION" -a "$current_local_revision" == "$PCSX2_REVISION_LOCAL" ] ; then
53                  echo "UPSTREAM REVISION: $upstream_revision"                  echo "UPSTREAM REVISION: $upstream_revision"
54                  echo "DOWNSTREAM REVISION: $current_downstream_revision"                  echo "DOWNSTREAM REVISION: $current_downstream_revision"
55                    echo "LOCAL REVISION: $current_local_revision"
56                  echo                  echo
57                  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."
58                  echo                  echo
59                  echo -e "\\tAborting update of $downstream_export_location/trunk"                  echo -e "\\tAborting update of $downstream_export_location/trunk"
60                  echo                  echo
61                  exit 0                  exit 0
62          fi          else
63                    echo "UPSTREAM REVISION: $upstream_revision"
64                    echo "DOWNSTREAM REVISION: $current_downstream_revision"
65                    echo "LOCAL REVISION: $current_local_revision"          
66            fi      
67  else  else
68          if [ "$current_downstream_revision" == "$upstream_revision" ] ; then          if [ "$current_downstream_revision" == "$PCSX2_REVISION" -a "$current_local_revision" == "$PCSX2_REVISION_LOCAL" ] ; then
69                  echo "UPSTREAM REVISION: $upstream_revision"                  echo "UPSTREAM REVISION: $upstream_revision"
70                  echo "DOWNSTREAM REVISION: $current_downstream_revision"                  echo "DOWNSTREAM REVISION: $current_downstream_revision"
71                    echo "LOCAL REVISION: $current_local_revision"
72                  echo                  echo
73                  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."
74                  echo                  echo
75                  echo -e "\\tDetected the use of: --force-update ... forcing update ..."                  echo -e "\\tDetected the use of: --force-update ... forcing update ..."
76            else
77                    echo "UPSTREAM REVISION: $upstream_revision"
78                    echo "DOWNSTREAM REVISION: $current_downstream_revision"
79                    echo "LOCAL REVISION: $current_local_revision"
80          fi          fi
81    
82  fi  fi
# Line 93  svn export --force "$upstream_trunk/trun Line 104  svn export --force "$upstream_trunk/trun
104  cp -f "$upstream_trunk/trunk/upstream_repository_revision.txt" "$downstream_export_location/trunk/upstream_repository_revision.txt" > /dev/null 2>/dev/null  cp -f "$upstream_trunk/trunk/upstream_repository_revision.txt" "$downstream_export_location/trunk/upstream_repository_revision.txt" > /dev/null 2>/dev/null
105  cp -f "$upstream_trunk/trunk/upstream_repository_url.txt" "$downstream_export_location/trunk/upstream_repository_url.txt" > /dev/null 2>/dev/null  cp -f "$upstream_trunk/trunk/upstream_repository_url.txt" "$downstream_export_location/trunk/upstream_repository_url.txt" > /dev/null 2>/dev/null
106  cp -f "$upstream_trunk/trunk/bin/pcsx2-version.txt" "$downstream_export_location/trunk/bin/pcsx2-version.txt"  cp -f "$upstream_trunk/trunk/bin/pcsx2-version.txt" "$downstream_export_location/trunk/bin/pcsx2-version.txt"
107    cp -f "$upstream_trunk/trunk/local_repository_revision.txt" "$downstream_export_location/trunk/local_repository_revision.txt"
108    
109  cd "$downstream_export_location"  cd "$downstream_export_location"
110  "$downstream_export_location/auto_import_3rdparty_deps.sh"  "$downstream_export_location/auto_import_3rdparty_deps.sh"

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

  ViewVC Help
Powered by ViewVC 1.1.22