zorba-coders team mailing list archive

[Chris Hillery <chillery+launchpad@xxxxxxxxx>]

Chris Hillery has proposed merging lp:~ceejatec/zorba/download-modules into lp:zorba.

Requested reviews:
  David Graf (davidagraf)

For more details, see:
https://code.launchpad.net/~ceejatec/zorba/download-modules/+merge/78376
-- 
https://code.launchpad.net/~ceejatec/zorba/download-modules/+merge/78376
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'modules/DownloadModules.cmake'
--- modules/DownloadModules.cmake	2011-06-26 09:43:12 +0000
+++ modules/DownloadModules.cmake	2011-10-06 10:01:25 +0000
@@ -27,11 +27,10 @@
 get_filename_component (cwd ${CMAKE_CURRENT_LIST_FILE} PATH)
 
 # Find SVN
-FIND_PROGRAM(SVN_EXECUTABLE svn DOC "subversion command line client")
-IF(NOT SVN_EXECUTABLE)
-  message (FATAL_ERROR "Subversion is required; not found")
-ENDIF(NOT SVN_EXECUTABLE)
-set (svn "${SVN_EXECUTABLE}")
+FIND_PROGRAM(svn svn DOC "subversion command line client")
+
+# Find BZR
+FIND_PROGRAM(bzr bzr DOC "bazaar command line client")
 
 # Check parameters
 if (NOT outdir)
@@ -68,22 +67,27 @@
       endif (NOT ${_modfound} EQUAL -1)
     endif (allmodules)
 
-    # Ensure we recognize vc-type
-    if (NOT ${_modvc} STREQUAL "svn")
-      message (FATAL_ERROR "Unknown vc-type '${_modvc}' for module "
-        "'${_modname}' in modules/ExternalModules.conf!")
-    endif (NOT ${_modvc} STREQUAL "svn")
-
     # Download
     if (_getmod)
       message ("Downloading module '${_modname}'...")
-      # QQQ Ridiculous and slow hack, but Sourceforge has been incredibly
-      # unreliable lately so this is the best choice I've got to make
-      # the remote queue semi-stable
-      foreach (s 1 2)
-        execute_process (COMMAND "${svn}" checkout "${_modurl}" "${_modname}"
+      if (${_modvc} STREQUAL "svn")
+        # QQQ Ridiculous and slow hack, but Sourceforge has been
+        # incredibly unreliable lately so this is the best choice I've
+        # got to make the remote queue semi-stable
+        foreach (s 1 2)
+          execute_process (COMMAND "${svn}" checkout "${_modurl}" "${_modname}"
+            WORKING_DIRECTORY "${outdir}" TIMEOUT 60)
+        endforeach (s 1 2)
+
+      elseif (${_modvc} STREQUAL "bzr")
+        execute_process (COMMAND "${bzr}" branch "${_modurl}" "${_modname}"
           WORKING_DIRECTORY "${outdir}" TIMEOUT 60)
-      endforeach (s 1 2)
+
+      else (${_modvc} STREQUAL "svn")
+        message (FATAL_ERROR "Unknown vc-type '${_modvc}' for module "
+          "'${_modname}' in modules/ExternalModules.conf!")
+
+      endif (${_modvc} STREQUAL "svn")
     endif (_getmod)
   endif (modline)
 endforeach (modline)

=== modified file 'modules/ExternalModules.conf'
--- modules/ExternalModules.conf	2011-07-26 10:07:30 +0000
+++ modules/ExternalModules.conf	2011-10-06 10:01:25 +0000
@@ -18,19 +18,19 @@
 # Format:
 #   short-mod-name   vc-type   url
 # where "short-mod-name" is a convenient tag for identifying the module;
-# "vc-type" is the type of version control software (so far only "svn"
-# is supported); and "url" is the URL to check out.
+# "vc-type" is the type of version control software (so far only "bzr"
+# and "svn" are supported); and "url" is the URL to check out.
 
-data-cleaning   svn  http://zorba.svn.sourceforge.net/svnroot/zorba/modules/data-cleaning/trunk
-data-converters svn  http://zorba.svn.sourceforge.net/svnroot/zorba/modules/data-converters/trunk
-data-formatting svn  http://zorba.svn.sourceforge.net/svnroot/zorba/modules/data-formatting/trunk
-email           svn  http://zorba.svn.sourceforge.net/svnroot/zorba/modules/email/trunk
-excel           svn  http://zorba.svn.sourceforge.net/svnroot/zorba/modules/excel/trunk
-geo             svn  http://zorba.svn.sourceforge.net/svnroot/zorba/modules/geo/trunk
-http-client     svn  http://zorba.svn.sourceforge.net/svnroot/zorba/modules/http-client/trunk
-image           svn  http://zorba.svn.sourceforge.net/svnroot/zorba/modules/image/trunk
-languages       svn  http://zorba.svn.sourceforge.net/svnroot/zorba/modules/languages/trunk
-oauth           svn  http://zorba.svn.sourceforge.net/svnroot/zorba/modules/oauth/trunk
-process         svn  http://zorba.svn.sourceforge.net/svnroot/zorba/modules/process/trunk
-security        svn  http://zorba.svn.sourceforge.net/svnroot/zorba/modules/security/trunk
-system          svn  http://zorba.svn.sourceforge.net/svnroot/zorba/modules/system/trunk
+data-cleaning   bzr  lp:zorba/data-cleaning-module
+data-converters bzr  lp:zorba/data-converters-module
+data-formatting bzr  lp:zorba/data-formatting-module
+email           bzr  lp:zorba/email-module
+excel           bzr  lp:zorba/excel-module
+geo             bzr  lp:zorba/geo-module
+http-client     bzr  lp:zorba/http-client-module
+image           bzr  lp:zorba/image-module
+languages       bzr  lp:zorba/languages-module
+oauth           bzr  lp:zorba/oauth-module
+process         bzr  lp:zorba/process-module
+security        bzr  lp:zorba/security-module
+system          bzr  lp:zorba/system-module