-
Notifications
You must be signed in to change notification settings - Fork 616
Conversation
This reverts commit 09199fc.
… config flie HAS to be named CustomAction.config else Wix ignores it
Also modified update.sh to be an executable(using chmod), so that it can be run as a script
appshell/appshell_extensions.cpp
Outdated
@@ -507,7 +508,35 @@ class ProcessMessageDelegate : public ClientHandler::ProcessMessageDelegate { | |||
error = CopyFile(src, dest); | |||
// No additional response args for this function | |||
} | |||
} else if (message_name == "GetDroppedFiles") { | |||
} else if (message_name == "SetUpdateParamsAndRunUpdate") { | |||
// Parameters: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: Please fix the indentation.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Addressed in ad0d490
…ts-shell into mbhavi-miglani/autoUpdate
…into mbhavi-miglani/autoUpdate
This should fix the issue where the dmg windwow looks wrong on mounting it
appshell/appshell_extensions.cpp
Outdated
@@ -507,7 +508,35 @@ class ProcessMessageDelegate : public ClientHandler::ProcessMessageDelegate { | |||
error = CopyFile(src, dest); | |||
// No additional response args for this function | |||
} | |||
} else if (message_name == "GetDroppedFiles") { | |||
} else if (message_name == "SetUpdateParamsAndRunUpdate") { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Where are you calling this method from in your extension?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is called from initiateUpdateProcess() in main.js file, from the extension.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mbhavi Can you help me point to the exact location in your PR adobe/brackets#14177. You could click on the line where this is getting called and copy paste the URL from the browser, here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here is where it is called in main.js on extension side : https://github.com/adobe/brackets/pull/14177/files#diff-7c95ea028e4f63308de3fda22211850cR392
The mapping for this function can be located here : https://github.com/adobe/brackets-shell/pull/634/files#diff-bbbf811f33a27b114763e0255590293fR656
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @mbhavi Got it!
appshell/update_mac.mm
Outdated
NSArray* pArgs = [NSArray arrayWithObjects:@"detach", mountPoint, @"-force", nil]; | ||
|
||
int retval = RunScript(hdiPath, pArgs, true); | ||
while (retval != 1) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When do you exit from the loop?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The loop is exited when any prior dmgs mounted on the mount point /Volumes/BracketsAutoUpdate are unmounted. Before I mount the new dmg, I unmount any dmgs mounted already on the same mountpoint.
… miglani/autoUpdate
Merging installer changes required for autoupdate to function
…ts-shell into miglani/autoUpdate
@nethip , I have addressed and committed all the required changes. Also, I have replied to all the comments. |
Installer changes LGTM |
"flatten" : true, | ||
"expand" : true, | ||
"src" : [ | ||
"installer/win/LaunchBrackets/LaunchBrackets/bin/Release/LaunchBrackets.CA.dll", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Where is the source for these DLLs?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ignore this comment.
Sequence="execute" | ||
Value="[%PATH]" /> | ||
|
||
<Binary Id="InstallLocationChecker.dll" SourceFile="BracketsConfigurator.CA.dll" /> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The source for this and how these DLLs are built?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Found them below. Please ignore the comment.
@@ -0,0 +1,67 @@ | |||
using System; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Copyright missing?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@gavankar , please address this
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@nethip we have never had a copyright in the installer files so far(installer/win/Brackets.wxs), should we be adding one now? This file creates a customhook dll in the installer
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes please go ahead.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@gavankar , please address this
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@@ -0,0 +1,30 @@ | |||
using System; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Copyright missing?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@gavankar , please address this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@nethip we have never had a copyright in the installer files so far(installer/win/Brackets.wxs), should we be adding one now? This file creates a customhook dll in the installer
Adding a license to the top of the Windows customaction files
@nethip, the steps to create BracketsConfigurator.CA.dll and LaunchBrackets.CA.dll have been added to the "build-win" grunt task, these steps are completely automated through grunt. Do we still require a wiki about the steps for generating the dlls? |
@gavankar Thanks for pointing out! Pretty neat! No need of adding a wiki for this. This PR looks good. LGTM @mbhavi Thanks for your efforts in making this happen and being patient in addressing the review comments 😄 . Really appreciate it. And great job 💯 Please address the review comments in Brackets as well. Thanks! I would merge this after @ayushrathi15 confirms the results from sanity testing. |
… miglani/autoUpdate
This PR includes changes for Auto Update of Brackets.
The changes are with respect to:
ping @swmitra @nethip for review