Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add premake-based build scripts #2

Merged
merged 16 commits into from Nov 28, 2016
Merged

Add premake-based build scripts #2

merged 16 commits into from Nov 28, 2016

Conversation

robryk
Copy link
Contributor

@robryk robryk commented Nov 23, 2016 •
edited

Make Guetzli compilable without Bazel.

Notably missing from this PR:

  • Windows-specific things (will add in a later PR).

Jyrki Alakuijala and others added 14 commits February 4, 2016 15:44
initial commit
54a9fd5
@robryk
Add a png comparison tool.
fd35595 
The tool compares two PNG images and outputs the butteraugli score. It requires libpng.
@jyrkialakuijala
Merge pull request #1 from robryk/compare-pngs
93e3668 
Add a png comparison tool.
@robryk
Fix comments. Remove an unused function.
c557fed
@robryk
Add a Makefile.
52bdbaf
@jyrkialakuijala
Merge pull request google#2 from robryk/random-stuff
9c9744a 
Makefile & small changes
@robryk
Tuning. Fix handling of transparency in compare_pngs.
c2bee26 
This commit is a squashed version of multiple changes made by multiple
authors.
@sbussard
Specify libpng dependency and build instructions
b94867e
@robryk
Merge pull request google#4 from sbussard/patch-1
26d3d9b 
Specify libpng dependency and build instructions
@lvandeve
Tuning. Update Butteraugli
88897ab
@robryk
Multiple changes impacting accuracy.
1a3580d 
This commit contains squashes changes by many authors.
@lvandeve
capitalize readme titles
029f5b7
@jyrkialakuijala
Merge pull request google#6 from google/readme
2f8d6a0 
capitalize readme titles
@jyrkialakuijala
color model refinements
037eff7 
improvements to visual masking
@googlebot
Copy link

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for the commit author(s). If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.

@robryk
Add 'third_party/butteraugli/' from commit '037eff792f5b1cc7c21cc2cdd…
f093b4b 
…325de712c387e11'

git-subtree-dir: third_party/butteraugli
git-subtree-mainline: 9ae5ac3
git-subtree-split: 037eff7
eustas
eustas reviewed Nov 24, 2016
View reviewed changes
guetzli/guetzli.cc
@@ -24,6 +24,10 @@
#include "guetzli/quality.h"
#include "guetzli/stats.h"

#ifndef GFLAGS_NAMESPACE
#define GFLAGS_NAMESPACE gflags
Copy link
Collaborator

Choose a reason for hiding this comment

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

Perhaps, "using namespace" might look al little bit better.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

eustas
eustas reviewed Nov 24, 2016
View reviewed changes
premake5.lua
defines { "GFLAGS_NAMESPACE=google" }
files
{
"guetzli/*.cc",
Copy link
Collaborator

Choose a reason for hiding this comment

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

whitespace

Copy link
Contributor Author

Choose a reason for hiding this comment

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

What exactly is the expected state here?

Copy link
Collaborator

Choose a reason for hiding this comment

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

I mean first line is padded by 3 spaces here, not 2.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Looks like a github bug - it is ok in downloaded sources.

eustas
eustas reviewed Nov 24, 2016
View reviewed changes
third_party/butteraugli/README.md

## Build instructions

Install [Bazel](http://bazel.io) by following the
Copy link
Collaborator

Choose a reason for hiding this comment

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

bazel.build

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

eustas
eustas approved these changes Nov 24, 2016
View reviewed changes
Copy link
Collaborator

@eustas eustas left a comment

Choose a reason for hiding this comment

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

LGTM

@robryk robryk force-pushed the add-premake branch 2 times, most recently from 60cfed6 to 10736c0 Compare November 28, 2016 11:29
@robryk
Copy link
Contributor Author

robryk commented Nov 28, 2016

PTAL.

@robryk
Change default build system to make.
6f99b17 
Add premake configuration and generate Makefile using premake.
Make both builds use the imported copy of Butteraugli, for consistency.
Make code compatible with pre-2.1 and post-2.1 gflags.
@robryk robryk merged commit db08983 into google:master Nov 28, 2016
@robryk robryk deleted the add-premake branch November 28, 2016 14:05
@yraen69 yraen69 mentioned this pull request Mar 24, 2017
Open
@atomissariyaporn
Copy link

Get

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eustas eustas eustas approved these changes

Assignees

@eustas eustas

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@robryk @googlebot @atomissariyaporn @eustas @jyrkialakuijala @sbussard @lvandeve