315 fi
316 }
317
318 ################################################################################
319 # Compare the rest of the files
320
321 compare_general_files() {
322 THIS_DIR=$1
323 OTHER_DIR=$2
324 WORK_DIR=$3
325
326 GENERAL_FILES=$(cd $THIS_DIR && $FIND . -type f ! -name "*.so" ! -name "*.jar" \
327 ! -name "*.zip" ! -name "*.debuginfo" ! -name "*.dylib" ! -name "jexec" \
328 ! -name "modules" ! -name "ct.sym" ! -name "*.diz" ! -name "*.dll" \
329 ! -name "*.cpl" ! -name "*.pdb" ! -name "*.exp" ! -name "*.ilk" \
330 ! -name "*.lib" ! -name "*.war" ! -name "JavaControlPanel" ! -name "*.jmod" \
331 ! -name "*.obj" ! -name "*.o" ! -name "JavaControlPanelHelper" \
332 ! -name "JavaUpdater" ! -name "JavaWSApplicationStub" \
333 ! -name "jspawnhelper" ! -name "JavawsLauncher" ! -name "*.a" \
334 ! -name "finish_installation" ! -name "Sparkle" ! -name "*.tar.gz" \
335 | $GREP -v "./bin/" | $SORT | $FILTER)
336
337 echo Other files with binary differences...
338 for f in $GENERAL_FILES
339 do
340 if [ -e $OTHER_DIR/$f ]; then
341 SUFFIX="${f##*.}"
342 if [ "$(basename $f)" = "release" ]; then
343 # In release file, ignore differences in change numbers and order
344 # of modules in list.
345 OTHER_FILE=$WORK_DIR/$f.other
346 THIS_FILE=$WORK_DIR/$f.this
347 $MKDIR -p $(dirname $OTHER_FILE)
348 $MKDIR -p $(dirname $THIS_FILE)
349 RELEASE_FILTER="$SED \
350 -e 's/\:[0-9a-f]\{12,12\}/:CHANGE/g' \
351 -e 's/[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}-[0-9]\{6\}/<DATE>/g' \
352 -e 's/^#.*/#COMMENT/g' \
353 -e 's/MODULES=/MODULES=\'$'\n/' \
354 -e 's/,/\'$'\n/g' \
|
315 fi
316 }
317
318 ################################################################################
319 # Compare the rest of the files
320
321 compare_general_files() {
322 THIS_DIR=$1
323 OTHER_DIR=$2
324 WORK_DIR=$3
325
326 GENERAL_FILES=$(cd $THIS_DIR && $FIND . -type f ! -name "*.so" ! -name "*.jar" \
327 ! -name "*.zip" ! -name "*.debuginfo" ! -name "*.dylib" ! -name "jexec" \
328 ! -name "modules" ! -name "ct.sym" ! -name "*.diz" ! -name "*.dll" \
329 ! -name "*.cpl" ! -name "*.pdb" ! -name "*.exp" ! -name "*.ilk" \
330 ! -name "*.lib" ! -name "*.war" ! -name "JavaControlPanel" ! -name "*.jmod" \
331 ! -name "*.obj" ! -name "*.o" ! -name "JavaControlPanelHelper" \
332 ! -name "JavaUpdater" ! -name "JavaWSApplicationStub" \
333 ! -name "jspawnhelper" ! -name "JavawsLauncher" ! -name "*.a" \
334 ! -name "finish_installation" ! -name "Sparkle" ! -name "*.tar.gz" \
335 ! -name "classes.jsa" \
336 | $GREP -v "./bin/" | $SORT | $FILTER)
337
338 echo Other files with binary differences...
339 for f in $GENERAL_FILES
340 do
341 if [ -e $OTHER_DIR/$f ]; then
342 SUFFIX="${f##*.}"
343 if [ "$(basename $f)" = "release" ]; then
344 # In release file, ignore differences in change numbers and order
345 # of modules in list.
346 OTHER_FILE=$WORK_DIR/$f.other
347 THIS_FILE=$WORK_DIR/$f.this
348 $MKDIR -p $(dirname $OTHER_FILE)
349 $MKDIR -p $(dirname $THIS_FILE)
350 RELEASE_FILTER="$SED \
351 -e 's/\:[0-9a-f]\{12,12\}/:CHANGE/g' \
352 -e 's/[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}-[0-9]\{6\}/<DATE>/g' \
353 -e 's/^#.*/#COMMENT/g' \
354 -e 's/MODULES=/MODULES=\'$'\n/' \
355 -e 's/,/\'$'\n/g' \
|