bump theme versions to 2.1 and get ready to release this

[themes.git] / origdiff

diff --git a/origdiff b/origdiff
index 711e071ce4cdf8fbf5273971290adc199082b9c0..cecebd500e7c2a4e1ce5759113be7d763c2d796e 100755 (executable)
--- a/origdiff
+++ b/origdiff
@@ -4,48 +4,75 @@ RUN_DIR=$(pwd)
 cd $(dirname "$0")
 SCRIPT_DIR=$(pwd)
 
+REPO_LIST="COMM MOZ MOZB DOMI CZ"
+
 if [ -n "$1" ]; then
   SRC_DATE="$1"
-  DST_DATE=`TZ=PST8PDT date +%Y-%m-%d`
+  DST_DATE=`TZ=America/Los_Angeles date +%Y-%m-%d`
 
-  HG_COMM_DIR=/mnt/mozilla/hg/comm-central
+  HG_COMM_DIR=/mnt/mozilla/hg/comm-2.0
+  #HG_COMM_DIR=/mnt/mozilla/hg/comm-central
+  COMM_HG_OPTIONS=
   COMM_DIR=suite/themes/classic/
+  COMM_NAME_EXTRA=" (suite)"
   COMM_LOG=$RUN_DIR/themelog-suitedefault.$SRC_DATE.$DST_DATE.log
 
-  HG_MOZ_DIR=/mnt/mozilla/hg/comm-central/mozilla
+  HG_MOZ_DIR=/mnt/mozilla/hg/comm-2.0/mozilla
+  #HG_MOZ_DIR=/mnt/mozilla/hg/comm-central/mozilla
+  MOZ_HG_OPTIONS=
   MOZ_DIR=toolkit/themes/winstripe/
+  MOZ_NAME_EXTRA=" (toolkit)"
   MOZ_LOG=$RUN_DIR/themelog-tkwinstripe.$SRC_DATE.$DST_DATE.log
 
-  HG_DOMI_DIR=/mnt/mozilla/hg/comm-central/mozilla/extensions/inspector
+  HG_MOZB_DIR=/mnt/mozilla/hg/comm-2.0/mozilla
+  #HG_MOZB_DIR=/mnt/mozilla/hg/comm-central/mozilla
+  MOZB_HG_OPTIONS=
+  MOZB_DIR=browser/themes/winstripe/
+  MOZB_NAME_EXTRA=" (browser)"
+  MOZB_LOG=$RUN_DIR/themelog-browserwin.$SRC_DATE.$DST_DATE.log
+
+  HG_DOMI_DIR=/mnt/mozilla/hg/comm-2.0/mozilla/extensions/inspector
+  #HG_DOMI_DIR=/mnt/mozilla/hg/comm-central/mozilla/extensions/inspector
+  DOMI_HG_OPTIONS=
   DOMI_DIR=resources/skin/classic/
+  DOMI_NAME_EXTRA=
   DOMI_LOG=$RUN_DIR/themelog-domiclassic.$SRC_DATE.$DST_DATE.log
 
-  if [ ! -e $COMM_LOG ]; then
-    echo "Getting $COMM_LOG..."
-    cd $HG_COMM_DIR
-    hg log -d ">$SRC_DATE" $COMM_DIR > $COMM_LOG
-  fi
-  if [ ! -e $MOZ_LOG ]; then
-    echo "Getting $MOZ_LOG..."
-    cd $HG_MOZ_DIR
-    hg log -d ">$SRC_DATE" $MOZ_DIR > $MOZ_LOG
-  fi
-  if [ ! -e $DOMI_LOG ]; then
-    echo "Getting $DOMI_LOG..."
-    cd $HG_DOMI_DIR
-    hg log -d ">$SRC_DATE" $DOMI_DIR > $DOMI_LOG
-  fi
+  HG_CZ_DIR=/mnt/mozilla/hg/comm-2.0/mozilla/extensions/irc
+  #HG_CZ_DIR=/mnt/mozilla/hg/comm-central/mozilla/extensions/irc
+  CZ_HG_OPTIONS=
+  CZ_DIR=xul/skin/
+  CZ_NAME_EXTRA=
+  CZ_LOG=$RUN_DIR/themelog-chatzilla.$SRC_DATE.$DST_DATE.log
+
+  for repo in $REPO_LIST; do
+    HG_DIR_VAR="HG_${repo}_DIR"
+    HG_DIR=${!HG_DIR_VAR}
+    HG_OPTIONS_VAR="${repo}_HG_OPTIONS"
+    HG_OPTIONS=${!HG_OPTIONS_VAR}
+    SKIN_DIR_VAR="${repo}_DIR"
+    SKIN_DIR=${!SKIN_DIR_VAR}
+    LOG_VAR="${repo}_LOG"
+    LOG_NAME=${!LOG_VAR}
+    if [ ! -e $LOG_NAME ]; then
+      echo "Getting $LOG_NAME..."
+      cd $HG_DIR
+      LC_ALL=C hg log -d ">$SRC_DATE" $HG_OPTIONS $SKIN_DIR > $LOG_NAME
+    fi
+  done
   cd $RUN_DIR
 else
   echo "You must specify a start date."
   exit 1
 fi
 
-for repo in "COMM" "MOZ" "DOMI"; do
+for repo in $REPO_LIST; do
   HG_DIR_VAR="HG_${repo}_DIR"
   LOG_VAR="${repo}_LOG"
+  NAME_EXTRA_VAR="${repo}_NAME_EXTRA"
+  NAME_EXTRA=${!NAME_EXTRA_VAR}
   HG_URL=`awk -F ' *= *' '/default *=/ { print $2 }' ${!HG_DIR_VAR}/.hg/hgrc`
-  REPO_NAME=`basename $HG_URL`
+  REPO_NAME=`basename $HG_URL`$NAME_EXTRA
   LOG_NAME=${!LOG_VAR}
   HTML_NAME=${LOG_NAME/.log/.html}
   echo "Writing $HTML_NAME..."
@@ -58,7 +85,7 @@ for repo in "COMM" "MOZ" "DOMI"; do
   echo "  <h1>$REPO_NAME Theme Changes</h1>" >> $HTML_NAME
   echo "  <h2>$SRC_DATE to $DST_DATE</h2>" >> $HTML_NAME
   echo "    <pre>" >> $HTML_NAME
-  sed -e "s/user:\(.*\)<\(.*\)>/user:\1\&lt;\2\&gt;/" \
+  sed -e "s/&/\&amp;/g" -e "s/</\&lt;/g" -e "s/>/\&gt;/g" \
       -e "s|\(changeset: *[0-9]*\):\([0-9a-f]*\)|\1:<a href=\"$HG_URL/rev/\2\">\2</a>|" \
       $LOG_NAME >> $HTML_NAME
   echo "    </pre>" >> $HTML_NAME