zorba-coders team mailing list archive

[Chris Hillery <chillery+launchpad@xxxxxxxxx>]

Chris Hillery has proposed merging lp:~zorba-coders/zorba/temp-http-client-workarounds into lp:zorba.

Requested reviews:
  Chris Hillery (ceejatec)
  Juan Zacarias (juan457)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/temp-http-client-workarounds/+merge/118237
-- 
https://code.launchpad.net/~zorba-coders/zorba/temp-http-client-workarounds/+merge/118237
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'bin/CMakeLists.txt'
--- bin/CMakeLists.txt	2012-07-24 08:48:48 +0000
+++ bin/CMakeLists.txt	2012-08-04 06:10:25 +0000
@@ -122,4 +122,6 @@
   PASS_REGULAR_EXPRESSION "hello, v2")
 
 # test compilation of the perf script
-ZORBA_ADD_TEST(bin/zorba_compilechk4 zorbacmd -q "${CMAKE_CURRENT_SOURCE_DIR}/../test/zperf/src/start.xq" -f --compile-only)
+# TEMPORARILY COMMENTED OUT - uses non-core http-client module which is
+# temporarily disabled
+#ZORBA_ADD_TEST(bin/zorba_compilechk4 zorbacmd -q "${CMAKE_CURRENT_SOURCE_DIR}/../test/zperf/src/start.xq" -f --compile-only)

=== modified file 'modules/ExternalModules.conf'
--- modules/ExternalModules.conf	2012-07-24 08:48:48 +0000
+++ modules/ExternalModules.conf	2012-08-04 06:10:25 +0000
@@ -34,7 +34,7 @@
 http-client     bzr  lp:zorba/http-client-module      zorba-2.5
 image           bzr  lp:zorba/image-module            zorba-2.5
 languages       bzr  lp:zorba/languages-module        zorba-2.5
-oauth           bzr  lp:zorba/oauth-module            zorba-2.5
+oauth           bzr  lp:zorba/oauth-module
 process         bzr  lp:zorba/process-module          zorba-2.5
 security        bzr  lp:zorba/security-module         zorba-2.5
 system          bzr  lp:zorba/system-module           zorba-2.5