Ubuntu One Windows Installer

Merge lp:~brian.curtin/ubuntuone-windows-installer/prefer-dev-devtools into lp:ubuntuone-windows-installer

  1. prefer-dev-devtools
  2. Merge into trunk
Proposed by Brian Curtin on 2012-06-21
Status: Merged
Approved by: Roberto Alsina on 2012-06-22
Approved revision: 124
Merged at revision: 124
Proposed branch: lp:~brian.curtin/ubuntuone-windows-installer/prefer-dev-devtools
Merge into: lp:ubuntuone-windows-installer
Diff against target: 29 lines (+5/-5)
1 file modified
scripts/devsetup/env.bat (+5/-5)
To merge this branch: bzr merge lp:~brian.curtin/ubuntuone-windows-installer/prefer-dev-devtools
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve on 2012-06-22
dobey (community) 2012-06-21 Approve on 2012-06-21
Review via email: mp+111463@code.launchpad.net

Commit Message

Take the bzr checkout of devtools rather than the egg format.

Description of the Change

Prefer the ubuntuone-dev-tools bzr branch which is added to sys.path to stay relevant, rather than the outdated egg versions.

To post a comment you must log in.
dobey (dobey) :
review: Approve
Roberto Alsina (ralsina) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/devsetup/env.bat'
2--- scripts/devsetup/env.bat 2012-04-17 20:01:12 +0000
3+++ scripts/devsetup/env.bat 2012-06-21 17:42:22 +0000
4@@ -15,20 +15,20 @@
5 python.exe get_protoc.py
6
7
8-FOR /F "tokens=*" %%A IN ('python -c "import sys;print [dir for dir in sys.path if \"ubuntuone_dev_tools\" in dir][0]"') DO SET DEVTOOLS=%%A
9+FOR /F "tokens=*" %%A IN ('python -c "import sys;print [dir for dir in sys.path if \"ubuntuone-dev-tools\" in dir][0]"') DO SET DEVTOOLS=%%A
10 FOR /F "tokens=*" %%A IN ('python -c "import sys;print [dir for dir in sys.path if \"pylint\" in dir][0]"') DO SET PYLINT=%%A
11 FOR /F "tokens=*" %%A IN ('python -c "import sys;print [dir for dir in sys.path if \"pyflakes\" in dir][0]"') DO SET PYFLAKES=%%A
12
13 IF EXIST "%~dp0bin\u1trial" GOTO TRIALALREADY
14 echo Copying u1trial to bin
15-copy %DEVTOOLS%\EGG-INFO\scripts\u1trial bin
16-copy %DEVTOOLS%\EGG-INFO\scripts\u1trial.bat bin
17+copy %DEVTOOLS%\bin\u1trial bin
18+copy %DEVTOOLS%\bin\u1trial.bat bin
19 :TRIALALREADY
20
21 IF EXIST "%~dp0bin\u1lint" GOTO LINTALREADY
22 echo Copying u1lint to bin
23-copy %DEVTOOLS%\EGG-INFO\scripts\u1lint bin
24-copy %DEVTOOLS%\EGG-INFO\scripts\u1lint.bat bin
25+copy %DEVTOOLS%\bin\u1lint bin
26+copy %DEVTOOLS%\bin\u1lint.bat bin
27 :LINTALREADY
28
29 IF EXIST "%~dp0bin\pylint" GOTO PYLINTALREADY

Subscribers

People subscribed via source and target branches