move padding to .urlbar-security-level to still have the whole relevant area colored...

[themes.git] / origdiff

diff --git a/origdiff b/origdiff
index 49decf35d2497a175b09538e77ac03bbd41eaf00..cecebd500e7c2a4e1ce5759113be7d763c2d796e 100755 (executable)
--- a/origdiff
+++ b/origdiff
@@ -4,29 +4,52 @@ RUN_DIR=$(pwd)
 cd $(dirname "$0")
 SCRIPT_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=America/Los_Angeles date +%Y-%m-%d`
 
 if [ -n "$1" ]; then
   SRC_DATE="$1"
   DST_DATE=`TZ=America/Los_Angeles date +%Y-%m-%d`
 

-  HG_COMM_DIR=/mnt/mozilla/hg/comm-1.9.1
+  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_DIR=suite/themes/classic/

+  COMM_NAME_EXTRA=" (suite)"

   COMM_LOG=$RUN_DIR/themelog-suitedefault.$SRC_DATE.$DST_DATE.log
 
   COMM_LOG=$RUN_DIR/themelog-suitedefault.$SRC_DATE.$DST_DATE.log
 

-  HG_MOZ_DIR=/mnt/mozilla/hg/comm-1.9.1/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_DIR=toolkit/themes/winstripe/

+  MOZ_NAME_EXTRA=" (toolkit)"

   MOZ_LOG=$RUN_DIR/themelog-tkwinstripe.$SRC_DATE.$DST_DATE.log
 
   MOZ_LOG=$RUN_DIR/themelog-tkwinstripe.$SRC_DATE.$DST_DATE.log
 

-  HG_DOMI_DIR=/mnt/mozilla/hg/comm-1.9.1/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_DIR=resources/skin/classic/

+  DOMI_NAME_EXTRA=

   DOMI_LOG=$RUN_DIR/themelog-domiclassic.$SRC_DATE.$DST_DATE.log
 
   DOMI_LOG=$RUN_DIR/themelog-domiclassic.$SRC_DATE.$DST_DATE.log
 

-  HG_CZ_DIR=/mnt/mozilla/hg/comm-1.9.1/mozilla/extensions/irc
+  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_DIR=xul/skin/

+  CZ_NAME_EXTRA=

   CZ_LOG=$RUN_DIR/themelog-chatzilla.$SRC_DATE.$DST_DATE.log
 
   CZ_LOG=$RUN_DIR/themelog-chatzilla.$SRC_DATE.$DST_DATE.log
 

-  for repo in "COMM" "MOZ" "DOMI" "CZ"; do
+  for repo in $REPO_LIST; do

     HG_DIR_VAR="HG_${repo}_DIR"
     HG_DIR=${!HG_DIR_VAR}
     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"
     SKIN_DIR_VAR="${repo}_DIR"
     SKIN_DIR=${!SKIN_DIR_VAR}
     LOG_VAR="${repo}_LOG"


@@ -34,7 +57,7 @@ if [ -n "$1" ]; then
     if [ ! -e $LOG_NAME ]; then
       echo "Getting $LOG_NAME..."
       cd $HG_DIR
     if [ ! -e $LOG_NAME ]; then
       echo "Getting $LOG_NAME..."
       cd $HG_DIR

-      hg log -d ">$SRC_DATE" $SKIN_DIR > $LOG_NAME
+      LC_ALL=C hg log -d ">$SRC_DATE" $HG_OPTIONS $SKIN_DIR > $LOG_NAME

     fi
   done
   cd $RUN_DIR
     fi
   done
   cd $RUN_DIR


@@ -43,11 +66,13 @@ else
   exit 1
 fi
 
   exit 1
 fi
 

-for repo in "COMM" "MOZ" "DOMI" "CZ"; do
+for repo in $REPO_LIST; do

   HG_DIR_VAR="HG_${repo}_DIR"
   LOG_VAR="${repo}_LOG"
   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`
   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..."
   LOG_NAME=${!LOG_VAR}
   HTML_NAME=${LOG_NAME/.log/.html}
   echo "Writing $HTML_NAME..."