Skip to content
This repository has been archived by the owner on Oct 11, 2020. It is now read-only.

Streamline building I #552

Merged
merged 7 commits into from
Jan 21, 2018
Merged

Streamline building I #552

merged 7 commits into from
Jan 21, 2018

Conversation

Croydon
Copy link
Contributor

@Croydon Croydon commented Jan 21, 2018

This fixes bugs and compatibility problems all over the place.
It gets us compatible with Conan 1.0, fixes Compiler errors and warnings, fixes problems with certain Python versions.

Also has some further progress on macOS: We are building and uploading now the first Conan packages! (#385)

This was an unpleasant job and is much more work as these few commits suggest. I'm really happy that our build env is becoming much more stable overall.

It still have some bigger bullet points for our build env on my to do list, but I will shift my personal focus slowly towards the C++ side of things :)

@Croydon Croydon added this to the 0.10.0-alpha milestone Jan 21, 2018
@Croydon Croydon self-assigned this Jan 21, 2018
@Croydon Croydon requested a review from a-teammate January 21, 2018 16:38
Binaries from GCC >= 5 are ABI compatible within their major versions.
This fixes bugs and compatiblity problems all over the place.
It gets us compatible with Conan 1.0, fixes Compiler errors and warnings, problems with certain Python versions.

Also has some further small progress on macOS.
@Croydon Croydon force-pushed the croydon/streamline_building branch from 6e1aa2c to 3ec42e8 Compare January 21, 2018 16:41
@Croydon Croydon changed the title WIP Streamline building Streamline building I Jan 21, 2018
Copy link
Contributor

@a-teammate a-teammate left a comment

Choose a reason for hiding this comment

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

Very cool!
I would just minor changes which are not critical currently.
That it makes us compatible with conan 1.0 again is just awesome! :)

elseif(OS_MACOSX)
add_executable(${exe} MACOSX_BUNDLE ${sources})
elseif(OS_MACOS)
add_executable(${exe} MACOS_BUNDLE ${sources})
Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Since this makes no practial difference right now (build fails long before this step), I will revert this in further pull requests.

args += ["-DBUILD_SERVER=1"]
if self.scope.build_master or self.scope.build_all:
if 'build_master' in os.environ or 'build_all' in os.environ:
Copy link
Contributor

Choose a reason for hiding this comment

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

These two lines can be omitted since there is no BUILD_MASTER anymore.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will do in further PRs.

bool Execute(const CefString& name, CefRefPtr<CefV8Value> object, const CefV8ValueList& arguments, CefRefPtr<CefV8Value>& retval, CefString& exception) override;
bool Get(const CefString& name, const CefRefPtr<CefV8Value> object, CefRefPtr<CefV8Value>& retval, CefString& exception) override;
bool Set(const CefString& name, const CefRefPtr<CefV8Value> object, const CefRefPtr<CefV8Value> value, CefString& exception) override;
std::string GetContextName() override { return "layer"; };
Copy link
Contributor

Choose a reason for hiding this comment

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

Im not so sure about the "override" changes.
They seem to be incomplete.
I ran clang-tidy to do it in another branch and it resulted in way more override additions. (could be that I made some changes which required those additional overrides though)
Anyways, better than nothing, so just a note.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I didn't notice more warnings, so I guess your work introduced them somehow.

#language: cpp
#compiler: clang
#env: docker_tag="NODOCKER" compiler=clang TARGET="osx" CMAKE_FLAGS="-DCMAKE_CXX_COMPILER=clang++-3.9 -DCMAKE_C_COMPILER=clang-3.9 -DBUILD_ALL=1"
#CI - os: osx
Copy link
Contributor

Choose a reason for hiding this comment

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

someday I'd like to split travis.yml again in two files to make this pipeline a bit more intuitively understandable :D ive no clue atm since "CI" is pretty ambigous
not now though



## increment the version number based on the last tag.
incremented_version()
Copy link
Contributor

Choose a reason for hiding this comment

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

you could leave this incremented_version and stuff out, but I assume you just copied it, so its fine for now.
But we need to remove the clutter later.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure, this is heavily work in progress.

@Croydon
Copy link
Contributor Author

Croydon commented Jan 21, 2018

AppVeyor has some issues right now. It did build successful, but did report the status only back for the "pr" status, not for the "branch" status. I'm going to merge now anway.

@Croydon Croydon merged commit f470beb into master Jan 21, 2018
@ghost ghost removed the org:in progress label Jan 21, 2018
Croydon added a commit that referenced this pull request Jan 21, 2018
@a-teammate a-teammate deleted the croydon/streamline_building branch February 21, 2018 13:51
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants