Index: branches/5.2.x/tools/araxis_merge.scpt =================================================================== diff -u -N --- branches/5.2.x/tools/araxis_merge.scpt (revision 0) +++ branches/5.2.x/tools/araxis_merge.scpt (revision 16757) @@ -0,0 +1,28 @@ +on run argv + set first_file to item 1 of argv + set second_file to item 2 of argv + + tell application "Araxis Merge" + -- Start/connect to Merge without displaying any UI + launch + + try + -- Use an empty document if available + set _document to the first empty text document + on error + -- Create a text comparison document + set _document to make text document at end of documents + end try + + tell _document + -- Tell the document which files to compare + set the (first compared file's path) to first_file + set the (second compared file's path) to second_file + + -- Compare the files + compare items + end tell + + activate + end tell +end run Index: branches/5.2.x/tools/synchronize.sh =================================================================== diff -u -N -r15660 -r16757 --- branches/5.2.x/tools/synchronize.sh (.../synchronize.sh) (revision 15660) +++ branches/5.2.x/tools/synchronize.sh (.../synchronize.sh) (revision 16757) @@ -1,4 +1,7 @@ #!/bin/sh MAPPED_PATH=`dirname $0` +PROJECT_ROOT_PATH=`dirname ${MAPPED_PATH}` -open $MAPPED_PATH/../system/export/Custom.textcomparison +if [[ "$OSTYPE" == "darwin"* ]]; then + osascript ${MAPPED_PATH}/araxis_merge.scpt "${PROJECT_ROOT_PATH}/system/export/Custom.lang" "${PROJECT_ROOT_PATH}/modules/custom/install/english.lang" +fi