From 690b7d1ff13454f9e5eddb3bfc869eb46c93ef01 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Fri, 13 Feb 2009 01:23:04 +0100 Subject: [PATCH] make the origdiff script include inspector, exclude generated theme logs from git commands --- .gitignore | 1 + origdiff | 22 ++++++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..f6600b56 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +themelog-* diff --git a/origdiff b/origdiff index ca45bad1..711e071c 100755 --- a/origdiff +++ b/origdiff @@ -1,8 +1,5 @@ #!/bin/sh -HG_COMM_DIR=/mnt/mozilla/hg/comm-central -HG_MOZ_DIR=/mnt/mozilla/hg/comm-central/mozilla - RUN_DIR=$(pwd) cd $(dirname "$0") SCRIPT_DIR=$(pwd) @@ -10,11 +7,19 @@ SCRIPT_DIR=$(pwd) if [ -n "$1" ]; then SRC_DATE="$1" DST_DATE=`TZ=PST8PDT date +%Y-%m-%d` + + HG_COMM_DIR=/mnt/mozilla/hg/comm-central COMM_DIR=suite/themes/classic/ - MOZ_DIR=toolkit/themes/winstripe/ COMM_LOG=$RUN_DIR/themelog-suitedefault.$SRC_DATE.$DST_DATE.log + + HG_MOZ_DIR=/mnt/mozilla/hg/comm-central/mozilla + MOZ_DIR=toolkit/themes/winstripe/ MOZ_LOG=$RUN_DIR/themelog-tkwinstripe.$SRC_DATE.$DST_DATE.log + HG_DOMI_DIR=/mnt/mozilla/hg/comm-central/mozilla/extensions/inspector + DOMI_DIR=resources/skin/classic/ + DOMI_LOG=$RUN_DIR/themelog-domiclassic.$SRC_DATE.$DST_DATE.log + if [ ! -e $COMM_LOG ]; then echo "Getting $COMM_LOG..." cd $HG_COMM_DIR @@ -25,19 +30,24 @@ if [ -n "$1" ]; then 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 cd $RUN_DIR else echo "You must specify a start date." exit 1 fi -for repo in "COMM" "MOZ"; do +for repo in "COMM" "MOZ" "DOMI"; do HG_DIR_VAR="HG_${repo}_DIR" LOG_VAR="${repo}_LOG" HG_URL=`awk -F ' *= *' '/default *=/ { print $2 }' ${!HG_DIR_VAR}/.hg/hgrc` REPO_NAME=`basename $HG_URL` LOG_NAME=${!LOG_VAR} - HTML_NAME=${DIFF_NAME/.diff/.html} + HTML_NAME=${LOG_NAME/.log/.html} echo "Writing $HTML_NAME..." echo '' > $HTML_NAME echo "" >> $HTML_NAME -- 2.35.3