Debian Codegraph @

debian/patches/debian-changes

raw
1 Description: Autogenerated patch header for a single-debian-patch file.
2 The delta against upstream is either kept as a single patch, or maintained
3 in some VCS, and exported as a single patch instead of more manageable
4 atomic patches.
5 Forwarded: not-needed
6
7 ---
8 --- /dev/null
9 +++ ola-0.10.9.nojsmin/.codespellignorelines
10 @@ -0,0 +1,197 @@
11 + int lock_fd = open(lock_file.c_str(), O_RDWR | O_CREAT | O_EXCL,
12 + if (!(ifrcopy.ifr_flags & IFF_UP)) {
13 + if (ifrcopy.ifr_flags & IFF_LOOPBACK) {
14 + if (ifrcopy.ifr_flags & IFF_BROADCAST) {
15 + string(" 00 48 65 6c .Hel\n"
16 + * Renamed fempto(sic) to femto in the RDM code (C++ and Python)
17 + * Renamed terra(sic) to tera in the RDM code (C++ and Python)
18 + * Renamed protocol convertor(sic) to protocol converter in the RDM code (C++
19 + * Renamed valiator(sic) to validator, incomming(sic) to incoming, mimimun(sic)
20 + to minimum and overiding(sic) to overriding, all of which may or may not
21 + * Renamed RESONSE_INVALID_DESTINATION(sic) to RESPONSE_INVALID_DESTINATION in
22 + * Rename CircularDepdendancyException(sic) to CircularDependencyException in
23 + * Rename AppendMultipler(sic) to AppendMultiplier in the RDM messaging code
24 + /^(?:([0-9]{1,3})(?:\s(THRU)\s(?:([0-9]{1,3}))?)?(?:\s(@)\s(?:([0-9]{1,3}|FULL))?)?)/;
25 + * channel_range ::= "ALL" | "*" | channel "THRU" channel | channel > channel
26 + /(?:([0-9]{1,3})(?:\s+THRU\s+([0-9]{0,3}))?)\s+@\s+([0-9]{0,3})$/);
27 + /(?:([0-9]{1,3})(?:\s+THRU\s+([0-9]{0,3}))?)(?:\s+@\s+([0-9]{0,3}))?$/);
28 + str = str.replace('>', 'THRU');
29 + ' THRU ' + ola.common.DmxConstants.MAX_CHANNEL_NUMBER);
30 + // If it's the T or > keys, autocomplete 'THRU'
31 + case 'U': // THRU
32 + var values = ['7', '8', '9', ' THRU ', '4', '5', '6', ' @ ', '1', '2', '3',
33 + // This is true iff all fields in a group are of a fixed size and the
34 + <button ng-click="input(' THRU ')" class="btn btn-keypad">THRU</button>
35 + if(/android|avantgo|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|e\-|e\/|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(di|rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|xda(\-|2|g)|yas\-|your|zeto|zte\-/i.test(a.substr(0,4)))
36 + state(AVAHI_ENTRY_GROUP_UNCOMMITED),
37 + case AVAHI_ENTRY_GROUP_UNCOMMITED:
38 + if (iter->second->state == AVAHI_ENTRY_GROUP_UNCOMMITED) {
39 + iter->second->state = AVAHI_ENTRY_GROUP_UNCOMMITED;
40 + case AVAHI_ENTRY_GROUP_UNCOMMITED:
41 + return "AVAHI_ENTRY_GROUP_UNCOMMITED";
42 + PRE_SOM,
43 + uint8_t som;
44 + static const uint8_t SOM = 0xa5;
45 + PRE_SOM,
46 + uint8_t som;
47 + static const uint8_t SOM = 0x7e;
48 + frame[0] = 0x7e; // som
49 + frame[0] = 0xa5; // som
50 + frame[0] = 0x7e; // som
51 +const uint8_t BaseRobeWidget::SOM;
52 + m_state(PRE_SOM),
53 + header->som = SOM;
54 + uint8_t crc = SOM + packet_type + (length & 0xFF) + ((length & 0xFF00) >> 8);
55 + case PRE_SOM:
56 + m_descriptor->Receive(&m_header.som, 1, count);
57 + } while (m_header.som != SOM);
58 + m_state = PRE_SOM;
59 + m_crc = SOM + m_header.packet_type + m_header.len + m_header.len_hi;
60 + m_state = PRE_SOM;
61 + m_state = PRE_SOM;
62 + m_state(PRE_SOM),
63 + header->som = SOM;
64 + case PRE_SOM:
65 + m_descriptor->Receive(&m_header.som, 1, count);
66 + } while (m_header.som != SOM);
67 + m_state = PRE_SOM;
68 + m_state = PRE_SOM;
69 + '%s attempted to get %s which wasn\'t declared' %
70 + '%s attempted to set %s which wasn\'t declared' %
71 + 'min': numpy.amin(array),
72 + void Syncronize();
73 + SC_E133_NONEXISTANT_ENDPOINT = 0x0005,
74 + saver_thread.Syncronize();
75 +void FilePreferenceSaverThread::Syncronize() {
76 + Mutex syncronize_mutex;
77 + syncronize_mutex.Lock();
78 + &syncronize_mutex));
79 + condition_var.Wait(&syncronize_mutex);
80 + ola::e133::SC_E133_NONEXISTANT_ENDPOINT,
81 + case ola::e133::SC_E133_NONEXISTANT_ENDPOINT:
82 + *status_code = ola::e133::SC_E133_NONEXISTANT_ENDPOINT;
83 + case ola::e133::SC_E133_NONEXISTANT_ENDPOINT:
84 + * @brief A LibUsbAdaptor for use with Syncronous widgets.
85 + * When using syncronous mode, we don't have the requirement of interacting
86 +class SyncronousLibUsbAdaptor : public BaseLibUsbAdaptor {
87 + SyncronousLibUsbAdaptor() {}
88 + DISALLOW_COPY_AND_ASSIGN(SyncronousLibUsbAdaptor);
89 + * @brief A LibUsbAdaptor for use with Asyncronous widgets.
90 + * Asyncronous mode requires notifying the LibUsbThread when handles are opened
91 +class AsyncronousLibUsbAdaptor : public BaseLibUsbAdaptor {
92 + explicit AsyncronousLibUsbAdaptor(class LibUsbThread *thread)
93 + DISALLOW_COPY_AND_ASSIGN(AsyncronousLibUsbAdaptor);
94 + manufacturer_name: "ARRI -- Arnold & Richter Cine Technik GmbH & Co. Betriebs KG"
95 + STLDeleteValues(&m_uint_map_variables);
96 + return GetMapVar(&m_uint_map_variables, name, label);
97 + STLValues(m_uint_map_variables, &variables);
98 + auto_ptr<JsonUInt> m_uint_value;
99 + m_uint_value.reset(new JsonUInt(4));
100 + m_uint_value->Accept(&wildcard_validator);
101 + m_uint_value->Accept(&validator);
102 + m_uint_value->Accept(&basic_string_validator);
103 + m_uint_value->Accept(&bool_validator);
104 + m_uint_value->Accept(&null_validator);
105 + m_uint_value->Accept(&integer_validator);
106 + auto_ptr<JsonInt> uint_value1(new JsonInt(5));
107 + m_uint_value->Accept(&max_int_validator);
108 + uint_value1->Accept(&max_int_validator);
109 + m_uint_value->Accept(&exclusive_max_int_validator);
110 + uint_value1->Accept(&max_int_validator);
111 + m_uint_value->Accept(&min_int_validator);
112 + m_uint_value->Accept(&exclusive_min_int_validator);
113 + m_uint_value->Accept(&multiple_of_validator);
114 + m_uint_value->Accept(&integer_validator);
115 + m_uint_value->Accept(&object_validator);
116 + m_uint_value->Accept(&array_validator);
117 + m_uint_value->Accept(&all_of_validator);
118 + m_uint_value->Accept(&any_of_validator);
119 + m_uint_value->Accept(&one_of_validator);
120 + m_uint_value->Accept(&not_validator);
121 + JsonInt uint_value1(2);
122 + JsonInt uint_value2(3);
123 + m_uint_value->Accept(&integer_validator);
124 + uint_value1.Accept(&integer_validator);
125 + uint_value2.Accept(&integer_validator);
126 + JsonUInt uint_value(10);
127 + OLA_ASSERT_EQ(expected, JsonWriter::AsString(uint_value));
128 + * Test the uint item
129 + " \"type\": \"uint\",\n"
130 + std::map<std::string, UIntMap*> m_uint_map_variables;
131 + if (message.uint_offset < MAX_UINT_FIELDS) {
132 + message.uint16_fields[message.uint_offset++] = field->Value();
133 + iter->uint_offset != MAX_UINT_FIELDS ||
134 + enum { MAX_UINT_FIELDS = 2 };
135 + uint16_t uint16_fields[MAX_UINT_FIELDS];
136 + uint8_t uint_offset;
137 + status_message() : uint_offset(0), int_offset(0), status_type(0),
138 + std::string Type() const { return "uint"; }
139 + if (items[i]['type'] == 'uint') {
140 + if (type == 'string' || type == 'uint' || type == 'hidden') {
141 +const char RDMHTTPModule::GENERIC_UINT_FIELD[] = "int";
142 + section.AddItem(new HiddenItem("1", GENERIC_UINT_FIELD));
143 + SelectItem *item = new SelectItem("Personality", GENERIC_UINT_FIELD);
144 + string personality_str = request->GetParameter(GENERIC_UINT_FIELD);
145 + UIntItem *uint_item = new UIntItem("DMX Start Address", address,
146 + uint_item->SetMin(DMX_MIN_SLOT_NUMBER);
147 + uint_item->SetMax(DMX_MAX_SLOT_NUMBER);
148 + item = uint_item;
149 + string device_hours = request->GetParameter(GENERIC_UINT_FIELD);
150 + string lamp_hours_str = request->GetParameter(GENERIC_UINT_FIELD);
151 + string lamp_strikes_str = request->GetParameter(GENERIC_UINT_FIELD);
152 + SelectItem *item = new SelectItem("Lamp State", GENERIC_UINT_FIELD);
153 + string lamp_state_str = request->GetParameter(GENERIC_UINT_FIELD);
154 + SelectItem *item = new SelectItem("Lamp Mode", GENERIC_UINT_FIELD);
155 + string lamp_mode_str = request->GetParameter(GENERIC_UINT_FIELD);
156 + string power_cycles_str = request->GetParameter(GENERIC_UINT_FIELD);
157 + UIntItem *item = new UIntItem("Display Level", value, GENERIC_UINT_FIELD);
158 + string display_level_str = request->GetParameter(GENERIC_UINT_FIELD);
159 + section.AddItem(new HiddenItem("1", GENERIC_UINT_FIELD));
160 + SelectItem *item = new SelectItem("Power State", GENERIC_UINT_FIELD);
161 + string power_state_str = request->GetParameter(GENERIC_UINT_FIELD);
162 + SelectItem *item = new SelectItem("Reset Device", GENERIC_UINT_FIELD);
163 + string reset_device_str = request->GetParameter(GENERIC_UINT_FIELD);
164 + section.AddItem(new UIntItem(description, value, GENERIC_UINT_FIELD));
165 +s.Xa=function(a){a.keyCode==32&&this.cd(a);return!1};wd("goog-checkbox",function(){return new Jg});function Kg(a,b){var c=b.type,d=b.value,h=b.id;if(c=="hidden"){var g=Q("input");g.id=h;g.type="hidden";g.value=d;a.appendChild(g)}else{g=Q("tr");a.appendChild(g);var j=Q("td");j.innerHTML=b.description;g.appendChild(j);j=Q("td");g.appendChild(j);if(h)if(c=="string"||c=="uint"||c=="hidden"){g=Q("input");g.value=d;g.name=h;if(c=="hidden")g.type="hidden";j.appendChild(g);b.button&&(d=new ed.mf(b.button),S(d,j))}else{if(c=="bool")c=new Jg,c.bc(d==1);else{c=new wg;h=d.length;for(g=0;g<h;++g)c.Ba(new Bg(d[g].label));
166 +function Tg(a){for(var b=a.Vd,c=b.length,d=P(a.za.id()),h="",g=0;g<c;++g){var j=b[g].id;if(j)if(b[g].type=="uint"){var l=d.elements[j].value,n=parseInt(l);if(isNaN(n)){a.Dd("Invalid Value",b[g].description+" must be an integer");return}var o=b[g].min;if(o!=k&&n<o){a.Dd("Invalid Value",b[g].description+" must be > "+(o-1));return}o=b[g].max;if(o!=k&&n>o){a.Dd("Invalid Value",b[g].description+" must be < "+(o+1));return}h+=j+"="+l+"&"}else if(b[g].type=="string")l=d.elements[j].value,h+=j+"="+l+"&";
167 +p.M=function(a){Yc(this.bd,a)};p.B=n("$");p.getParent=n("D");p.u=function(a){this.S=a;this.bd.className=a?"goog-tabpane-tab":"goog-tabpane-tab-disabled"};p.isEnabled=n("S");function dk(a,b){if(a.isEnabled())a.$.style.display=b?"":"none",a.bd.className=b?"goog-tabpane-tab-selected":"goog-tabpane-tab"}p.ue=function(a,b){this.D=a;this.jd=ga(b)?b:l};function ck(a,b,c){E.call(this,a,b);this.page=c}w(ck,E);function ek(a,b,c){ti.call(this,a,b,c);this.Xg(!0)}w(ek,ti);ek.prototype.Ec=function(){return this.dispatchEvent("action")};se("goog-option",function(){return new ek(l)});function fk(a,b){var c=b.type,d=b.value,g=b.id;if(c=="hidden"){var h=P("input");h.id=g;h.type="hidden";h.value=d;a.appendChild(h)}else{h=P("tr");a.appendChild(h);var i=P("td");i.innerHTML=b.description;h.appendChild(i);i=P("td");h.appendChild(i);if(g)if(c=="string"||c=="uint"||c=="hidden"){h=P("input");h.value=d;h.name=g;if(c=="hidden")h.type="hidden";i.appendChild(h);b.button&&(new gk(b.button)).L(i)}else{if(c=="bool")c=new dj,c.Kc(d==1);else{c=new $;g=d.length;for(h=0;h<g;++h)c.bb(new ek(d[h].label));
168 +function ok(a,b){for(var c=a.wa[b].data.items,d=c.length,g=N(a.wa[b].id),h="",i=0;i<d;++i){var k=c[i].id;if(k)if(c[i].type=="uint"){var m=g.elements[k].value,q=parseInt(m);if(isNaN(q)){a.Mb("Invalid Value",c[i].description+" must be an integer");return}var t=c[i].min;if(t!=j&&q<t){a.Mb("Invalid Value",c[i].description+" must be > "+(t-1));return}t=c[i].max;if(t!=j&&q>t){a.Mb("Invalid Value",c[i].description+" must be < "+(t+1));return}h+=k+"="+m+"&"}else if(c[i].type=="string")m=g.elements[k].value,
169 + UIntValidator uint_validator(10, 14);
170 + OLA_ASSERT(uint_validator.IsValid("10"));
171 + OLA_ASSERT(uint_validator.IsValid("14"));
172 + OLA_ASSERT_FALSE(uint_validator.IsValid("0"));
173 + OLA_ASSERT_FALSE(uint_validator.IsValid("9"));
174 + OLA_ASSERT_FALSE(uint_validator.IsValid("15"));
175 + // test get/set/has single values uint
176 + // test get/set multiple value uint
177 + // test SetDefaultValue uint
178 + UIntValidator uint_validator(0, 3);
179 + OLA_ASSERT(preferences->SetDefaultValue(key1, uint_validator, value3));
180 + OLA_ASSERT_FALSE(preferences->SetDefaultValue(key1, uint_validator,
181 + const char *uint_vars[] = {
182 + for (unsigned int i = 0; i < arraysize(uint_vars); ++i) {
183 + m_export_map->GetUIntMapVar(uint_vars[i])->Remove(m_universe_id_str);
184 + static const char GENERIC_UINT_FIELD[];
185 + if ((uint) r != buffer.Size()) {
186 + UIntValidator(0, UINT_MAX),
187 + // On win32 TRUE and FALSE are #define'd. We can #undef them here but that
188 + * A #define'd value HAVE_LIBLO which lets us know within the code if the OSC
189 +import java.nio.ByteOrder;
190 + byte[] header = ByteBuffer.allocate(4).order(ByteOrder.nativeOrder()).putInt(headerContent).array();
191 + int headerValue = ByteBuffer.wrap(header).order(ByteOrder.nativeOrder()).getInt();
192 +# This is a very bodgy workaround to the fact that the pip install of the archive doesn't seem to work properly now on Travis
193 + "uest\032\036.ola.rpc.STREAMING_NO_RESPONSEB\006\200\001"
194 + s1 = "one\"two\\three/four\bfive\fsix\nseven\reight\tnine";
195 + string("one\\\"two\\\\three\\/four\\bfive\\fsix\\nseven\\reight\\tnine"),
196 + s1 = "one\"two\\three/four\bfive\fsix\nseven\reight\tnine";
197 + string("one\\\"two\\\\three\\/four\\bfive\\fsix\\nseven\\reight\\tnine"),
198 + self.assertEqual(rtf._EscapeData(u'caf\xe9'), "caf\\xe9")
199 + self.assertEqual('%s' % rtf._EscapeData(u'caf\xe9'), "caf\\xe9")
200 + self.assertEqual('%s' % rtf._EscapeData(['caf\xe9']), "['caf\\\\xe9']")
201 + self.assertEqual('%s' % rtf._EscapeData({"a": "caf\xe9"}),
202 + "{'a': 'caf\\\\xe9'}")
203 +# self.assertEqual('%s' % rtf._EscapeData({"caf\xe9": "bar"}),
204 +# "{'caf\xe9': 'bar'}")
205 + self.assertEqual('caf\\xe9', StringEscape(u'caf\xe9'))
206 + self.assertEqual('caf\\xe9', ("%s" % StringEscape(u'caf\xe9')))
207 + "forin": true,
208 --- /dev/null
209 +++ ola-0.10.9.nojsmin/.codespellignorewords
210 @@ -0,0 +1,5 @@
211 +acn
212 +ACN
213 +inflight
214 +thead
215 +wronly
216 --- /dev/null
217 +++ ola-0.10.9.nojsmin/.flake8
218 @@ -0,0 +1,4 @@
219 +[flake8]
220 +max-line-length = 80
221 +exclude = .svn,CVS,.bzr,.hg,.git,__pycache__,.tox,*_pb2.py
222 +ignore = E111,E114,E121,E127,E129,W504
223 --- /dev/null
224 +++ ola-0.10.9.nojsmin/.github/dependabot.yml
225 @@ -0,0 +1,10 @@
226 +# See: https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#about-the-dependabotyml-file
227 +version: 2
228 +
229 +updates:
230 + # Configure check for outdated GitHub Actions actions in workflows.
231 + # See: https://docs.github.com/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot
232 + - package-ecosystem: github-actions
233 + directory: / # Check the repository's workflows under /.github/workflows/
234 + schedule:
235 + interval: daily
236 --- /dev/null
237 +++ ola-0.10.9.nojsmin/.github/problem-matcher-lint-check-licences.json
238 @@ -0,0 +1,16 @@
239 +{
240 + "problemMatcher": [
241 + {
242 + "owner": "lint-check-licences",
243 + "pattern": [
244 + {
245 + "regexp": "^(notice|error)(:(file|dir):([^:]+)(:lines? (\\d+)(-(\\d+))?)?)?: (.+)$",
246 + "severity": 1,
247 + "file": 4,
248 + "line": 6,
249 + "message": 9
250 + }
251 + ]
252 + }
253 + ]
254 +}
255 --- /dev/null
256 +++ ola-0.10.9.nojsmin/.github/problem-matcher-lint-cpplint.json
257 @@ -0,0 +1,17 @@
258 +{
259 + "problemMatcher": [
260 + {
261 + "owner": "lint-cpplint",
262 + "severity": "error",
263 + "pattern": [
264 + {
265 + "regexp": "^(.+):(\\d+):\\s+((.+)\\s+\\[(.*)\\]\\s\\[(.*)\\])$",
266 + "file": 1,
267 + "line": 2,
268 + "message": 3,
269 + "code": 5
270 + }
271 + ]
272 + }
273 + ]
274 +}
275 --- /dev/null
276 +++ ola-0.10.9.nojsmin/.github/problem-matcher-lint-generic-nolints.json
277 @@ -0,0 +1,16 @@
278 +{
279 + "problemMatcher": [
280 + {
281 + "owner": "lint-generic-nolints",
282 + "pattern": [
283 + {
284 + "regexp": "^(notice|error)(:(file|dir):([^:]+)(:lines? (\\d+)(-(\\d+))?)?)?: (.+)$",
285 + "severity": 1,
286 + "file": 4,
287 + "line": 6,
288 + "message": 9
289 + }
290 + ]
291 + }
292 + ]
293 +}
294 --- /dev/null
295 +++ ola-0.10.9.nojsmin/.github/problem-matcher-lint-spellintian.json
296 @@ -0,0 +1,15 @@
297 +{
298 + "problemMatcher": [
299 + {
300 + "owner": "lint-spellintian",
301 + "severity": "warning",
302 + "pattern": [
303 + {
304 + "regexp": "^([^:]+):(\\s+)(.+)$",
305 + "file": 1,
306 + "message": 3
307 + }
308 + ]
309 + }
310 + ]
311 +}
312 --- /dev/null
313 +++ ola-0.10.9.nojsmin/.github/workflows/annotation.yml
314 @@ -0,0 +1,14 @@
315 +# GitHub Action to annotate some of our test tool results
316 +name: annotation
317 +on: [push, pull_request]
318 +jobs:
319 + flake8-annotation-python2:
320 + runs-on: ubuntu-latest
321 + steps:
322 + - uses: actions/checkout@master
323 + - uses: actions/setup-python@v2
324 + with:
325 + python-version: '2.7'
326 + - name: Flake8 with annotations - Python 2
327 + # Using the flake8 options in the .flake8 file
328 + uses: TrueBrain/actions-flake8@main
329 --- /dev/null
330 +++ ola-0.10.9.nojsmin/.github/workflows/isort.yml
331 @@ -0,0 +1,12 @@
332 +name: isort
333 +
334 +on:
335 + - push
336 + - pull_request
337 +
338 +jobs:
339 + isort:
340 + runs-on: ubuntu-latest
341 + steps:
342 + - uses: actions/checkout@v3
343 + - uses: isort/isort-action@v1
344 --- /dev/null
345 +++ ola-0.10.9.nojsmin/.github/workflows/lint.yaml
346 @@ -0,0 +1,238 @@
347 +name: lint
348 +on: [push, pull_request]
349 +jobs:
350 + build:
351 + name: Build for Lint Tasks
352 + runs-on: ubuntu-latest
353 + container: debian:stable
354 + steps:
355 + - name: Update package database
356 + run: apt-get update -y
357 + # See comments beginning at
358 + # https://github.com/actions/runner/issues/763#issuecomment-1435474884
359 + # Without Git, actions/checkout@v3 will resort to REST and will not
360 + # create a .git folder or .git.config. The Problem Matcher looks for
361 + # .git/config to find where the root of the repo is, so it must be
362 + # present.
363 + - name: Install Git
364 + run: apt-get -y install git
365 + - uses: actions/checkout@v3
366 + - name: Install build tools
367 + shell: bash
368 + run: |
369 + apt-get -y install pkg-config libtool autoconf \
370 + automake g++ bison flex make bash-completion dh-autoreconf \
371 + debhelper devscripts wget python3-pip
372 + - name: Install Python lint tools
373 + run: python3 -m pip install --no-input cpplint flake8
374 + - name: Install build dependencies
375 + shell: bash
376 + run: |
377 + apt-get -y install libcppunit-dev uuid-dev libncurses5-dev \
378 + libmicrohttpd-dev protobuf-compiler python3-protobuf \
379 + libprotobuf-dev libprotoc-dev zlib1g-dev libftdi-dev \
380 + libusb-1.0-0-dev liblo-dev libavahi-client-dev python3-numpy
381 + - name: Autoreconf
382 + run: autoreconf -i
383 + - name: Configure
384 + run: ./configure --enable-rdm-tests --enable-ja-rule --enable-e133
385 + - name: Build builtfiles
386 + run: make builtfiles VERBOSE=1
387 + - name: Display structure of the built files
388 + if: env.ACTIONS_STEP_DEBUG == 'true'
389 + run: ls -alR
390 + - name: Archive artifacts to speed up slow GH Actions upload/download
391 + shell: bash
392 + # If the file does not exist when tar excludes it, then it will not
393 + # actually exclude it, so it must first be touched
394 + run: |
395 + touch ola-debian-stable-built-source-tree.tar.gz
396 + tar --exclude=ola-debian-stable-built-source-tree.tar.gz -cvzf ola-debian-stable-built-source-tree.tar.gz .
397 + - name: SHA256 artifact archive
398 + run: sha256sum ola-debian-stable-built-source-tree.tar.gz
399 + - uses: actions/upload-artifact@v3
400 + with:
401 + name: ola-debian-stable-built-source-tree
402 + path: ola-debian-stable-built-source-tree.tar.gz
403 + check-licences:
404 + name: Check Licences
405 + runs-on: ubuntu-latest
406 + container: debian:stable
407 + needs: build
408 + steps:
409 + - name: Download built source tree archive
410 + uses: actions/download-artifact@v3
411 + with:
412 + name: ola-debian-stable-built-source-tree
413 + path: .
414 + - name: SHA256 artifact archive
415 + run: sha256sum ola-debian-stable-built-source-tree.tar.gz
416 + - name: Unarchive artifacts and delete archive
417 + shell: bash
418 + run: |
419 + tar -xvzf ola-debian-stable-built-source-tree.tar.gz .
420 + rm ola-debian-stable-built-source-tree.tar.gz
421 + - name: Display structure of extracted files
422 + if: env.ACTIONS_STEP_DEBUG == 'true'
423 + run: ls -alR
424 + - name: Update package database
425 + run: apt-get update -y
426 + - name: Install Python
427 + run: apt-get -y install python3 python-is-python3
428 + - name: Enable Problem Matcher for GitHub annotations
429 + run: echo "::add-matcher::.github/problem-matcher-lint-check-licences.json"
430 + - name: Check licenses
431 + shell: bash
432 + run: ./scripts/enforce_licence.py
433 + generic-nolints:
434 + name: Count generic NOLINTs
435 + runs-on: ubuntu-latest
436 + container: debian:stable
437 + needs: build
438 + steps:
439 + - name: Download built source tree archive
440 + uses: actions/download-artifact@v3
441 + with:
442 + name: ola-debian-stable-built-source-tree
443 + path: .
444 + - name: SHA256 artifact archive
445 + run: sha256sum ola-debian-stable-built-source-tree.tar.gz
446 + - name: Unarchive artifacts and delete archive
447 + shell: bash
448 + run: |
449 + tar -xvzf ola-debian-stable-built-source-tree.tar.gz .
450 + rm ola-debian-stable-built-source-tree.tar.gz
451 + - name: Display structure of extracted files
452 + if: env.ACTIONS_STEP_DEBUG == 'true'
453 + run: ls -alR
454 + - name: Enable Problem Matcher for GitHub annotations
455 + run: echo "::add-matcher::.github/problem-matcher-lint-generic-nolints.json"
456 + - name: Count the number of generic NOLINTs
457 + shell: bash
458 + run: ./scripts/count_generic_nolints.sh
459 + cpplint:
460 + name: cpplint
461 + runs-on: ubuntu-latest
462 + container: debian:stable
463 + needs: build
464 + steps:
465 + - name: Download built source tree archive
466 + uses: actions/download-artifact@v3
467 + with:
468 + name: ola-debian-stable-built-source-tree
469 + path: .
470 + - name: SHA256 artifact archive
471 + run: sha256sum ola-debian-stable-built-source-tree.tar.gz
472 + - name: Unarchive artifacts and delete archive
473 + shell: bash
474 + run: |
475 + tar -xvzf ola-debian-stable-built-source-tree.tar.gz .
476 + rm ola-debian-stable-built-source-tree.tar.gz
477 + - name: Display structure of extracted files
478 + if: env.ACTIONS_STEP_DEBUG == 'true'
479 + run: ls -alR
480 + - name: Update package database
481 + run: apt-get update -y
482 + - name: Install build tools
483 + shell: bash
484 + run: |
485 + apt-get -y install make python3-pip
486 + - name: Install Python lint tools
487 + run: python3 -m pip install --no-input cpplint
488 + - name: Enable Problem Matcher for GitHub annotations
489 + run: echo "::add-matcher::.github/problem-matcher-lint-cpplint.json"
490 + - name: cpplint
491 + run: make cpplint VERBOSE=1
492 + flake8:
493 + name: flake8
494 + runs-on: ubuntu-latest
495 + container: debian:stable
496 + needs: build
497 + steps:
498 + - name: Download built source tree archive
499 + uses: actions/download-artifact@v3
500 + with:
501 + name: ola-debian-stable-built-source-tree
502 + path: .
503 + - name: SHA256 artifact archive
504 + run: sha256sum ola-debian-stable-built-source-tree.tar.gz
505 + - name: Unarchive artifacts and delete archive
506 + shell: bash
507 + run: |
508 + tar -xvzf ola-debian-stable-built-source-tree.tar.gz .
509 + rm ola-debian-stable-built-source-tree.tar.gz
510 + - name: Display structure of extracted files
511 + if: env.ACTIONS_STEP_DEBUG == 'true'
512 + run: ls -alR
513 + - name: Update package database
514 + run: apt-get update -y
515 + - name: Install build tools
516 + shell: bash
517 + run: |
518 + apt-get -y install make python3-pip
519 + - name: Install Python lint tools
520 + run: python3 -m pip install --no-input flake8
521 + - name: Setup flake8 annotations
522 + uses: rbialon/flake8-annotations@v1
523 + - name: flake8
524 + run: make flake8 VERBOSE=1
525 + spellintian:
526 + name: spellintian
527 + runs-on: ubuntu-latest
528 + container: debian:stable
529 + needs: build
530 + steps:
531 + - name: Download built source tree archive
532 + uses: actions/download-artifact@v3
533 + with:
534 + name: ola-debian-stable-built-source-tree
535 + path: .
536 + - name: SHA256 artifact archive
537 + run: sha256sum ola-debian-stable-built-source-tree.tar.gz
538 + - name: Unarchive artifacts and delete archive
539 + shell: bash
540 + run: |
541 + tar -xvzf ola-debian-stable-built-source-tree.tar.gz .
542 + rm ola-debian-stable-built-source-tree.tar.gz
543 + - name: Display structure of extracted files
544 + if: env.ACTIONS_STEP_DEBUG == 'true'
545 + run: ls -alR
546 + - name: Update package database
547 + run: apt-get update -y
548 + - name: Install lint tools
549 + run: apt-get -y install moreutils lintian
550 + - name: Enable Problem Matcher for GitHub annotations
551 + run: echo "::add-matcher::.github/problem-matcher-lint-spellintian.json"
552 + - name: spellintian
553 + run: ./scripts/spelling.sh spellintian
554 + codespell:
555 + name: codespell
556 + runs-on: ubuntu-latest
557 + container: debian:stable
558 + needs: build
559 + steps:
560 + - name: Download built source tree archive
561 + uses: actions/download-artifact@v3
562 + with:
563 + name: ola-debian-stable-built-source-tree
564 + path: .
565 + - name: SHA256 artifact archive
566 + run: sha256sum ola-debian-stable-built-source-tree.tar.gz
567 + - name: Unarchive artifacts and delete archive
568 + shell: bash
569 + run: |
570 + tar -xvzf ola-debian-stable-built-source-tree.tar.gz .
571 + rm ola-debian-stable-built-source-tree.tar.gz
572 + - name: Display structure of extracted files
573 + if: env.ACTIONS_STEP_DEBUG == 'true'
574 + run: ls -alR
575 + - name: Update package database
576 + run: apt-get update -y
577 + - name: Install lint tools
578 + run: apt-get -y install python3-pip git moreutils
579 + - name: Install Python lint tools
580 + run: python3 -m pip install --no-input git+https://github.com/codespell-project/codespell.git
581 + - name: Setup codespell annotations
582 + uses: codespell-project/codespell-problem-matcher@v1
583 + - name: codespell
584 + run: ./scripts/spelling.sh codespell
585 --- /dev/null
586 +++ ola-0.10.9.nojsmin/.gitlab-ci.yml
587 @@ -0,0 +1,43 @@
588 +stages:
589 + - build
590 + - autopkgtest
591 +.build: &build
592 + before_script:
593 + - apt-get update
594 + - apt-get -y install devscripts adduser fakeroot sudo
595 + - mk-build-deps -t "apt-get -y -o Debug::pkgProblemResolver=yes --no-install-recommends" -i -r
596 + - adduser --disabled-password --gecos "" builduser
597 + - chown -R builduser:builduser .
598 + - chown builduser:builduser ..
599 + stage: build
600 + artifacts:
601 + paths:
602 + - built
603 + script:
604 + - sudo -u builduser dpkg-buildpackage -b -rfakeroot
605 + after_script:
606 + - mkdir built
607 + - dcmd mv ../*ges built/
608 +.test: &test
609 + before_script:
610 + - apt-get update
611 + - apt-get -y install autopkgtest
612 + stage: autopkgtest
613 + script:
614 + - autopkgtest built/*ges -- null
615 +build:testing:
616 + <<: *build
617 + image: debian:testing
618 +build:unstable:
619 + <<: *build
620 + image: debian:sid
621 +test:testing:
622 + <<: *test
623 + dependencies:
624 + - build:testing
625 + image: debian:testing
626 +test:unstable:
627 + <<: *test
628 + dependencies:
629 + - build:unstable
630 + image: debian:sid
631 --- /dev/null
632 +++ ola-0.10.9.nojsmin/.travis-ci.sh
633 @@ -0,0 +1,259 @@
634 +#!/bin/bash
635 +
636 +# This script is triggered from the script section of .travis.yml
637 +# It runs the appropriate commands depending on the task requested.
638 +
639 +set -e
640 +
641 +CPP_LINT_URL="https://raw.githubusercontent.com/google/styleguide/gh-pages/cpplint/cpplint.py";
642 +
643 +COVERITY_SCAN_BUILD_URL="https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh"
644 +
645 +SPELLINGBLACKLIST=$(cat <<-BLACKLIST
646 + -wholename "./.codespellignorewords" -or \
647 + -wholename "./.codespellignorelines" -or \
648 + -wholename "./.git/*" -or \
649 + -wholename "./aclocal.m4" -or \
650 + -wholename "./config/config.guess" -or \
651 + -wholename "./config/config.sub" -or \
652 + -wholename "./config/depcomp" -or \
653 + -wholename "./config/install-sh" -or \
654 + -wholename "./config/libtool.m4" -or \
655 + -wholename "./config/ltmain.sh" -or \
656 + -wholename "./config/ltoptions.m4" -or \
657 + -wholename "./config/ltsugar.m4" -or \
658 + -wholename "./config/missing" -or \
659 + -wholename "./libtool" -or \
660 + -wholename "./config.log" -or \
661 + -wholename "./config.status" -or \
662 + -wholename "./Makefile" -or \
663 + -wholename "./Makefile.in" -or \
664 + -wholename "./autom4te.cache/*" -or \
665 + -wholename "./java/Makefile" -or \
666 + -wholename "./java/Makefile.in" -or \
667 + -wholename "./olad/www/new/js/app.min.js" -or \
668 + -wholename "./olad/www/new/js/app.min.js.map" -or \
669 + -wholename "./olad/www/new/libs/angular/js/angular.min.js" -or \
670 + -wholename "./olad/www/mobile.js" -or \
671 + -wholename "./olad/www/ola.js" -or \
672 + -wholename "./configure" -or \
673 + -wholename "./common/protocol/Ola.pb.*" -or \
674 + -wholename "./plugins/artnet/messages/ArtNetConfigMessages.pb.*" -or \
675 + -wholename "./tools/ola_trigger/config.tab.*" -or \
676 + -wholename "./tools/ola_trigger/lex.yy.cpp"
677 +BLACKLIST
678 +)
679 +
680 +if [[ $TASK = 'lint' ]]; then
681 + # run the lint tool only if it is the requested task
682 + travis_fold start "autoreconf"
683 + autoreconf -i;
684 + travis_fold end "autoreconf"
685 + ./configure --enable-rdm-tests --enable-ja-rule --enable-e133;
686 + # the following is a bit of a hack to build the files normally built during
687 + # the build, so they are present for linting to run against
688 + travis_fold start "make_builtfiles"
689 + make builtfiles VERBOSE=1;
690 + travis_fold end "make_builtfiles"
691 + # first check we've not got any generic NOLINTs
692 + # count the number of generic NOLINTs
693 + nolints=$(grep -IR NOLINT * | grep -v "NOLINT(" | wc -l)
694 + if [[ $nolints -ne 0 ]]; then
695 + # print the output for info
696 + echo $(grep -IR NOLINT * | grep -v "NOLINT(")
697 + echo "Found $nolints generic NOLINTs"
698 + exit 1;
699 + else
700 + echo "Found $nolints generic NOLINTs"
701 + fi;
702 + # run the cpplint tool, fetching it if necessary
703 + make cpplint VERBOSE=1
704 +elif [[ $TASK = 'check-licences' ]]; then
705 + # check licences only if it is the requested task
706 + travis_fold start "autoreconf"
707 + autoreconf -i;
708 + travis_fold end "autoreconf"
709 + travis_fold start "configure"
710 + ./configure --enable-rdm-tests --enable-ja-rule --enable-e133;
711 + travis_fold end "configure"
712 + # the following is a bit of a hack to build the files normally built during
713 + # the build, so they are present for licence checking to run against
714 + travis_fold start "make_builtfiles"
715 + make builtfiles VERBOSE=1;
716 + travis_fold end "make_builtfiles"
717 + ./scripts/enforce_licence.py
718 + if [[ $? -ne 0 ]]; then
719 + exit 1;
720 + fi;
721 +elif [[ $TASK = 'spellintian' ]]; then
722 + # run spellintian only if it is the requested task, ignoring duplicate words
723 + travis_fold start "autoreconf"
724 + autoreconf -i;
725 + travis_fold end "autoreconf"
726 + travis_fold start "configure"
727 + ./configure --enable-rdm-tests --enable-ja-rule --enable-e133;
728 + travis_fold end "configure"
729 + # the following is a bit of a hack to build the files normally built during
730 + # the build, so they are present for spellintian to run against
731 + travis_fold start "make_builtfiles"
732 + make builtfiles VERBOSE=1;
733 + travis_fold end "make_builtfiles"
734 + spellingfiles=$(eval "find ./ -type f -and ! \( \
735 + $SPELLINGBLACKLIST \
736 + \) | xargs")
737 + # count the number of spellintian errors, ignoring duplicate words
738 + spellingerrors=$(zrun spellintian $spellingfiles 2>&1 | grep -v "\(duplicate word\)" | wc -l)
739 + if [[ $spellingerrors -ne 0 ]]; then
740 + # print the output for info
741 + zrun spellintian $spellingfiles | grep -v "\(duplicate word\)"
742 + echo "Found $spellingerrors spelling errors via spellintian, ignoring duplicates"
743 + exit 1;
744 + else
745 + echo "Found $spellingerrors spelling errors via spellintian, ignoring duplicates"
746 + fi;
747 +elif [[ $TASK = 'spellintian-duplicates' ]]; then
748 + # run spellintian only if it is the requested task
749 + travis_fold start "autoreconf"
750 + autoreconf -i;
751 + travis_fold end "autoreconf"
752 + travis_fold start "configure"
753 + ./configure --enable-rdm-tests --enable-ja-rule --enable-e133;
754 + travis_fold end "configure"
755 + # the following is a bit of a hack to build the files normally built during
756 + # the build, so they are present for spellintian to run against
757 + travis_fold start "make_builtfiles"
758 + make builtfiles VERBOSE=1;
759 + travis_fold end "make_builtfiles"
760 + spellingfiles=$(eval "find ./ -type f -and ! \( \
761 + $SPELLINGBLACKLIST \
762 + \) | xargs")
763 + # count the number of spellintian errors
764 + spellingerrors=$(zrun spellintian $spellingfiles 2>&1 | wc -l)
765 + if [[ $spellingerrors -ne 0 ]]; then
766 + # print the output for info
767 + zrun spellintian $spellingfiles
768 + echo "Found $spellingerrors spelling errors via spellintian"
769 + exit 1;
770 + else
771 + echo "Found $spellingerrors spelling errors via spellintian"
772 + fi;
773 +elif [[ $TASK = 'codespell' ]]; then
774 + # run codespell only if it is the requested task
775 + travis_fold start "autoreconf"
776 + autoreconf -i;
777 + travis_fold end "autoreconf"
778 + travis_fold start "configure"
779 + ./configure --enable-rdm-tests --enable-ja-rule --enable-e133;
780 + travis_fold end "configure"
781 + # the following is a bit of a hack to build the files normally built during
782 + # the build, so they are present for codespell to run against
783 + travis_fold start "make_builtfiles"
784 + make builtfiles VERBOSE=1;
785 + travis_fold end "make_builtfiles"
786 + spellingfiles=$(eval "find ./ -type f -and ! \( \
787 + $SPELLINGBLACKLIST \
788 + \) | xargs")
789 + # count the number of codespell errors
790 + spellingerrors=$(zrun codespell --check-filenames --check-hidden --quiet 2 --regex "[a-zA-Z0-9][\\-'a-zA-Z0-9]+[a-zA-Z0-9]" --exclude-file .codespellignorelines --ignore-words .codespellignorewords $spellingfiles 2>&1 | wc -l)
791 + if [[ $spellingerrors -ne 0 ]]; then
792 + # print the output for info, including the count
793 + zrun codespell --count --check-filenames --check-hidden --quiet 2 --regex "[a-zA-Z0-9][\\-'a-zA-Z0-9]+[a-zA-Z0-9]" --exclude-file .codespellignorelines --ignore-words .codespellignorewords $spellingfiles
794 + echo "Found $spellingerrors spelling errors via codespell"
795 + exit 1;
796 + else
797 + echo "Found $spellingerrors spelling errors via codespell"
798 + fi;
799 +elif [[ $TASK = 'doxygen' ]]; then
800 + # check doxygen only if it is the requested task
801 + travis_fold start "autoreconf"
802 + autoreconf -i;
803 + travis_fold end "autoreconf"
804 + # Doxygen is C++ only, so don't bother with RDM tests
805 + travis_fold start "configure"
806 + ./configure --enable-ja-rule --enable-e133;
807 + travis_fold end "configure"
808 + # the following is a bit of a hack to build the files normally built during
809 + # the build, so they are present for Doxygen to run against
810 + travis_fold start "make_builtfiles"
811 + make builtfiles VERBOSE=1;
812 + travis_fold end "make_builtfiles"
813 + # count the number of warnings
814 + warnings=$(make doxygen-doc 2>&1 >/dev/null | wc -l)
815 + if [[ $warnings -ne 0 ]]; then
816 + # print the output for info
817 + make doxygen-doc VERBOSE=1
818 + echo "Found $warnings doxygen warnings"
819 + exit 1;
820 + else
821 + echo "Found $warnings doxygen warnings"
822 + fi;
823 +elif [[ $TASK = 'coverage' ]]; then
824 + # Compile with coverage for coveralls
825 + travis_fold start "autoreconf"
826 + autoreconf -i;
827 + travis_fold end "autoreconf"
828 + # Coverage is C++ only, so don't bother with RDM tests
829 + travis_fold start "configure"
830 + ./configure --enable-gcov --enable-ja-rule --enable-e133;
831 + travis_fold end "configure"
832 + travis_fold start "make"
833 + make;
834 + travis_fold end "make"
835 + travis_fold start "make_check"
836 + make check VERBOSE=1;
837 + travis_fold end "make_check"
838 +elif [[ $TASK = 'coverity' ]]; then
839 + # Run Coverity Scan unless token is zero length
840 + # The Coverity Scan script also relies on a number of other COVERITY_SCAN_
841 + # variables set in .travis.yml
842 + if [[ ${#COVERITY_SCAN_TOKEN} -ne 0 ]]; then
843 + curl -s $COVERITY_SCAN_BUILD_URL | bash
844 + else
845 + echo "Skipping Coverity Scan as no token found, probably a Pull Request"
846 + fi;
847 +elif [[ $TASK = 'jshint' ]]; then
848 + cd ./javascript/new-src;
849 + travis_fold start "npm_install"
850 + npm install;
851 + travis_fold end "npm_install"
852 + grunt test
853 +elif [[ $TASK = 'flake8' ]]; then
854 + travis_fold start "autoreconf"
855 + autoreconf -i;
856 + travis_fold end "autoreconf"
857 + travis_fold start "configure"
858 + ./configure --enable-rdm-tests;
859 + travis_fold end "configure"
860 + # the following is a bit of a hack to build the files normally built during
861 + # the build, so they are present for flake8 to run against
862 + travis_fold start "make_builtfiles"
863 + make builtfiles VERBOSE=1;
864 + travis_fold end "make_builtfiles"
865 + make flake8
866 +else
867 + # Otherwise compile and check as normal
868 + if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then
869 + # Silence all deprecated declarations on Linux due to auto_ptr making the build log too long
870 + export DISTCHECK_CONFIGURE_FLAGS='--enable-rdm-tests --enable-ja-rule --enable-e133 CPPFLAGS=-Wno-deprecated-declarations'
871 + else
872 + export DISTCHECK_CONFIGURE_FLAGS='--enable-rdm-tests --enable-ja-rule --enable-e133'
873 + fi
874 + travis_fold start "autoreconf"
875 + autoreconf -i;
876 + travis_fold end "autoreconf"
877 + travis_fold start "configure"
878 + ./configure $DISTCHECK_CONFIGURE_FLAGS;
879 + travis_fold end "configure"
880 + travis_fold start "make_distcheck"
881 + make distcheck VERBOSE=1;
882 + travis_fold end "make_distcheck"
883 + travis_fold start "make_dist"
884 + make dist;
885 + travis_fold end "make_dist"
886 + travis_fold start "verify_trees"
887 + tarball=$(ls -Ut ola*.tar.gz | head -1)
888 + tar -zxf $tarball;
889 + tarball_root=$(echo $tarball | sed 's/.tar.gz$//')
890 + ./scripts/verify_trees.py ./ $tarball_root
891 + travis_fold end "verify_trees"
892 +fi
893 --- /dev/null
894 +++ ola-0.10.9.nojsmin/.travis.yml
895 @@ -0,0 +1,565 @@
896 +language: cpp
897 +# Use the latest Travis images since they are more up to date than the stable release.
898 +group: edge
899 +
900 +before_script:
901 + - export -f travis_fold
902 +
903 +script:
904 + - "bash -ex .travis-ci.sh"
905 +
906 +addons:
907 + apt:
908 + packages: &base_build
909 + # This is the absolute minimum for configure to pass
910 + # Non C++ based tasks use it so they can run make builtfiles
911 + - ccache
912 + - libcppunit-dev
913 + - bison
914 + - flex
915 + - uuid-dev
916 + - libprotobuf-dev
917 + - protobuf-compiler
918 + - libprotoc-dev
919 + packages: &core_build
920 + # This is all the bits we need to enable all options
921 + - *base_build
922 + - libftdi-dev
923 + - libftdi1
924 + - libusb-1.0-0-dev
925 + - liblo-dev
926 + - libavahi-glib1
927 + - libncurses5-dev
928 + - libmicrohttpd-dev
929 + packages: &core_build_clang_recent
930 + - *core_build
931 + - clang-10
932 + packages: &core_build_gpp_latest
933 + - *core_build
934 + - g++-10
935 + packages: &core_build_clang_latest
936 + - *core_build
937 + - clang-11
938 + packages: &bionic_build_extras
939 + # To fix the build/add missing components
940 + - libtool
941 + - pkg-config
942 + packages: &bionic_build_extras_python2
943 + - *bionic_build_extras
944 + - python-protobuf
945 + - python-numpy
946 + - python-pip
947 + packages: &bionic_build_extras_python3
948 + - *bionic_build_extras
949 + # The apt packaged files don't seem to work with Bionic and Python 3, so do it via pip
950 + # To compile numpy
951 + - python3-dev
952 +# - python3-protobuf
953 +# - python3-numpy
954 +# - python3-pip
955 + homebrew:
956 + packages: &mac_core_build
957 + - ccache
958 + # This is all the bits we need to enable all options on Mac
959 + - bison
960 + - flex
961 + # Installing via the addon isn't currently working so do it the old fashioned way below
962 + # - https://raw.githubusercontent.com/Homebrew/homebrew-core/024ca9a4730a1f26ceede43485fbf62ef6f41179%5E/Formula/[email protected]
963 + - liblo
964 + - libmicrohttpd
965 + - ossp-uuid
966 + # Looks like this is Python 3 only, so install via pip
967 + # - numpy
968 + - libusb
969 + packages: &mac_cppunit_113
970 + # Installing via the addon isn't currently working so do it the old fashioned way below
971 + # - https://raw.githubusercontent.com/Homebrew/homebrew-core/e6e43cf6a3^/Formula/cppunit.rb # install a slightly older cppunit, as latest needs C++11 support
972 +
973 +jobs:
974 + fast_finish: true
975 + include:
976 + - os: linux
977 + dist: bionic
978 + arch: arm64
979 + env: TASK='doxygen'
980 + addons:
981 + apt:
982 + packages:
983 + - *core_build_gpp_latest
984 + - *bionic_build_extras_python2
985 + - doxygen
986 + - graphviz
987 + sources:
988 + - ubuntu-toolchain-r-test
989 + - os: linux
990 + dist: bionic
991 + arch: arm64
992 + env: TASK='lint'
993 + addons:
994 + apt:
995 + packages:
996 + - *core_build
997 + - *bionic_build_extras_python2
998 + - os: linux
999 + dist: bionic
1000 + arch: arm64
1001 + env:
1002 + - TASK='check-licences'
1003 + - PYTHON='python3'
1004 + addons:
1005 + apt:
1006 + packages:
1007 + - *core_build
1008 + - *bionic_build_extras_python3
1009 + - os: linux
1010 + dist: bionic
1011 + arch: arm64
1012 + env:
1013 + - TASK='codespell'
1014 + - PYTHON='python3'
1015 + addons:
1016 + apt:
1017 + packages:
1018 + - *core_build
1019 + - *bionic_build_extras_python3
1020 + - moreutils
1021 + - os: linux
1022 + dist: bionic
1023 + arch: arm64
1024 + env: TASK='jshint'
1025 + addons:
1026 + apt:
1027 + packages:
1028 + - os: linux
1029 + dist: bionic
1030 + arch: arm64
1031 + env: TASK='flake8'
1032 + python: '2.7'
1033 + addons:
1034 + apt:
1035 + packages:
1036 + - *base_build
1037 + - *bionic_build_extras_python2
1038 + - os: linux
1039 + dist: bionic
1040 + arch: arm64
1041 + env:
1042 + - TASK='flake8'
1043 + - PYTHON='python3'
1044 + addons:
1045 + apt:
1046 + packages:
1047 + - *base_build
1048 + - *bionic_build_extras_python3
1049 +# Only run Travis builds against the zero credit partner queue solution
1050 +# - os: linux
1051 +# dist: bionic
1052 +# arch: amd64
1053 +# compiler: clang
1054 +# env:
1055 +# - TASK='compile'
1056 +# - PYTHON='python3'
1057 +# addons:
1058 +# apt:
1059 +# packages:
1060 +# - *core_build_clang_latest
1061 +# - *bionic_build_extras_python3
1062 +# sources:
1063 +# - sourceline: "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-11 main"
1064 +# key_url: "https://apt.llvm.org/llvm-snapshot.gpg.key"
1065 +# - sourceline: "ppa:ubuntu-toolchain-r/test"
1066 +# - os: linux
1067 +# dist: bionic
1068 +# arch: amd64
1069 +# compiler: gcc
1070 +# env: TASK='compile'
1071 +# python: '2.7'
1072 +# addons:
1073 +# apt:
1074 +# packages:
1075 +# - *core_build_gpp_latest
1076 +# - *bionic_build_extras_python2
1077 +# sources:
1078 +# - ubuntu-toolchain-r-test
1079 + - os: linux
1080 + dist: bionic
1081 + arch: arm64
1082 + compiler: clang
1083 + env:
1084 + - TASK='compile'
1085 + - PYTHON='python3'
1086 + addons:
1087 + apt:
1088 + packages:
1089 + - *core_build_clang_recent
1090 + - *bionic_build_extras_python3
1091 + - os: linux
1092 + dist: bionic
1093 + arch: arm64
1094 + compiler: gcc
1095 + env: TASK='compile'
1096 + python: '2.7'
1097 + addons:
1098 + apt:
1099 + packages:
1100 + - *core_build_gpp_latest
1101 + - *bionic_build_extras_python2
1102 + sources:
1103 + - ubuntu-toolchain-r-test
1104 + - os: linux
1105 + dist: bionic
1106 + arch: s390x
1107 + compiler: clang
1108 + env: TASK='compile'
1109 + python: '2.7'
1110 + addons:
1111 + apt:
1112 + packages:
1113 + - *core_build_clang_recent
1114 + - *bionic_build_extras_python2
1115 + - os: linux
1116 + dist: bionic
1117 + arch: s390x
1118 + compiler: gcc
1119 + env: TASK='compile'
1120 + python: '2.7'
1121 + addons:
1122 + apt:
1123 + packages:
1124 + - *core_build_gpp_latest
1125 + - *bionic_build_extras_python2
1126 + sources:
1127 + - ubuntu-toolchain-r-test
1128 +# - os: osx
1129 +# osx_image: xcode9.4
1130 +# compiler: clang
1131 +# env:
1132 +# - TASK='compile'
1133 +# - CPPUNIT='1.13'
1134 +# - PROTOBUF='latest'
1135 +# - LIBFTDI='0'
1136 +# addons:
1137 +# homebrew:
1138 +# packages:
1139 +# - *mac_core_build
1140 +# - *mac_cppunit_113
1141 +# - protobuf
1142 +# - libftdi0
1143 +# update: false
1144 +# - os: osx
1145 +# osx_image: xcode9.4
1146 +# compiler: gcc
1147 +# env:
1148 +# - TASK='compile'
1149 +# - CPPUNIT='1.13'
1150 +# - PROTOBUF='latest'
1151 +# - LIBFTDI='0'
1152 +# addons:
1153 +# homebrew:
1154 +# packages:
1155 +# - *mac_core_build
1156 +# - *mac_cppunit_113
1157 +# - protobuf
1158 +# - libftdi0
1159 +# update: false
1160 +# - os: osx
1161 +# osx_image: xcode9.4
1162 +# compiler: clang
1163 +# env:
1164 +# - TASK='compile'
1165 +# - CPPUNIT='1.14'
1166 +# - PROTOBUF='latest'
1167 +# - LIBFTDI='0'
1168 +# addons:
1169 +# homebrew:
1170 +# packages:
1171 +# - *mac_core_build
1172 +# - cppunit
1173 +# - protobuf
1174 +# - libftdi0
1175 +# update: false
1176 +# - os: osx
1177 +# osx_image: xcode9.4
1178 +# compiler: gcc
1179 +# env:
1180 +# - TASK='compile'
1181 +# - CPPUNIT='1.14'
1182 +# - PROTOBUF='latest'
1183 +# - LIBFTDI='0'
1184 +# addons:
1185 +# homebrew:
1186 +# packages:
1187 +# - *mac_core_build
1188 +# - cppunit
1189 +# - protobuf
1190 +# - libftdi0
1191 +# update: false
1192 +# - os: osx
1193 +# osx_image: xcode9.4
1194 +# compiler: clang
1195 +# env:
1196 +# - TASK='compile'
1197 +# - CPPUNIT='1.14'
1198 +# - PROTOBUF='latest'
1199 +# - LIBFTDI='1'
1200 +# addons:
1201 +# homebrew:
1202 +# packages:
1203 +# - *mac_core_build
1204 +# - cppunit
1205 +# - protobuf
1206 +# - libftdi # install the latest cppunit, which needs C++11
1207 +# update: false
1208 +# - os: osx
1209 +# osx_image: xcode9.4
1210 +# compiler: gcc
1211 +# env:
1212 +# - TASK='compile'
1213 +# - CPPUNIT='1.14'
1214 +# - PROTOBUF='latest'
1215 +# - LIBFTDI='1'
1216 +# addons:
1217 +# homebrew:
1218 +# packages:
1219 +# - *mac_core_build
1220 +# - cppunit
1221 +# - protobuf
1222 +# - libftdi # install the latest cppunit, which needs C++11
1223 +# update: false
1224 + - os: linux
1225 + dist: bionic
1226 + arch: arm64
1227 + compiler: gcc
1228 + env: TASK='coverage'
1229 + addons:
1230 + apt:
1231 + packages:
1232 + - *core_build_gpp_latest
1233 + sources:
1234 + - sourceline: "ppa:ubuntu-toolchain-r/test"
1235 + - os: linux
1236 + dist: xenial
1237 + arch: arm64
1238 + compiler: gcc
1239 + env: TASK='coverity'
1240 + addons:
1241 + apt:
1242 + packages:
1243 + # Coverity doesn't work with g++-5 or g++-6 yet
1244 + - *core_build
1245 + - g++-4.9
1246 + sources:
1247 + - sourceline: "ppa:ubuntu-toolchain-r/test"
1248 + - os: linux
1249 + dist: bionic
1250 + arch: arm64
1251 + env: TASK='spellintian'
1252 + addons:
1253 + apt:
1254 + packages:
1255 + - *core_build
1256 + - *bionic_build_extras_python2
1257 + - lintian
1258 + - moreutils
1259 + - os: linux
1260 + dist: bionic
1261 + arch: arm64
1262 + env: TASK='spellintian-duplicates'
1263 + addons:
1264 + apt:
1265 + packages:
1266 + - *core_build
1267 + - *bionic_build_extras_python2
1268 + - lintian
1269 + - moreutils
1270 + allow_failures:
1271 +# - os: osx
1272 +# osx_image: xcode9.4
1273 +# compiler: clang
1274 +# env:
1275 +# - TASK='compile'
1276 +# - CPPUNIT='1.13'
1277 +# - LIBFTDI='0'
1278 +# - os: osx
1279 +# osx_image: xcode9.4
1280 +# compiler: clang
1281 +# env:
1282 +# - TASK='compile'
1283 +# - CPPUNIT='1.14'
1284 +# - LIBFTDI='0'
1285 +# - os: osx
1286 +# osx_image: xcode9.4
1287 +# compiler: gcc
1288 +# env:
1289 +# - TASK='compile'
1290 +# - CPPUNIT='1.13'
1291 +# - LIBFTDI='0'
1292 +# - os: osx
1293 +# osx_image: xcode9.4
1294 +# compiler: gcc
1295 +# env:
1296 +# - TASK='compile'
1297 +# - CPPUNIT='1.14'
1298 +# - LIBFTDI='0'
1299 +# - os: osx
1300 +# osx_image: xcode9.4
1301 +# compiler: clang
1302 +# env:
1303 +# - TASK='compile'
1304 +# - CPPUNIT='1.14'
1305 +# - LIBFTDI='1'
1306 +# - os: osx
1307 +# osx_image: xcode9.4
1308 +# compiler: gcc
1309 +# env:
1310 +# - TASK='compile'
1311 +# - CPPUNIT='1.14'
1312 +# - LIBFTDI='1'
1313 + - os: osx
1314 + osx_image: xcode9.4
1315 + compiler: clang
1316 + env:
1317 + - TASK='compile'
1318 + - CPPUNIT='1.14'
1319 + - PROTOBUF='latest'
1320 + - LIBFTDI='1'
1321 + - os: osx
1322 + osx_image: xcode9.4
1323 + compiler: gcc
1324 + env:
1325 + - TASK='compile'
1326 + - CPPUNIT='1.14'
1327 + - PROTOBUF='latest'
1328 + - LIBFTDI='1'
1329 + - os: linux
1330 + dist: bionic
1331 + arch: arm64
1332 + compiler: gcc
1333 + env: TASK='coverage'
1334 + - os: linux
1335 + dist: xenial
1336 + arch: arm64
1337 + compiler: gcc
1338 + env: TASK='coverity'
1339 + - os: linux
1340 + dist: bionic
1341 + arch: arm64
1342 + env: TASK='spellintian'
1343 + - os: linux
1344 + dist: bionic
1345 + arch: arm64
1346 + env: TASK='spellintian-duplicates'
1347 +
1348 +env:
1349 + global:
1350 + # No colours in terminal (to reduce log file size)
1351 + - TERM=dumb
1352 + # Parallel make build
1353 + - MAKEFLAGS="-j 2"
1354 + # -- BEGIN Coverity Scan ENV
1355 + - COVERITY_SCAN_BUILD_COMMAND_PREPEND="cov-configure --comptype gcc --compiler gcc-4.9 --template && autoreconf -i && ./configure --enable-ja-rule --enable-e133"
1356 + # The build command with all of the arguments that you would apply to a manual `cov-build`
1357 + # Usually this is the same as STANDARD_BUILD_COMMAND, excluding the automated test arguments
1358 + - COVERITY_SCAN_BUILD_COMMAND="make"
1359 + # Name of the project
1360 + - COVERITY_SCAN_PROJECT_NAME="$TRAVIS_REPO_SLUG"
1361 + # Email address for notifications related to this build
1362 + - COVERITY_SCAN_NOTIFICATION_EMAIL="[email protected]"
1363 + # Regular expression selects on which branches to run analysis
1364 + # Be aware of quotas. Do not run on every branch/commit
1365 + - COVERITY_SCAN_BRANCH_PATTERN=".*"
1366 + # COVERITY_SCAN_TOKEN via "travis encrypt" using the repo's public key
1367 + - secure: "U+NmPtScHZ1NLmkDrzpqApHmJvELV44cXgjQsxA8N8xIATckbs+DrmWSNeECENyvuOPz+nPzglSgBvJtejf97jYJIIwAExq5TJMUAIPFS6KU3mohODW2PZSoVoUyJPzFIlhzcELQgONI+ILLm29lNdQNb7GFUVtO6+jS10AFtWY="
1368 + # -- END Coverity Scan ENV
1369 +
1370 +cache:
1371 + apt: true
1372 + ccache: true
1373 + npm: true
1374 + pip: true
1375 + directories:
1376 + - $HOME/Library/Caches/Homebrew # homebrew bottle cache
1377 +
1378 +before_cache:
1379 + - rm -f $HOME/.cache/pip/log/debug.log # erase log
1380 + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew cleanup; fi # avoid caching old package versions
1381 + - ccache -s # see how many hits ccache got
1382 +
1383 +before_install:
1384 + - if [ "$PYTHON" == "python3" -a "$TRAVIS_CPU_ARCH" != "arm64" ]; then pyenv global 3.8.1; fi
1385 +#On arm64 (at least) pip is now pip3, so symlink it to pip2 unless we're using python3.
1386 + - if [ "$PYTHON" != "python3" ]; then sudo rm /usr/local/bin/pip && sudo ln -s /usr/local/bin/pip2 /usr/local/bin/pip; fi
1387 +#Switch node to version 16 LTS, as newer LTS ones don't work with Ubuntu 18.04 and some older ones are too old
1388 + - if [ "$TASK" = "jshint" ]; then nvm install 16 && nvm use 16; fi
1389 +#Fix permissions for unbound (and possibly others)
1390 + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then if [ ! -d /usr/local/sbin ]; then sudo mkdir -p /usr/local/sbin && sudo chown -R $(whoami) /usr/local/sbin; fi; fi
1391 +#Add a missing gnupg folder
1392 + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then if [ ! -d /usr/local/Cellar/gnupg2/2.2.5 ]; then sudo mkdir -p /usr/local/Cellar/gnupg2/2.2.5 && sudo chown -R $(whoami) /usr/local/Cellar/gnupg2/2.2.5; fi; fi
1393 +#We install packages via brew which pull in numpy, so try a reinstall over the pip numpy to avoid conflicts
1394 + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew reinstall numpy || brew link --overwrite numpy; fi
1395 +#Fix a broken homebrew libtool install
1396 + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew reinstall libtool; fi
1397 +#Fix a broken homebrew gnupg install
1398 + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew uninstall --ignore-dependencies gnupg; fi
1399 +#Fix a broken homebrew python upgrade - see https://github.com/Homebrew/homebrew-core/issues/26358
1400 + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade python || true; fi
1401 +#Uninstall some homebrew packages which aren't required so we don't end up updating and rebuilding them. Force so it doesn't reinstall
1402 + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew uninstall --ignore-dependencies --force cgal liblwgeom libspatialite mercurial postgis postgres sfcgal; fi
1403 +#Having fixed everything up, update to the bleeding edge
1404 +#Skip updating for now as it seems to be breaking the build, also now done via the addon
1405 +# - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
1406 + # This is no longer allowed, so build all Mac builds as protobuf latest
1407 + #- if [ "$TRAVIS_OS_NAME" == "osx" -a "$PROTOBUF" != "latest" ]; then brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/024ca9a4730a1f26ceede43485fbf62ef6f41179%5E/Formula/[email protected]; fi # install protobuf 3.1 as that's the latest we support everywhere
1408 + #- if [ "$TRAVIS_OS_NAME" == "osx" -a "$PROTOBUF" != "latest" ]; then brew link -f https://raw.githubusercontent.com/Homebrew/homebrew-core/024ca9a4730a1f26ceede43485fbf62ef6f41179%5E/Formula/[email protected]; export PKG_CONFIG_PATH=/usr/local/opt/[email protected]/lib/pkgconfig; brew install --build-from-source --ignore-dependencies --env=std protobuf-c; fi # While protobuf is not on the latest release
1409 + - if [ "$TRAVIS_OS_NAME" == "osx" -a "$PROTOBUF" != "latest" ]; then brew install [email protected]; fi
1410 + - if [ "$TRAVIS_OS_NAME" == "osx" -a "$PROTOBUF" != "latest" ]; then brew link -f [email protected]; export PKG_CONFIG_PATH=/usr/local/opt/[email protected]/lib/pkgconfig; brew install --build-from-source --ignore-dependencies --env=std protobuf-c; fi # When protobuf is not on the latest release
1411 + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mkdir -p ${HOME}/Library/Python/2.7/lib/python/site-packages; echo 'import site; site.addsitedir("/usr/local/lib/python2.7/site-packages")' >> ${HOME}/Library/Python/2.7/lib/python/site-packages/homebrew.pth; fi
1412 + - if [ "$TRAVIS_OS_NAME" == "osx" -a "$CPPUNIT" != "1.14" ]; then brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/e6e43cf6a3%5E/Formula/cppunit.rb; fi # install a slightly older cppunit, as latest needs C++11 support
1413 + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then PATH=/usr/local/opt/ccache/libexec:$PATH; fi # Use ccache on Mac too
1414 +#Put back the old pip numpy we need to work
1415 + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then pip install --upgrade --no-deps --force-reinstall --user numpy; fi
1416 +#Coverity doesn't work with g++ 5 or 6, so only upgrade to g++ 4.9 for that
1417 + - if [ "$TRAVIS_OS_NAME" == "linux" -a \( "$TASK" = "compile" -o "$TASK" = "coverage" -o "$TASK" = "doxygen" \) -a "$CXX" = "g++" ]; then export CXX="ccache g++-10" CC="ccache gcc-10"; fi
1418 + - if [ "$TASK" = "coverity" -a "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
1419 +#Use the latest clang if we're compiling with clang, except on arm64 and s390x where it's not available
1420 + - if [ "$TRAVIS_OS_NAME" == "linux" -a "$CXX" = "clang++" -a "$TRAVIS_CPU_ARCH" != "arm64" -a "$TRAVIS_CPU_ARCH" != "s390x" ]; then export CXX="clang++-11" CC="clang-11"; fi
1421 +#Use a recent clang if we're compiling with clang on arm64 or s390x as the latest isn't available
1422 + - if [ "$TRAVIS_OS_NAME" == "linux" -a "$CXX" = "clang++" -a \( "$TRAVIS_CPU_ARCH" == "arm64" -o "$TRAVIS_CPU_ARCH" == "s390x" \) ]; then export CXX="clang++-10" CC="clang-10"; fi
1423 +#Report the compiler version
1424 + - $CXX --version
1425 +
1426 +install:
1427 +# Match the version of protobuf being installed via apt/Homebrew
1428 + - if [ "$PROTOBUF" == "latest" -a \( "$TRAVIS_DIST" != "bionic" -o "$PYTHON" == "python3" \) ]; then pip install --user protobuf; fi
1429 + - if [ "$PROTOBUF" != "latest" -a \( "$TRAVIS_DIST" != "bionic" -o "$PYTHON" == "python3" \) ]; then pip install --user protobuf==3.1.0; fi
1430 + # disable until can be added to all build variants
1431 + #- pip install --user timeout-decorator
1432 +# We sometimes need to use pip rather than apt on Bionic
1433 + - if [ "$TRAVIS_OS_NAME" == "linux" -a "$TRAVIS_DIST" == "bionic" -a "$TRAVIS_CPU_ARCH" != "arm64" ]; then pip install --user wheel; fi # Wheel only needed to fix a broken bionic build
1434 +# Install numpy via deb where it works, otherwise on OS X and non-bionic Python 2 Linux install via pip
1435 + - if [ "$TRAVIS_DIST" != "bionic" -o "$PYTHON" == "python3" ]; then pip install --user numpy; fi
1436 + - if [ "$TASK" = "coverage" ]; then pip install --user cpp-coveralls; fi
1437 + - if [ "$TASK" = "flake8" ]; then pip install --user flake8; fi
1438 + - if [ "$TASK" = "codespell" ]; then pip3 install --user codespell==2.2.1; fi
1439 + - if [ "$TASK" = "jshint" ]; then npm --verbose install -g grunt-cli; fi
1440 + - if [ "$TASK" = "jshint" ]; then grunt --version --verbose; fi
1441 +# Installing via the addon isn't currently working so do it the old fashioned way
1442 + - if [ "$TRAVIS_OS_NAME" == "osx" -a "$CPPUNIT" != "1.14" ]; then brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/e6e43cf6a3%5E/Formula/cppunit.rb; fi # install a slightly older cppunit, as latest needs C++11 support
1443 +
1444 +after_failure:
1445 + - if [ -f ${TRAVIS_BUILD_DIR}/config.log ]; then cat ${TRAVIS_BUILD_DIR}/config.log; fi
1446 + - if [ -f ${TRAVIS_BUILD_DIR}/ola-*/_build/config.log ]; then cat ${TRAVIS_BUILD_DIR}/ola-*/_build/config.log; fi
1447 + - if [ -f ${TRAVIS_BUILD_DIR}/ola-*/_build/sub/config.log ]; then cat ${TRAVIS_BUILD_DIR}/ola-*/_build/sub/config.log; fi
1448 +
1449 +after_success:
1450 + - if [ "$TASK" = "coverage" ]; then coveralls --gcov /usr/bin/gcov-10 -b . -E '.*Test\.cpp$' -E '.*\.pb\.cc$' -E '.*\.pb\.cpp$' -E '.*\.pb\.h$' -E '.*\.yy\.cpp$' -E '.*\.tab\.cpp$' -E '.*\.tab\.h$' -E '.*/doxygen/examples.*$' --gcov-options '\-lp' > /dev/null; fi
1451 +
1452 +after_script:
1453 + - if [ "$TASK" = "coverity" ]; then tail -n 10000 ${TRAVIS_BUILD_DIR}/cov-int/build-log.txt; cat ${TRAVIS_BUILD_DIR}/cov-int/scm_log.txt; fi
1454 +
1455 +notifications:
1456 + irc:
1457 + channels:
1458 + - "chat.freenode.net#openlighting"
1459 + on_success: change
1460 + on_failure: change
1461 --- ola-0.10.9.nojsmin.orig/Makefile.am
1462 +++ ola-0.10.9.nojsmin/Makefile.am
1463 @@ -159,7 +159,6 @@ PYTHON_BUILD_DIRS =
1464 # which libraries depend on each other. e.g. common, plugin_api, plugins, server.
1465 include common/Makefile.mk
1466 include data/Makefile.mk
1467 -include debian/Makefile.mk
1468 include doxygen/Makefile.mk
1469 include examples/Makefile.mk
1470 include include/Makefile.mk
1471 --- /dev/null
1472 +++ ola-0.10.9.nojsmin/common/LICENCE
1473 @@ -0,0 +1,13 @@
1474 +This library is free software; you can redistribute it and/or
1475 +modify it under the terms of the GNU Lesser General Public
1476 +License as published by the Free Software Foundation; either
1477 +version 2.1 of the License, or (at your option) any later version.
1478 +
1479 +This library is distributed in the hope that it will be useful,
1480 +but WITHOUT ANY WARRANTY; without even the implied warranty of
1481 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1482 +Lesser General Public License for more details.
1483 +
1484 +You should have received a copy of the GNU Lesser General Public
1485 +License along with this library; if not, write to the Free Software
1486 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1487 --- ola-0.10.9.nojsmin.orig/configure.ac
1488 +++ ola-0.10.9.nojsmin/configure.ac
1489 @@ -822,7 +822,7 @@ AS_IF([test -d $UUCPLOCK],
1490 AM_CONDITIONAL([BUILD_PYTHON_LIBS], [test "x$enable_python_libs" = xyes])
1491
1492 AS_IF([test "${enable_python_libs}" = "yes"],
1493 - [AM_PATH_PYTHON(2.6)
1494 + [AM_PATH_PYTHON(3.8)
1495 AS_IF([test -z $PYTHON], [PYTHON="python"])
1496 PYTHON_NAME=`basename $PYTHON`
1497 AC_CACHE_CHECK([for $PYTHON_NAME module: google.protobuf],
1498 --- ola-0.10.9.nojsmin.orig/doxygen/Makefile.mk
1499 +++ ola-0.10.9.nojsmin/doxygen/Makefile.mk
1500 @@ -1,7 +1,6 @@
1501 include doxygen/examples/Makefile.mk
1502
1503 EXTRA_DIST += \
1504 - doxygen/copy-doc.sh \
1505 doxygen/cpp-client.dox \
1506 doxygen/dmx-cpp-client.dox \
1507 doxygen/event-driven.dox \
1508 --- /dev/null
1509 +++ ola-0.10.9.nojsmin/examples/LICENCE
1510 @@ -0,0 +1,13 @@
1511 +This program is free software; you can redistribute it and/or modify
1512 +it under the terms of the GNU General Public License as published by
1513 +the Free Software Foundation; either version 2 of the License, or
1514 +(at your option) any later version.
1515 +
1516 +This program is distributed in the hope that it will be useful,
1517 +but WITHOUT ANY WARRANTY; without even the implied warranty of
1518 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1519 +GNU Library General Public License for more details.
1520 +
1521 +You should have received a copy of the GNU General Public License
1522 +along with this program; if not, write to the Free Software
1523 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1524 --- /dev/null
1525 +++ ola-0.10.9.nojsmin/include/ola/LICENCE
1526 @@ -0,0 +1,13 @@
1527 +This library is free software; you can redistribute it and/or
1528 +modify it under the terms of the GNU Lesser General Public
1529 +License as published by the Free Software Foundation; either
1530 +version 2.1 of the License, or (at your option) any later version.
1531 +
1532 +This library is distributed in the hope that it will be useful,
1533 +but WITHOUT ANY WARRANTY; without even the implied warranty of
1534 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1535 +Lesser General Public License for more details.
1536 +
1537 +You should have received a copy of the GNU Lesser General Public
1538 +License along with this library; if not, write to the Free Software
1539 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1540 --- /dev/null
1541 +++ ola-0.10.9.nojsmin/include/ola/acn/LICENCE
1542 @@ -0,0 +1,13 @@
1543 +This program is free software; you can redistribute it and/or modify
1544 +it under the terms of the GNU General Public License as published by
1545 +the Free Software Foundation; either version 2 of the License, or
1546 +(at your option) any later version.
1547 +
1548 +This program is distributed in the hope that it will be useful,
1549 +but WITHOUT ANY WARRANTY; without even the implied warranty of
1550 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1551 +GNU Library General Public License for more details.
1552 +
1553 +You should have received a copy of the GNU General Public License
1554 +along with this program; if not, write to the Free Software
1555 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1556 --- /dev/null
1557 +++ ola-0.10.9.nojsmin/include/ola/e133/LICENCE
1558 @@ -0,0 +1,13 @@
1559 +This program is free software; you can redistribute it and/or modify
1560 +it under the terms of the GNU General Public License as published by
1561 +the Free Software Foundation; either version 2 of the License, or
1562 +(at your option) any later version.
1563 +
1564 +This program is distributed in the hope that it will be useful,
1565 +but WITHOUT ANY WARRANTY; without even the implied warranty of
1566 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1567 +GNU Library General Public License for more details.
1568 +
1569 +You should have received a copy of the GNU General Public License
1570 +along with this program; if not, write to the Free Software
1571 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1572 --- /dev/null
1573 +++ ola-0.10.9.nojsmin/include/olad/LICENCE
1574 @@ -0,0 +1,13 @@
1575 +This program is free software; you can redistribute it and/or modify
1576 +it under the terms of the GNU General Public License as published by
1577 +the Free Software Foundation; either version 2 of the License, or
1578 +(at your option) any later version.
1579 +
1580 +This program is distributed in the hope that it will be useful,
1581 +but WITHOUT ANY WARRANTY; without even the implied warranty of
1582 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1583 +GNU Library General Public License for more details.
1584 +
1585 +You should have received a copy of the GNU General Public License
1586 +along with this program; if not, write to the Free Software
1587 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1588 --- ola-0.10.9.nojsmin.orig/java/Makefile.am
1589 +++ ola-0.10.9.nojsmin/java/Makefile.am
1590 @@ -12,8 +12,8 @@ src/main/java/ola/proto/Ola.java: ${top_
1591 src/main/java/ola/rpc/Rpc.java: ${top_srcdir}/common/rpc/Rpc.proto
1592 $(PROTOC) --java_out=src/main/java --proto_path=${top_srcdir}/common/rpc ${top_srcdir}/common/rpc/Rpc.proto
1593
1594 -ola.jar: src/main/java/ola/proto/Ola.java src/main/java/ola/rpc/Rpc.java
1595 - mvn package
1596 +ola.jar: generated-src/main/java/ola/proto/Ola.java generated-src/main/java/ola/rpc/Rpc.java
1597 + cd ${top_builddir}/java && mvn --file ${top_srcdir}/java/pom.xml -DbuildDir=${abs_top_builddir}/java -DprotobufGeneratedSource=$(abs_top_builddir)/java/generated-src/main/java -DprotobufJavaVersion=$(PROTOBUF_VERSION) package
1598
1599 CLEANFILES = src/main/java/ola/proto/Ola.java \
1600 src/main/java/ola/rpc/Rpc.java
1601 --- ola-0.10.9.nojsmin.orig/java/pom.xml
1602 +++ ola-0.10.9.nojsmin/java/pom.xml
1603 @@ -31,7 +31,7 @@
1604 <dependency>
1605 <groupId>com.google.protobuf</groupId>
1606 <artifactId>protobuf-java</artifactId>
1607 - <version>2.6.1</version>
1608 + <version>${protobufJavaVersion}</version>
1609 </dependency>
1610 <dependency>
1611 <groupId>junit</groupId>
1612 --- /dev/null
1613 +++ ola-0.10.9.nojsmin/javascript/new-src/LICENCE
1614 @@ -0,0 +1,13 @@
1615 +This program is free software; you can redistribute it and/or modify
1616 +it under the terms of the GNU General Public License as published by
1617 +the Free Software Foundation; either version 2 of the License, or
1618 +(at your option) any later version.
1619 +
1620 +This program is distributed in the hope that it will be useful,
1621 +but WITHOUT ANY WARRANTY; without even the implied warranty of
1622 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1623 +GNU Library General Public License for more details.
1624 +
1625 +You should have received a copy of the GNU General Public License
1626 +along with this program; if not, write to the Free Software
1627 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1628 \ No newline at end of file
1629 --- /dev/null
1630 +++ ola-0.10.9.nojsmin/javascript/ola/LICENCE
1631 @@ -0,0 +1,13 @@
1632 +This program is free software; you can redistribute it and/or modify
1633 +it under the terms of the GNU General Public License as published by
1634 +the Free Software Foundation; either version 2 of the License, or
1635 +(at your option) any later version.
1636 +
1637 +This program is distributed in the hope that it will be useful,
1638 +but WITHOUT ANY WARRANTY; without even the implied warranty of
1639 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1640 +GNU Library General Public License for more details.
1641 +
1642 +You should have received a copy of the GNU General Public License
1643 +along with this program; if not, write to the Free Software
1644 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1645 --- /dev/null
1646 +++ ola-0.10.9.nojsmin/libs/LICENCE
1647 @@ -0,0 +1,13 @@
1648 +This program is free software; you can redistribute it and/or modify
1649 +it under the terms of the GNU General Public License as published by
1650 +the Free Software Foundation; either version 2 of the License, or
1651 +(at your option) any later version.
1652 +
1653 +This program is distributed in the hope that it will be useful,
1654 +but WITHOUT ANY WARRANTY; without even the implied warranty of
1655 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1656 +GNU Library General Public License for more details.
1657 +
1658 +You should have received a copy of the GNU General Public License
1659 +along with this program; if not, write to the Free Software
1660 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1661 --- /dev/null
1662 +++ ola-0.10.9.nojsmin/man/generate-html.sh
1663 @@ -0,0 +1,45 @@
1664 +#!/bin/sh
1665 +
1666 +if [ $# != 1 ]; then
1667 + echo "Usage: $0 <output_dir>"
1668 + exit 1;
1669 +fi
1670 +
1671 +output_dir=$1
1672 +if [ ! -d $output_dir ]; then
1673 + echo $output_dir is not a directory
1674 + exit 1;
1675 +fi
1676 +
1677 +index_file=$output_dir/index.html;
1678 +
1679 +echo "Output dir: $output_dir";
1680 +echo "Index file: $index_file";
1681 +
1682 +cat << 'EOF' > $index_file
1683 +<html>
1684 +<head>
1685 +<title>Man pages for the Open Lighting Architecture</title>
1686 +</head>
1687 +<body>
1688 +<h1>Man pages for the <a href="https://openlighting.org/ola/">Open Lighting Architecture</a></h1>
1689 +<ul>
1690 +EOF
1691 +
1692 +if [ ! -d $output_dir/man1/ ]; then
1693 + echo $output_dir/man1/ doesn\'t exist, please create it
1694 + exit 1;
1695 +fi
1696 +for man_file in *.1; do
1697 + echo "Generating $man_file";
1698 + output_file=$output_dir/man1/$man_file.html;
1699 + man2html -r $man_file -M ../index.html | sed 1,2d > $output_file;
1700 + chmod a+r $output_file;
1701 + echo "<li><a href='./man1/$man_file.html'>$man_file</a> - `grep "\.SH NAME" $man_file -A 1 | tail -n 1 | sed -e 's/\\\-/-/g'`</li>" >> $index_file
1702 +done
1703 +
1704 +cat << 'EOF' >> $index_file
1705 +</ul>
1706 +</body>
1707 +</html>
1708 +EOF
1709 --- /dev/null
1710 +++ ola-0.10.9.nojsmin/ola/LICENCE
1711 @@ -0,0 +1,13 @@
1712 +This library is free software; you can redistribute it and/or
1713 +modify it under the terms of the GNU Lesser General Public
1714 +License as published by the Free Software Foundation; either
1715 +version 2.1 of the License, or (at your option) any later version.
1716 +
1717 +This library is distributed in the hope that it will be useful,
1718 +but WITHOUT ANY WARRANTY; without even the implied warranty of
1719 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1720 +Lesser General Public License for more details.
1721 +
1722 +You should have received a copy of the GNU Lesser General Public
1723 +License along with this library; if not, write to the Free Software
1724 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1725 --- /dev/null
1726 +++ ola-0.10.9.nojsmin/olad/LICENCE
1727 @@ -0,0 +1,13 @@
1728 +This program is free software; you can redistribute it and/or modify
1729 +it under the terms of the GNU General Public License as published by
1730 +the Free Software Foundation; either version 2 of the License, or
1731 +(at your option) any later version.
1732 +
1733 +This program is distributed in the hope that it will be useful,
1734 +but WITHOUT ANY WARRANTY; without even the implied warranty of
1735 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1736 +GNU Library General Public License for more details.
1737 +
1738 +You should have received a copy of the GNU General Public License
1739 +along with this program; if not, write to the Free Software
1740 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1741 --- ola-0.10.9.nojsmin.orig/olad/www/Makefile.mk
1742 +++ ola-0.10.9.nojsmin/olad/www/Makefile.mk
1743 @@ -69,19 +69,3 @@ dist_img_DATA = \
1744 olad/www/new/img/light_bulb.png \
1745 olad/www/new/img/logo-mini.png \
1746 olad/www/new/img/logo.png
1747 -dist_jquery_DATA = \
1748 - olad/www/new/libs/jquery/js/jquery.min.js
1749 -dist_angularroute_DATA = \
1750 - olad/www/new/libs/angular-route/js/angular-route.min.js
1751 -dist_angular_DATA = \
1752 - olad/www/new/libs/angular/js/angular.min.js
1753 -dist_bootjs_DATA = \
1754 - olad/www/new/libs/bootstrap/js/bootstrap.min.js
1755 -dist_bootfonts_DATA = \
1756 - olad/www/new/libs/bootstrap/fonts/glyphicons-halflings-regular.eot \
1757 - olad/www/new/libs/bootstrap/fonts/glyphicons-halflings-regular.svg \
1758 - olad/www/new/libs/bootstrap/fonts/glyphicons-halflings-regular.ttf \
1759 - olad/www/new/libs/bootstrap/fonts/glyphicons-halflings-regular.woff \
1760 - olad/www/new/libs/bootstrap/fonts/glyphicons-halflings-regular.woff2
1761 -dist_bootcss_DATA = \
1762 - olad/www/new/libs/bootstrap/css/bootstrap.min.css
1763 --- /dev/null
1764 +++ ola-0.10.9.nojsmin/plugins/LICENCE
1765 @@ -0,0 +1,13 @@
1766 +This program is free software; you can redistribute it and/or modify
1767 +it under the terms of the GNU General Public License as published by
1768 +the Free Software Foundation; either version 2 of the License, or
1769 +(at your option) any later version.
1770 +
1771 +This program is distributed in the hope that it will be useful,
1772 +but WITHOUT ANY WARRANTY; without even the implied warranty of
1773 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1774 +GNU Library General Public License for more details.
1775 +
1776 +You should have received a copy of the GNU General Public License
1777 +along with this program; if not, write to the Free Software
1778 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1779 --- /dev/null
1780 +++ ola-0.10.9.nojsmin/plugins/kinet/kinet.cpp
1781 @@ -0,0 +1,308 @@
1782 +/*
1783 + * This program is free software; you can redistribute it and/or modify
1784 + * it under the terms of the GNU General Public License as published by
1785 + * the Free Software Foundation; either version 2 of the License, or
1786 + * (at your option) any later version.
1787 + *
1788 + * This program is distributed in the hope that it will be useful,
1789 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
1790 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1791 + * GNU Library General Public License for more details.
1792 + *
1793 + * You should have received a copy of the GNU General Public License
1794 + * along with this program; if not, write to the Free Software
1795 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1796 + *
1797 + * kinet.cpp
1798 + * Scratch pad for Kinet work
1799 + * Copyright (C) 2010 Simon Newton
1800 + */
1801 +
1802 +#include <ola/Callback.h>
1803 +#include <ola/Logging.h>
1804 +#include <ola/network/NetworkUtils.h>
1805 +#include <ola/network/SelectServer.h>
1806 +#include <ola/network/Socket.h>
1807 +
1808 +#include <iostream>
1809 +#include <string>
1810 +
1811 +using std::cout;
1812 +using std::endl;
1813 +using std::string;
1814 +using ola::network::SelectServer;
1815 +using ola::network::UDPSocket;
1816 +using ola::network::LittleEndianToHost;
1817 +
1818 +
1819 +/*
1820 + * The KiNet protocol appears to be little-endian. We write the constants as
1821 + * they appear to a human and convert back and forth.
1822 + */
1823 +
1824 +// All packets seem to start with this number
1825 +const uint32_t KINET_MAGIC = 0x4adc0104;
1826 +// We haven't seen a non V1 protocol in the wild yet.
1827 +const uint16_t KINET_VERSION = 0x0001;
1828 +// No idea what this is, but we should send a poll reply when we see it
1829 +const uint32_t KINET_DISCOVERY_COMMAND = 0x8988870a;
1830 +
1831 +// KiNet packet types
1832 +typedef enum {
1833 + KINET_POLL = 0x0001,
1834 + KINET_POLL_REPLY = 0x0002,
1835 + KINET_SET_IP = 0x0003,
1836 + KINET_SET_UNIVERSE = 0x0005,
1837 + KINET_SET_NAME = 0x0006,
1838 + // KINET_?? = 0x000a;
1839 + KINET_DMX = 0x0101,
1840 + // KINET_PORTOUT = 0x0108; // portout
1841 + // KINET_PORTOUT_SYNC = 0x0109; // portout_sync
1842 + // KINET_?? = 0x0201; // seems to be a discovery packet
1843 + // KINET_?? = 0x0203; // get dmx address?
1844 +} kinet_packet_type;
1845 +
1846 +
1847 +/**
1848 + * The KiNet header
1849 + */
1850 +PACK(
1851 +struct kinet_header {
1852 + uint32_t magic;
1853 + uint16_t version;
1854 + uint16_t type; // see kinet_packet_type above
1855 + uint32_t padding; // always set to 0, seq #,
1856 + // most of the time it's 0,
1857 + // not implemented in most supplies
1858 +});
1859 +
1860 +
1861 +// A KiNet poll message
1862 +PACK(
1863 +struct kinet_poll {
1864 + uint32_t command; // ??, Seems to always be KINET_DISCOVERY_COMMAND
1865 +});
1866 +
1867 +
1868 +// A KiNet poll reply message
1869 +PACK(
1870 +struct kinet_poll_reply {
1871 + uint32_t src_ip;
1872 + uint8_t hw_address[6]; // mac address
1873 + uint8_t data[2]; // This contains non-0 data
1874 + uint32_t serial; // The node serial #
1875 + uint32_t zero;
1876 + uint8_t node_name[60];
1877 + uint8_t node_label[31];
1878 + uint16_t zero2;
1879 +});
1880 +
1881 +
1882 +// A KiNet Set IP Command.
1883 +// TODO(simon): Check what ip,mac dst this packet is sent to.
1884 +PACK(
1885 +struct kinet_set_ip {
1886 + uint32_t something; // ef be ad de
1887 + uint8_t hw_address[6]; // The MAC address to match
1888 + uint16_t something2; // 05 67
1889 + uint32_t new_ip;
1890 +});
1891 +
1892 +
1893 +// A KiNet Set Universe Command
1894 +PACK(
1895 +struct kinet_set_universe {
1896 + uint32_t something; // ef be ad de
1897 + uint8_t universe;
1898 + uint8_t zero[3];
1899 +});
1900 +
1901 +
1902 +// A KiNet Set Name Command
1903 +PACK(
1904 +struct kinet_set_name {
1905 + uint32_t something; // ef be ad de
1906 + uint8_t new_name[31]; // Null terminated.
1907 +});
1908 +
1909 +
1910 +// A KiNet Get Address command
1911 +PACK(
1912 +struct kinet_get_address {
1913 + uint32_t serial;
1914 + uint32_t something; // 41 00 12 00
1915 +});
1916 +
1917 +
1918 +// A KiNet DMX packet
1919 +PACK(
1920 +struct kinet_dmx {
1921 + uint8_t port; // should be set to 0 for v1
1922 + uint8_t flags; // set to 0
1923 + uint16_t timerVal; // set to 0
1924 + uint32_t universe;
1925 + uint8_t paylod[513]; // payload inc start code
1926 +});
1927 +
1928 +
1929 +struct kinet_port_out_flags {
1930 + uint16_t flags;
1931 + // little endian
1932 + // first bit is undefined 0:1;
1933 + // second bit is for 16 bit data, set to 0 :1;
1934 + // third is shall hold for sync packet :: 1;
1935 +};
1936 +
1937 +
1938 +struct kinet_port_out_sync {
1939 + uint32_t padding;
1940 +}
1941 +
1942 +// A KiNet DMX port out packet
1943 +PACK(
1944 +struct kinet_port_out {
1945 + uint32_t universe;
1946 + uint8_t port; // 1- 16
1947 + uint8_t pad; // set to 0
1948 + portoutflags flags;
1949 + uint16_t length; // little endian
1950 + uint16_t startCode; // 0x0fff for chomASIC products, 0x0000 otherwise
1951 + uint8_t payload[512];
1952 +});
1953 +
1954 +
1955 +// The full kinet packet
1956 +struct kinet_packet {
1957 + struct kinet_header header;
1958 + union {
1959 + struct kinet_poll poll;
1960 + struct kinet_poll_reply poll_reply;
1961 + } data;
1962 +};
1963 +
1964 +
1965 +uint8_t peer0_0[] = {
1966 + 0x04, 0x01, 0xdc, 0x4a, // magic number
1967 + 0x01, 0x00, // version #
1968 + 0x02, 0x00, // packet type (poll reply)
1969 + 0x00, 0x00, 0x00, 0x00, // sequence
1970 + 0x0a, 0x00, 0x00, 0x01, // 192.168.1.207
1971 + 0x00, 0x0a, 0xc5, 0xff, 0xae, 0x01, // mac address
1972 + 0x01, 0x00,
1973 + 0xff, 0xff, 0x00, 0x2d, // serial #
1974 + 0x00, 0x00, 0x00, 0x00, // padding
1975 + // What follows is ascii text, with fields separated by new lines. Each field
1976 + // is in the form /[MD#R]:.*/
1977 + // It's unclear is this is a variable length field or not.
1978 + 0x4d, 0x3a, // M:
1979 + 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x4b, 0x69, 0x6e, 0x65, 0x74, 0x69, 0x63,
1980 + 0x73, 0x20, 0x49, 0x6e, 0x63, 0x6f, 0x72, 0x70, 0x6f, 0x72, 0x61, 0x74, 0x65,
1981 + 0x64, // Color Kinetics cs Incorporated
1982 + 0x0a, // \n
1983 + 0x44, 0x3a, // D:
1984 + 0x50, 0x44, 0x53, 0x2d, 0x65, // PDS-e
1985 + 0x0a, // \n
1986 + 0x23, 0x3a, // #:
1987 + 0x53, 0x46, 0x54, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x36, 0x36, 0x2d, 0x30, 0x30,
1988 + 0x0a, // SFT-000066-00
1989 + 0x52, 0x3a, // R:
1990 + 0x30, 0x30, // 00
1991 + 0x0a, // \n
1992 + 0x00,
1993 + // offset 92
1994 + 0x64, 0x73, 0x2d, 0x64, 0x61, 0x6e, 0x63, 0x65, 0x2d, 0x72, 0x65, 0x61, 0x72,
1995 + 0x00, // device name?
1996 + 0x00, 0x95, 0x8c, 0xc7, 0xb6, 0x00,
1997 + 0x00,
1998 + 0xff, 0x00, 0x00,
1999 + 0xff, 0x00, 0x00,
2000 + 0xff, 0x00, 0x00,
2001 + 0xff, 0x00, 0x00 };
2002 +
2003 +
2004 +SelectServer ss;
2005 +UDPSocket udp_socket;
2006 +
2007 +/**
2008 + * Check if a packet is valid KiNet
2009 + */
2010 +bool IsKiNet(const kinet_packet *packet, unsigned int size) {
2011 + return (size > sizeof(struct kinet_header) &&
2012 + KINET_MAGIC == LittleEndianToHost(packet->header.magic) &&
2013 + KINET_VERSION == LittleEndianToHost(packet->header.version));
2014 +}
2015 +
2016 +
2017 +/**
2018 + * Handle a KiNet poll packet
2019 + */
2020 +void HandlePoll(const struct sockaddr_in &source,
2021 + const kinet_packet &packet,
2022 + unsigned int size) {
2023 + ssize_t r = udp_socket.SendTo(peer0_0, sizeof(peer0_0), source);
2024 + OLA_INFO << "sent " << r << " bytes";
2025 +}
2026 +
2027 +
2028 +/**
2029 + * Handle a KiNet DMX packet
2030 + */
2031 +void HandleDmx(const struct sockaddr_in &source,
2032 + const kinet_packet &packet,
2033 + unsigned int size) {
2034 +}
2035 +
2036 +
2037 +void SocketReady() {
2038 + kinet_packet packet;
2039 + ssize_t data_read = sizeof(packet);
2040 + struct sockaddr_in source;
2041 + socklen_t src_size = sizeof(source);
2042 +
2043 + udp_socket.RecvFrom(reinterpret_cast<uint8_t*>(&packet),
2044 + &data_read,
2045 + source,
2046 + src_size);
2047 + if (IsKiNet(&packet, data_read)) {
2048 + uint16_t command = LittleEndianToHost(packet.header.type);
2049 + switch (command) {
2050 + case KINET_POLL:
2051 + HandlePoll(source, packet, data_read);
2052 + break;
2053 + case KINET_DMX:
2054 + HandleDmx(source, packet, data_read);
2055 + break;
2056 + default:
2057 + OLA_WARN << "Unknown packet 0x" << std::hex << command;
2058 + }
2059 + } else {
2060 + OLA_WARN << "Not a KiNet packet";
2061 + }
2062 +}
2063 +
2064 +
2065 +/*
2066 + * Main
2067 + */
2068 +int main(int argc, char *argv[]) {
2069 + ola::InitLogging(ola::OLA_LOG_INFO, ola::OLA_LOG_STDERR);
2070 +
2071 + udp_socket.SetOnData(ola::NewCallback(&SocketReady));
2072 + if (!udp_socket.Init()) {
2073 + OLA_WARN << "Failed to init";
2074 + return 1;
2075 + }
2076 + if (!udp_socket.Bind(6038)) {
2077 + OLA_WARN << "Failed to bind";
2078 + return 1;
2079 + }
2080 + if (!udp_socket.EnableBroadcast()) {
2081 + OLA_WARN << "Failed to enabl bcast";
2082 + return 1;
2083 + }
2084 +
2085 + ss.AddSocket(&udp_socket);
2086 +
2087 + ss.Run();
2088 + return 0;
2089 +}
2090 --- ola-0.10.9.nojsmin.orig/plugins/osc/OSCNode.cpp
2091 +++ ola-0.10.9.nojsmin/plugins/osc/OSCNode.cpp
2092 @@ -141,7 +141,7 @@ bool ExtractSlotValueFromPair(const stri
2093 * @param user_data a pointer to the OSCNode object.
2094 */
2095 int OSCDataHandler(const char *osc_address, const char *types, lo_arg **argv,
2096 - int argc, void *, void *user_data) {
2097 + int argc, lo_message, void *user_data) {
2098 OLA_DEBUG << "Got OSC message for " << osc_address << ", types are " << types;
2099
2100 OSCNode *node = reinterpret_cast<OSCNode*>(user_data);
2101 @@ -150,7 +150,7 @@ int OSCDataHandler(const char *osc_addre
2102
2103 if (argc == 1) {
2104 if (type == "b") {
2105 - lo_blob blob = argv[0];
2106 + lo_blob blob = (lo_blob)argv[0];
2107 unsigned int size = min(static_cast<uint32_t>(DMX_UNIVERSE_SIZE),
2108 lo_blob_datasize(blob));
2109 node->SetUniverse(
2110 --- /dev/null
2111 +++ ola-0.10.9.nojsmin/python/examples/LICENCE
2112 @@ -0,0 +1,13 @@
2113 +This program is free software; you can redistribute it and/or modify
2114 +it under the terms of the GNU General Public License as published by
2115 +the Free Software Foundation; either version 2 of the License, or
2116 +(at your option) any later version.
2117 +
2118 +This program is distributed in the hope that it will be useful,
2119 +but WITHOUT ANY WARRANTY; without even the implied warranty of
2120 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2121 +GNU Library General Public License for more details.
2122 +
2123 +You should have received a copy of the GNU General Public License
2124 +along with this program; if not, write to the Free Software
2125 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
2126 --- ola-0.10.9.nojsmin.orig/python/examples/ola_artnet_params.py
2127 +++ ola-0.10.9.nojsmin/python/examples/ola_artnet_params.py
2128 @@ -1,4 +1,4 @@
2129 -#!/usr/bin/env python
2130 +#!/usr/bin/env python3
2131 # This program is free software; you can redistribute it and/or modify
2132 # it under the terms of the GNU General Public License as published by
2133 # the Free Software Foundation; either version 2 of the License, or
2134 --- ola-0.10.9.nojsmin.orig/python/examples/ola_candidate_ports.py
2135 +++ ola-0.10.9.nojsmin/python/examples/ola_candidate_ports.py
2136 @@ -1,4 +1,4 @@
2137 -#!/usr/bin/env python
2138 +#!/usr/bin/env python3
2139 # This program is free software; you can redistribute it and/or modify
2140 # it under the terms of the GNU General Public License as published by
2141 # the Free Software Foundation; either version 2 of the License, or
2142 --- ola-0.10.9.nojsmin.orig/python/examples/ola_devices.py
2143 +++ ola-0.10.9.nojsmin/python/examples/ola_devices.py
2144 @@ -1,4 +1,4 @@
2145 -#!/usr/bin/env python
2146 +#!/usr/bin/env python3
2147 # This program is free software; you can redistribute it and/or modify
2148 # it under the terms of the GNU General Public License as published by
2149 # the Free Software Foundation; either version 2 of the License, or
2150 --- ola-0.10.9.nojsmin.orig/python/examples/ola_patch_unpatch.py
2151 +++ ola-0.10.9.nojsmin/python/examples/ola_patch_unpatch.py
2152 @@ -1,4 +1,4 @@
2153 -#!/usr/bin/env python
2154 +#!/usr/bin/env python3
2155 # This program is free software; you can redistribute it and/or modify
2156 # it under the terms of the GNU General Public License as published by
2157 # the Free Software Foundation; either version 2 of the License, or
2158 --- ola-0.10.9.nojsmin.orig/python/examples/ola_plugin_info.py
2159 +++ ola-0.10.9.nojsmin/python/examples/ola_plugin_info.py
2160 @@ -1,4 +1,4 @@
2161 -#!/usr/bin/env python
2162 +#!/usr/bin/env python3
2163 # This program is free software; you can redistribute it and/or modify
2164 # it under the terms of the GNU General Public License as published by
2165 # the Free Software Foundation; either version 2 of the License, or
2166 --- ola-0.10.9.nojsmin.orig/python/examples/ola_rdm_discover.py
2167 +++ ola-0.10.9.nojsmin/python/examples/ola_rdm_discover.py
2168 @@ -1,4 +1,4 @@
2169 -#!/usr/bin/env python
2170 +#!/usr/bin/env python3
2171 # This program is free software; you can redistribute it and/or modify
2172 # it under the terms of the GNU General Public License as published by
2173 # the Free Software Foundation; either version 2 of the License, or
2174 --- ola-0.10.9.nojsmin.orig/python/examples/ola_rdm_get.py
2175 +++ ola-0.10.9.nojsmin/python/examples/ola_rdm_get.py
2176 @@ -1,4 +1,4 @@
2177 -#!/usr/bin/env python
2178 +#!/usr/bin/env python3
2179 # This program is free software; you can redistribute it and/or modify
2180 # it under the terms of the GNU General Public License as published by
2181 # the Free Software Foundation; either version 2 of the License, or
2182 --- ola-0.10.9.nojsmin.orig/python/examples/ola_recv_dmx.py
2183 +++ ola-0.10.9.nojsmin/python/examples/ola_recv_dmx.py
2184 @@ -1,4 +1,4 @@
2185 -#!/usr/bin/env python
2186 +#!/usr/bin/env python3
2187 # This program is free software; you can redistribute it and/or modify
2188 # it under the terms of the GNU General Public License as published by
2189 # the Free Software Foundation; either version 2 of the License, or
2190 --- ola-0.10.9.nojsmin.orig/python/examples/ola_send_dmx.py
2191 +++ ola-0.10.9.nojsmin/python/examples/ola_send_dmx.py
2192 @@ -1,4 +1,4 @@
2193 -#!/usr/bin/env python
2194 +#!/usr/bin/env python3
2195 # This program is free software; you can redistribute it and/or modify
2196 # it under the terms of the GNU General Public License as published by
2197 # the Free Software Foundation; either version 2 of the License, or
2198 --- ola-0.10.9.nojsmin.orig/python/examples/ola_simple_fade.py
2199 +++ ola-0.10.9.nojsmin/python/examples/ola_simple_fade.py
2200 @@ -1,4 +1,4 @@
2201 -#!/usr/bin/env python
2202 +#!/usr/bin/env python3
2203 # This program is free software; you can redistribute it and/or modify
2204 # it under the terms of the GNU General Public License as published by
2205 # the Free Software Foundation; either version 2 of the License, or
2206 --- ola-0.10.9.nojsmin.orig/python/examples/ola_universe_info.py
2207 +++ ola-0.10.9.nojsmin/python/examples/ola_universe_info.py
2208 @@ -1,4 +1,4 @@
2209 -#!/usr/bin/env python
2210 +#!/usr/bin/env python3
2211 # This program is free software; you can redistribute it and/or modify
2212 # it under the terms of the GNU General Public License as published by
2213 # the Free Software Foundation; either version 2 of the License, or
2214 --- ola-0.10.9.nojsmin.orig/python/examples/rdm_compare.py
2215 +++ ola-0.10.9.nojsmin/python/examples/rdm_compare.py
2216 @@ -1,4 +1,4 @@
2217 -#!/usr/bin/env python
2218 +#!/usr/bin/env python3
2219 # This program is free software; you can redistribute it and/or modify
2220 # it under the terms of the GNU General Public License as published by
2221 # the Free Software Foundation; either version 2 of the License, or
2222 --- ola-0.10.9.nojsmin.orig/python/examples/rdm_snapshot.py
2223 +++ ola-0.10.9.nojsmin/python/examples/rdm_snapshot.py
2224 @@ -1,4 +1,4 @@
2225 -#!/usr/bin/env python
2226 +#!/usr/bin/env python3
2227 # This program is free software; you can redistribute it and/or modify
2228 # it under the terms of the GNU General Public License as published by
2229 # the Free Software Foundation; either version 2 of the License, or
2230 --- ola-0.10.9.nojsmin.orig/python/ola/ClientWrapperTest.py
2231 +++ ola-0.10.9.nojsmin/python/ola/ClientWrapperTest.py
2232 @@ -1,4 +1,4 @@
2233 -#!/usr/bin/env python
2234 +#!/usr/bin/env python3
2235 # This library is free software; you can redistribute it and/or
2236 # modify it under the terms of the GNU Lesser General Public
2237 # License as published by the Free Software Foundation; either
2238 --- ola-0.10.9.nojsmin.orig/python/ola/DUBDecoderTest.py
2239 +++ ola-0.10.9.nojsmin/python/ola/DUBDecoderTest.py
2240 @@ -1,4 +1,4 @@
2241 -#!/usr/bin/env python
2242 +#!/usr/bin/env python3
2243 # This library is free software; you can redistribute it and/or
2244 # modify it under the terms of the GNU Lesser General Public
2245 # License as published by the Free Software Foundation; either
2246 --- /dev/null
2247 +++ ola-0.10.9.nojsmin/python/ola/LICENCE
2248 @@ -0,0 +1,13 @@
2249 +This library is free software; you can redistribute it and/or
2250 +modify it under the terms of the GNU Lesser General Public
2251 +License as published by the Free Software Foundation; either
2252 +version 2.1 of the License, or (at your option) any later version.
2253 +
2254 +This library is distributed in the hope that it will be useful,
2255 +but WITHOUT ANY WARRANTY; without even the implied warranty of
2256 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
2257 +Lesser General Public License for more details.
2258 +
2259 +You should have received a copy of the GNU Lesser General Public
2260 +License along with this library; if not, write to the Free Software
2261 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2262 --- ola-0.10.9.nojsmin.orig/python/ola/MACAddressTest.py
2263 +++ ola-0.10.9.nojsmin/python/ola/MACAddressTest.py
2264 @@ -1,4 +1,4 @@
2265 -#!/usr/bin/env python
2266 +#!/usr/bin/env python3
2267 # This library is free software; you can redistribute it and/or
2268 # modify it under the terms of the GNU Lesser General Public
2269 # License as published by the Free Software Foundation; either
2270 --- ola-0.10.9.nojsmin.orig/python/ola/OlaClientTest.py
2271 +++ ola-0.10.9.nojsmin/python/ola/OlaClientTest.py
2272 @@ -1,4 +1,4 @@
2273 -#!/usr/bin/env python
2274 +#!/usr/bin/env python3
2275 # This library is free software; you can redistribute it and/or
2276 # modify it under the terms of the GNU Lesser General Public
2277 # License as published by the Free Software Foundation; either
2278 --- ola-0.10.9.nojsmin.orig/python/ola/PidStoreTest.py
2279 +++ ola-0.10.9.nojsmin/python/ola/PidStoreTest.py
2280 @@ -1,4 +1,4 @@
2281 -#!/usr/bin/env python
2282 +#!/usr/bin/env python3
2283 # This library is free software; you can redistribute it and/or
2284 # modify it under the terms of the GNU Lesser General Public
2285 # License as published by the Free Software Foundation; either
2286 --- ola-0.10.9.nojsmin.orig/python/ola/RDMTest.py
2287 +++ ola-0.10.9.nojsmin/python/ola/RDMTest.py
2288 @@ -1,4 +1,4 @@
2289 -#!/usr/bin/env python
2290 +#!/usr/bin/env python3
2291 # This library is free software; you can redistribute it and/or
2292 # modify it under the terms of the GNU Lesser General Public
2293 # License as published by the Free Software Foundation; either
2294 @@ -27,6 +27,7 @@ from ola.OlaClient import RDMNack
2295 from ola.RDMAPI import RDMAPI
2296 from ola.TestUtils import handleRPCByteOrder
2297 from ola.UID import UID
2298 +from ola.TestUtils import handleRPCByteOrder
2299
2300 from ola import PidStore
2301
2302 --- ola-0.10.9.nojsmin.orig/python/ola/TestUtils.py
2303 +++ ola-0.10.9.nojsmin/python/ola/TestUtils.py
2304 @@ -1,4 +1,4 @@
2305 -#!/usr/bin/env python
2306 +#!/usr/bin/env python3
2307 # This library is free software; you can redistribute it and/or
2308 # modify it under the terms of the GNU Lesser General Public
2309 # License as published by the Free Software Foundation; either
2310 --- ola-0.10.9.nojsmin.orig/python/ola/UIDTest.py
2311 +++ ola-0.10.9.nojsmin/python/ola/UIDTest.py
2312 @@ -1,4 +1,4 @@
2313 -#!/usr/bin/env python
2314 +#!/usr/bin/env python3
2315 # This library is free software; you can redistribute it and/or
2316 # modify it under the terms of the GNU Lesser General Public
2317 # License as published by the Free Software Foundation; either
2318 --- ola-0.10.9.nojsmin.orig/python/ola/rpc/SimpleRpcControllerTest.py
2319 +++ ola-0.10.9.nojsmin/python/ola/rpc/SimpleRpcControllerTest.py
2320 @@ -1,4 +1,4 @@
2321 -#!/usr/bin/env python
2322 +#!/usr/bin/env python3
2323 # This library is free software; you can redistribute it and/or
2324 # modify it under the terms of the GNU Lesser General Public
2325 # License as published by the Free Software Foundation; either
2326 --- /dev/null
2327 +++ ola-0.10.9.nojsmin/scripts/count_generic_nolints.sh
2328 @@ -0,0 +1,29 @@
2329 +#!/usr/bin/env bash
2330 +# This program is free software; you can redistribute it and/or modify
2331 +# it under the terms of the GNU General Public License as published by
2332 +# the Free Software Foundation; either version 2 of the License, or
2333 +# (at your option) any later version.
2334 +#
2335 +# This program is distributed in the hope that it will be useful,
2336 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
2337 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2338 +# GNU Library General Public License for more details.
2339 +#
2340 +# You should have received a copy of the GNU General Public License
2341 +# along with this program; if not, write to the Free Software
2342 +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
2343 +#
2344 +# count_generic_nolints.sh
2345 +# Copyright (C) 2023 Perry Naseck, Peter Newman
2346 +
2347 +# This script is based on a Travis CI test by Peter Newman
2348 +nolints="$(grep -n --exclude "$(basename $0)" -IR NOLINT * | grep -v "NOLINT(" | sed 's/^\(.*\):\([0-9]\+\):\(.*\)$/error:file:\.\/\1:line \2: Generic NOLINT not permitted/g')"
2349 +nolints_count="$(grep --exclude "$(basename $0)" -IR NOLINT * | grep -c -v "NOLINT(")"
2350 +if [[ $nolints_count -ne 0 ]]; then
2351 + # print the output for info
2352 + printf "%s\n" "$nolints"
2353 + printf "error: Found $nolints_count generic NOLINTs\n"
2354 + exit 1
2355 +else
2356 + printf "notice: Found $nolints_count generic NOLINTs\n"
2357 +fi
2358 --- /dev/null
2359 +++ ola-0.10.9.nojsmin/scripts/enforce_licence.py
2360 @@ -0,0 +1,341 @@
2361 +#!/usr/bin/env python
2362 +# This program is free software; you can redistribute it and/or modify
2363 +# it under the terms of the GNU General Public License as published by
2364 +# the Free Software Foundation; either version 2 of the License, or
2365 +# (at your option) any later version.
2366 +#
2367 +# This program is distributed in the hope that it will be useful,
2368 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
2369 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2370 +# GNU Library General Public License for more details.
2371 +#
2372 +# You should have received a copy of the GNU General Public License
2373 +# along with this program; if not, write to the Free Software
2374 +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
2375 +#
2376 +# enforce_licence.py
2377 +# Copyright (C) 2013 Simon Newton
2378 +
2379 +from __future__ import print_function
2380 +
2381 +import difflib
2382 +import getopt
2383 +import glob
2384 +import os
2385 +import pprint
2386 +import re
2387 +import sys
2388 +import textwrap
2389 +
2390 +CPP, JS, PROTOBUF, PYTHON = range(4)
2391 +
2392 +IGNORED_DIRECTORIES = [
2393 + 'javascript/new-src/node_modules/',
2394 +]
2395 +
2396 +IGNORED_FILES = [
2397 + 'common/rdm/testdata/duplicate_manufacturer.proto',
2398 + 'common/rdm/testdata/duplicate_pid_name.proto',
2399 + 'common/rdm/testdata/duplicate_pid_value.proto',
2400 + 'common/rdm/testdata/inconsistent_pid.proto',
2401 + 'common/rdm/testdata/invalid_esta_pid.proto',
2402 + 'common/rdm/testdata/test_pids.proto',
2403 + 'common/rdm/testdata/pids/overrides.proto',
2404 + 'common/rdm/testdata/pids/pids1.proto',
2405 + 'common/rdm/testdata/pids/pids2.proto',
2406 + 'examples/ola-dmxconsole.cpp',
2407 + 'examples/ola-dmxmonitor.cpp',
2408 + 'include/ola/gen_callbacks.py',
2409 + 'olad/www/mobile.js',
2410 + 'olad/www/ola.js',
2411 + 'javascript/new-src/Gruntfile.js',
2412 + 'olad/www/new/js/app.min.js',
2413 + 'olad/www/new/js/app.min.js.map',
2414 + 'python/ola/PidStoreLocation.py',
2415 + 'python/ola/Version.py',
2416 + 'tools/ola_trigger/config.tab.cpp',
2417 + 'tools/ola_trigger/config.tab.h',
2418 + 'tools/ola_trigger/lex.yy.cpp',
2419 + 'tools/rdm/DataLocation.py',
2420 + 'tools/rdm/static/ui.multiselect.js',
2421 +]
2422 +
2423 +
2424 +def Usage(arg0):
2425 + print(textwrap.dedent("""\
2426 + Usage: %s
2427 +
2428 + Walk the directory tree from the current directory, and make sure all .cpp,
2429 + .h, .js, .proto and .py files have the appropriate Licence. The licence is
2430 + determined from the LICENCE file in each branch of the directory tree.
2431 +
2432 + --diff Print the diffs.
2433 + --fix Fix the files.
2434 + --help Display this message.""" % arg0))
2435 +
2436 +
2437 +def ParseArgs():
2438 + """Extract the options."""
2439 + try:
2440 + opts, args = getopt.getopt(sys.argv[1:], '',
2441 + ['diff', 'fix', 'help'])
2442 + except getopt.GetoptError as e:
2443 + print(str(e))
2444 + Usage(sys.argv[0])
2445 + sys.exit(2)
2446 +
2447 + help = False
2448 + fix = False
2449 + diff = False
2450 + for o, a in opts:
2451 + if o in ('--diff'):
2452 + diff = True
2453 + elif o in ('--fix'):
2454 + fix = True
2455 + elif o in ('-h', '--help'):
2456 + Usage(sys.argv[0])
2457 + sys.exit()
2458 +
2459 + if help:
2460 + Usage(sys.argv[0])
2461 + sys.exit(0)
2462 + return diff, fix
2463 +
2464 +
2465 +def IgnoreFile(file_name):
2466 + for ignored_dir in IGNORED_DIRECTORIES:
2467 + if file_name.rfind(ignored_dir) != -1:
2468 + return True
2469 + for ignored_file in IGNORED_FILES:
2470 + if file_name.endswith(ignored_file):
2471 + return True
2472 + return False
2473 +
2474 +
2475 +def TransformCppLine(line):
2476 + """Transform a line to within a C++ multiline style comment"""
2477 + line = line.strip()
2478 + if line:
2479 + return ' * %s' % line
2480 + else:
2481 + return ' *'
2482 +
2483 +
2484 +def TransformLicence(licence):
2485 + """Wrap a licence in C++ style comments"""
2486 + output = []
2487 + output.append('/*')
2488 + output.extend(map(TransformCppLine, licence))
2489 + output.append(TransformCppLine(''))
2490 + return '\n'.join(output)
2491 +
2492 +
2493 +def TransformJsLine(line):
2494 + """Transform a line to within a JS multiline style comment"""
2495 + return TransformCppLine(line)
2496 +
2497 +
2498 +def TransformCppToJsLicence(licence):
2499 + """Change a C++ licence to JS style"""
2500 + lines = licence.split('\n')
2501 + output = []
2502 + output.append('/**')
2503 + for line in lines[1:]:
2504 + output.append(TransformJsLine(line[2:]))
2505 + return '\n'.join(output)
2506 +
2507 +
2508 +def TransformPythonLine(line):
2509 + """Transform a line to within a Python multiline style comment"""
2510 + line = line.strip()
2511 + if line:
2512 + return '# %s' % line
2513 + else:
2514 + return '#'
2515 +
2516 +
2517 +def TransformCppToPythonLicence(licence):
2518 + """Change a C++ licence to Python style"""
2519 + lines = licence.split('\n')
2520 + output = []
2521 + for line in lines[1:]:
2522 + output.append(TransformPythonLine(line[3:]))
2523 + return '\n'.join(output)
2524 +
2525 +
2526 +def TransformLine(line, lang):
2527 + if lang == CPP or lang == PROTOBUF:
2528 + return TransformCppLine(line)
2529 + elif lang == JS:
2530 + return TransformJsLine(line)
2531 + elif lang == PYTHON:
2532 + return TransformPythonLine(line)
2533 + else:
2534 + return line
2535 +
2536 +
2537 +def ReplaceHeader(file_name, new_header, lang):
2538 + f = open(file_name)
2539 + breaks = 0
2540 + line = f.readline()
2541 + while line != '':
2542 + if (lang == CPP or lang == JS or lang == PROTOBUF) and \
2543 + re.match(r'^ \*\s*\n$', line):
2544 + breaks += 1
2545 + if lang == PYTHON and re.match(r'^#\s*\n$', line):
2546 + breaks += 1
2547 + if breaks == 3:
2548 + break
2549 + line = f.readline()
2550 +
2551 + if breaks < 3:
2552 + print("Couldn't find header for %s so couldn't fix it" % file_name)
2553 + f.close()
2554 + return
2555 +
2556 + remainder = f.read()
2557 + f.close()
2558 +
2559 + f = open(file_name, 'w')
2560 + f.write(new_header)
2561 + f.write('\n')
2562 + f.write(remainder)
2563 + f.close()
2564 +
2565 +
2566 +def GetDirectoryLicences(root_dir):
2567 + """Walk the directory tree and determine the licence for each directory."""
2568 + LICENCE_FILE = 'LICENCE'
2569 + licences = {}
2570 +
2571 + for dir_name, subdirs, files in os.walk(root_dir):
2572 + # skip the root_dir since the licence file is different there
2573 + if dir_name == root_dir:
2574 + continue
2575 +
2576 + # skip ignored dirs since we don't check them anyways
2577 + skip = False
2578 + for ignored_dir in IGNORED_DIRECTORIES:
2579 + if dir_name.rfind(ignored_dir) != -1:
2580 + skip = True
2581 +
2582 + if skip:
2583 + continue
2584 +
2585 + # don't descend into hidden dirs like .libs and .deps
2586 + subdirs[:] = [d for d in subdirs if not d.startswith('.')]
2587 +
2588 + if LICENCE_FILE in files:
2589 + licence_path = os.path.join(dir_name, LICENCE_FILE)
2590 + f = open(licence_path)
2591 + lines = f.readlines()
2592 + f.close()
2593 + licences[dir_name] = TransformLicence(lines)
2594 + rel_licence_path = os.path.relpath(licence_path)
2595 + rel_dir_path = os.path.relpath(dir_name)
2596 + print('debug:file:%s: Found LICENCE for directory %s' %
2597 + (rel_licence_path, rel_dir_path))
2598 +
2599 + # use this licence for all subdirs
2600 + licence = licences.get(dir_name)
2601 + if licence is not None:
2602 + for sub_dir in subdirs:
2603 + licences[os.path.join(dir_name, sub_dir)] = licence
2604 + return licences
2605 +
2606 +
2607 +def CheckLicenceForDir(dir_name, licence, diff, fix):
2608 + """Check all files in a directory contain the correct licence."""
2609 + errors = 0
2610 + # glob doesn't support { } so we iterate instead
2611 + for match in ['*.h', '*.cpp']:
2612 + for file_name in glob.glob(os.path.join(dir_name, match)):
2613 + # skip the generated protobuf code
2614 + if '.pb.' in file_name:
2615 + continue
2616 + errors += CheckLicenceForFile(file_name, licence, CPP, diff, fix)
2617 +
2618 + js_licence = TransformCppToJsLicence(licence)
2619 + for file_name in glob.glob(os.path.join(dir_name, '*.js')):
2620 + errors += CheckLicenceForFile(file_name, js_licence, JS, diff, fix)
2621 +
2622 + for file_name in glob.glob(os.path.join(dir_name, '*.proto')):
2623 + errors += CheckLicenceForFile(file_name, licence, PROTOBUF, diff, fix)
2624 +
2625 + python_licence = TransformCppToPythonLicence(licence)
2626 + for file_name in glob.glob(os.path.join(dir_name, '*.py')):
2627 + # skip the generated protobuf code
2628 + if file_name.endswith('__init__.py') or file_name.endswith('pb2.py'):
2629 + continue
2630 + errors += CheckLicenceForFile(file_name, python_licence, PYTHON, diff, fix)
2631 +
2632 + return errors
2633 +
2634 +
2635 +def CheckLicenceForFile(file_name, licence, lang, diff, fix):
2636 + """Check a file contains the correct licence."""
2637 + if IgnoreFile(file_name):
2638 + return 0
2639 +
2640 + f = open(file_name)
2641 + rel_path = os.path.relpath(file_name)
2642 + # + 1 to include the newline to have a complete line
2643 + header_size = len(licence) + 1
2644 + file_name_line_count = licence.count('\n') + 2
2645 + first_line = None
2646 + if lang == PYTHON:
2647 + first_line = f.readline()
2648 + if not first_line.startswith('#!') and not first_line.startswith('# !'):
2649 + # First line isn't a shebang, ignore it.
2650 + f.seek(0, os.SEEK_SET)
2651 + first_line = None
2652 + else:
2653 + file_name_line_count += 1
2654 + # strip the trailing newline off as we don't actually want it
2655 + header = f.read(header_size).rstrip('\n')
2656 + file_name_line = f.readline()
2657 + f.close()
2658 + if header == licence:
2659 + expected_line = TransformLine(os.path.basename(file_name), lang)
2660 + if lang != JS and file_name_line.rstrip('\n') != expected_line:
2661 + print("error:file:%s:line %s: File does not have a filename line after "
2662 + "the licence; found \"%s\" expected \"%s\"" %
2663 + (rel_path, file_name_line_count, file_name_line.rstrip('\n'),
2664 + expected_line))
2665 + return 1
2666 + return 0
2667 +
2668 + if fix:
2669 + print('notice:file:%s: Fixing file' % rel_path)
2670 + if lang == PYTHON and first_line is not None:
2671 + licence = first_line + licence
2672 + ReplaceHeader(file_name, licence, lang)
2673 + return 1
2674 + else:
2675 + print("error:file:%s:lines 1-%s: File does not start with, or not exact "
2676 + "match of, \"%s...\"" %
2677 + (rel_path, file_name_line_count,
2678 + licence.split('\n')[(0 if (lang == PYTHON) else 1)]))
2679 + if diff:
2680 + d = difflib.Differ()
2681 + result = list(d.compare(header.splitlines(1), licence.splitlines(1)))
2682 + pprint.pprint(result)
2683 + return 1
2684 +
2685 +
2686 +def main():
2687 + diff, fix = ParseArgs()
2688 + licences = GetDirectoryLicences(os.getcwd())
2689 + errors = 0
2690 + for dir_name, licence in licences.items():
2691 + errors += CheckLicenceForDir(dir_name, licence, diff=diff, fix=fix)
2692 + if (errors > 0):
2693 + print('error: Found %d files with incorrect licences' % errors)
2694 + sys.exit(1)
2695 + else:
2696 + print('notice: Found %d files with incorrect licences' % errors)
2697 + sys.exit()
2698 +
2699 +
2700 +if __name__ == '__main__':
2701 + main()
2702 --- /dev/null
2703 +++ ola-0.10.9.nojsmin/scripts/spelling.sh
2704 @@ -0,0 +1,104 @@
2705 +#!/usr/bin/env bash
2706 +# This program is free software; you can redistribute it and/or modify
2707 +# it under the terms of the GNU General Public License as published by
2708 +# the Free Software Foundation; either version 2 of the License, or
2709 +# (at your option) any later version.
2710 +#
2711 +# This program is distributed in the hope that it will be useful,
2712 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
2713 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2714 +# GNU Library General Public License for more details.
2715 +#
2716 +# You should have received a copy of the GNU General Public License
2717 +# along with this program; if not, write to the Free Software
2718 +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
2719 +#
2720 +# spellintian.sh
2721 +# Copyright (C) 2023 Perry Naseck, Peter Newman
2722 +
2723 +# This script is based on Travis CI tests by Peter Newman
2724 +current_test=""
2725 +if [ "$1" = "spellintian" ]; then
2726 + current_test="spellintian"
2727 +elif [ "$1" = "codespell" ]; then
2728 + current_test="codespell"
2729 +else
2730 + echo "Unknown test \"$1\" specified in first argument. Options are spellintian and codespell."
2731 + exit 1;
2732 +fi;
2733 +
2734 +if ! [ -x "$(command -v zrun)" ]; then
2735 + echo "error: Cannot find zrun. Do you need the moreutils package?"
2736 + exit 1;
2737 +fi;
2738 +if [ $current_test = "spellintian" ] && ! [ -x "$(command -v spellintian)" ]; then
2739 + echo "error: Cannot find spellintian. Do you need the lintian package?"
2740 + exit 1;
2741 +fi;
2742 +if [ $current_test = "codespell" ] && ! [ -x "$(command -v codespell)" ]; then
2743 + echo "error: Cannot find codespell. Install via pip."
2744 + exit 1;
2745 +fi;
2746 +
2747 +SPELLINGBLACKLIST=$(cat <<-BLACKLIST
2748 + -wholename "./.codespellignorelines" -or \
2749 + -wholename "./.codespellignorewords" -or \
2750 + -wholename "./.git/*" -or \
2751 + -wholename "./Makefile" -or \
2752 + -wholename "./Makefile.in" -or \
2753 + -wholename "./aclocal.m4" -or \
2754 + -wholename "./autom4te.cache/*" -or \
2755 + -wholename "./common/protocol/Ola.pb.*" -or \
2756 + -wholename "./common/rpc/TestService.pb.*" -or \
2757 + -wholename "./config.log" -or \
2758 + -wholename "./config.status" -or \
2759 + -wholename "./config/config.guess" -or \
2760 + -wholename "./config/config.sub" -or \
2761 + -wholename "./config/depcomp" -or \
2762 + -wholename "./config/install-sh" -or \
2763 + -wholename "./config/libtool.m4" -or \
2764 + -wholename "./config/ltmain.sh" -or \
2765 + -wholename "./config/ltoptions.m4" -or \
2766 + -wholename "./config/ltsugar.m4" -or \
2767 + -wholename "./config/missing" -or \
2768 + -wholename "./configure" -or \
2769 + -wholename "./java/Makefile" -or \
2770 + -wholename "./java/Makefile.in" -or \
2771 + -wholename "./libtool" -or \
2772 + -wholename "./olad/www/mobile.js" -or \
2773 + -wholename "./olad/www/new/js/app.min.js" -or \
2774 + -wholename "./olad/www/new/js/app.min.js.map" -or \
2775 + -wholename "./olad/www/new/libs/angular/js/angular.min.js" -or \
2776 + -wholename "./olad/www/new/libs/marked/js/marked.min.js" -or \
2777 + -wholename "./olad/www/ola.js" -or \
2778 + -wholename "./plugins/artnet/messages/ArtNetConfigMessages.pb.*" -or \
2779 + -wholename "./tools/ola_trigger/config.tab.*" -or \
2780 + -wholename "./tools/ola_trigger/lex.yy.cpp"
2781 +BLACKLIST
2782 +)
2783 +
2784 +spellingfiles=$(eval "find ./ -type f -and ! \( \
2785 + $SPELLINGBLACKLIST \
2786 + \) | xargs")
2787 +
2788 +if [ $current_test = "spellintian" ]; then
2789 + # count the number of spellintian errors, including duplicate words
2790 + # spellintian does not change the exit code, so the output must be checked
2791 + spellintian_issues="$(zrun spellintian $spellingfiles 2>&1)"
2792 +
2793 + if [[ -n $spellintian_issues ]]; then
2794 + printf "%s\n" "$spellintian_issues"
2795 + # For now we always exit with success, as these errors are manually checked
2796 + # TODO: Actively match and skip printing known false positives, exit with
2797 + # errors properly.
2798 + # exit 1;
2799 + exit 0;
2800 + fi;
2801 +elif [ $current_test = "codespell" ]; then
2802 + if ! zrun codespell --interactive 0 --check-filenames --check-hidden \
2803 + --quiet 2 --regex "[a-zA-Z0-9][\\-'a-zA-Z0-9]+[a-zA-Z0-9]" \
2804 + --exclude-file .codespellignorelines \
2805 + --ignore-words .codespellignorewords $spellingfiles 2>&1; then
2806 + exit 1;
2807 + fi;
2808 +fi;
2809 --- /dev/null
2810 +++ ola-0.10.9.nojsmin/scripts/verify_trees.py
2811 @@ -0,0 +1,132 @@
2812 +#!/usr/bin/python
2813 +# This program is free software; you can redistribute it and/or modify
2814 +# it under the terms of the GNU General Public License as published by
2815 +# the Free Software Foundation; either version 2 of the License, or
2816 +# (at your option) any later version.
2817 +#
2818 +# This program is distributed in the hope that it will be useful,
2819 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
2820 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2821 +# GNU Library General Public License for more details.
2822 +#
2823 +# You should have received a copy of the GNU General Public License
2824 +# along with this program; if not, write to the Free Software
2825 +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
2826 +#
2827 +# verify_trees.py
2828 +# Copyright (C) 2015 Simon Newton
2829 +
2830 +from __future__ import print_function
2831 +
2832 +import fnmatch
2833 +import os
2834 +import sys
2835 +import textwrap
2836 +
2837 +# File & directory patterns that differ between what's in the git repo and
2838 +# what's in the tarball.
2839 +IGNORE_PATTERNS = [
2840 + '*.log',
2841 + '*.pc',
2842 + '*.swp',
2843 + '*.trs',
2844 + '*/.deps',
2845 + '*/.dirstamp',
2846 + '*/.libs',
2847 + '*/LICENCE',
2848 + '*/Makefile',
2849 + '*_pb2.py',
2850 + '*~',
2851 + '.codespellignore*',
2852 + '.flake8',
2853 + '.git',
2854 + '.git/*',
2855 + '.github/*',
2856 + '.gitignore',
2857 + '.travis-ci.sh',
2858 + '.travis.yml',
2859 + 'Doxyfile',
2860 + 'Makefile',
2861 + 'README.md',
2862 + 'autom4te.cache',
2863 + 'config.h',
2864 + 'config.status',
2865 + 'html/*',
2866 + 'include/ola/base/Version.h',
2867 + 'libtool',
2868 + 'man/generate-html.sh',
2869 + 'ola-*.tar.gz',
2870 + 'ola-*/*',
2871 + 'plugins/kinet/kinet.cpp',
2872 + 'python/ola/PidStoreLocation.py',
2873 + 'python/ola/Version.py',
2874 + 'scripts/*',
2875 + 'stamp-h1',
2876 + 'tools/rdm/DataLocation.py',
2877 +]
2878 +
2879 +
2880 +def Usage(arg0):
2881 + print(textwrap.dedent("""\
2882 + Usage: %s <treeA> <treeB>
2883 +
2884 + Check for files that exist in treeA but aren't in treeB. This can be used to
2885 + ensure we don't miss files from the tarball.""" % arg0))
2886 +
2887 +
2888 +def ShouldIgnore(path):
2889 + for pattern in IGNORE_PATTERNS:
2890 + if fnmatch.fnmatch(path, pattern):
2891 + return True
2892 + return False
2893 +
2894 +
2895 +def BuildTree(root):
2896 + tree = set()
2897 + for directory, sub_dirs, files in os.walk(root):
2898 + rel_dir = os.path.relpath(directory, root)
2899 + if rel_dir == '.':
2900 + rel_dir = ''
2901 + if ShouldIgnore(rel_dir):
2902 + continue
2903 + for f in files:
2904 + path = os.path.join(rel_dir, f)
2905 + if not ShouldIgnore(path):
2906 + tree.add(path)
2907 +
2908 + return tree
2909 +
2910 +
2911 +def main():
2912 + if len(sys.argv) != 3:
2913 + Usage(sys.argv[0])
2914 + sys.exit(1)
2915 +
2916 + tree_a_root = sys.argv[1]
2917 + tree_b_root = sys.argv[2]
2918 + for tree in (tree_a_root, tree_b_root):
2919 + if not os.path.isdir(tree):
2920 + print('Not a directory `%s`' % tree, file=sys.stderr)
2921 + sys.exit(2)
2922 +
2923 + tree_a = BuildTree(tree_a_root)
2924 + tree_b = BuildTree(tree_b_root)
2925 +
2926 + difference = tree_a.difference(tree_b)
2927 +
2928 + if difference:
2929 + for file_path in difference:
2930 + print('Missing from tarball %s' % file_path, file=sys.stderr)
2931 +
2932 + print('\n---------------------------------------', file=sys.stderr)
2933 + print('Either add the missing files to the appropriate Makefile.mk\n'
2934 + 'or update IGNORE_PATTERNS in scripts/verify_trees.py',
2935 + file=sys.stderr)
2936 + print('---------------------------------------', file=sys.stderr)
2937 + sys.exit(1)
2938 +
2939 + sys.exit()
2940 +
2941 +
2942 +if __name__ == '__main__':
2943 + main()
2944 --- /dev/null
2945 +++ ola-0.10.9.nojsmin/tools/e133/LICENCE
2946 @@ -0,0 +1,13 @@
2947 +This program is free software; you can redistribute it and/or modify
2948 +it under the terms of the GNU General Public License as published by
2949 +the Free Software Foundation; either version 2 of the License, or
2950 +(at your option) any later version.
2951 +
2952 +This program is distributed in the hope that it will be useful,
2953 +but WITHOUT ANY WARRANTY; without even the implied warranty of
2954 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2955 +GNU Library General Public License for more details.
2956 +
2957 +You should have received a copy of the GNU General Public License
2958 +along with this program; if not, write to the Free Software
2959 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
2960 --- /dev/null
2961 +++ ola-0.10.9.nojsmin/tools/logic/LICENCE
2962 @@ -0,0 +1,13 @@
2963 +This program is free software; you can redistribute it and/or modify
2964 +it under the terms of the GNU General Public License as published by
2965 +the Free Software Foundation; either version 2 of the License, or
2966 +(at your option) any later version.
2967 +
2968 +This program is distributed in the hope that it will be useful,
2969 +but WITHOUT ANY WARRANTY; without even the implied warranty of
2970 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2971 +GNU Library General Public License for more details.
2972 +
2973 +You should have received a copy of the GNU General Public License
2974 +along with this program; if not, write to the Free Software
2975 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
2976 --- /dev/null
2977 +++ ola-0.10.9.nojsmin/tools/ola_mon/LICENCE
2978 @@ -0,0 +1,13 @@
2979 +This program is free software; you can redistribute it and/or modify
2980 +it under the terms of the GNU General Public License as published by
2981 +the Free Software Foundation; either version 2 of the License, or
2982 +(at your option) any later version.
2983 +
2984 +This program is distributed in the hope that it will be useful,
2985 +but WITHOUT ANY WARRANTY; without even the implied warranty of
2986 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2987 +GNU Library General Public License for more details.
2988 +
2989 +You should have received a copy of the GNU General Public License
2990 +along with this program; if not, write to the Free Software
2991 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
2992 --- /dev/null
2993 +++ ola-0.10.9.nojsmin/tools/ola_trigger/LICENCE
2994 @@ -0,0 +1,13 @@
2995 +This program is free software; you can redistribute it and/or modify
2996 +it under the terms of the GNU General Public License as published by
2997 +the Free Software Foundation; either version 2 of the License, or
2998 +(at your option) any later version.
2999 +
3000 +This program is distributed in the hope that it will be useful,
3001 +but WITHOUT ANY WARRANTY; without even the implied warranty of
3002 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3003 +GNU Library General Public License for more details.
3004 +
3005 +You should have received a copy of the GNU General Public License
3006 +along with this program; if not, write to the Free Software
3007 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
3008 --- /dev/null
3009 +++ ola-0.10.9.nojsmin/tools/rdm/LICENCE
3010 @@ -0,0 +1,13 @@
3011 +This program is free software; you can redistribute it and/or modify
3012 +it under the terms of the GNU General Public License as published by
3013 +the Free Software Foundation; either version 2 of the License, or
3014 +(at your option) any later version.
3015 +
3016 +This program is distributed in the hope that it will be useful,
3017 +but WITHOUT ANY WARRANTY; without even the implied warranty of
3018 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3019 +GNU Library General Public License for more details.
3020 +
3021 +You should have received a copy of the GNU General Public License
3022 +along with this program; if not, write to the Free Software
3023 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
3024 --- ola-0.10.9.nojsmin.orig/tools/rdm/Makefile.mk
3025 +++ ola-0.10.9.nojsmin/tools/rdm/Makefile.mk
3026 @@ -17,9 +17,7 @@ module_files = \
3027 testserver_static_files = \
3028 tools/rdm/static/MIT-LICENSE.txt \
3029 tools/rdm/static/common.css \
3030 - tools/rdm/static/jquery-1.7.2.min.js \
3031 tools/rdm/static/jquery-ui-1.8.21.custom.css \
3032 - tools/rdm/static/jquery-ui-1.8.21.custom.min.js \
3033 tools/rdm/static/rdm_tests.js \
3034 tools/rdm/static/rdmtests.html \
3035 tools/rdm/static/ui.multiselect.css \
3036 --- ola-0.10.9.nojsmin.orig/tools/rdm/ResponderTestTest.py
3037 +++ ola-0.10.9.nojsmin/tools/rdm/ResponderTestTest.py
3038 @@ -1,4 +1,4 @@
3039 -#!/usr/bin/env python
3040 +#!/usr/bin/env python3
3041 # This program is free software; you can redistribute it and/or modify
3042 # it under the terms of the GNU General Public License as published by
3043 # the Free Software Foundation; either version 2 of the License, or
3044 --- ola-0.10.9.nojsmin.orig/tools/rdm/TestStateTest.py
3045 +++ ola-0.10.9.nojsmin/tools/rdm/TestStateTest.py
3046 @@ -1,4 +1,4 @@
3047 -#!/usr/bin/env python
3048 +#!/usr/bin/env python3
3049 # This program is free software; you can redistribute it and/or modify
3050 # it under the terms of the GNU General Public License as published by
3051 # the Free Software Foundation; either version 2 of the License, or
3052 --- ola-0.10.9.nojsmin.orig/tools/rdm/launch_tests.py
3053 +++ ola-0.10.9.nojsmin/tools/rdm/launch_tests.py
3054 @@ -1,4 +1,4 @@
3055 -#!/usr/bin/env python
3056 +#!/usr/bin/env python3
3057 # This program is free software; you can redistribute it and/or modify
3058 # it under the terms of the GNU General Public License as published by
3059 # the Free Software Foundation; either version 2 of the License, or
3060 --- ola-0.10.9.nojsmin.orig/tools/rdm/rdm_model_collector.py
3061 +++ ola-0.10.9.nojsmin/tools/rdm/rdm_model_collector.py
3062 @@ -1,4 +1,4 @@
3063 -#!/usr/bin/env python
3064 +#!/usr/bin/env python3
3065 # This program is free software; you can redistribute it and/or modify
3066 # it under the terms of the GNU General Public License as published by
3067 # the Free Software Foundation; either version 2 of the License, or
3068 --- ola-0.10.9.nojsmin.orig/tools/rdm/rdm_responder_test.py
3069 +++ ola-0.10.9.nojsmin/tools/rdm/rdm_responder_test.py
3070 @@ -1,4 +1,4 @@
3071 -#!/usr/bin/env python
3072 +#!/usr/bin/env python3
3073 # This program is free software; you can redistribute it and/or modify
3074 # it under the terms of the GNU General Public License as published by
3075 # the Free Software Foundation; either version 2 of the License, or
3076 --- ola-0.10.9.nojsmin.orig/tools/rdm/rdm_test_server.py
3077 +++ ola-0.10.9.nojsmin/tools/rdm/rdm_test_server.py
3078 @@ -1,4 +1,4 @@
3079 -#!/usr/bin/env python
3080 +#!/usr/bin/env python3
3081 # This program is free software; you can redistribute it and/or modify
3082 # it under the terms of the GNU General Public License as published by
3083 # the Free Software Foundation; either version 2 of the License, or
3084 --- ola-0.10.9.nojsmin.orig/tools/rdm/setup_patch.py
3085 +++ ola-0.10.9.nojsmin/tools/rdm/setup_patch.py
3086 @@ -1,4 +1,4 @@
3087 -#!/usr/bin/env python
3088 +#!/usr/bin/env python3
3089 # This program is free software; you can redistribute it and/or modify
3090 # it under the terms of the GNU General Public License as published by
3091 # the Free Software Foundation; either version 2 of the License, or
3092 --- ola-0.10.9.nojsmin.orig/tools/rdm/static/rdmtests.html
3093 +++ ola-0.10.9.nojsmin/tools/rdm/static/rdmtests.html
3094 @@ -1,10 +1,10 @@
3095 <!DOCTYPE html>
3096 <html>
3097 <head>
3098 - <link type='text/css' rel='stylesheet' href='/static/jquery-ui-1.8.21.custom.css' />
3099 + <link type='text/css' rel='stylesheet' href='/static/jquery-ui.css' />
3100 <link rel='stylesheet' href='/static/ui.multiselect.css' type='text/css'>
3101 - <script src='/static/jquery-1.7.2.min.js'></script>
3102 - <script src='/static/jquery-ui-1.8.21.custom.min.js'></script>
3103 + <script src='/static/jquery.min.js'></script>
3104 + <script src='/static/jquery-ui.min.js'></script>
3105 <script src='/static/ui.multiselect.js'></script>
3106 <script src='/static/rdm_tests.js'></script>
3107 <title>RDM Tests &amp; Publisher</title>
3108 --- /dev/null
3109 +++ ola-0.10.9.nojsmin/tools/rdmpro/LICENCE
3110 @@ -0,0 +1,13 @@
3111 +This program is free software; you can redistribute it and/or modify
3112 +it under the terms of the GNU General Public License as published by
3113 +the Free Software Foundation; either version 2 of the License, or
3114 +(at your option) any later version.
3115 +
3116 +This program is distributed in the hope that it will be useful,
3117 +but WITHOUT ANY WARRANTY; without even the implied warranty of
3118 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3119 +GNU Library General Public License for more details.
3120 +
3121 +You should have received a copy of the GNU General Public License
3122 +along with this program; if not, write to the Free Software
3123 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
3124 --- /dev/null
3125 +++ ola-0.10.9.nojsmin/tools/usbpro/LICENCE
3126 @@ -0,0 +1,13 @@
3127 +This program is free software; you can redistribute it and/or modify
3128 +it under the terms of the GNU General Public License as published by
3129 +the Free Software Foundation; either version 2 of the License, or
3130 +(at your option) any later version.
3131 +
3132 +This program is distributed in the hope that it will be useful,
3133 +but WITHOUT ANY WARRANTY; without even the implied warranty of
3134 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3135 +GNU Library General Public License for more details.
3136 +
3137 +You should have received a copy of the GNU General Public License
3138 +along with this program; if not, write to the Free Software
3139 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.