External Programs for Mac OS

If you are having a problem using SourceOffSite, post a message here.

Moderator: SourceGear

Post Reply
CodeLab
Posts: 6
Joined: Wed Apr 23, 2008 8:18 am

External Programs for Mac OS

Post by CodeLab » Wed Apr 23, 2008 8:24 am

We are mostly a Windows shop, but we have two full time Mac users. They are up to date (Mac OS 10.5.2). We're trying the Mac client.

What should they be using for the External Programs for SoS? Are there suggestions for what would work well for a Mac user who hasn't really added much to their Mac? They have added Dreamweaver, Photoshop, Flash, etc., but they are not developers in the programming sense.

PS: We are also having issues with focus with X11. Suyggestions welcome.

jclausius
Posts: 3655
Joined: Tue Dec 16, 2003 1:17 pm
Location: SourceGear
Contact:

Post by jclausius » Wed Apr 23, 2008 10:08 am

For the view/edit, use "/usr/bin/open %s"

For the diff of files, directories, and merging, you'll need to find a tool which you would like to use, provide the path to that tool along with any arguments. If you need a Diff/Merge tool, we recommend SourceGear Diff/Merge.

In terms of setting up, for diffing files/folders would look like "/path/to/diff/utility/binary %s %s"

In terms of merge, it appears as if the files being merged are applied directly to the command line. So you can use, "/path/to/merge/utility/binary"

HTH
Last edited by jclausius on Wed Apr 23, 2008 10:29 am, edited 1 time in total.
Jeff Clausius
SourceGear

CodeLab
Posts: 6
Joined: Wed Apr 23, 2008 8:18 am

Post by CodeLab » Wed Apr 23, 2008 10:12 am

jclausius wrote:For the diff of files, directories, and merging, you'll need to find a tool which you would like to use, provide the path to that tool along with any arguments. If you need a Diff/Merge tool, we recommend SourceGear Diff/Merge.
While I'm sure SourceGear's DiffMerge is better, is there any already-on-a-Mac diff utility? I don't really care about a merge utility right now.

jclausius
Posts: 3655
Joined: Tue Dec 16, 2003 1:17 pm
Location: SourceGear
Contact:

Post by jclausius » Wed Apr 23, 2008 10:28 am

I think there is the standard "diff" program for x-code. I'm not certain if there is a GUI based version. Perhaps others will chime in. Whatever you choose, with SOS,you can configure whatever tool you like.

<my $.02>
Personally, I'd recommend DiffMerge. It is a really well designed tool, which just happened to win a Jolt Productivity Award for 2008.
</my $.02>
Last edited by jclausius on Wed Apr 23, 2008 10:37 am, edited 5 times in total.
Jeff Clausius
SourceGear

jclausius
Posts: 3655
Joined: Tue Dec 16, 2003 1:17 pm
Location: SourceGear
Contact:

Post by jclausius » Wed Apr 23, 2008 10:32 am

Note, /usr/bin/open is a Mac based program which will launch an editor based on the file's associated set up in Chooser. So if an html file is set to launch with TextPad, that is the app invoked to view/edit the file. To use different programs based on file, just change the file's association within OS X.
Jeff Clausius
SourceGear

CodeLab
Posts: 6
Joined: Wed Apr 23, 2008 8:18 am

External programs being erased?

Post by CodeLab » Thu Apr 24, 2008 12:03 pm

We installed SourceGear's DiffMerge. The only time consuming thing was finding the right UNIX path to it. We did manage to do that.

But, after enterming the External Program strings into SourceOffSite on MacOS, we find they have disappeared the next run. Actually, the /usr/bin/open string has stayed, but the much longer strings to DiffMerge go away.

We have to put quotes around the launch path as there is a space in it. That makes things worked right in SoS. Could that cause the disappearing strings?

The only things I can think of are (a) the quotes and (b) the length.

Any help is appreciated.

jclausius
Posts: 3655
Joined: Tue Dec 16, 2003 1:17 pm
Location: SourceGear
Contact:

Post by jclausius » Thu Apr 24, 2008 12:46 pm

I don't know what may be the problem.

In my configuration, I moved the unpackaged DiffMerge folder into /Applications. Then, there is a Readme.txt file. I followed the instructions there, and copied the two files found in the CommandLine directory to /usr/local/ and /usr/share/man/man1.

I followed the instructions in the file, but also edited the diffmerge.sh to use the path "/Applications/DiffMerge/DiffMerge.app" as I moved the whole DiffMerge package.

Finally, I configured SOS to use "/usr/local/diffmerge.sh %s %s".
Jeff Clausius
SourceGear

CodeLab
Posts: 6
Joined: Wed Apr 23, 2008 8:18 am

External programs being erased?

Post by CodeLab » Thu Apr 24, 2008 3:04 pm

One person had already installed DiffMerge for others reasons. (He was just using it to compare local files.) So, we just found the path to the executable and used that. The entry we did for both comparing files and comparing folders is:

"/Volumes/Macintosh HD/Applications/DiffMerge.app/Contents/MacOS/DiffMerge" %s %s

We had to quote the executable's path due to the space in "Macintosh HD". But, it works fine.

If we exit SoS and then exit X11 then back into SoS, the strong is gone...

Do we need to do all of the file copying, using the shell file, etc.?

CodeLab
Posts: 6
Joined: Wed Apr 23, 2008 8:18 am

External programs being erased?

Post by CodeLab » Thu Apr 24, 2008 3:37 pm

The other person just installed the downloaded DiffMerge package (.pkg). Below is where things ended up asnd what they are. The path we used for him was /Applications/DiffMerge.app/Contents/MacOS/DiffMerge, which works fine, but gets lost upon exit and reentry just like the other guy.

bash-3.2$ pwd
/Applications/DiffMerge.app
bash-3.2$ ls -laR
total 0
drwxr-xr-x@ 3 johnlarochelle admin 102 Oct 8 2007 .
drwxrwxr-x@ 84 root admin 2856 Apr 24 10:26 ..
drwxr-xr-x@ 5 johnlarochelle admin 170 Oct 8 2007 Contents

./Contents:
total 8
drwxr-xr-x@ 5 johnlarochelle admin 170 Oct 8 2007 .
drwxr-xr-x@ 3 johnlarochelle admin 102 Oct 8 2007 ..
-rw-r--r--@ 1 johnlarochelle admin 978 Oct 8 2007 Info.plist
drwxr-xr-x@ 3 johnlarochelle admin 102 Oct 8 2007 MacOS
drwxr-xr-x@ 6 johnlarochelle admin 204 Oct 8 2007 Resources

./Contents/MacOS:
total 19520
drwxr-xr-x@ 3 johnlarochelle admin 102 Oct 8 2007 .
drwxr-xr-x@ 5 johnlarochelle admin 170 Oct 8 2007 ..
-rwxr-xr-x@ 1 johnlarochelle admin 9993896 Oct 8 2007 DiffMerge

./Contents/Resources:
total 6544
drwxr-xr-x@ 6 johnlarochelle admin 204 Oct 8 2007 .
drwxr-xr-x@ 5 johnlarochelle admin 170 Oct 8 2007 ..
-rwx------@ 1 johnlarochelle admin 46681 Oct 8 2007 DiffMergeIcon.icns
-rwx------@ 1 johnlarochelle admin 3282434 Oct 8 2007 DiffMergeManual.pdf
-rwx------@ 1 johnlarochelle admin 15484 Oct 8 2007 License.rtf
drwxr-xr-x@ 6 johnlarochelle admin 204 Oct 8 2007 MoreFromSourceGear

./Contents/Resources/MoreFromSourceGear:
total 160
drwxr-xr-x@ 6 johnlarochelle admin 204 Oct 8 2007 .
drwxr-xr-x@ 6 johnlarochelle admin 204 Oct 8 2007 ..
-rwx------@ 1 johnlarochelle admin 2268 Oct 8 2007 Fortress75.png
-rwx------@ 1 johnlarochelle admin 2295 Oct 8 2007 Vault75.png
-rwx------@ 1 johnlarochelle admin 5420 Oct 8 2007 index.html
-rwx------@ 1 johnlarochelle admin 65161 Oct 8 2007 sgbg.png bash-3.2$

jclausius
Posts: 3655
Joined: Tue Dec 16, 2003 1:17 pm
Location: SourceGear
Contact:

Post by jclausius » Fri Apr 25, 2008 8:04 am

Have you tried the setup mentioned in Readme.txt using just the script? That worked straight off for me.

To test your setup, I went into SOS -> external program, and set the diff program to "/Applications/DiffMerge/DiffMerge.app/Contents/MacOS/DiffMerge %s %s". I tabbed off the edit box (just to be certain), and clicked OK. Invoking a Diff worked. I next closed SOS, and restarted it. Logged back in, and went back to the options page, and the Diff program was still there.

Another thing you can check is to open up a x-win terminal, and run "grep diffprogram ~/.sos/prefs". This should bring up two entries, one for the normal file based diff setting, and one for the project diff setting.

On my system, this looked like the following:

Code: Select all

diffprogram:/Applications/DiffMerge/DiffMerge.app/Contents/MacOS/DiffMerge %s %s
projectdiffprogram:/usr/bin/diffmerge.sh %s %s
HTH
Jeff Clausius
SourceGear

CodeLab
Posts: 6
Joined: Wed Apr 23, 2008 8:18 am

External programs being erased?

Post by CodeLab » Fri Apr 25, 2008 8:23 am

Thanks for the reference to the preferences file. I will check that.

I could not find a readme.txt file on their machines. Can you post or email me the readme.txt file? Thanks.
Last edited by CodeLab on Fri Apr 25, 2008 12:37 pm, edited 1 time in total.

jclausius
Posts: 3655
Joined: Tue Dec 16, 2003 1:17 pm
Location: SourceGear
Contact:

Post by jclausius » Fri Apr 25, 2008 8:40 am

Sure...

This was in the main DiffMerge package.
Attachments
Readme.txt
(844 Bytes) Downloaded 547 times
Jeff Clausius
SourceGear

jclausius
Posts: 3655
Joined: Tue Dec 16, 2003 1:17 pm
Location: SourceGear
Contact:

Post by jclausius » Fri Apr 25, 2008 11:59 am

CodeLab:

Would you edit out the e-mail address above? There are a lot of different people who may abuse the info.

Thanks,
Jeff Clausius
SourceGear

Post Reply