Merge lp:~ralsina/ubuntuone-windows-installer/fix_809873 into lp:ubuntuone-windows-installer
| Status: | Merged |
|---|---|
| Approved by: | Roberto Alsina on 2012-01-09 |
| Approved revision: | 96 |
| Merged at revision: | 102 |
| Proposed branch: | lp:~ralsina/ubuntuone-windows-installer/fix_809873 |
| Merge into: | lp:ubuntuone-windows-installer |
| Prerequisite: | lp:~ralsina/ubuntuone-windows-installer/fix-810053 |
| Diff against target: |
949 lines (+899/-2) 8 files modified
scripts/README (+71/-0) scripts/README_nonelevated.txt (+21/-0) scripts/conf.py (+41/-0) scripts/customlang/ubuntuone_en.lng (+1/-0) scripts/setup.py (+360/-0) scripts/ubuntuone.xml (+396/-0) scripts/ubuntuone_autoupdate.xml (+9/-0) ubuntuone_installer/gui/qt/sync_now_or_later.py (+0/-2) |
| To merge this branch: | bzr merge lp:~ralsina/ubuntuone-windows-installer/fix_809873 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Manuel de la Peña (community) | Approve on 2012-01-09 | ||
| Diego Sarmentero (community) | Approve on 2012-01-06 | ||
| Shane Fagan (community) | irl test | 2011-07-13 | Approve on 2011-07-15 |
|
Review via email:
|
|||
Commit Message
Add a scripts folder containing the bundle-making script and the bitrock installer project
Description of the Change
Add a scripts folder containing the bundle-making script and the bitrock installer project
- 24. By Roberto Alsina on 2011-07-14
-
Run wizard in background
- 25. By Roberto Alsina on 2011-07-14
-
tweak
- 26. By Roberto Alsina on 2011-07-14
-
instructions
- 27. By Roberto Alsina on 2011-07-14
-
modular commands
- 28. By Roberto Alsina on 2011-07-14
-
style fixes
- 29. By Roberto Alsina on 2011-07-14
-
use the same version number
- 30. By Roberto Alsina on 2011-07-14
-
Take conf files from sources instead of keepinga copy
- 31. By Roberto Alsina on 2011-07-22
-
manually copy ubuntu_sso
- 32. By Roberto Alsina on 2011-07-22
-
make it work from trunk, style fixes
- 33. By Roberto Alsina on 2011-07-31
-
Add fix for win32com usage
- 34. By Roberto Alsina on 2011-08-02
-
add icon for setup (just for testing purposes)
- 35. By Roberto Alsina on 2011-08-03
-
no more embedded_sso
- 36. By Roberto Alsina on 2011-08-04
-
Copy config files to the right place, set registry keys accordingly.
- 37. By Roberto Alsina on 2011-08-09
-
Ignore DLLs that break XP, embed vcredist in the installer.
- 38. By Roberto Alsina on 2011-08-09
-
More vcredist support, copy pem files
- 39. By Roberto Alsina on 2011-08-09
-
typo
- 40. By Roberto Alsina on 2011-08-10
-
Don't use cmd windows
- 41. By Roberto Alsina on 2011-08-10
-
only upgrade/install vc_redist if needed
- 42. By Roberto Alsina on 2011-08-10
-
fail quietly if vc_redist is installed
- 43. By Roberto Alsina on 2011-08-16
-
pep8 fixes
- 44. By Roberto Alsina on 2011-08-18
-
Only provide access to the wizard, which will start u1cp if needed
- 45. By Roberto Alsina on 2011-08-18
-
start uninstaller with UI from the menu
- 46. By Roberto Alsina on 2011-08-23
-
add wizard to the menu temporarily
- 47. By Roberto Alsina on 2011-08-24
-
Add missing configglue bits
- 48. By Roberto Alsina on 2011-08-29
-
Provide revnos in the installer
- 49. By Roberto Alsina on 2011-08-30
-
Keep install.log
- 50. By Roberto Alsina on 2011-08-31
-
Fix cparrino's handoff bug
- 51. By Roberto Alsina on 2011-09-02
-
Fix for bug 839906 (icon on taskbar was not correct)
- 52. By Roberto Alsina on 2011-09-07
-
Changed title in the bitrock window
- 53. By Roberto Alsina on 2011-09-08
-
installer tuning
- 54. By Roberto Alsina on 2011-09-08
-
delete the temp files reported on bug 840178
- 55. By Roberto Alsina on 2011-09-09
-
don't ship get_credentials
- 56. By Roberto Alsina on 2011-09-12
-
Added Ubuntu One folder to the start menu
- 57. By Roberto Alsina on 2011-09-13
-
use --mode win32 on uninstaller
- 58. By Roberto Alsina on 2011-09-15
-
Fix metadata
- 59. By Roberto Alsina on 2011-09-15
-
Fix metadata
- 60. By Roberto Alsina on 2011-09-16
-
merged mandel's autoupdate branch
- 61. By Roberto Alsina on 2011-09-16
-
merged trunk
- 62. By Roberto Alsina on 2011-09-16
-
new release
- 63. By Roberto Alsina on 2011-09-20
-
updated instructions
- 64. By Roberto Alsina on 2011-09-21
-
add --installer argument
- 65. By Roberto Alsina on 2011-09-21
-
setting version numbers for new release
- 66. By Roberto Alsina on 2011-09-26
-
Don't start u1cp on upgrades
- 67. By Roberto Alsina on 2011-09-26
-
build 200, version 2.0
- 68. By Roberto Alsina on 2011-10-07
-
version 2.0.1 build 201
- 69. By Roberto Alsina on 2011-11-15
-
Only set upgrade mode when uninstall.exe exists
- 70. By Roberto Alsina on 2011-11-18
-
Use the new name of the SSO binary
- 71. By Roberto Alsina on 2011-11-18
-
This is version 2.0.2 build 202
- 72. By Roberto Alsina on 2011-11-18
-
Use the new name of the SSO binary
- 73. By Roberto Alsina on 2011-11-18
-
Version 2.0.2, build 202
- 74. By Roberto Alsina on 2011-12-06
-
Fix for vista autoupdate
- 75. By Roberto Alsina on 2011-12-08
-
Don't step on platform, offer windows/console builds
- 76. By Roberto Alsina on 2011-12-09
-
Only copy bin files in prepare step, add binary for u1sdtool
- 77. By Roberto Alsina on 2011-12-14
-
Start windows-installer without privilege escalation
- 78. By Roberto Alsina on 2011-12-14
-
typo
- 79. By Roberto Alsina on 2011-12-14
-
bump to 2.0.3
- 80. By Roberto Alsina on 2011-12-28
-
Fix for LP:883675 [you may need to reboot]
- 81. By Roberto Alsina on 2012-01-02
-
make this configurable
- 82. By Roberto Alsina on 2012-01-02
-
merge the config'd branches
- 83. By Roberto Alsina on 2012-01-02
-
updated instructions
- 84. By Roberto Alsina on 2012-01-02
-
merged trunk
- 85. By Roberto Alsina on 2012-01-02
-
no glob, pep8 fixes
- 86. By Roberto Alsina on 2012-01-02
-
oops
- 87. By Roberto Alsina on 2012-01-02
-
typo
| Manuel de la Peña (mandel) wrote : | # |
Cool, We need to get this to lang, here are some comments:
* It looks to me that glob is not longer used, shall we remove the import.
* Regarding: os.system("bzr branch %s %s" % (urls[0], folder_name)) could we use Popen for that and find the location of the .exe via 'from distutils.spawn import find_executable'. That will also ensure that we can test if the system has bzr, if not we can give a meaningful error.
* In:
325 + # Remove "installed" copy
326 + try:
327 + shutil.
328 + except OSError:
329 + pass
Why do we ignore the exception?
* Within the source tree of ubuntuone-client there is a windows folder that contains an example loging.conf maybe we can simply copy it rather than doing:
401 + with open(logging_path, "rb") as f:
402 + data = f.read()
403 + data = data.replace(
404 + data = data.replace(
405 + with open(os.
406 + f.write(data)
* Shall we put a poor mans name for:
449 + author='',
450 + author_email='',
| Roberto Alsina (ralsina) wrote : | # |
> Cool, We need to get this to lang, here are some comments:
>
> * It looks to me that glob is not longer used, shall we remove the import.
Agreed, removed.
> * Regarding: os.system("bzr branch %s %s" % (urls[0], folder_name)) could we
> use Popen for that and find the location of the .exe via 'from distutils.spawn
> import find_executable'. That will also ensure that we can test if the system
> has bzr, if not we can give a meaningful error.
Right now, if you don't have bzr, it fails with "'bzr' is not recognized as an internal or external command, operable program or batch file." which should be meaningful enough ;-)
I added error checking and made it abort on bzr errors now.
> * In:
> 325 + # Remove "installed" copy
> 326 + try:
> 327 + shutil.
> 328 + except OSError:
> 329 + pass
>
> Why do we ignore the exception?
Just in case it's not there.
> * Within the source tree of ubuntuone-client there is a windows folder that
> contains an example loging.conf maybe we can simply copy it rather than doing:
> 401 + with open(logging_path, "rb") as f:
> 402 + data = f.read()
> 403 + data = data.replace(
> 404 + data = data.replace(
> 405 + with open(os.
> 406 + f.write(data)
> * Shall we put a poor mans name for:
> 449 + author='',
> 450 + author_email='',
This mimics the linux build's behaviour, to make those configurable.
- 88. By Roberto Alsina on 2012-01-04
-
remove traces of glob
- 89. By Roberto Alsina on 2012-01-04
-
handle bzr errors
- 90. By Roberto Alsina on 2012-01-05
-
unique app is merged in trunk
- 91. By Roberto Alsina on 2012-01-05
-
avoid system()
| Diego Sarmentero (diegosarmentero) wrote : | # |
Shouldn't this line be removed?:
139 + "lp:~ralsina/ubuntuone-windows-installer/register_plus_login"
Except for that, the rest looks ok!
| Roberto Alsina (ralsina) wrote : | # |
> Shouldn't this line be removed?:
> 139 + "lp:~ralsina/ubuntuone-windows-installer/register_plus_login"
>
>
Not yet! Without that hack, we don't produce a working release (the wizard will register users and leave them with invalid credentials)
| Manuel de la Peña (mandel) wrote : | # |
We do the following a number of times: os.path.join("..", "..", "installed", "Lib", "site-packages", .. ) can we merge the common path and store it in a var?
| Roberto Alsina (ralsina) wrote : | # |
> We do the following a number of times: os.path.join("..", "..", "installed",
> "Lib", "site-packages", .. ) can we merge the common path and store it in a
> var?
Done!
- 92. By Roberto Alsina on 2012-01-09
-
remove redundancy
- 93. By Roberto Alsina on 2012-01-09
-
pep8 fix
- 94. By Roberto Alsina on 2012-01-09
-
lint fixes
- 95. By Roberto Alsina on 2012-01-09
-
lint
- 96. By Roberto Alsina on 2012-01-09
-
linux lint

Made the exes then tested on a clean XP install and its working perfect +1