[Gzz-commits] gzz Makefile TODO sync-remote-private.sh

[Tuukka Hastrup]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuukka Hastrup <address@hidden> 02/09/27 12:06:32

Modified files:
        .              : Makefile TODO sync-remote-private.sh 

Log message:
        TODO

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Makefile.diff?tr1=1.171&tr2=1.172&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.163&tr2=1.164&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/sync-remote-private.sh.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gzz/Makefile
diff -c gzz/Makefile:1.171 gzz/Makefile:1.172
*** gzz/Makefile:1.171  Mon Sep 23 04:24:25 2002
--- gzz/Makefile        Fri Sep 27 12:06:32 2002
***************
*** 107,134 ****
  Z_DIR=../Z/
  Z_PRIVATE=../Z-private/
  MEDIASERVER=http://himalia.it.jyu.fi/ms
  
  mainclass = gzz.control.Main
  
  httpsync: 
        mkdir -p $(Z_DIR)
!       $(JAVA) gzz.client.Synch -dir $(Z_DIR) -url $(MEDIASERVER)/gzz-base
  
  sync:
- #     $(JAVA) gzz.client.Synch -dir $(Z_DIR) -url $(MEDIASERVER)
        mkdir -p $(Z_DIR)
!       ./sync-remote-private.sh $(Z_DIR) gzz-base
  
! sync-private:
!       mkdir -p $(Z_PRIVATE)
!       ./sync-remote-private.sh $(Z_PRIVATE) gzz-jyu-private
! 
! 
! rm-private:
        find $(Z_DIR) -name 'b_*'|xargs rm -f
        find $(Z_DIR) -name 'ps_*'|xargs rm -f
  
! get-private: rm-private sync-private
  
  # -taglet gzz.util.JythonDoclet
  JAVADOCOPTS=-use -version -author -windowtitle "GZigZag Java API"
--- 107,138 ----
  Z_DIR=../Z/
  Z_PRIVATE=../Z-private/
  MEDIASERVER=http://himalia.it.jyu.fi/ms
+ POOL=gzz-base
+ PRIVATEPOOL=gzz-jyu-private
  
  mainclass = gzz.control.Main
  
  httpsync: 
        mkdir -p $(Z_DIR)
!       $(JAVA) gzz.client.Synch -dir $(Z_DIR) -url $(MEDIASERVER)/$(POOL)
  
  sync:
        mkdir -p $(Z_DIR)
!       ./sync-remote-private.sh $(Z_DIR) $(POOL)
  
! discard-pool:
        find $(Z_DIR) -name 'b_*'|xargs rm -f
        find $(Z_DIR) -name 'ps_*'|xargs rm -f
  
! get-ms: discard-pool sync
! 
! sync-private: Z_DIR=$(Z_PRIVATE)
! sync-private: POOL=$(PRIVATEPOOL)
! sync-private: sync
! 
! get-ms-private: Z_DIR=$(Z_PRIVATE)
! get-ms-private: POOL=$(PRIVATEPOOL)
! get-ms-private: get-ms
  
  # -taglet gzz.util.JythonDoclet
  JAVADOCOPTS=-use -version -author -windowtitle "GZigZag Java API"
Index: gzz/TODO
diff -c gzz/TODO:1.163 gzz/TODO:1.164
*** gzz/TODO:1.163      Fri Sep 27 11:56:42 2002
--- gzz/TODO    Fri Sep 27 12:06:32 2002
***************
*** 9,14 ****
--- 9,15 ----
  
  
  0.8alpha2: Crucial demos for continued funding preliminary work - until 28th
+          Release time estimated at 30th evening
  ( unlike the other releases, the things here are in priority order )
      tuukkah:
        - get rid of the undistributable mstmpimg blocks in use, replace 
Index: gzz/sync-remote-private.sh
diff -c gzz/sync-remote-private.sh:1.1 gzz/sync-remote-private.sh:1.2
*** gzz/sync-remote-private.sh:1.1      Sun Apr  7 15:43:06 2002
--- gzz/sync-remote-private.sh  Fri Sep 27 12:06:32 2002
***************
*** 2,15 ****
  
  set -e
  
! TMP=privatecopy
  
  cleanup() {
        ssh address@hidden "sh -vc 'chmod 700 .lock ; rm -f .lock'"
  }
  
! if [ "$1" = "cleanup" ]; then cleanup; exit; fi
  
  MS="$1"
  MSREMOTE="$2"
  if [ "$1" != "" ]; then MS="$1"; fi
--- 2,22 ----
  
  set -e
  
! TMP=../ms-rsync-cache
  
  cleanup() {
        ssh address@hidden "sh -vc 'chmod 700 .lock ; rm -f .lock'"
  }
  
! if [ "$1" = "cleanup" ]; then 
!       cleanup
!       exit 
! elif [ "$2" = "purgecache" ]; then
!       rm -R "$TMP"
!       exit
! fi
  
+ # XXX makes no sense. Maybe we should require non-empty parameters?
  MS="$1"
  MSREMOTE="$2"
  if [ "$1" != "" ]; then MS="$1"; fi
***************
*** 22,26 ****
  trap cleanup EXIT
  echo "Success."
  rsync --rsh=ssh -rtvz address@hidden:$MSREMOTE/ $TMP/$MSREMOTE/
! ${JAVA:-java} gzz.client.Synch -dir $MS -dir $TMP/$MSREMOTE
  rsync --rsh=ssh -rtvz $TMP/$MSREMOTE/ address@hidden:$MSREMOTE/
--- 29,40 ----
  trap cleanup EXIT
  echo "Success."
  rsync --rsh=ssh -rtvz address@hidden:$MSREMOTE/ $TMP/$MSREMOTE/
! 
! # XXX We need Synch when we start to have pointer conflicts
! # ${JAVA:-java} gzz.client.Synch -dir $MS -dir $TMP/$MSREMOTE
! # For now, simply update blocks to both directions
! # Also, local pools must use dirstorer.maxlen=255
! rsync -rt $TMP/$MSREMOTE/ $MS/
! rsync -rt $MS/ $TMP/$MSREMOTE/
! 
  rsync --rsh=ssh -rtvz $TMP/$MSREMOTE/ address@hidden:$MSREMOTE/