You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2016/04/06 19:58:11 UTC
[1/3] qpid-proton git commit: NO-JIRA: Fix break in Javascript
bindings build
Repository: qpid-proton
Updated Branches:
refs/heads/master 6738c16ff -> 38bf12f9b
NO-JIRA: Fix break in Javascript bindings build
Attempting to build Proton with Emscripten on the path fails with the following
message:
/home/prestona/git/qpid-proton/examples/c/messenger/recv-async.c:26:10: fatal
error: 'pncompat/misc_funcs.inc' file not found
#include "pncompat/misc_funcs.inc"
^
1 error generated.
This appears to have been introduced by commit
84e416e389fe74ec7a1cab9252af2342fc95b83f
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/46f94969
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/46f94969
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/46f94969
Branch: refs/heads/master
Commit: 46f949699531b873f10b301aae0e73ff1ed8220a
Parents: c7dff22
Author: Adrian Preston <pr...@uk.ibm.com>
Authored: Thu Mar 31 14:10:34 2016 +0100
Committer: Adrian Preston <pr...@uk.ibm.com>
Committed: Thu Mar 31 14:21:58 2016 +0100
----------------------------------------------------------------------
proton-c/bindings/javascript/CMakeLists.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/46f94969/proton-c/bindings/javascript/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/bindings/javascript/CMakeLists.txt b/proton-c/bindings/javascript/CMakeLists.txt
index ea06e07..368a2fb 100644
--- a/proton-c/bindings/javascript/CMakeLists.txt
+++ b/proton-c/bindings/javascript/CMakeLists.txt
@@ -192,6 +192,7 @@ target_link_libraries(qpid-proton-bitcode)
# Compile the send-async.c and recv-async.c examples into JavaScript
+include_directories(${PN_PATH}/../examples/c/include)
add_executable(send-async.js ${PN_PATH}/../examples/c/messenger/send-async.c)
target_link_libraries(send-async.js qpid-proton-bitcode)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/3] qpid-proton git commit: NO-JIRA: Use ${Proton_SOURCE_DIR} in
CMakeLists
Posted by as...@apache.org.
NO-JIRA: Use ${Proton_SOURCE_DIR} in CMakeLists
Improve maintainability of Javascript binding's CMakeLists.txt by replacing the
use of ${PN_PATH}/../ with ${Proton_SOURCE_DIR}
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/353b345b
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/353b345b
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/353b345b
Branch: refs/heads/master
Commit: 353b345bcd29b06a1a662df12253811756f891c6
Parents: 46f9496
Author: Adrian Preston <pr...@uk.ibm.com>
Authored: Thu Mar 31 16:11:47 2016 +0100
Committer: Adrian Preston <pr...@uk.ibm.com>
Committed: Thu Mar 31 16:11:47 2016 +0100
----------------------------------------------------------------------
proton-c/bindings/javascript/CMakeLists.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/353b345b/proton-c/bindings/javascript/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/bindings/javascript/CMakeLists.txt b/proton-c/bindings/javascript/CMakeLists.txt
index 368a2fb..971097c 100644
--- a/proton-c/bindings/javascript/CMakeLists.txt
+++ b/proton-c/bindings/javascript/CMakeLists.txt
@@ -192,11 +192,11 @@ target_link_libraries(qpid-proton-bitcode)
# Compile the send-async.c and recv-async.c examples into JavaScript
-include_directories(${PN_PATH}/../examples/c/include)
-add_executable(send-async.js ${PN_PATH}/../examples/c/messenger/send-async.c)
+include_directories(${Proton_SOURCE_DIR}/examples/c/include)
+add_executable(send-async.js ${Proton_SOURCE_DIR}/examples/c/messenger/send-async.c)
target_link_libraries(send-async.js qpid-proton-bitcode)
-add_executable(recv-async.js ${PN_PATH}/../examples/c/messenger/recv-async.c)
+add_executable(recv-async.js ${Proton_SOURCE_DIR}/examples/c/messenger/recv-async.c)
target_link_libraries(recv-async.js qpid-proton-bitcode)
set_target_properties(
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[3/3] qpid-proton git commit: Merge branch 'javascript_build_break'
of https://github.com/prestona/qpid-proton
Posted by as...@apache.org.
Merge branch 'javascript_build_break' of https://github.com/prestona/qpid-proton
This closes #72
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/38bf12f9
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/38bf12f9
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/38bf12f9
Branch: refs/heads/master
Commit: 38bf12f9b3eebbedeb9e12191be7b8f21981abd4
Parents: 6738c16 353b345
Author: Andrew Stitcher <as...@apache.org>
Authored: Wed Apr 6 13:56:22 2016 -0400
Committer: Andrew Stitcher <as...@apache.org>
Committed: Wed Apr 6 13:56:22 2016 -0400
----------------------------------------------------------------------
proton-c/bindings/javascript/CMakeLists.txt | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org