Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Update DEPS to pull in libtess2, sqlite, and, inja.#30334

Merged
chinmaygarde merged 4 commits intoflutter:mainfrom
chinmaygarde:update_deps
Dec 21, 2021
Merged

Update DEPS to pull in libtess2, sqlite, and, inja.#30334
chinmaygarde merged 4 commits intoflutter:mainfrom
chinmaygarde:update_deps

Conversation

@chinmaygarde
Copy link
Copy Markdown
Contributor

Also updates the license script to appropriately handle these
dependencies.

@flutter-dashboard
Copy link
Copy Markdown

It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption to this rule, contact Hixie on the #hackers channel in Chat.

If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix?

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing.

@chinmaygarde
Copy link
Copy Markdown
Contributor Author

@Hixie was taking over progress on this but ran into roadblocks. @Hixie were the roadblocks related to the new dependencies being added? If not, may I add support in the script just for these dependencies?

@Hixie
Copy link
Copy Markdown
Contributor

Hixie commented Dec 21, 2021

Sorry, I got distracted by other unrelated issues. To fix the script for libtess2, just add the following to tools/licenses/lib/patterns.dart:

@@ -1573,20 +1593,27 @@ final List<RegExp> csLicenses = <RegExp>[
       r'|'

       r'\1\2 '
       r'The above copyright notice and this permission notice'
       r'(?: \(including the next paragraph\))? '
       r'shall be included in all copies or substantial portions '
       r'of the (?:Software|Materials)\.'

       r'|'

+      r'\1\2 '
+      r'The above copyright notice including the dates of first publication and either this '
+      r'permission notice or a reference to .+ shall be '
+      r'included in all copies or substantial portions of the Software.'
+
+      r'|'
+
       r'\1\2 '
       r'In addition, the following condition applies:'

       r'|'

       r'\1\2 '
       r'All redistributions must retain an intact copy of this copyright notice and disclaimer\.'

       r'|'

@@ -1606,20 +1633,27 @@ final List<RegExp> csLicenses = <RegExp>[
       r'OR FITNESS FOR A PARTICULAR PURPOSE\.'

       r'|'

       r'\1\2 '
       r'IN NO EVENT SHALL .+ BE LIABLE FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL '
       r'DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, '
       r'WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING '
       r'OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE\.'

+      r'|'
+
+      r'\1\2 '
+      r'Except as contained in this notice, the name of .+ shall not '
+      r'be used in advertising or otherwise to promote the sale, use or other dealings in '
+      r'this Software without prior written authorization from .+\.'
+
       .replaceAll(' ', _linebreak)
     )
     +
     r')*',
     multiLine: true,
     caseSensitive: false
   ),

   // BISON LICENSE
   // Seen in some ANGLE source. The usage falls under the "special exception" clause.

To skip INJA, add the following to _RepositoryRootThirdPartyDirectory.shouldRecurse in the appropriate place:

+        && entry.name != 'inja' // build-time only according to chinmay

That should get you far enough to add the dependencies without the CI failing. I'll submit a follow-up patch shortly that cleans up some of the issues I ran into. I don't think they're actually causing us to show the wrong licenses; I think they're causing us to show the right licenses but for the wrong reasons.

Also updates the license script to appropriately handle these
dependencies.
@chinmaygarde chinmaygarde removed the Work in progress (WIP) Not ready (yet) for review! label Dec 21, 2021
@chinmaygarde
Copy link
Copy Markdown
Contributor Author

Thanks for the help! The patch should be good for a review now.

Copy link
Copy Markdown
Member

@zanderso zanderso left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm w/ nit

Comment thread tools/licenses/lib/main.dart Outdated
@chinmaygarde chinmaygarde added the waiting for tree to go green This PR is approved and tested, but waiting for the tree to be green to land. label Dec 21, 2021
@Hixie
Copy link
Copy Markdown
Contributor

Hixie commented Dec 21, 2021

Don't forget to also update the actual LICENSE file, that's the one that matters the most.

@chinmaygarde chinmaygarde removed the waiting for tree to go green This PR is approved and tested, but waiting for the tree to be green to land. label Dec 21, 2021
@chinmaygarde
Copy link
Copy Markdown
Contributor Author

Done.

@chinmaygarde chinmaygarde added the waiting for tree to go green This PR is approved and tested, but waiting for the tree to be green to land. label Dec 21, 2021
@chinmaygarde chinmaygarde merged commit 9173dd1 into flutter:main Dec 21, 2021
@chinmaygarde chinmaygarde deleted the update_deps branch December 21, 2021 21:19
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Dec 21, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

needs tests waiting for tree to go green This PR is approved and tested, but waiting for the tree to be green to land.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants