summaryrefslogtreecommitdiff
path: root/Master/Tools/tlrebuild
diff options
context:
space:
mode:
Diffstat (limited to 'Master/Tools/tlrebuild')
-rwxr-xr-xMaster/Tools/tlrebuild69
1 files changed, 37 insertions, 32 deletions
diff --git a/Master/Tools/tlrebuild b/Master/Tools/tlrebuild
index 98e9a57b4fd..9692d43df14 100755
--- a/Master/Tools/tlrebuild
+++ b/Master/Tools/tlrebuild
@@ -12,18 +12,21 @@ umask 0
if test x$1 = x--no-tpm; then
no_tpm=true
+ shift
else
no_tpm=false
fi
#
if test x$1 = x--no-images; then
no_images=true
+ shift
else
no_images=false
fi
#
if test x$1 = x--no-test; then
no_test=true
+ shift
else
no_test=false
fi
@@ -34,8 +37,10 @@ message() \
}
# don't work with old stuff.
-message "p4 sync"
-p4 sync || exit 1
+master=`cd $tools/.. && pwd`
+top=`cd $master/.. && pwd`
+message "svn update"
+(cd $top && svn update) || exit 1
if $no_tpm; then :; else
# have to run multiple times to make the sizes converge, since the .tpm
@@ -54,34 +59,34 @@ message "#4"
message "tpm-check"
tpm-check || exit 1
-master=`cd $mydir/.. && pwd`
-for dir in texmf/tpm texmf-dist/tpm texmf-doc/tpm; do
- cd $master/$dir || exit 1
- message "$dir: finding changed tpms"
- changelist=`p4 diff -se ...`
- if test -n "$changelist"; then
- echo "$changelist" | p4 -x - edit 2>&1 | grep -v 'opened for edit'
- for f in $changelist; do
-#echo "checking $f for unimportant change..."
- # revert tpms that differ only in the date.
- diff="`p4 diff $f \
- | egrep -v '^===|^---|^[0-9]+c[0-9]|TPM:Date' 2>/dev/null`"
- if test -z "$diff"; then
- p4 revert $f 2>&1 | grep -v 'was edit'
- else
- echo $f diff: $diff
- fi
- done
- fi
-
- # new tpms not in depot
- message "$dir: finding new tpms"
- find . -type f | p4 -x - add 2>&1 \
- | egrep -v 'already opened|add.*existing file'
-
- message "$dir: finding obsolete tpms"
- p4 diff -sd ... | p4 -x - delete # old tpms no longer needed
-done
+#master=`cd $mydir/.. && pwd`
+#for dir in texmf/tpm texmf-dist/tpm texmf-doc/tpm; do
+# cd $master/$dir || exit 1
+# message "$dir: finding changed tpms"
+# changelist=`p4 diff -se ...`
+# if test -n "$changelist"; then
+# echo "$changelist" | p4 -x - edit 2>&1 | grep -v 'opened for edit'
+# for f in $changelist; do
+##echo "checking $f for unimportant change..."
+# # revert tpms that differ only in the date.
+# diff="`p4 diff $f \
+# | egrep -v '^===|^---|^[0-9]+c[0-9]|TPM:Date' 2>/dev/null`"
+# if test -z "$diff"; then
+# p4 revert $f 2>&1 | grep -v 'was edit'
+# else
+# echo $f diff: $diff
+# fi
+# done
+# fi
+#
+# # new tpms not in depot
+# message "$dir: finding new tpms"
+# find . -type f | p4 -x - add 2>&1 \
+# | egrep -v 'already opened|add.*existing file'
+#
+# message "$dir: finding obsolete tpms"
+# p4 diff -sd ... | p4 -x - delete # old tpms no longer needed
+#done
# lists files used by the Unix installer.
message "update-lists for Unix installer"
@@ -90,7 +95,7 @@ update-lists || exit 1
#
# if we have any files, submit to perforce (frightening but necessary).
-if p4 change -o | grep '^Files:' >/dev/null; then
+if false p4 change -o | grep '^Files:' >/dev/null; then
message "submitting to p4"
p4 change -o \
| sed "s!<enter description here>!regenerated by $0!" \
@@ -100,7 +105,7 @@ else
fi
# keep writable for next time, trying to have rahtz/staw share /home/tlprod.
-chmod a+rw $master/*/tpm/* >&/dev/null
+#chmod a+rw $master/*/tpm/* >&/dev/null
message "ls-R updates"
update-lsr