Description: Autogenerated patch header for a single-debian-patch file. The delta against upstream is either kept as a single patch, or maintained in some VCS, and exported as a single patch instead of more manageable atomic patches. Forwarded: not-needed --- --- /dev/null +++ ola-0.10.9.nojsmin/.codespellignorelines @@ -0,0 +1,197 @@ + int lock_fd = open(lock_file.c_str(), O_RDWR | O_CREAT | O_EXCL, + if (!(ifrcopy.ifr_flags & IFF_UP)) { + if (ifrcopy.ifr_flags & IFF_LOOPBACK) { + if (ifrcopy.ifr_flags & IFF_BROADCAST) { + string(" 00 48 65 6c .Hel\n" + * Renamed fempto(sic) to femto in the RDM code (C++ and Python) + * Renamed terra(sic) to tera in the RDM code (C++ and Python) + * Renamed protocol convertor(sic) to protocol converter in the RDM code (C++ + * Renamed valiator(sic) to validator, incomming(sic) to incoming, mimimun(sic) + to minimum and overiding(sic) to overriding, all of which may or may not + * Renamed RESONSE_INVALID_DESTINATION(sic) to RESPONSE_INVALID_DESTINATION in + * Rename CircularDepdendancyException(sic) to CircularDependencyException in + * Rename AppendMultipler(sic) to AppendMultiplier in the RDM messaging code + /^(?:([0-9]{1,3})(?:\s(THRU)\s(?:([0-9]{1,3}))?)?(?:\s(@)\s(?:([0-9]{1,3}|FULL))?)?)/; + * channel_range ::= "ALL" | "*" | channel "THRU" channel | channel > channel + /(?:([0-9]{1,3})(?:\s+THRU\s+([0-9]{0,3}))?)\s+@\s+([0-9]{0,3})$/); + /(?:([0-9]{1,3})(?:\s+THRU\s+([0-9]{0,3}))?)(?:\s+@\s+([0-9]{0,3}))?$/); + str = str.replace('>', 'THRU'); + ' THRU ' + ola.common.DmxConstants.MAX_CHANNEL_NUMBER); + // If it's the T or > keys, autocomplete 'THRU' + case 'U': // THRU + var values = ['7', '8', '9', ' THRU ', '4', '5', '6', ' @ ', '1', '2', '3', + // This is true iff all fields in a group are of a fixed size and the + + 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))) + state(AVAHI_ENTRY_GROUP_UNCOMMITED), + case AVAHI_ENTRY_GROUP_UNCOMMITED: + if (iter->second->state == AVAHI_ENTRY_GROUP_UNCOMMITED) { + iter->second->state = AVAHI_ENTRY_GROUP_UNCOMMITED; + case AVAHI_ENTRY_GROUP_UNCOMMITED: + return "AVAHI_ENTRY_GROUP_UNCOMMITED"; + PRE_SOM, + uint8_t som; + static const uint8_t SOM = 0xa5; + PRE_SOM, + uint8_t som; + static const uint8_t SOM = 0x7e; + frame[0] = 0x7e; // som + frame[0] = 0xa5; // som + frame[0] = 0x7e; // som +const uint8_t BaseRobeWidget::SOM; + m_state(PRE_SOM), + header->som = SOM; + uint8_t crc = SOM + packet_type + (length & 0xFF) + ((length & 0xFF00) >> 8); + case PRE_SOM: + m_descriptor->Receive(&m_header.som, 1, count); + } while (m_header.som != SOM); + m_state = PRE_SOM; + m_crc = SOM + m_header.packet_type + m_header.len + m_header.len_hi; + m_state = PRE_SOM; + m_state = PRE_SOM; + m_state(PRE_SOM), + header->som = SOM; + case PRE_SOM: + m_descriptor->Receive(&m_header.som, 1, count); + } while (m_header.som != SOM); + m_state = PRE_SOM; + m_state = PRE_SOM; + '%s attempted to get %s which wasn\'t declared' % + '%s attempted to set %s which wasn\'t declared' % + 'min': numpy.amin(array), + void Syncronize(); + SC_E133_NONEXISTANT_ENDPOINT = 0x0005, + saver_thread.Syncronize(); +void FilePreferenceSaverThread::Syncronize() { + Mutex syncronize_mutex; + syncronize_mutex.Lock(); + &syncronize_mutex)); + condition_var.Wait(&syncronize_mutex); + ola::e133::SC_E133_NONEXISTANT_ENDPOINT, + case ola::e133::SC_E133_NONEXISTANT_ENDPOINT: + *status_code = ola::e133::SC_E133_NONEXISTANT_ENDPOINT; + case ola::e133::SC_E133_NONEXISTANT_ENDPOINT: + * @brief A LibUsbAdaptor for use with Syncronous widgets. + * When using syncronous mode, we don't have the requirement of interacting +class SyncronousLibUsbAdaptor : public BaseLibUsbAdaptor { + SyncronousLibUsbAdaptor() {} + DISALLOW_COPY_AND_ASSIGN(SyncronousLibUsbAdaptor); + * @brief A LibUsbAdaptor for use with Asyncronous widgets. + * Asyncronous mode requires notifying the LibUsbThread when handles are opened +class AsyncronousLibUsbAdaptor : public BaseLibUsbAdaptor { + explicit AsyncronousLibUsbAdaptor(class LibUsbThread *thread) + DISALLOW_COPY_AND_ASSIGN(AsyncronousLibUsbAdaptor); + manufacturer_name: "ARRI -- Arnold & Richter Cine Technik GmbH & Co. Betriebs KG" + STLDeleteValues(&m_uint_map_variables); + return GetMapVar(&m_uint_map_variables, name, label); + STLValues(m_uint_map_variables, &variables); + auto_ptr m_uint_value; + m_uint_value.reset(new JsonUInt(4)); + m_uint_value->Accept(&wildcard_validator); + m_uint_value->Accept(&validator); + m_uint_value->Accept(&basic_string_validator); + m_uint_value->Accept(&bool_validator); + m_uint_value->Accept(&null_validator); + m_uint_value->Accept(&integer_validator); + auto_ptr uint_value1(new JsonInt(5)); + m_uint_value->Accept(&max_int_validator); + uint_value1->Accept(&max_int_validator); + m_uint_value->Accept(&exclusive_max_int_validator); + uint_value1->Accept(&max_int_validator); + m_uint_value->Accept(&min_int_validator); + m_uint_value->Accept(&exclusive_min_int_validator); + m_uint_value->Accept(&multiple_of_validator); + m_uint_value->Accept(&integer_validator); + m_uint_value->Accept(&object_validator); + m_uint_value->Accept(&array_validator); + m_uint_value->Accept(&all_of_validator); + m_uint_value->Accept(&any_of_validator); + m_uint_value->Accept(&one_of_validator); + m_uint_value->Accept(¬_validator); + JsonInt uint_value1(2); + JsonInt uint_value2(3); + m_uint_value->Accept(&integer_validator); + uint_value1.Accept(&integer_validator); + uint_value2.Accept(&integer_validator); + JsonUInt uint_value(10); + OLA_ASSERT_EQ(expected, JsonWriter::AsString(uint_value)); + * Test the uint item + " \"type\": \"uint\",\n" + std::map m_uint_map_variables; + if (message.uint_offset < MAX_UINT_FIELDS) { + message.uint16_fields[message.uint_offset++] = field->Value(); + iter->uint_offset != MAX_UINT_FIELDS || + enum { MAX_UINT_FIELDS = 2 }; + uint16_t uint16_fields[MAX_UINT_FIELDS]; + uint8_t uint_offset; + status_message() : uint_offset(0), int_offset(0), status_type(0), + std::string Type() const { return "uint"; } + if (items[i]['type'] == 'uint') { + if (type == 'string' || type == 'uint' || type == 'hidden') { +const char RDMHTTPModule::GENERIC_UINT_FIELD[] = "int"; + section.AddItem(new HiddenItem("1", GENERIC_UINT_FIELD)); + SelectItem *item = new SelectItem("Personality", GENERIC_UINT_FIELD); + string personality_str = request->GetParameter(GENERIC_UINT_FIELD); + UIntItem *uint_item = new UIntItem("DMX Start Address", address, + uint_item->SetMin(DMX_MIN_SLOT_NUMBER); + uint_item->SetMax(DMX_MAX_SLOT_NUMBER); + item = uint_item; + string device_hours = request->GetParameter(GENERIC_UINT_FIELD); + string lamp_hours_str = request->GetParameter(GENERIC_UINT_FIELD); + string lamp_strikes_str = request->GetParameter(GENERIC_UINT_FIELD); + SelectItem *item = new SelectItem("Lamp State", GENERIC_UINT_FIELD); + string lamp_state_str = request->GetParameter(GENERIC_UINT_FIELD); + SelectItem *item = new SelectItem("Lamp Mode", GENERIC_UINT_FIELD); + string lamp_mode_str = request->GetParameter(GENERIC_UINT_FIELD); + string power_cycles_str = request->GetParameter(GENERIC_UINT_FIELD); + UIntItem *item = new UIntItem("Display Level", value, GENERIC_UINT_FIELD); + string display_level_str = request->GetParameter(GENERIC_UINT_FIELD); + section.AddItem(new HiddenItem("1", GENERIC_UINT_FIELD)); + SelectItem *item = new SelectItem("Power State", GENERIC_UINT_FIELD); + string power_state_str = request->GetParameter(GENERIC_UINT_FIELD); + SelectItem *item = new SelectItem("Reset Device", GENERIC_UINT_FIELD); + string reset_device_str = request->GetParameter(GENERIC_UINT_FIELD); + section.AddItem(new UIntItem(description, value, GENERIC_UINT_FIELD)); +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 "+(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+"&"; +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 "+(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, + UIntValidator uint_validator(10, 14); + OLA_ASSERT(uint_validator.IsValid("10")); + OLA_ASSERT(uint_validator.IsValid("14")); + OLA_ASSERT_FALSE(uint_validator.IsValid("0")); + OLA_ASSERT_FALSE(uint_validator.IsValid("9")); + OLA_ASSERT_FALSE(uint_validator.IsValid("15")); + // test get/set/has single values uint + // test get/set multiple value uint + // test SetDefaultValue uint + UIntValidator uint_validator(0, 3); + OLA_ASSERT(preferences->SetDefaultValue(key1, uint_validator, value3)); + OLA_ASSERT_FALSE(preferences->SetDefaultValue(key1, uint_validator, + const char *uint_vars[] = { + for (unsigned int i = 0; i < arraysize(uint_vars); ++i) { + m_export_map->GetUIntMapVar(uint_vars[i])->Remove(m_universe_id_str); + static const char GENERIC_UINT_FIELD[]; + if ((uint) r != buffer.Size()) { + UIntValidator(0, UINT_MAX), + // On win32 TRUE and FALSE are #define'd. We can #undef them here but that + * A #define'd value HAVE_LIBLO which lets us know within the code if the OSC +import java.nio.ByteOrder; + byte[] header = ByteBuffer.allocate(4).order(ByteOrder.nativeOrder()).putInt(headerContent).array(); + int headerValue = ByteBuffer.wrap(header).order(ByteOrder.nativeOrder()).getInt(); +# 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 + "uest\032\036.ola.rpc.STREAMING_NO_RESPONSEB\006\200\001" + s1 = "one\"two\\three/four\bfive\fsix\nseven\reight\tnine"; + string("one\\\"two\\\\three\\/four\\bfive\\fsix\\nseven\\reight\\tnine"), + s1 = "one\"two\\three/four\bfive\fsix\nseven\reight\tnine"; + string("one\\\"two\\\\three\\/four\\bfive\\fsix\\nseven\\reight\\tnine"), + self.assertEqual(rtf._EscapeData(u'caf\xe9'), "caf\\xe9") + self.assertEqual('%s' % rtf._EscapeData(u'caf\xe9'), "caf\\xe9") + self.assertEqual('%s' % rtf._EscapeData(['caf\xe9']), "['caf\\\\xe9']") + self.assertEqual('%s' % rtf._EscapeData({"a": "caf\xe9"}), + "{'a': 'caf\\\\xe9'}") +# self.assertEqual('%s' % rtf._EscapeData({"caf\xe9": "bar"}), +# "{'caf\xe9': 'bar'}") + self.assertEqual('caf\\xe9', StringEscape(u'caf\xe9')) + self.assertEqual('caf\\xe9', ("%s" % StringEscape(u'caf\xe9'))) + "forin": true, --- /dev/null +++ ola-0.10.9.nojsmin/.codespellignorewords @@ -0,0 +1,5 @@ +acn +ACN +inflight +thead +wronly --- /dev/null +++ ola-0.10.9.nojsmin/.flake8 @@ -0,0 +1,4 @@ +[flake8] +max-line-length = 80 +exclude = .svn,CVS,.bzr,.hg,.git,__pycache__,.tox,*_pb2.py +ignore = E111,E114,E121,E127,E129,W504 --- /dev/null +++ ola-0.10.9.nojsmin/.github/dependabot.yml @@ -0,0 +1,10 @@ +# See: https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#about-the-dependabotyml-file +version: 2 + +updates: + # Configure check for outdated GitHub Actions actions in workflows. + # See: https://docs.github.com/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot + - package-ecosystem: github-actions + directory: / # Check the repository's workflows under /.github/workflows/ + schedule: + interval: daily --- /dev/null +++ ola-0.10.9.nojsmin/.github/problem-matcher-lint-check-licences.json @@ -0,0 +1,16 @@ +{ + "problemMatcher": [ + { + "owner": "lint-check-licences", + "pattern": [ + { + "regexp": "^(notice|error)(:(file|dir):([^:]+)(:lines? (\\d+)(-(\\d+))?)?)?: (.+)$", + "severity": 1, + "file": 4, + "line": 6, + "message": 9 + } + ] + } + ] +} --- /dev/null +++ ola-0.10.9.nojsmin/.github/problem-matcher-lint-cpplint.json @@ -0,0 +1,17 @@ +{ + "problemMatcher": [ + { + "owner": "lint-cpplint", + "severity": "error", + "pattern": [ + { + "regexp": "^(.+):(\\d+):\\s+((.+)\\s+\\[(.*)\\]\\s\\[(.*)\\])$", + "file": 1, + "line": 2, + "message": 3, + "code": 5 + } + ] + } + ] +} --- /dev/null +++ ola-0.10.9.nojsmin/.github/problem-matcher-lint-generic-nolints.json @@ -0,0 +1,16 @@ +{ + "problemMatcher": [ + { + "owner": "lint-generic-nolints", + "pattern": [ + { + "regexp": "^(notice|error)(:(file|dir):([^:]+)(:lines? (\\d+)(-(\\d+))?)?)?: (.+)$", + "severity": 1, + "file": 4, + "line": 6, + "message": 9 + } + ] + } + ] +} --- /dev/null +++ ola-0.10.9.nojsmin/.github/problem-matcher-lint-spellintian.json @@ -0,0 +1,15 @@ +{ + "problemMatcher": [ + { + "owner": "lint-spellintian", + "severity": "warning", + "pattern": [ + { + "regexp": "^([^:]+):(\\s+)(.+)$", + "file": 1, + "message": 3 + } + ] + } + ] +} --- /dev/null +++ ola-0.10.9.nojsmin/.github/workflows/annotation.yml @@ -0,0 +1,14 @@ +# GitHub Action to annotate some of our test tool results +name: annotation +on: [push, pull_request] +jobs: + flake8-annotation-python2: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + - uses: actions/setup-python@v2 + with: + python-version: '2.7' + - name: Flake8 with annotations - Python 2 + # Using the flake8 options in the .flake8 file + uses: TrueBrain/actions-flake8@main --- /dev/null +++ ola-0.10.9.nojsmin/.github/workflows/isort.yml @@ -0,0 +1,12 @@ +name: isort + +on: + - push + - pull_request + +jobs: + isort: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: isort/isort-action@v1 --- /dev/null +++ ola-0.10.9.nojsmin/.github/workflows/lint.yaml @@ -0,0 +1,238 @@ +name: lint +on: [push, pull_request] +jobs: + build: + name: Build for Lint Tasks + runs-on: ubuntu-latest + container: debian:stable + steps: + - name: Update package database + run: apt-get update -y + # See comments beginning at + # https://github.com/actions/runner/issues/763#issuecomment-1435474884 + # Without Git, actions/checkout@v3 will resort to REST and will not + # create a .git folder or .git.config. The Problem Matcher looks for + # .git/config to find where the root of the repo is, so it must be + # present. + - name: Install Git + run: apt-get -y install git + - uses: actions/checkout@v3 + - name: Install build tools + shell: bash + run: | + apt-get -y install pkg-config libtool autoconf \ + automake g++ bison flex make bash-completion dh-autoreconf \ + debhelper devscripts wget python3-pip + - name: Install Python lint tools + run: python3 -m pip install --no-input cpplint flake8 + - name: Install build dependencies + shell: bash + run: | + apt-get -y install libcppunit-dev uuid-dev libncurses5-dev \ + libmicrohttpd-dev protobuf-compiler python3-protobuf \ + libprotobuf-dev libprotoc-dev zlib1g-dev libftdi-dev \ + libusb-1.0-0-dev liblo-dev libavahi-client-dev python3-numpy + - name: Autoreconf + run: autoreconf -i + - name: Configure + run: ./configure --enable-rdm-tests --enable-ja-rule --enable-e133 + - name: Build builtfiles + run: make builtfiles VERBOSE=1 + - name: Display structure of the built files + if: env.ACTIONS_STEP_DEBUG == 'true' + run: ls -alR + - name: Archive artifacts to speed up slow GH Actions upload/download + shell: bash + # If the file does not exist when tar excludes it, then it will not + # actually exclude it, so it must first be touched + run: | + touch ola-debian-stable-built-source-tree.tar.gz + tar --exclude=ola-debian-stable-built-source-tree.tar.gz -cvzf ola-debian-stable-built-source-tree.tar.gz . + - name: SHA256 artifact archive + run: sha256sum ola-debian-stable-built-source-tree.tar.gz + - uses: actions/upload-artifact@v3 + with: + name: ola-debian-stable-built-source-tree + path: ola-debian-stable-built-source-tree.tar.gz + check-licences: + name: Check Licences + runs-on: ubuntu-latest + container: debian:stable + needs: build + steps: + - name: Download built source tree archive + uses: actions/download-artifact@v3 + with: + name: ola-debian-stable-built-source-tree + path: . + - name: SHA256 artifact archive + run: sha256sum ola-debian-stable-built-source-tree.tar.gz + - name: Unarchive artifacts and delete archive + shell: bash + run: | + tar -xvzf ola-debian-stable-built-source-tree.tar.gz . + rm ola-debian-stable-built-source-tree.tar.gz + - name: Display structure of extracted files + if: env.ACTIONS_STEP_DEBUG == 'true' + run: ls -alR + - name: Update package database + run: apt-get update -y + - name: Install Python + run: apt-get -y install python3 python-is-python3 + - name: Enable Problem Matcher for GitHub annotations + run: echo "::add-matcher::.github/problem-matcher-lint-check-licences.json" + - name: Check licenses + shell: bash + run: ./scripts/enforce_licence.py + generic-nolints: + name: Count generic NOLINTs + runs-on: ubuntu-latest + container: debian:stable + needs: build + steps: + - name: Download built source tree archive + uses: actions/download-artifact@v3 + with: + name: ola-debian-stable-built-source-tree + path: . + - name: SHA256 artifact archive + run: sha256sum ola-debian-stable-built-source-tree.tar.gz + - name: Unarchive artifacts and delete archive + shell: bash + run: | + tar -xvzf ola-debian-stable-built-source-tree.tar.gz . + rm ola-debian-stable-built-source-tree.tar.gz + - name: Display structure of extracted files + if: env.ACTIONS_STEP_DEBUG == 'true' + run: ls -alR + - name: Enable Problem Matcher for GitHub annotations + run: echo "::add-matcher::.github/problem-matcher-lint-generic-nolints.json" + - name: Count the number of generic NOLINTs + shell: bash + run: ./scripts/count_generic_nolints.sh + cpplint: + name: cpplint + runs-on: ubuntu-latest + container: debian:stable + needs: build + steps: + - name: Download built source tree archive + uses: actions/download-artifact@v3 + with: + name: ola-debian-stable-built-source-tree + path: . + - name: SHA256 artifact archive + run: sha256sum ola-debian-stable-built-source-tree.tar.gz + - name: Unarchive artifacts and delete archive + shell: bash + run: | + tar -xvzf ola-debian-stable-built-source-tree.tar.gz . + rm ola-debian-stable-built-source-tree.tar.gz + - name: Display structure of extracted files + if: env.ACTIONS_STEP_DEBUG == 'true' + run: ls -alR + - name: Update package database + run: apt-get update -y + - name: Install build tools + shell: bash + run: | + apt-get -y install make python3-pip + - name: Install Python lint tools + run: python3 -m pip install --no-input cpplint + - name: Enable Problem Matcher for GitHub annotations + run: echo "::add-matcher::.github/problem-matcher-lint-cpplint.json" + - name: cpplint + run: make cpplint VERBOSE=1 + flake8: + name: flake8 + runs-on: ubuntu-latest + container: debian:stable + needs: build + steps: + - name: Download built source tree archive + uses: actions/download-artifact@v3 + with: + name: ola-debian-stable-built-source-tree + path: . + - name: SHA256 artifact archive + run: sha256sum ola-debian-stable-built-source-tree.tar.gz + - name: Unarchive artifacts and delete archive + shell: bash + run: | + tar -xvzf ola-debian-stable-built-source-tree.tar.gz . + rm ola-debian-stable-built-source-tree.tar.gz + - name: Display structure of extracted files + if: env.ACTIONS_STEP_DEBUG == 'true' + run: ls -alR + - name: Update package database + run: apt-get update -y + - name: Install build tools + shell: bash + run: | + apt-get -y install make python3-pip + - name: Install Python lint tools + run: python3 -m pip install --no-input flake8 + - name: Setup flake8 annotations + uses: rbialon/flake8-annotations@v1 + - name: flake8 + run: make flake8 VERBOSE=1 + spellintian: + name: spellintian + runs-on: ubuntu-latest + container: debian:stable + needs: build + steps: + - name: Download built source tree archive + uses: actions/download-artifact@v3 + with: + name: ola-debian-stable-built-source-tree + path: . + - name: SHA256 artifact archive + run: sha256sum ola-debian-stable-built-source-tree.tar.gz + - name: Unarchive artifacts and delete archive + shell: bash + run: | + tar -xvzf ola-debian-stable-built-source-tree.tar.gz . + rm ola-debian-stable-built-source-tree.tar.gz + - name: Display structure of extracted files + if: env.ACTIONS_STEP_DEBUG == 'true' + run: ls -alR + - name: Update package database + run: apt-get update -y + - name: Install lint tools + run: apt-get -y install moreutils lintian + - name: Enable Problem Matcher for GitHub annotations + run: echo "::add-matcher::.github/problem-matcher-lint-spellintian.json" + - name: spellintian + run: ./scripts/spelling.sh spellintian + codespell: + name: codespell + runs-on: ubuntu-latest + container: debian:stable + needs: build + steps: + - name: Download built source tree archive + uses: actions/download-artifact@v3 + with: + name: ola-debian-stable-built-source-tree + path: . + - name: SHA256 artifact archive + run: sha256sum ola-debian-stable-built-source-tree.tar.gz + - name: Unarchive artifacts and delete archive + shell: bash + run: | + tar -xvzf ola-debian-stable-built-source-tree.tar.gz . + rm ola-debian-stable-built-source-tree.tar.gz + - name: Display structure of extracted files + if: env.ACTIONS_STEP_DEBUG == 'true' + run: ls -alR + - name: Update package database + run: apt-get update -y + - name: Install lint tools + run: apt-get -y install python3-pip git moreutils + - name: Install Python lint tools + run: python3 -m pip install --no-input git+https://github.com/codespell-project/codespell.git + - name: Setup codespell annotations + uses: codespell-project/codespell-problem-matcher@v1 + - name: codespell + run: ./scripts/spelling.sh codespell --- /dev/null +++ ola-0.10.9.nojsmin/.gitlab-ci.yml @@ -0,0 +1,43 @@ +stages: + - build + - autopkgtest +.build: &build + before_script: + - apt-get update + - apt-get -y install devscripts adduser fakeroot sudo + - mk-build-deps -t "apt-get -y -o Debug::pkgProblemResolver=yes --no-install-recommends" -i -r + - adduser --disabled-password --gecos "" builduser + - chown -R builduser:builduser . + - chown builduser:builduser .. + stage: build + artifacts: + paths: + - built + script: + - sudo -u builduser dpkg-buildpackage -b -rfakeroot + after_script: + - mkdir built + - dcmd mv ../*ges built/ +.test: &test + before_script: + - apt-get update + - apt-get -y install autopkgtest + stage: autopkgtest + script: + - autopkgtest built/*ges -- null +build:testing: + <<: *build + image: debian:testing +build:unstable: + <<: *build + image: debian:sid +test:testing: + <<: *test + dependencies: + - build:testing + image: debian:testing +test:unstable: + <<: *test + dependencies: + - build:unstable + image: debian:sid --- /dev/null +++ ola-0.10.9.nojsmin/.travis-ci.sh @@ -0,0 +1,259 @@ +#!/bin/bash + +# This script is triggered from the script section of .travis.yml +# It runs the appropriate commands depending on the task requested. + +set -e + +CPP_LINT_URL="https://raw.githubusercontent.com/google/styleguide/gh-pages/cpplint/cpplint.py"; + +COVERITY_SCAN_BUILD_URL="https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" + +SPELLINGBLACKLIST=$(cat <<-BLACKLIST + -wholename "./.codespellignorewords" -or \ + -wholename "./.codespellignorelines" -or \ + -wholename "./.git/*" -or \ + -wholename "./aclocal.m4" -or \ + -wholename "./config/config.guess" -or \ + -wholename "./config/config.sub" -or \ + -wholename "./config/depcomp" -or \ + -wholename "./config/install-sh" -or \ + -wholename "./config/libtool.m4" -or \ + -wholename "./config/ltmain.sh" -or \ + -wholename "./config/ltoptions.m4" -or \ + -wholename "./config/ltsugar.m4" -or \ + -wholename "./config/missing" -or \ + -wholename "./libtool" -or \ + -wholename "./config.log" -or \ + -wholename "./config.status" -or \ + -wholename "./Makefile" -or \ + -wholename "./Makefile.in" -or \ + -wholename "./autom4te.cache/*" -or \ + -wholename "./java/Makefile" -or \ + -wholename "./java/Makefile.in" -or \ + -wholename "./olad/www/new/js/app.min.js" -or \ + -wholename "./olad/www/new/js/app.min.js.map" -or \ + -wholename "./olad/www/new/libs/angular/js/angular.min.js" -or \ + -wholename "./olad/www/mobile.js" -or \ + -wholename "./olad/www/ola.js" -or \ + -wholename "./configure" -or \ + -wholename "./common/protocol/Ola.pb.*" -or \ + -wholename "./plugins/artnet/messages/ArtNetConfigMessages.pb.*" -or \ + -wholename "./tools/ola_trigger/config.tab.*" -or \ + -wholename "./tools/ola_trigger/lex.yy.cpp" +BLACKLIST +) + +if [[ $TASK = 'lint' ]]; then + # run the lint tool only if it is the requested task + travis_fold start "autoreconf" + autoreconf -i; + travis_fold end "autoreconf" + ./configure --enable-rdm-tests --enable-ja-rule --enable-e133; + # the following is a bit of a hack to build the files normally built during + # the build, so they are present for linting to run against + travis_fold start "make_builtfiles" + make builtfiles VERBOSE=1; + travis_fold end "make_builtfiles" + # first check we've not got any generic NOLINTs + # count the number of generic NOLINTs + nolints=$(grep -IR NOLINT * | grep -v "NOLINT(" | wc -l) + if [[ $nolints -ne 0 ]]; then + # print the output for info + echo $(grep -IR NOLINT * | grep -v "NOLINT(") + echo "Found $nolints generic NOLINTs" + exit 1; + else + echo "Found $nolints generic NOLINTs" + fi; + # run the cpplint tool, fetching it if necessary + make cpplint VERBOSE=1 +elif [[ $TASK = 'check-licences' ]]; then + # check licences only if it is the requested task + travis_fold start "autoreconf" + autoreconf -i; + travis_fold end "autoreconf" + travis_fold start "configure" + ./configure --enable-rdm-tests --enable-ja-rule --enable-e133; + travis_fold end "configure" + # the following is a bit of a hack to build the files normally built during + # the build, so they are present for licence checking to run against + travis_fold start "make_builtfiles" + make builtfiles VERBOSE=1; + travis_fold end "make_builtfiles" + ./scripts/enforce_licence.py + if [[ $? -ne 0 ]]; then + exit 1; + fi; +elif [[ $TASK = 'spellintian' ]]; then + # run spellintian only if it is the requested task, ignoring duplicate words + travis_fold start "autoreconf" + autoreconf -i; + travis_fold end "autoreconf" + travis_fold start "configure" + ./configure --enable-rdm-tests --enable-ja-rule --enable-e133; + travis_fold end "configure" + # the following is a bit of a hack to build the files normally built during + # the build, so they are present for spellintian to run against + travis_fold start "make_builtfiles" + make builtfiles VERBOSE=1; + travis_fold end "make_builtfiles" + spellingfiles=$(eval "find ./ -type f -and ! \( \ + $SPELLINGBLACKLIST \ + \) | xargs") + # count the number of spellintian errors, ignoring duplicate words + spellingerrors=$(zrun spellintian $spellingfiles 2>&1 | grep -v "\(duplicate word\)" | wc -l) + if [[ $spellingerrors -ne 0 ]]; then + # print the output for info + zrun spellintian $spellingfiles | grep -v "\(duplicate word\)" + echo "Found $spellingerrors spelling errors via spellintian, ignoring duplicates" + exit 1; + else + echo "Found $spellingerrors spelling errors via spellintian, ignoring duplicates" + fi; +elif [[ $TASK = 'spellintian-duplicates' ]]; then + # run spellintian only if it is the requested task + travis_fold start "autoreconf" + autoreconf -i; + travis_fold end "autoreconf" + travis_fold start "configure" + ./configure --enable-rdm-tests --enable-ja-rule --enable-e133; + travis_fold end "configure" + # the following is a bit of a hack to build the files normally built during + # the build, so they are present for spellintian to run against + travis_fold start "make_builtfiles" + make builtfiles VERBOSE=1; + travis_fold end "make_builtfiles" + spellingfiles=$(eval "find ./ -type f -and ! \( \ + $SPELLINGBLACKLIST \ + \) | xargs") + # count the number of spellintian errors + spellingerrors=$(zrun spellintian $spellingfiles 2>&1 | wc -l) + if [[ $spellingerrors -ne 0 ]]; then + # print the output for info + zrun spellintian $spellingfiles + echo "Found $spellingerrors spelling errors via spellintian" + exit 1; + else + echo "Found $spellingerrors spelling errors via spellintian" + fi; +elif [[ $TASK = 'codespell' ]]; then + # run codespell only if it is the requested task + travis_fold start "autoreconf" + autoreconf -i; + travis_fold end "autoreconf" + travis_fold start "configure" + ./configure --enable-rdm-tests --enable-ja-rule --enable-e133; + travis_fold end "configure" + # the following is a bit of a hack to build the files normally built during + # the build, so they are present for codespell to run against + travis_fold start "make_builtfiles" + make builtfiles VERBOSE=1; + travis_fold end "make_builtfiles" + spellingfiles=$(eval "find ./ -type f -and ! \( \ + $SPELLINGBLACKLIST \ + \) | xargs") + # count the number of codespell errors + 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) + if [[ $spellingerrors -ne 0 ]]; then + # print the output for info, including the count + 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 + echo "Found $spellingerrors spelling errors via codespell" + exit 1; + else + echo "Found $spellingerrors spelling errors via codespell" + fi; +elif [[ $TASK = 'doxygen' ]]; then + # check doxygen only if it is the requested task + travis_fold start "autoreconf" + autoreconf -i; + travis_fold end "autoreconf" + # Doxygen is C++ only, so don't bother with RDM tests + travis_fold start "configure" + ./configure --enable-ja-rule --enable-e133; + travis_fold end "configure" + # the following is a bit of a hack to build the files normally built during + # the build, so they are present for Doxygen to run against + travis_fold start "make_builtfiles" + make builtfiles VERBOSE=1; + travis_fold end "make_builtfiles" + # count the number of warnings + warnings=$(make doxygen-doc 2>&1 >/dev/null | wc -l) + if [[ $warnings -ne 0 ]]; then + # print the output for info + make doxygen-doc VERBOSE=1 + echo "Found $warnings doxygen warnings" + exit 1; + else + echo "Found $warnings doxygen warnings" + fi; +elif [[ $TASK = 'coverage' ]]; then + # Compile with coverage for coveralls + travis_fold start "autoreconf" + autoreconf -i; + travis_fold end "autoreconf" + # Coverage is C++ only, so don't bother with RDM tests + travis_fold start "configure" + ./configure --enable-gcov --enable-ja-rule --enable-e133; + travis_fold end "configure" + travis_fold start "make" + make; + travis_fold end "make" + travis_fold start "make_check" + make check VERBOSE=1; + travis_fold end "make_check" +elif [[ $TASK = 'coverity' ]]; then + # Run Coverity Scan unless token is zero length + # The Coverity Scan script also relies on a number of other COVERITY_SCAN_ + # variables set in .travis.yml + if [[ ${#COVERITY_SCAN_TOKEN} -ne 0 ]]; then + curl -s $COVERITY_SCAN_BUILD_URL | bash + else + echo "Skipping Coverity Scan as no token found, probably a Pull Request" + fi; +elif [[ $TASK = 'jshint' ]]; then + cd ./javascript/new-src; + travis_fold start "npm_install" + npm install; + travis_fold end "npm_install" + grunt test +elif [[ $TASK = 'flake8' ]]; then + travis_fold start "autoreconf" + autoreconf -i; + travis_fold end "autoreconf" + travis_fold start "configure" + ./configure --enable-rdm-tests; + travis_fold end "configure" + # the following is a bit of a hack to build the files normally built during + # the build, so they are present for flake8 to run against + travis_fold start "make_builtfiles" + make builtfiles VERBOSE=1; + travis_fold end "make_builtfiles" + make flake8 +else + # Otherwise compile and check as normal + if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then + # Silence all deprecated declarations on Linux due to auto_ptr making the build log too long + export DISTCHECK_CONFIGURE_FLAGS='--enable-rdm-tests --enable-ja-rule --enable-e133 CPPFLAGS=-Wno-deprecated-declarations' + else + export DISTCHECK_CONFIGURE_FLAGS='--enable-rdm-tests --enable-ja-rule --enable-e133' + fi + travis_fold start "autoreconf" + autoreconf -i; + travis_fold end "autoreconf" + travis_fold start "configure" + ./configure $DISTCHECK_CONFIGURE_FLAGS; + travis_fold end "configure" + travis_fold start "make_distcheck" + make distcheck VERBOSE=1; + travis_fold end "make_distcheck" + travis_fold start "make_dist" + make dist; + travis_fold end "make_dist" + travis_fold start "verify_trees" + tarball=$(ls -Ut ola*.tar.gz | head -1) + tar -zxf $tarball; + tarball_root=$(echo $tarball | sed 's/.tar.gz$//') + ./scripts/verify_trees.py ./ $tarball_root + travis_fold end "verify_trees" +fi --- /dev/null +++ ola-0.10.9.nojsmin/.travis.yml @@ -0,0 +1,565 @@ +language: cpp +# Use the latest Travis images since they are more up to date than the stable release. +group: edge + +before_script: + - export -f travis_fold + +script: + - "bash -ex .travis-ci.sh" + +addons: + apt: + packages: &base_build + # This is the absolute minimum for configure to pass + # Non C++ based tasks use it so they can run make builtfiles + - ccache + - libcppunit-dev + - bison + - flex + - uuid-dev + - libprotobuf-dev + - protobuf-compiler + - libprotoc-dev + packages: &core_build + # This is all the bits we need to enable all options + - *base_build + - libftdi-dev + - libftdi1 + - libusb-1.0-0-dev + - liblo-dev + - libavahi-glib1 + - libncurses5-dev + - libmicrohttpd-dev + packages: &core_build_clang_recent + - *core_build + - clang-10 + packages: &core_build_gpp_latest + - *core_build + - g++-10 + packages: &core_build_clang_latest + - *core_build + - clang-11 + packages: &bionic_build_extras + # To fix the build/add missing components + - libtool + - pkg-config + packages: &bionic_build_extras_python2 + - *bionic_build_extras + - python-protobuf + - python-numpy + - python-pip + packages: &bionic_build_extras_python3 + - *bionic_build_extras + # The apt packaged files don't seem to work with Bionic and Python 3, so do it via pip + # To compile numpy + - python3-dev +# - python3-protobuf +# - python3-numpy +# - python3-pip + homebrew: + packages: &mac_core_build + - ccache + # This is all the bits we need to enable all options on Mac + - bison + - flex + # Installing via the addon isn't currently working so do it the old fashioned way below + # - https://raw.githubusercontent.com/Homebrew/homebrew-core/024ca9a4730a1f26ceede43485fbf62ef6f41179%5E/Formula/protobuf@3.1.rb + - liblo + - libmicrohttpd + - ossp-uuid + # Looks like this is Python 3 only, so install via pip + # - numpy + - libusb + packages: &mac_cppunit_113 + # Installing via the addon isn't currently working so do it the old fashioned way below + # - https://raw.githubusercontent.com/Homebrew/homebrew-core/e6e43cf6a3^/Formula/cppunit.rb # install a slightly older cppunit, as latest needs C++11 support + +jobs: + fast_finish: true + include: + - os: linux + dist: bionic + arch: arm64 + env: TASK='doxygen' + addons: + apt: + packages: + - *core_build_gpp_latest + - *bionic_build_extras_python2 + - doxygen + - graphviz + sources: + - ubuntu-toolchain-r-test + - os: linux + dist: bionic + arch: arm64 + env: TASK='lint' + addons: + apt: + packages: + - *core_build + - *bionic_build_extras_python2 + - os: linux + dist: bionic + arch: arm64 + env: + - TASK='check-licences' + - PYTHON='python3' + addons: + apt: + packages: + - *core_build + - *bionic_build_extras_python3 + - os: linux + dist: bionic + arch: arm64 + env: + - TASK='codespell' + - PYTHON='python3' + addons: + apt: + packages: + - *core_build + - *bionic_build_extras_python3 + - moreutils + - os: linux + dist: bionic + arch: arm64 + env: TASK='jshint' + addons: + apt: + packages: + - os: linux + dist: bionic + arch: arm64 + env: TASK='flake8' + python: '2.7' + addons: + apt: + packages: + - *base_build + - *bionic_build_extras_python2 + - os: linux + dist: bionic + arch: arm64 + env: + - TASK='flake8' + - PYTHON='python3' + addons: + apt: + packages: + - *base_build + - *bionic_build_extras_python3 +# Only run Travis builds against the zero credit partner queue solution +# - os: linux +# dist: bionic +# arch: amd64 +# compiler: clang +# env: +# - TASK='compile' +# - PYTHON='python3' +# addons: +# apt: +# packages: +# - *core_build_clang_latest +# - *bionic_build_extras_python3 +# sources: +# - sourceline: "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-11 main" +# key_url: "https://apt.llvm.org/llvm-snapshot.gpg.key" +# - sourceline: "ppa:ubuntu-toolchain-r/test" +# - os: linux +# dist: bionic +# arch: amd64 +# compiler: gcc +# env: TASK='compile' +# python: '2.7' +# addons: +# apt: +# packages: +# - *core_build_gpp_latest +# - *bionic_build_extras_python2 +# sources: +# - ubuntu-toolchain-r-test + - os: linux + dist: bionic + arch: arm64 + compiler: clang + env: + - TASK='compile' + - PYTHON='python3' + addons: + apt: + packages: + - *core_build_clang_recent + - *bionic_build_extras_python3 + - os: linux + dist: bionic + arch: arm64 + compiler: gcc + env: TASK='compile' + python: '2.7' + addons: + apt: + packages: + - *core_build_gpp_latest + - *bionic_build_extras_python2 + sources: + - ubuntu-toolchain-r-test + - os: linux + dist: bionic + arch: s390x + compiler: clang + env: TASK='compile' + python: '2.7' + addons: + apt: + packages: + - *core_build_clang_recent + - *bionic_build_extras_python2 + - os: linux + dist: bionic + arch: s390x + compiler: gcc + env: TASK='compile' + python: '2.7' + addons: + apt: + packages: + - *core_build_gpp_latest + - *bionic_build_extras_python2 + sources: + - ubuntu-toolchain-r-test +# - os: osx +# osx_image: xcode9.4 +# compiler: clang +# env: +# - TASK='compile' +# - CPPUNIT='1.13' +# - PROTOBUF='latest' +# - LIBFTDI='0' +# addons: +# homebrew: +# packages: +# - *mac_core_build +# - *mac_cppunit_113 +# - protobuf +# - libftdi0 +# update: false +# - os: osx +# osx_image: xcode9.4 +# compiler: gcc +# env: +# - TASK='compile' +# - CPPUNIT='1.13' +# - PROTOBUF='latest' +# - LIBFTDI='0' +# addons: +# homebrew: +# packages: +# - *mac_core_build +# - *mac_cppunit_113 +# - protobuf +# - libftdi0 +# update: false +# - os: osx +# osx_image: xcode9.4 +# compiler: clang +# env: +# - TASK='compile' +# - CPPUNIT='1.14' +# - PROTOBUF='latest' +# - LIBFTDI='0' +# addons: +# homebrew: +# packages: +# - *mac_core_build +# - cppunit +# - protobuf +# - libftdi0 +# update: false +# - os: osx +# osx_image: xcode9.4 +# compiler: gcc +# env: +# - TASK='compile' +# - CPPUNIT='1.14' +# - PROTOBUF='latest' +# - LIBFTDI='0' +# addons: +# homebrew: +# packages: +# - *mac_core_build +# - cppunit +# - protobuf +# - libftdi0 +# update: false +# - os: osx +# osx_image: xcode9.4 +# compiler: clang +# env: +# - TASK='compile' +# - CPPUNIT='1.14' +# - PROTOBUF='latest' +# - LIBFTDI='1' +# addons: +# homebrew: +# packages: +# - *mac_core_build +# - cppunit +# - protobuf +# - libftdi # install the latest cppunit, which needs C++11 +# update: false +# - os: osx +# osx_image: xcode9.4 +# compiler: gcc +# env: +# - TASK='compile' +# - CPPUNIT='1.14' +# - PROTOBUF='latest' +# - LIBFTDI='1' +# addons: +# homebrew: +# packages: +# - *mac_core_build +# - cppunit +# - protobuf +# - libftdi # install the latest cppunit, which needs C++11 +# update: false + - os: linux + dist: bionic + arch: arm64 + compiler: gcc + env: TASK='coverage' + addons: + apt: + packages: + - *core_build_gpp_latest + sources: + - sourceline: "ppa:ubuntu-toolchain-r/test" + - os: linux + dist: xenial + arch: arm64 + compiler: gcc + env: TASK='coverity' + addons: + apt: + packages: + # Coverity doesn't work with g++-5 or g++-6 yet + - *core_build + - g++-4.9 + sources: + - sourceline: "ppa:ubuntu-toolchain-r/test" + - os: linux + dist: bionic + arch: arm64 + env: TASK='spellintian' + addons: + apt: + packages: + - *core_build + - *bionic_build_extras_python2 + - lintian + - moreutils + - os: linux + dist: bionic + arch: arm64 + env: TASK='spellintian-duplicates' + addons: + apt: + packages: + - *core_build + - *bionic_build_extras_python2 + - lintian + - moreutils + allow_failures: +# - os: osx +# osx_image: xcode9.4 +# compiler: clang +# env: +# - TASK='compile' +# - CPPUNIT='1.13' +# - LIBFTDI='0' +# - os: osx +# osx_image: xcode9.4 +# compiler: clang +# env: +# - TASK='compile' +# - CPPUNIT='1.14' +# - LIBFTDI='0' +# - os: osx +# osx_image: xcode9.4 +# compiler: gcc +# env: +# - TASK='compile' +# - CPPUNIT='1.13' +# - LIBFTDI='0' +# - os: osx +# osx_image: xcode9.4 +# compiler: gcc +# env: +# - TASK='compile' +# - CPPUNIT='1.14' +# - LIBFTDI='0' +# - os: osx +# osx_image: xcode9.4 +# compiler: clang +# env: +# - TASK='compile' +# - CPPUNIT='1.14' +# - LIBFTDI='1' +# - os: osx +# osx_image: xcode9.4 +# compiler: gcc +# env: +# - TASK='compile' +# - CPPUNIT='1.14' +# - LIBFTDI='1' + - os: osx + osx_image: xcode9.4 + compiler: clang + env: + - TASK='compile' + - CPPUNIT='1.14' + - PROTOBUF='latest' + - LIBFTDI='1' + - os: osx + osx_image: xcode9.4 + compiler: gcc + env: + - TASK='compile' + - CPPUNIT='1.14' + - PROTOBUF='latest' + - LIBFTDI='1' + - os: linux + dist: bionic + arch: arm64 + compiler: gcc + env: TASK='coverage' + - os: linux + dist: xenial + arch: arm64 + compiler: gcc + env: TASK='coverity' + - os: linux + dist: bionic + arch: arm64 + env: TASK='spellintian' + - os: linux + dist: bionic + arch: arm64 + env: TASK='spellintian-duplicates' + +env: + global: + # No colours in terminal (to reduce log file size) + - TERM=dumb + # Parallel make build + - MAKEFLAGS="-j 2" + # -- BEGIN Coverity Scan ENV + - COVERITY_SCAN_BUILD_COMMAND_PREPEND="cov-configure --comptype gcc --compiler gcc-4.9 --template && autoreconf -i && ./configure --enable-ja-rule --enable-e133" + # The build command with all of the arguments that you would apply to a manual `cov-build` + # Usually this is the same as STANDARD_BUILD_COMMAND, excluding the automated test arguments + - COVERITY_SCAN_BUILD_COMMAND="make" + # Name of the project + - COVERITY_SCAN_PROJECT_NAME="$TRAVIS_REPO_SLUG" + # Email address for notifications related to this build + - COVERITY_SCAN_NOTIFICATION_EMAIL="ola-coverity@pjnewman.co.uk" + # Regular expression selects on which branches to run analysis + # Be aware of quotas. Do not run on every branch/commit + - COVERITY_SCAN_BRANCH_PATTERN=".*" + # COVERITY_SCAN_TOKEN via "travis encrypt" using the repo's public key + - secure: "U+NmPtScHZ1NLmkDrzpqApHmJvELV44cXgjQsxA8N8xIATckbs+DrmWSNeECENyvuOPz+nPzglSgBvJtejf97jYJIIwAExq5TJMUAIPFS6KU3mohODW2PZSoVoUyJPzFIlhzcELQgONI+ILLm29lNdQNb7GFUVtO6+jS10AFtWY=" + # -- END Coverity Scan ENV + +cache: + apt: true + ccache: true + npm: true + pip: true + directories: + - $HOME/Library/Caches/Homebrew # homebrew bottle cache + +before_cache: + - rm -f $HOME/.cache/pip/log/debug.log # erase log + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew cleanup; fi # avoid caching old package versions + - ccache -s # see how many hits ccache got + +before_install: + - if [ "$PYTHON" == "python3" -a "$TRAVIS_CPU_ARCH" != "arm64" ]; then pyenv global 3.8.1; fi +#On arm64 (at least) pip is now pip3, so symlink it to pip2 unless we're using python3. + - if [ "$PYTHON" != "python3" ]; then sudo rm /usr/local/bin/pip && sudo ln -s /usr/local/bin/pip2 /usr/local/bin/pip; fi +#Switch node to version 16 LTS, as newer LTS ones don't work with Ubuntu 18.04 and some older ones are too old + - if [ "$TASK" = "jshint" ]; then nvm install 16 && nvm use 16; fi +#Fix permissions for unbound (and possibly others) + - 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 +#Add a missing gnupg folder + - 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 +#We install packages via brew which pull in numpy, so try a reinstall over the pip numpy to avoid conflicts + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew reinstall numpy || brew link --overwrite numpy; fi +#Fix a broken homebrew libtool install + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew reinstall libtool; fi +#Fix a broken homebrew gnupg install + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew uninstall --ignore-dependencies gnupg; fi +#Fix a broken homebrew python upgrade - see https://github.com/Homebrew/homebrew-core/issues/26358 + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade python || true; fi +#Uninstall some homebrew packages which aren't required so we don't end up updating and rebuilding them. Force so it doesn't reinstall + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew uninstall --ignore-dependencies --force cgal liblwgeom libspatialite mercurial postgis postgres sfcgal; fi +#Having fixed everything up, update to the bleeding edge +#Skip updating for now as it seems to be breaking the build, also now done via the addon +# - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi + # This is no longer allowed, so build all Mac builds as protobuf latest + #- if [ "$TRAVIS_OS_NAME" == "osx" -a "$PROTOBUF" != "latest" ]; then brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/024ca9a4730a1f26ceede43485fbf62ef6f41179%5E/Formula/protobuf@3.1.rb; fi # install protobuf 3.1 as that's the latest we support everywhere + #- if [ "$TRAVIS_OS_NAME" == "osx" -a "$PROTOBUF" != "latest" ]; then brew link -f https://raw.githubusercontent.com/Homebrew/homebrew-core/024ca9a4730a1f26ceede43485fbf62ef6f41179%5E/Formula/protobuf@3.1.rb; export PKG_CONFIG_PATH=/usr/local/opt/protobuf@3.1/lib/pkgconfig; brew install --build-from-source --ignore-dependencies --env=std protobuf-c; fi # While protobuf is not on the latest release + - if [ "$TRAVIS_OS_NAME" == "osx" -a "$PROTOBUF" != "latest" ]; then brew install protobuf@3.6; fi + - if [ "$TRAVIS_OS_NAME" == "osx" -a "$PROTOBUF" != "latest" ]; then brew link -f protobuf@3.6; export PKG_CONFIG_PATH=/usr/local/opt/protobuf@3.6/lib/pkgconfig; brew install --build-from-source --ignore-dependencies --env=std protobuf-c; fi # When protobuf is not on the latest release + - 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 + - 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 + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then PATH=/usr/local/opt/ccache/libexec:$PATH; fi # Use ccache on Mac too +#Put back the old pip numpy we need to work + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then pip install --upgrade --no-deps --force-reinstall --user numpy; fi +#Coverity doesn't work with g++ 5 or 6, so only upgrade to g++ 4.9 for that + - 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 + - if [ "$TASK" = "coverity" -a "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi +#Use the latest clang if we're compiling with clang, except on arm64 and s390x where it's not available + - 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 +#Use a recent clang if we're compiling with clang on arm64 or s390x as the latest isn't available + - 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 +#Report the compiler version + - $CXX --version + +install: +# Match the version of protobuf being installed via apt/Homebrew + - if [ "$PROTOBUF" == "latest" -a \( "$TRAVIS_DIST" != "bionic" -o "$PYTHON" == "python3" \) ]; then pip install --user protobuf; fi + - if [ "$PROTOBUF" != "latest" -a \( "$TRAVIS_DIST" != "bionic" -o "$PYTHON" == "python3" \) ]; then pip install --user protobuf==3.1.0; fi + # disable until can be added to all build variants + #- pip install --user timeout-decorator +# We sometimes need to use pip rather than apt on Bionic + - 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 +# Install numpy via deb where it works, otherwise on OS X and non-bionic Python 2 Linux install via pip + - if [ "$TRAVIS_DIST" != "bionic" -o "$PYTHON" == "python3" ]; then pip install --user numpy; fi + - if [ "$TASK" = "coverage" ]; then pip install --user cpp-coveralls; fi + - if [ "$TASK" = "flake8" ]; then pip install --user flake8; fi + - if [ "$TASK" = "codespell" ]; then pip3 install --user codespell==2.2.1; fi + - if [ "$TASK" = "jshint" ]; then npm --verbose install -g grunt-cli; fi + - if [ "$TASK" = "jshint" ]; then grunt --version --verbose; fi +# Installing via the addon isn't currently working so do it the old fashioned way + - 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 + +after_failure: + - if [ -f ${TRAVIS_BUILD_DIR}/config.log ]; then cat ${TRAVIS_BUILD_DIR}/config.log; fi + - if [ -f ${TRAVIS_BUILD_DIR}/ola-*/_build/config.log ]; then cat ${TRAVIS_BUILD_DIR}/ola-*/_build/config.log; fi + - if [ -f ${TRAVIS_BUILD_DIR}/ola-*/_build/sub/config.log ]; then cat ${TRAVIS_BUILD_DIR}/ola-*/_build/sub/config.log; fi + +after_success: + - 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 + +after_script: + - 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 + +notifications: + irc: + channels: + - "chat.freenode.net#openlighting" + on_success: change + on_failure: change --- ola-0.10.9.nojsmin.orig/Makefile.am +++ ola-0.10.9.nojsmin/Makefile.am @@ -159,7 +159,6 @@ PYTHON_BUILD_DIRS = # which libraries depend on each other. e.g. common, plugin_api, plugins, server. include common/Makefile.mk include data/Makefile.mk -include debian/Makefile.mk include doxygen/Makefile.mk include examples/Makefile.mk include include/Makefile.mk --- /dev/null +++ ola-0.10.9.nojsmin/common/LICENCE @@ -0,0 +1,13 @@ +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --- ola-0.10.9.nojsmin.orig/configure.ac +++ ola-0.10.9.nojsmin/configure.ac @@ -822,7 +822,7 @@ AS_IF([test -d $UUCPLOCK], AM_CONDITIONAL([BUILD_PYTHON_LIBS], [test "x$enable_python_libs" = xyes]) AS_IF([test "${enable_python_libs}" = "yes"], - [AM_PATH_PYTHON(2.6) + [AM_PATH_PYTHON(3.8) AS_IF([test -z $PYTHON], [PYTHON="python"]) PYTHON_NAME=`basename $PYTHON` AC_CACHE_CHECK([for $PYTHON_NAME module: google.protobuf], --- ola-0.10.9.nojsmin.orig/doxygen/Makefile.mk +++ ola-0.10.9.nojsmin/doxygen/Makefile.mk @@ -1,7 +1,6 @@ include doxygen/examples/Makefile.mk EXTRA_DIST += \ - doxygen/copy-doc.sh \ doxygen/cpp-client.dox \ doxygen/dmx-cpp-client.dox \ doxygen/event-driven.dox \ --- /dev/null +++ ola-0.10.9.nojsmin/examples/LICENCE @@ -0,0 +1,13 @@ +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Library General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --- /dev/null +++ ola-0.10.9.nojsmin/include/ola/LICENCE @@ -0,0 +1,13 @@ +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --- /dev/null +++ ola-0.10.9.nojsmin/include/ola/acn/LICENCE @@ -0,0 +1,13 @@ +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Library General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --- /dev/null +++ ola-0.10.9.nojsmin/include/ola/e133/LICENCE @@ -0,0 +1,13 @@ +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Library General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --- /dev/null +++ ola-0.10.9.nojsmin/include/olad/LICENCE @@ -0,0 +1,13 @@ +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Library General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --- ola-0.10.9.nojsmin.orig/java/Makefile.am +++ ola-0.10.9.nojsmin/java/Makefile.am @@ -12,8 +12,8 @@ src/main/java/ola/proto/Ola.java: ${top_ src/main/java/ola/rpc/Rpc.java: ${top_srcdir}/common/rpc/Rpc.proto $(PROTOC) --java_out=src/main/java --proto_path=${top_srcdir}/common/rpc ${top_srcdir}/common/rpc/Rpc.proto -ola.jar: src/main/java/ola/proto/Ola.java src/main/java/ola/rpc/Rpc.java - mvn package +ola.jar: generated-src/main/java/ola/proto/Ola.java generated-src/main/java/ola/rpc/Rpc.java + 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 CLEANFILES = src/main/java/ola/proto/Ola.java \ src/main/java/ola/rpc/Rpc.java --- ola-0.10.9.nojsmin.orig/java/pom.xml +++ ola-0.10.9.nojsmin/java/pom.xml @@ -31,7 +31,7 @@ com.google.protobuf protobuf-java - 2.6.1 + ${protobufJavaVersion} junit --- /dev/null +++ ola-0.10.9.nojsmin/javascript/new-src/LICENCE @@ -0,0 +1,13 @@ +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Library General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. \ No newline at end of file --- /dev/null +++ ola-0.10.9.nojsmin/javascript/ola/LICENCE @@ -0,0 +1,13 @@ +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Library General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --- /dev/null +++ ola-0.10.9.nojsmin/libs/LICENCE @@ -0,0 +1,13 @@ +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Library General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --- /dev/null +++ ola-0.10.9.nojsmin/man/generate-html.sh @@ -0,0 +1,45 @@ +#!/bin/sh + +if [ $# != 1 ]; then + echo "Usage: $0 " + exit 1; +fi + +output_dir=$1 +if [ ! -d $output_dir ]; then + echo $output_dir is not a directory + exit 1; +fi + +index_file=$output_dir/index.html; + +echo "Output dir: $output_dir"; +echo "Index file: $index_file"; + +cat << 'EOF' > $index_file + + +Man pages for the Open Lighting Architecture + + +

Man pages for the Open Lighting Architecture

+
    +EOF + +if [ ! -d $output_dir/man1/ ]; then + echo $output_dir/man1/ doesn\'t exist, please create it + exit 1; +fi +for man_file in *.1; do + echo "Generating $man_file"; + output_file=$output_dir/man1/$man_file.html; + man2html -r $man_file -M ../index.html | sed 1,2d > $output_file; + chmod a+r $output_file; + echo "
  • $man_file - `grep "\.SH NAME" $man_file -A 1 | tail -n 1 | sed -e 's/\\\-/-/g'`
  • " >> $index_file +done + +cat << 'EOF' >> $index_file +
+ + +EOF --- /dev/null +++ ola-0.10.9.nojsmin/ola/LICENCE @@ -0,0 +1,13 @@ +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --- /dev/null +++ ola-0.10.9.nojsmin/olad/LICENCE @@ -0,0 +1,13 @@ +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Library General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --- ola-0.10.9.nojsmin.orig/olad/www/Makefile.mk +++ ola-0.10.9.nojsmin/olad/www/Makefile.mk @@ -69,19 +69,3 @@ dist_img_DATA = \ olad/www/new/img/light_bulb.png \ olad/www/new/img/logo-mini.png \ olad/www/new/img/logo.png -dist_jquery_DATA = \ - olad/www/new/libs/jquery/js/jquery.min.js -dist_angularroute_DATA = \ - olad/www/new/libs/angular-route/js/angular-route.min.js -dist_angular_DATA = \ - olad/www/new/libs/angular/js/angular.min.js -dist_bootjs_DATA = \ - olad/www/new/libs/bootstrap/js/bootstrap.min.js -dist_bootfonts_DATA = \ - olad/www/new/libs/bootstrap/fonts/glyphicons-halflings-regular.eot \ - olad/www/new/libs/bootstrap/fonts/glyphicons-halflings-regular.svg \ - olad/www/new/libs/bootstrap/fonts/glyphicons-halflings-regular.ttf \ - olad/www/new/libs/bootstrap/fonts/glyphicons-halflings-regular.woff \ - olad/www/new/libs/bootstrap/fonts/glyphicons-halflings-regular.woff2 -dist_bootcss_DATA = \ - olad/www/new/libs/bootstrap/css/bootstrap.min.css --- /dev/null +++ ola-0.10.9.nojsmin/plugins/LICENCE @@ -0,0 +1,13 @@ +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Library General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --- /dev/null +++ ola-0.10.9.nojsmin/plugins/kinet/kinet.cpp @@ -0,0 +1,308 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Library General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * kinet.cpp + * Scratch pad for Kinet work + * Copyright (C) 2010 Simon Newton + */ + +#include +#include +#include +#include +#include + +#include +#include + +using std::cout; +using std::endl; +using std::string; +using ola::network::SelectServer; +using ola::network::UDPSocket; +using ola::network::LittleEndianToHost; + + +/* + * The KiNet protocol appears to be little-endian. We write the constants as + * they appear to a human and convert back and forth. + */ + +// All packets seem to start with this number +const uint32_t KINET_MAGIC = 0x4adc0104; +// We haven't seen a non V1 protocol in the wild yet. +const uint16_t KINET_VERSION = 0x0001; +// No idea what this is, but we should send a poll reply when we see it +const uint32_t KINET_DISCOVERY_COMMAND = 0x8988870a; + +// KiNet packet types +typedef enum { + KINET_POLL = 0x0001, + KINET_POLL_REPLY = 0x0002, + KINET_SET_IP = 0x0003, + KINET_SET_UNIVERSE = 0x0005, + KINET_SET_NAME = 0x0006, + // KINET_?? = 0x000a; + KINET_DMX = 0x0101, + // KINET_PORTOUT = 0x0108; // portout + // KINET_PORTOUT_SYNC = 0x0109; // portout_sync + // KINET_?? = 0x0201; // seems to be a discovery packet + // KINET_?? = 0x0203; // get dmx address? +} kinet_packet_type; + + +/** + * The KiNet header + */ +PACK( +struct kinet_header { + uint32_t magic; + uint16_t version; + uint16_t type; // see kinet_packet_type above + uint32_t padding; // always set to 0, seq #, + // most of the time it's 0, + // not implemented in most supplies +}); + + +// A KiNet poll message +PACK( +struct kinet_poll { + uint32_t command; // ??, Seems to always be KINET_DISCOVERY_COMMAND +}); + + +// A KiNet poll reply message +PACK( +struct kinet_poll_reply { + uint32_t src_ip; + uint8_t hw_address[6]; // mac address + uint8_t data[2]; // This contains non-0 data + uint32_t serial; // The node serial # + uint32_t zero; + uint8_t node_name[60]; + uint8_t node_label[31]; + uint16_t zero2; +}); + + +// A KiNet Set IP Command. +// TODO(simon): Check what ip,mac dst this packet is sent to. +PACK( +struct kinet_set_ip { + uint32_t something; // ef be ad de + uint8_t hw_address[6]; // The MAC address to match + uint16_t something2; // 05 67 + uint32_t new_ip; +}); + + +// A KiNet Set Universe Command +PACK( +struct kinet_set_universe { + uint32_t something; // ef be ad de + uint8_t universe; + uint8_t zero[3]; +}); + + +// A KiNet Set Name Command +PACK( +struct kinet_set_name { + uint32_t something; // ef be ad de + uint8_t new_name[31]; // Null terminated. +}); + + +// A KiNet Get Address command +PACK( +struct kinet_get_address { + uint32_t serial; + uint32_t something; // 41 00 12 00 +}); + + +// A KiNet DMX packet +PACK( +struct kinet_dmx { + uint8_t port; // should be set to 0 for v1 + uint8_t flags; // set to 0 + uint16_t timerVal; // set to 0 + uint32_t universe; + uint8_t paylod[513]; // payload inc start code +}); + + +struct kinet_port_out_flags { + uint16_t flags; + // little endian + // first bit is undefined 0:1; + // second bit is for 16 bit data, set to 0 :1; + // third is shall hold for sync packet :: 1; +}; + + +struct kinet_port_out_sync { + uint32_t padding; +} + +// A KiNet DMX port out packet +PACK( +struct kinet_port_out { + uint32_t universe; + uint8_t port; // 1- 16 + uint8_t pad; // set to 0 + portoutflags flags; + uint16_t length; // little endian + uint16_t startCode; // 0x0fff for chomASIC products, 0x0000 otherwise + uint8_t payload[512]; +}); + + +// The full kinet packet +struct kinet_packet { + struct kinet_header header; + union { + struct kinet_poll poll; + struct kinet_poll_reply poll_reply; + } data; +}; + + +uint8_t peer0_0[] = { + 0x04, 0x01, 0xdc, 0x4a, // magic number + 0x01, 0x00, // version # + 0x02, 0x00, // packet type (poll reply) + 0x00, 0x00, 0x00, 0x00, // sequence + 0x0a, 0x00, 0x00, 0x01, // 192.168.1.207 + 0x00, 0x0a, 0xc5, 0xff, 0xae, 0x01, // mac address + 0x01, 0x00, + 0xff, 0xff, 0x00, 0x2d, // serial # + 0x00, 0x00, 0x00, 0x00, // padding + // What follows is ascii text, with fields separated by new lines. Each field + // is in the form /[MD#R]:.*/ + // It's unclear is this is a variable length field or not. + 0x4d, 0x3a, // M: + 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x4b, 0x69, 0x6e, 0x65, 0x74, 0x69, 0x63, + 0x73, 0x20, 0x49, 0x6e, 0x63, 0x6f, 0x72, 0x70, 0x6f, 0x72, 0x61, 0x74, 0x65, + 0x64, // Color Kinetics cs Incorporated + 0x0a, // \n + 0x44, 0x3a, // D: + 0x50, 0x44, 0x53, 0x2d, 0x65, // PDS-e + 0x0a, // \n + 0x23, 0x3a, // #: + 0x53, 0x46, 0x54, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x36, 0x36, 0x2d, 0x30, 0x30, + 0x0a, // SFT-000066-00 + 0x52, 0x3a, // R: + 0x30, 0x30, // 00 + 0x0a, // \n + 0x00, + // offset 92 + 0x64, 0x73, 0x2d, 0x64, 0x61, 0x6e, 0x63, 0x65, 0x2d, 0x72, 0x65, 0x61, 0x72, + 0x00, // device name? + 0x00, 0x95, 0x8c, 0xc7, 0xb6, 0x00, + 0x00, + 0xff, 0x00, 0x00, + 0xff, 0x00, 0x00, + 0xff, 0x00, 0x00, + 0xff, 0x00, 0x00 }; + + +SelectServer ss; +UDPSocket udp_socket; + +/** + * Check if a packet is valid KiNet + */ +bool IsKiNet(const kinet_packet *packet, unsigned int size) { + return (size > sizeof(struct kinet_header) && + KINET_MAGIC == LittleEndianToHost(packet->header.magic) && + KINET_VERSION == LittleEndianToHost(packet->header.version)); +} + + +/** + * Handle a KiNet poll packet + */ +void HandlePoll(const struct sockaddr_in &source, + const kinet_packet &packet, + unsigned int size) { + ssize_t r = udp_socket.SendTo(peer0_0, sizeof(peer0_0), source); + OLA_INFO << "sent " << r << " bytes"; +} + + +/** + * Handle a KiNet DMX packet + */ +void HandleDmx(const struct sockaddr_in &source, + const kinet_packet &packet, + unsigned int size) { +} + + +void SocketReady() { + kinet_packet packet; + ssize_t data_read = sizeof(packet); + struct sockaddr_in source; + socklen_t src_size = sizeof(source); + + udp_socket.RecvFrom(reinterpret_cast(&packet), + &data_read, + source, + src_size); + if (IsKiNet(&packet, data_read)) { + uint16_t command = LittleEndianToHost(packet.header.type); + switch (command) { + case KINET_POLL: + HandlePoll(source, packet, data_read); + break; + case KINET_DMX: + HandleDmx(source, packet, data_read); + break; + default: + OLA_WARN << "Unknown packet 0x" << std::hex << command; + } + } else { + OLA_WARN << "Not a KiNet packet"; + } +} + + +/* + * Main + */ +int main(int argc, char *argv[]) { + ola::InitLogging(ola::OLA_LOG_INFO, ola::OLA_LOG_STDERR); + + udp_socket.SetOnData(ola::NewCallback(&SocketReady)); + if (!udp_socket.Init()) { + OLA_WARN << "Failed to init"; + return 1; + } + if (!udp_socket.Bind(6038)) { + OLA_WARN << "Failed to bind"; + return 1; + } + if (!udp_socket.EnableBroadcast()) { + OLA_WARN << "Failed to enabl bcast"; + return 1; + } + + ss.AddSocket(&udp_socket); + + ss.Run(); + return 0; +} --- ola-0.10.9.nojsmin.orig/plugins/osc/OSCNode.cpp +++ ola-0.10.9.nojsmin/plugins/osc/OSCNode.cpp @@ -141,7 +141,7 @@ bool ExtractSlotValueFromPair(const stri * @param user_data a pointer to the OSCNode object. */ int OSCDataHandler(const char *osc_address, const char *types, lo_arg **argv, - int argc, void *, void *user_data) { + int argc, lo_message, void *user_data) { OLA_DEBUG << "Got OSC message for " << osc_address << ", types are " << types; OSCNode *node = reinterpret_cast(user_data); @@ -150,7 +150,7 @@ int OSCDataHandler(const char *osc_addre if (argc == 1) { if (type == "b") { - lo_blob blob = argv[0]; + lo_blob blob = (lo_blob)argv[0]; unsigned int size = min(static_cast(DMX_UNIVERSE_SIZE), lo_blob_datasize(blob)); node->SetUniverse( --- /dev/null +++ ola-0.10.9.nojsmin/python/examples/LICENCE @@ -0,0 +1,13 @@ +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Library General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --- ola-0.10.9.nojsmin.orig/python/examples/ola_artnet_params.py +++ ola-0.10.9.nojsmin/python/examples/ola_artnet_params.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or --- ola-0.10.9.nojsmin.orig/python/examples/ola_candidate_ports.py +++ ola-0.10.9.nojsmin/python/examples/ola_candidate_ports.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or --- ola-0.10.9.nojsmin.orig/python/examples/ola_devices.py +++ ola-0.10.9.nojsmin/python/examples/ola_devices.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or --- ola-0.10.9.nojsmin.orig/python/examples/ola_patch_unpatch.py +++ ola-0.10.9.nojsmin/python/examples/ola_patch_unpatch.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or --- ola-0.10.9.nojsmin.orig/python/examples/ola_plugin_info.py +++ ola-0.10.9.nojsmin/python/examples/ola_plugin_info.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or --- ola-0.10.9.nojsmin.orig/python/examples/ola_rdm_discover.py +++ ola-0.10.9.nojsmin/python/examples/ola_rdm_discover.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or --- ola-0.10.9.nojsmin.orig/python/examples/ola_rdm_get.py +++ ola-0.10.9.nojsmin/python/examples/ola_rdm_get.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or --- ola-0.10.9.nojsmin.orig/python/examples/ola_recv_dmx.py +++ ola-0.10.9.nojsmin/python/examples/ola_recv_dmx.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or --- ola-0.10.9.nojsmin.orig/python/examples/ola_send_dmx.py +++ ola-0.10.9.nojsmin/python/examples/ola_send_dmx.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or --- ola-0.10.9.nojsmin.orig/python/examples/ola_simple_fade.py +++ ola-0.10.9.nojsmin/python/examples/ola_simple_fade.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or --- ola-0.10.9.nojsmin.orig/python/examples/ola_universe_info.py +++ ola-0.10.9.nojsmin/python/examples/ola_universe_info.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or --- ola-0.10.9.nojsmin.orig/python/examples/rdm_compare.py +++ ola-0.10.9.nojsmin/python/examples/rdm_compare.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or --- ola-0.10.9.nojsmin.orig/python/examples/rdm_snapshot.py +++ ola-0.10.9.nojsmin/python/examples/rdm_snapshot.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or --- ola-0.10.9.nojsmin.orig/python/ola/ClientWrapperTest.py +++ ola-0.10.9.nojsmin/python/ola/ClientWrapperTest.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either --- ola-0.10.9.nojsmin.orig/python/ola/DUBDecoderTest.py +++ ola-0.10.9.nojsmin/python/ola/DUBDecoderTest.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either --- /dev/null +++ ola-0.10.9.nojsmin/python/ola/LICENCE @@ -0,0 +1,13 @@ +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --- ola-0.10.9.nojsmin.orig/python/ola/MACAddressTest.py +++ ola-0.10.9.nojsmin/python/ola/MACAddressTest.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either --- ola-0.10.9.nojsmin.orig/python/ola/OlaClientTest.py +++ ola-0.10.9.nojsmin/python/ola/OlaClientTest.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either --- ola-0.10.9.nojsmin.orig/python/ola/PidStoreTest.py +++ ola-0.10.9.nojsmin/python/ola/PidStoreTest.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either --- ola-0.10.9.nojsmin.orig/python/ola/RDMTest.py +++ ola-0.10.9.nojsmin/python/ola/RDMTest.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either @@ -27,6 +27,7 @@ from ola.OlaClient import RDMNack from ola.RDMAPI import RDMAPI from ola.TestUtils import handleRPCByteOrder from ola.UID import UID +from ola.TestUtils import handleRPCByteOrder from ola import PidStore --- ola-0.10.9.nojsmin.orig/python/ola/TestUtils.py +++ ola-0.10.9.nojsmin/python/ola/TestUtils.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either --- ola-0.10.9.nojsmin.orig/python/ola/UIDTest.py +++ ola-0.10.9.nojsmin/python/ola/UIDTest.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either --- ola-0.10.9.nojsmin.orig/python/ola/rpc/SimpleRpcControllerTest.py +++ ola-0.10.9.nojsmin/python/ola/rpc/SimpleRpcControllerTest.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either --- /dev/null +++ ola-0.10.9.nojsmin/scripts/count_generic_nolints.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +# count_generic_nolints.sh +# Copyright (C) 2023 Perry Naseck, Peter Newman + +# This script is based on a Travis CI test by Peter Newman +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')" +nolints_count="$(grep --exclude "$(basename $0)" -IR NOLINT * | grep -c -v "NOLINT(")" +if [[ $nolints_count -ne 0 ]]; then + # print the output for info + printf "%s\n" "$nolints" + printf "error: Found $nolints_count generic NOLINTs\n" + exit 1 +else + printf "notice: Found $nolints_count generic NOLINTs\n" +fi --- /dev/null +++ ola-0.10.9.nojsmin/scripts/enforce_licence.py @@ -0,0 +1,341 @@ +#!/usr/bin/env python +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +# enforce_licence.py +# Copyright (C) 2013 Simon Newton + +from __future__ import print_function + +import difflib +import getopt +import glob +import os +import pprint +import re +import sys +import textwrap + +CPP, JS, PROTOBUF, PYTHON = range(4) + +IGNORED_DIRECTORIES = [ + 'javascript/new-src/node_modules/', +] + +IGNORED_FILES = [ + 'common/rdm/testdata/duplicate_manufacturer.proto', + 'common/rdm/testdata/duplicate_pid_name.proto', + 'common/rdm/testdata/duplicate_pid_value.proto', + 'common/rdm/testdata/inconsistent_pid.proto', + 'common/rdm/testdata/invalid_esta_pid.proto', + 'common/rdm/testdata/test_pids.proto', + 'common/rdm/testdata/pids/overrides.proto', + 'common/rdm/testdata/pids/pids1.proto', + 'common/rdm/testdata/pids/pids2.proto', + 'examples/ola-dmxconsole.cpp', + 'examples/ola-dmxmonitor.cpp', + 'include/ola/gen_callbacks.py', + 'olad/www/mobile.js', + 'olad/www/ola.js', + 'javascript/new-src/Gruntfile.js', + 'olad/www/new/js/app.min.js', + 'olad/www/new/js/app.min.js.map', + 'python/ola/PidStoreLocation.py', + 'python/ola/Version.py', + 'tools/ola_trigger/config.tab.cpp', + 'tools/ola_trigger/config.tab.h', + 'tools/ola_trigger/lex.yy.cpp', + 'tools/rdm/DataLocation.py', + 'tools/rdm/static/ui.multiselect.js', +] + + +def Usage(arg0): + print(textwrap.dedent("""\ + Usage: %s + + Walk the directory tree from the current directory, and make sure all .cpp, + .h, .js, .proto and .py files have the appropriate Licence. The licence is + determined from the LICENCE file in each branch of the directory tree. + + --diff Print the diffs. + --fix Fix the files. + --help Display this message.""" % arg0)) + + +def ParseArgs(): + """Extract the options.""" + try: + opts, args = getopt.getopt(sys.argv[1:], '', + ['diff', 'fix', 'help']) + except getopt.GetoptError as e: + print(str(e)) + Usage(sys.argv[0]) + sys.exit(2) + + help = False + fix = False + diff = False + for o, a in opts: + if o in ('--diff'): + diff = True + elif o in ('--fix'): + fix = True + elif o in ('-h', '--help'): + Usage(sys.argv[0]) + sys.exit() + + if help: + Usage(sys.argv[0]) + sys.exit(0) + return diff, fix + + +def IgnoreFile(file_name): + for ignored_dir in IGNORED_DIRECTORIES: + if file_name.rfind(ignored_dir) != -1: + return True + for ignored_file in IGNORED_FILES: + if file_name.endswith(ignored_file): + return True + return False + + +def TransformCppLine(line): + """Transform a line to within a C++ multiline style comment""" + line = line.strip() + if line: + return ' * %s' % line + else: + return ' *' + + +def TransformLicence(licence): + """Wrap a licence in C++ style comments""" + output = [] + output.append('/*') + output.extend(map(TransformCppLine, licence)) + output.append(TransformCppLine('')) + return '\n'.join(output) + + +def TransformJsLine(line): + """Transform a line to within a JS multiline style comment""" + return TransformCppLine(line) + + +def TransformCppToJsLicence(licence): + """Change a C++ licence to JS style""" + lines = licence.split('\n') + output = [] + output.append('/**') + for line in lines[1:]: + output.append(TransformJsLine(line[2:])) + return '\n'.join(output) + + +def TransformPythonLine(line): + """Transform a line to within a Python multiline style comment""" + line = line.strip() + if line: + return '# %s' % line + else: + return '#' + + +def TransformCppToPythonLicence(licence): + """Change a C++ licence to Python style""" + lines = licence.split('\n') + output = [] + for line in lines[1:]: + output.append(TransformPythonLine(line[3:])) + return '\n'.join(output) + + +def TransformLine(line, lang): + if lang == CPP or lang == PROTOBUF: + return TransformCppLine(line) + elif lang == JS: + return TransformJsLine(line) + elif lang == PYTHON: + return TransformPythonLine(line) + else: + return line + + +def ReplaceHeader(file_name, new_header, lang): + f = open(file_name) + breaks = 0 + line = f.readline() + while line != '': + if (lang == CPP or lang == JS or lang == PROTOBUF) and \ + re.match(r'^ \*\s*\n$', line): + breaks += 1 + if lang == PYTHON and re.match(r'^#\s*\n$', line): + breaks += 1 + if breaks == 3: + break + line = f.readline() + + if breaks < 3: + print("Couldn't find header for %s so couldn't fix it" % file_name) + f.close() + return + + remainder = f.read() + f.close() + + f = open(file_name, 'w') + f.write(new_header) + f.write('\n') + f.write(remainder) + f.close() + + +def GetDirectoryLicences(root_dir): + """Walk the directory tree and determine the licence for each directory.""" + LICENCE_FILE = 'LICENCE' + licences = {} + + for dir_name, subdirs, files in os.walk(root_dir): + # skip the root_dir since the licence file is different there + if dir_name == root_dir: + continue + + # skip ignored dirs since we don't check them anyways + skip = False + for ignored_dir in IGNORED_DIRECTORIES: + if dir_name.rfind(ignored_dir) != -1: + skip = True + + if skip: + continue + + # don't descend into hidden dirs like .libs and .deps + subdirs[:] = [d for d in subdirs if not d.startswith('.')] + + if LICENCE_FILE in files: + licence_path = os.path.join(dir_name, LICENCE_FILE) + f = open(licence_path) + lines = f.readlines() + f.close() + licences[dir_name] = TransformLicence(lines) + rel_licence_path = os.path.relpath(licence_path) + rel_dir_path = os.path.relpath(dir_name) + print('debug:file:%s: Found LICENCE for directory %s' % + (rel_licence_path, rel_dir_path)) + + # use this licence for all subdirs + licence = licences.get(dir_name) + if licence is not None: + for sub_dir in subdirs: + licences[os.path.join(dir_name, sub_dir)] = licence + return licences + + +def CheckLicenceForDir(dir_name, licence, diff, fix): + """Check all files in a directory contain the correct licence.""" + errors = 0 + # glob doesn't support { } so we iterate instead + for match in ['*.h', '*.cpp']: + for file_name in glob.glob(os.path.join(dir_name, match)): + # skip the generated protobuf code + if '.pb.' in file_name: + continue + errors += CheckLicenceForFile(file_name, licence, CPP, diff, fix) + + js_licence = TransformCppToJsLicence(licence) + for file_name in glob.glob(os.path.join(dir_name, '*.js')): + errors += CheckLicenceForFile(file_name, js_licence, JS, diff, fix) + + for file_name in glob.glob(os.path.join(dir_name, '*.proto')): + errors += CheckLicenceForFile(file_name, licence, PROTOBUF, diff, fix) + + python_licence = TransformCppToPythonLicence(licence) + for file_name in glob.glob(os.path.join(dir_name, '*.py')): + # skip the generated protobuf code + if file_name.endswith('__init__.py') or file_name.endswith('pb2.py'): + continue + errors += CheckLicenceForFile(file_name, python_licence, PYTHON, diff, fix) + + return errors + + +def CheckLicenceForFile(file_name, licence, lang, diff, fix): + """Check a file contains the correct licence.""" + if IgnoreFile(file_name): + return 0 + + f = open(file_name) + rel_path = os.path.relpath(file_name) + # + 1 to include the newline to have a complete line + header_size = len(licence) + 1 + file_name_line_count = licence.count('\n') + 2 + first_line = None + if lang == PYTHON: + first_line = f.readline() + if not first_line.startswith('#!') and not first_line.startswith('# !'): + # First line isn't a shebang, ignore it. + f.seek(0, os.SEEK_SET) + first_line = None + else: + file_name_line_count += 1 + # strip the trailing newline off as we don't actually want it + header = f.read(header_size).rstrip('\n') + file_name_line = f.readline() + f.close() + if header == licence: + expected_line = TransformLine(os.path.basename(file_name), lang) + if lang != JS and file_name_line.rstrip('\n') != expected_line: + print("error:file:%s:line %s: File does not have a filename line after " + "the licence; found \"%s\" expected \"%s\"" % + (rel_path, file_name_line_count, file_name_line.rstrip('\n'), + expected_line)) + return 1 + return 0 + + if fix: + print('notice:file:%s: Fixing file' % rel_path) + if lang == PYTHON and first_line is not None: + licence = first_line + licence + ReplaceHeader(file_name, licence, lang) + return 1 + else: + print("error:file:%s:lines 1-%s: File does not start with, or not exact " + "match of, \"%s...\"" % + (rel_path, file_name_line_count, + licence.split('\n')[(0 if (lang == PYTHON) else 1)])) + if diff: + d = difflib.Differ() + result = list(d.compare(header.splitlines(1), licence.splitlines(1))) + pprint.pprint(result) + return 1 + + +def main(): + diff, fix = ParseArgs() + licences = GetDirectoryLicences(os.getcwd()) + errors = 0 + for dir_name, licence in licences.items(): + errors += CheckLicenceForDir(dir_name, licence, diff=diff, fix=fix) + if (errors > 0): + print('error: Found %d files with incorrect licences' % errors) + sys.exit(1) + else: + print('notice: Found %d files with incorrect licences' % errors) + sys.exit() + + +if __name__ == '__main__': + main() --- /dev/null +++ ola-0.10.9.nojsmin/scripts/spelling.sh @@ -0,0 +1,104 @@ +#!/usr/bin/env bash +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +# spellintian.sh +# Copyright (C) 2023 Perry Naseck, Peter Newman + +# This script is based on Travis CI tests by Peter Newman +current_test="" +if [ "$1" = "spellintian" ]; then + current_test="spellintian" +elif [ "$1" = "codespell" ]; then + current_test="codespell" +else + echo "Unknown test \"$1\" specified in first argument. Options are spellintian and codespell." + exit 1; +fi; + +if ! [ -x "$(command -v zrun)" ]; then + echo "error: Cannot find zrun. Do you need the moreutils package?" + exit 1; +fi; +if [ $current_test = "spellintian" ] && ! [ -x "$(command -v spellintian)" ]; then + echo "error: Cannot find spellintian. Do you need the lintian package?" + exit 1; +fi; +if [ $current_test = "codespell" ] && ! [ -x "$(command -v codespell)" ]; then + echo "error: Cannot find codespell. Install via pip." + exit 1; +fi; + +SPELLINGBLACKLIST=$(cat <<-BLACKLIST + -wholename "./.codespellignorelines" -or \ + -wholename "./.codespellignorewords" -or \ + -wholename "./.git/*" -or \ + -wholename "./Makefile" -or \ + -wholename "./Makefile.in" -or \ + -wholename "./aclocal.m4" -or \ + -wholename "./autom4te.cache/*" -or \ + -wholename "./common/protocol/Ola.pb.*" -or \ + -wholename "./common/rpc/TestService.pb.*" -or \ + -wholename "./config.log" -or \ + -wholename "./config.status" -or \ + -wholename "./config/config.guess" -or \ + -wholename "./config/config.sub" -or \ + -wholename "./config/depcomp" -or \ + -wholename "./config/install-sh" -or \ + -wholename "./config/libtool.m4" -or \ + -wholename "./config/ltmain.sh" -or \ + -wholename "./config/ltoptions.m4" -or \ + -wholename "./config/ltsugar.m4" -or \ + -wholename "./config/missing" -or \ + -wholename "./configure" -or \ + -wholename "./java/Makefile" -or \ + -wholename "./java/Makefile.in" -or \ + -wholename "./libtool" -or \ + -wholename "./olad/www/mobile.js" -or \ + -wholename "./olad/www/new/js/app.min.js" -or \ + -wholename "./olad/www/new/js/app.min.js.map" -or \ + -wholename "./olad/www/new/libs/angular/js/angular.min.js" -or \ + -wholename "./olad/www/new/libs/marked/js/marked.min.js" -or \ + -wholename "./olad/www/ola.js" -or \ + -wholename "./plugins/artnet/messages/ArtNetConfigMessages.pb.*" -or \ + -wholename "./tools/ola_trigger/config.tab.*" -or \ + -wholename "./tools/ola_trigger/lex.yy.cpp" +BLACKLIST +) + +spellingfiles=$(eval "find ./ -type f -and ! \( \ + $SPELLINGBLACKLIST \ + \) | xargs") + +if [ $current_test = "spellintian" ]; then + # count the number of spellintian errors, including duplicate words + # spellintian does not change the exit code, so the output must be checked + spellintian_issues="$(zrun spellintian $spellingfiles 2>&1)" + + if [[ -n $spellintian_issues ]]; then + printf "%s\n" "$spellintian_issues" + # For now we always exit with success, as these errors are manually checked + # TODO: Actively match and skip printing known false positives, exit with + # errors properly. + # exit 1; + exit 0; + fi; +elif [ $current_test = "codespell" ]; then + if ! zrun codespell --interactive 0 --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; then + exit 1; + fi; +fi; --- /dev/null +++ ola-0.10.9.nojsmin/scripts/verify_trees.py @@ -0,0 +1,132 @@ +#!/usr/bin/python +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +# verify_trees.py +# Copyright (C) 2015 Simon Newton + +from __future__ import print_function + +import fnmatch +import os +import sys +import textwrap + +# File & directory patterns that differ between what's in the git repo and +# what's in the tarball. +IGNORE_PATTERNS = [ + '*.log', + '*.pc', + '*.swp', + '*.trs', + '*/.deps', + '*/.dirstamp', + '*/.libs', + '*/LICENCE', + '*/Makefile', + '*_pb2.py', + '*~', + '.codespellignore*', + '.flake8', + '.git', + '.git/*', + '.github/*', + '.gitignore', + '.travis-ci.sh', + '.travis.yml', + 'Doxyfile', + 'Makefile', + 'README.md', + 'autom4te.cache', + 'config.h', + 'config.status', + 'html/*', + 'include/ola/base/Version.h', + 'libtool', + 'man/generate-html.sh', + 'ola-*.tar.gz', + 'ola-*/*', + 'plugins/kinet/kinet.cpp', + 'python/ola/PidStoreLocation.py', + 'python/ola/Version.py', + 'scripts/*', + 'stamp-h1', + 'tools/rdm/DataLocation.py', +] + + +def Usage(arg0): + print(textwrap.dedent("""\ + Usage: %s + + Check for files that exist in treeA but aren't in treeB. This can be used to + ensure we don't miss files from the tarball.""" % arg0)) + + +def ShouldIgnore(path): + for pattern in IGNORE_PATTERNS: + if fnmatch.fnmatch(path, pattern): + return True + return False + + +def BuildTree(root): + tree = set() + for directory, sub_dirs, files in os.walk(root): + rel_dir = os.path.relpath(directory, root) + if rel_dir == '.': + rel_dir = '' + if ShouldIgnore(rel_dir): + continue + for f in files: + path = os.path.join(rel_dir, f) + if not ShouldIgnore(path): + tree.add(path) + + return tree + + +def main(): + if len(sys.argv) != 3: + Usage(sys.argv[0]) + sys.exit(1) + + tree_a_root = sys.argv[1] + tree_b_root = sys.argv[2] + for tree in (tree_a_root, tree_b_root): + if not os.path.isdir(tree): + print('Not a directory `%s`' % tree, file=sys.stderr) + sys.exit(2) + + tree_a = BuildTree(tree_a_root) + tree_b = BuildTree(tree_b_root) + + difference = tree_a.difference(tree_b) + + if difference: + for file_path in difference: + print('Missing from tarball %s' % file_path, file=sys.stderr) + + print('\n---------------------------------------', file=sys.stderr) + print('Either add the missing files to the appropriate Makefile.mk\n' + 'or update IGNORE_PATTERNS in scripts/verify_trees.py', + file=sys.stderr) + print('---------------------------------------', file=sys.stderr) + sys.exit(1) + + sys.exit() + + +if __name__ == '__main__': + main() --- /dev/null +++ ola-0.10.9.nojsmin/tools/e133/LICENCE @@ -0,0 +1,13 @@ +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Library General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --- /dev/null +++ ola-0.10.9.nojsmin/tools/logic/LICENCE @@ -0,0 +1,13 @@ +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Library General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --- /dev/null +++ ola-0.10.9.nojsmin/tools/ola_mon/LICENCE @@ -0,0 +1,13 @@ +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Library General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --- /dev/null +++ ola-0.10.9.nojsmin/tools/ola_trigger/LICENCE @@ -0,0 +1,13 @@ +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Library General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --- /dev/null +++ ola-0.10.9.nojsmin/tools/rdm/LICENCE @@ -0,0 +1,13 @@ +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Library General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --- ola-0.10.9.nojsmin.orig/tools/rdm/Makefile.mk +++ ola-0.10.9.nojsmin/tools/rdm/Makefile.mk @@ -17,9 +17,7 @@ module_files = \ testserver_static_files = \ tools/rdm/static/MIT-LICENSE.txt \ tools/rdm/static/common.css \ - tools/rdm/static/jquery-1.7.2.min.js \ tools/rdm/static/jquery-ui-1.8.21.custom.css \ - tools/rdm/static/jquery-ui-1.8.21.custom.min.js \ tools/rdm/static/rdm_tests.js \ tools/rdm/static/rdmtests.html \ tools/rdm/static/ui.multiselect.css \ --- ola-0.10.9.nojsmin.orig/tools/rdm/ResponderTestTest.py +++ ola-0.10.9.nojsmin/tools/rdm/ResponderTestTest.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or --- ola-0.10.9.nojsmin.orig/tools/rdm/TestStateTest.py +++ ola-0.10.9.nojsmin/tools/rdm/TestStateTest.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or --- ola-0.10.9.nojsmin.orig/tools/rdm/launch_tests.py +++ ola-0.10.9.nojsmin/tools/rdm/launch_tests.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or --- ola-0.10.9.nojsmin.orig/tools/rdm/rdm_model_collector.py +++ ola-0.10.9.nojsmin/tools/rdm/rdm_model_collector.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or --- ola-0.10.9.nojsmin.orig/tools/rdm/rdm_responder_test.py +++ ola-0.10.9.nojsmin/tools/rdm/rdm_responder_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or --- ola-0.10.9.nojsmin.orig/tools/rdm/rdm_test_server.py +++ ola-0.10.9.nojsmin/tools/rdm/rdm_test_server.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or --- ola-0.10.9.nojsmin.orig/tools/rdm/setup_patch.py +++ ola-0.10.9.nojsmin/tools/rdm/setup_patch.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or --- ola-0.10.9.nojsmin.orig/tools/rdm/static/rdmtests.html +++ ola-0.10.9.nojsmin/tools/rdm/static/rdmtests.html @@ -1,10 +1,10 @@ - + - - + + RDM Tests & Publisher --- /dev/null +++ ola-0.10.9.nojsmin/tools/rdmpro/LICENCE @@ -0,0 +1,13 @@ +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Library General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --- /dev/null +++ ola-0.10.9.nojsmin/tools/usbpro/LICENCE @@ -0,0 +1,13 @@ +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Library General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.