Skip to content

Commit

Permalink
Update external modules to their new git location
Browse files Browse the repository at this point in the history
  • Loading branch information
William Candillon committed May 9, 2014
1 parent c04bd6d commit 029d9fc
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 28 deletions.
28 changes: 27 additions & 1 deletion modules/DownloadModules.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ FIND_PROGRAM(svn svn DOC "subversion command line client")

# Find BZR
FIND_PROGRAM(bzr bzr DOC "bazaar command line client" PATH ${BZR_PATH})

# Find GIT
FIND_PROGRAM(git git DOC "git command line client" PATH ${GIT_PATH})

# Check parameters
if (NOT outdir)
message (FATAL_ERROR "Please pass -Doutdir.")
Expand Down Expand Up @@ -130,7 +134,29 @@ foreach (modline ${modlines})
${_modtagargs} WORKING_DIRECTORY "${outdir}/${_modname}" TIMEOUT 120
RESULT_VARIABLE _status)
endif (overwrite)



elseif (${_modvc} STREQUAL "git")
if (NOT git)
message (FATAL_ERROR
"Git client not found - required for ${_modname} module!")
endif (NOT git)

set (_modtagargs)
if (_modtag AND NOT notags)
set (_modtagargs "clone" "${_modtag}")
endif (_modtag AND NOT notags)
if (overwrite)
execute_process (COMMAND "${git}" clone "${_modurl}" "${_modname}"
${_modtagargs} WORKING_DIRECTORY "${outdir}" TIMEOUT 120
RESULT_VARIABLE _status)
else (overwrite)
execute_process (COMMAND "${git}" clone
${_modtagargs} WORKING_DIRECTORY "${outdir}/${_modname}" TIMEOUT 120
RESULT_VARIABLE _status)
endif (overwrite)



else (${_modvc} STREQUAL "svn")
message (FATAL_ERROR "Unknown vc-type '${_modvc}' for module "
Expand Down
54 changes: 27 additions & 27 deletions modules/ExternalModules.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,30 +26,30 @@
# "tag" is the VCS tag to check out (optional - defaults to HEAD;
# currently only works for bzr, since svn tags are just different URLS)

archive bzr lp:zorba/archive-module
csv bzr lp:zorba/csv-module
data-cleaning bzr lp:zorba/data-cleaning-module
data-formatting bzr lp:zorba/data-formatting-module
excel bzr lp:zorba/excel-module zorba-2.9
info-extraction bzr lp:zorba/info-extraction-module zorba-2.9
geo bzr lp:zorba/geo-module
geoproj bzr lp:zorba/geoproj-module zorba-2.9
graphviz bzr lp:zorba/graphviz-module zorba-2.9
html bzr lp:zorba/html-module zorba-2.9
http-client bzr lp:zorba/http-client-module zorba-2.9
image bzr lp:zorba/image-module
jdbc bzr lp:zorba/jdbc-module
languages bzr lp:zorba/languages-module
oracle-nosql-db bzr lp:zorba/oracle-nosql-db-module
oauth bzr lp:zorba/oauth-module zorba-2.9
process bzr lp:zorba/process-module
read-pdf bzr lp:zorba/read-pdf-module
security bzr lp:zorba/security-module
system bzr lp:zorba/system-module zorba-2.9
email bzr lp:zorba/email-module
util-jvm bzr lp:zorba/util-jvm-module
schema-tools bzr lp:zorba/schema-tools-module
stack bzr lp:zorba/stack-module
queue bzr lp:zorba/queue-module
couchbase bzr lp:zorba/couchbase-module
sqlite bzr lp:zorba/sqlite-module
archive git [email protected]:28msec/zorba-archive-module
csv git [email protected]:28msec/zorba-csv-module
data-cleaning git [email protected]:28msec/zorba-data-cleaning-module
data-formatting git [email protected]:28msec/zorba-data-formatting-module.git
excel git [email protected]:28msec/zorba-excel-module.git
info-extraction git [email protected]:28msec/zorba-info-extraction-module.git
geo git [email protected]:28msec/zorba-geo-module.git
geoproj git [email protected]:28msec/zorba-geoproj-module.git
graphviz git [email protected]:28msec/zorba-graphviz-module.git
html git [email protected]:28msec/zorba-html-module.git
http-client git [email protected]:28msec/zorba-http-client-module.git
image git [email protected]:28msec/zorba-image-module.git
jdbc git [email protected]:28msec/zorba-jdbc-module.git
languages git [email protected]:28msec/zorba-languages-module.git
oracle-nosql-db git [email protected]:28msec/zorba-oracle-nosql-db-module.git
oauth git [email protected]:28msec/zorba-oauth-module.git
process git [email protected]:28msec/zorba-process-module.git
read-pdf git [email protected]:28msec/zorba-read-pdf-module.git
security git [email protected]:28msec/zorba-security-module.git
system git [email protected]:28msec/zorba-system-module.git
email git [email protected]:28msec/zorba-email-module.git
util-jvm git [email protected]:28msec/zorba-util-jvm-module.git
schema-tools git [email protected]:28msec/zorba-schema-tools-module.git
stack git [email protected]:28msec/zorba-stack-module.git
queue git [email protected]:28msec/zorba-queue-module.git
couchbase git [email protected]:28msec/zorba-couchbase-module.git
sqlite git [email protected]:28msec/zorba-sqlite-module.git

0 comments on commit 029d9fc

Please sign in to comment.