ubuntuone-dev-tools

Merge lp:~dobey/ubuntuone-dev-tools/fix-bat-3-0 into lp:ubuntuone-dev-tools/stable-3-0

  1. fix-bat-3-0
  2. Merge into stable-3-0
Proposed by dobey
Status: Merged
Approved by: Manuel de la Peña
Approved revision: 64
Merged at revision: 64
Proposed branch: lp:~dobey/ubuntuone-dev-tools/fix-bat-3-0
Merge into: lp:ubuntuone-dev-tools/stable-3-0
Diff against target: 104 lines (+40/-27)
3 files modified
bin/u1lint.bat (+13/-13)
bin/u1trial.bat (+13/-13)
run-tests.bat (+14/-1)
To merge this branch: bzr merge lp:~dobey/ubuntuone-dev-tools/fix-bat-3-0
Reviewer Review Type Date Requested Status
Manuel de la Peña (community) Approve
Review via email: mp+102595@code.launchpad.net

Commit message

Batch files use double colons, not semicolons
Add missing exception to run-tests.bat as well

To post a comment you must log in.
Revision history for this message
Manuel de la Peña (mandel) wrote :

Easy!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/u1lint.bat'
2--- bin/u1lint.bat 2012-03-30 17:44:03 +0000
3+++ bin/u1lint.bat 2012-04-18 21:40:22 +0000
4@@ -12,19 +12,19 @@
5 ::
6 :: You should have received a copy of the GNU General Public License along
7 :: with this program. If not, see <http://www.gnu.org/licenses/>.
8-;;
9-;; In addition, as a special exception, the copyright holders give
10-;; permission to link the code of portions of this program with the
11-;; OpenSSL library under certain conditions as described in each
12-;; individual source file, and distribute linked combinations
13-;; including the two.
14-;; You must obey the GNU General Public License in all respects
15-;; for all of the code used other than OpenSSL. If you modify
16-;; file(s) with this exception, you may extend this exception to your
17-;; version of the file(s), but you are not obligated to do so. If you
18-;; do not wish to do so, delete this exception statement from your
19-;; version. If you delete this exception statement from all source
20-;; files in the program, then also delete it here.
21+::
22+:: In addition, as a special exception, the copyright holders give
23+:: permission to link the code of portions of this program with the
24+:: OpenSSL library under certain conditions as described in each
25+:: individual source file, and distribute linked combinations
26+:: including the two.
27+:: You must obey the GNU General Public License in all respects
28+:: for all of the code used other than OpenSSL. If you modify
29+:: file(s) with this exception, you may extend this exception to your
30+:: version of the file(s), but you are not obligated to do so. If you
31+:: do not wish to do so, delete this exception statement from your
32+:: version. If you delete this exception statement from all source
33+:: files in the program, then also delete it here.
34
35 :: Use python to execute the script having the same name as this batch
36 python "%~dpn0" %*
37
38=== modified file 'bin/u1trial.bat'
39--- bin/u1trial.bat 2012-03-30 17:44:03 +0000
40+++ bin/u1trial.bat 2012-04-18 21:40:22 +0000
41@@ -12,19 +12,19 @@
42 ::
43 :: You should have received a copy of the GNU General Public License along
44 :: with this program. If not, see <http://www.gnu.org/licenses/>.
45-;;
46-;; In addition, as a special exception, the copyright holders give
47-;; permission to link the code of portions of this program with the
48-;; OpenSSL library under certain conditions as described in each
49-;; individual source file, and distribute linked combinations
50-;; including the two.
51-;; You must obey the GNU General Public License in all respects
52-;; for all of the code used other than OpenSSL. If you modify
53-;; file(s) with this exception, you may extend this exception to your
54-;; version of the file(s), but you are not obligated to do so. If you
55-;; do not wish to do so, delete this exception statement from your
56-;; version. If you delete this exception statement from all source
57-;; files in the program, then also delete it here.
58+::
59+:: In addition, as a special exception, the copyright holders give
60+:: permission to link the code of portions of this program with the
61+:: OpenSSL library under certain conditions as described in each
62+:: individual source file, and distribute linked combinations
63+:: including the two.
64+:: You must obey the GNU General Public License in all respects
65+:: for all of the code used other than OpenSSL. If you modify
66+:: file(s) with this exception, you may extend this exception to your
67+:: version of the file(s), but you are not obligated to do so. If you
68+:: do not wish to do so, delete this exception statement from your
69+:: version. If you delete this exception statement from all source
70+:: files in the program, then also delete it here.
71
72 :: Use python to execute the script having the same name as this batch
73 python "%~dpn0" %*
74
75=== modified file 'run-tests.bat'
76--- run-tests.bat 2011-05-26 16:14:03 +0000
77+++ run-tests.bat 2012-04-18 21:40:22 +0000
78@@ -13,6 +13,19 @@
79 ::
80 :: You should have received a copy of the GNU General Public License along
81 :: with this program. If not, see <http://www.gnu.org/licenses/>.
82+::
83+:: In addition, as a special exception, the copyright holders give
84+:: permission to link the code of portions of this program with the
85+:: OpenSSL library under certain conditions as described in each
86+:: individual source file, and distribute linked combinations
87+:: including the two.
88+:: You must obey the GNU General Public License in all respects
89+:: for all of the code used other than OpenSSL. If you modify
90+:: file(s) with this exception, you may extend this exception to your
91+:: version of the file(s), but you are not obligated to do so. If you
92+:: do not wish to do so, delete this exception statement from your
93+:: version. If you delete this exception statement from all source
94+:: files in the program, then also delete it here.
95 @ECHO off
96 :: We could have Python 2.6 or 2.7 on Windows. In order to check availability,
97 :: we should first check for 2.7, and run the tests, otherwise fall back to 2.6.
98@@ -49,4 +62,4 @@
99 :: Delete the temp folders
100 RMDIR /s /q _trial_temp
101 RMDIR /s /q .coverage
102-:END
103\ No newline at end of file
104+:END

Subscribers

People subscribed via source and target branches

to all changes: