Adium

Opened 10 years ago

Closed 9 years ago

Last modified 6 years ago

#13940 closed patch (fixed)

Why not have source files instead of binary files?

Reported by: dak180 Owned by:
Milestone: Adium 1.5 Component: Adium Core
Version: Severity: normal
Keywords: applescript Cc:
Patch Status: Accepted

Description

I noticed that the .scpt files that are included in the xcode project could be made into .applescript files instead.

This makes them plain text files that can be diffed.

As an example of this, this patch changes the CurrentTunes and Safari scripts and causes them to be compiled into .scpt files at build time.

It does this using a custom build rule.

Attachments (4)

applescript2.diff (26.6 KB) - added by dak180 10 years ago.
applescript3.diff (6.4 KB) - added by dak180 10 years ago.
Adds "using terms from " guards on commands so people that try to edit the file do not get bombarded with requests to locate apps they do not have.
applescript.diff (18.6 KB) - added by dak180 9 years ago.
applescript4.diff (24.1 KB) - added by dak180 9 years ago.

Download all attachments as: .zip

Change History (22)

Changed 10 years ago by dak180

Attachment: applescript2.diff added

comment:1 Changed 10 years ago by Robert

Milestone: Adium 1.5
Patch Status: Initially IncludedNeeds Dev Review

Changed 10 years ago by dak180

Attachment: applescript3.diff added

Adds "using terms from " guards on commands so people that try to edit the file do not get bombarded with requests to locate apps they do not have.

comment:2 Changed 10 years ago by dak180

applescript2.diff finishes what applescript.diff started by converting all the .scpt files in the Adium Framework.

comment:3 Changed 10 years ago by Frank

We can convert some of the files, but Safari.applescript, when compiled, will open a few browsers looking for their dictionaries.

comment:4 in reply to:  3 Changed 10 years ago by dak180

Replying to wixardy:

We can convert some of the files, but Safari.applescript, when compiled, will open a few browsers looking for their dictionaries.

Does it still do this after applying the third patch?

comment:5 Changed 10 years ago by Frank

Yes it does.

comment:6 in reply to:  5 Changed 10 years ago by dak180

Replying to wixardy:

Yes it does.

Hmm, I wonder why it did not do that to me when I tested it.

In any case if you decide to leave the Safari script as compiled you may still want to keep the text version around and generate the compiled version from that as needed (just not as part of the build process).

comment:7 Changed 9 years ago by Robert

Milestone: Adium 1.5Patches Needing Improvement
Patch Status: Needs Dev ReviewNeeds Changes by Author

comment:8 in reply to:  7 ; Changed 9 years ago by dak180

Replying to Robby:
Were you looking for any changes in particular or just a general update to fit the current codebase?

Last edited 9 years ago by dak180 (previous) (diff)

comment:9 in reply to:  8 ; Changed 9 years ago by Frank

Replying to dak180:

Were you looking for any changes in particular or just a general update to fit the current codebase?

It'd be great if all of my browsers didn't open when the Safari script is compiled. The other scripts can be changed to text if you'd like to update your patch.

comment:10 in reply to:  9 Changed 9 years ago by dak180

Replying to wixardy:

Replying to dak180:

Were you looking for any changes in particular or just a general update to fit the current codebase?

It'd be great if all of my browsers didn't open when the Safari script is compiled. The other scripts can be changed to text if you'd like to update your patch.

Unfortunately I do not think that can be done, mostly because I have no idea why it does it.

That script can certainly be taken out of the patch, would you still want a copy of it in text form in the repo even if it is not automatically compiled?

comment:11 Changed 9 years ago by Frank

I tried a few things last night to see if it was still an issue and couldn't find a way for them not to load. I think it would not be advantageous for it to be in both forms.

Changed 9 years ago by dak180

Attachment: applescript.diff added

Changed 9 years ago by dak180

Attachment: applescript4.diff added

comment:12 in reply to:  11 Changed 9 years ago by dak180

Replying to wixardy:

I tried a few things last night to see if it was still an issue and couldn't find a way for them not to load. I think it would not be advantageous for it to be in both forms.

I updated the patches for the current branch and made those changes; let me know if there is anything else.

comment:13 Changed 9 years ago by Frank Dowsett <wixardy@…>

Resolution: fixed
Status: newclosed

(In 8983c14bea2f) Patch from dak180 with extra work by me to have most of our AppleScripts in text rather than compiled for easier diffing and such. Fixes #13940.

comment:14 Changed 9 years ago by Frank

Milestone: Patches Needing ImprovementAdium 1.5
Patch Status: Needs Changes by AuthorAccepted

comment:15 Changed 9 years ago by Robert

dak180, which name would you like to be credited with?

comment:16 in reply to:  15 Changed 9 years ago by dak180

Replying to Robby:

dak180, which name would you like to be credited with?

dak180 is fine.

comment:17 Changed 9 years ago by Robert

Okay, so it will be done. :)

comment:18 Changed 6 years ago by Frank Dowsett <wixardy@…>

(In 9a8643d5b679) Combine the insert link and browser toolbar items. Fixes #15404 The new toolbar item will show a menu after a short delay like Xcode's run button.

P.S. Switching to ScriptingBridge significantly speeds up adding a link. And I am so happy to be rid of that .scpt file. Refs #13940

Note: See TracTickets for help on using tickets.