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

Make #379 compatible with python branch #388

Open
wants to merge 6 commits into
base: python
Choose a base branch
from
Open

Make #379 compatible with python branch #388

wants to merge 6 commits into from

Conversation

xianwen
Copy link

@xianwen xianwen commented Jul 18, 2018

After merging master branch to python branch, the python compile failed because of the update in #379.
So I made another commit 875bbe2 to update PythonGenerator.scala, so that it can make use of the updated Doc object

The only commit that matters here is 875bbe2, while the previous commits are just merged commits from master branch

jfirebaugh and others added 6 commits July 17, 2018 16:15
When the CDPATH environment variable is set, the cd command prints the path of the directory to stdout. Redirect that output to /dev/null to avoid it being mistakenly included in the base_dir variable, which then causes cryptic errors.
* Implement comments support, tests and readme documentation

* improve code comments and documents comments parser when the two types of comments are one after the other

* improve tests
# Conflicts:
#	test-suite/djinni/client_interface.djinni
#	test-suite/djinni/multiple_inheritance.djinni
#	test-suite/generated-src/cpp/second_listener.hpp
#	test-suite/generated-src/java/com/dropbox/djinni/test/SecondListener.java
#	test-suite/generated-src/objc/DBSecondListener.h
@xianwen xianwen requested a review from artwyman July 18, 2018 20:12
@xianwen
Copy link
Author

xianwen commented Jul 18, 2018

@4brunu please take a look to see if anything should be adjusted, thanks.

Copy link
Contributor

@artwyman artwyman left a comment

Choose a reason for hiding this comment

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

On hold until discussion around #379 is resolved.

@artwyman artwyman self-assigned this Apr 9, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants