Re-added support for Chams & CMake support for Git hash retreival.
Details:
* Change, in build.conf: re-added support for the newly migrated Chams
project.
* Bug, in bootstrap/../Project.py: the tool by tool compilation was
not working. Now it does (argument "--tool").
* New, in boostrap/../cmake_modules: support for retreiving the Git
hash number (SHA1). Borrowed on the net from (kudos):
Ryan Pavlik <rpavlik@iastate.edu>
This commit is contained in:
Jean-Paul Chaput
parent
34e0edfd61
commit
c0b999241f
|
|
@ -26,19 +26,19 @@ projects = [ { 'name' : "coriolis"
|
|||
]
|
||||
, 'repository': 'ssh://asim-t/users/largo2/git/coriolis.git' }
|
||||
|
||||
#, { 'name' : "chams"
|
||||
# , 'tools' : [ "hurricaneAMS"
|
||||
# , "amsCore"
|
||||
# , "opSim"
|
||||
# , "scribe"
|
||||
# , "graph"
|
||||
# , "pharos"
|
||||
# , "isis"
|
||||
# , "schematic"
|
||||
# , "solver"
|
||||
# , "autoDTR"
|
||||
# ]
|
||||
# , 'repository':"/users/outil/chams/svn" }
|
||||
, { 'name' : "chams"
|
||||
, 'tools' : [ "hurricaneAMS"
|
||||
, "amsCore"
|
||||
, "opSim"
|
||||
, "scribe"
|
||||
, "graph"
|
||||
, "pharos"
|
||||
, "isis"
|
||||
, "schematic"
|
||||
, "solver"
|
||||
, "autoDTR"
|
||||
]
|
||||
, 'repository':"ssh://melon-t/users/outil/chams/chams.git" }
|
||||
]
|
||||
|
||||
package = { 'name' : 'coriolis2'
|
||||
|
|
|
|||
|
|
@ -62,11 +62,12 @@ class Project ( object ):
|
|||
return
|
||||
|
||||
def activate ( self, toolNames ):
|
||||
rejecteds = []
|
||||
for tool in self._tools:
|
||||
if tool.name in toolNames:
|
||||
tool.active = True
|
||||
else:
|
||||
if tool.name in toolNames:
|
||||
rejecteds.append( tool.name )
|
||||
|
||||
rejecteds = []
|
||||
for tool in toolNames:
|
||||
if not self.hasTool(tool):
|
||||
rejecteds.append( tool )
|
||||
return rejecteds
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@
|
|||
FindBootstrap.cmake
|
||||
FindLibexecinfo.cmake
|
||||
FindQwt.cmake
|
||||
GetGitRevisionDescription.cmake
|
||||
GetGitRevisionDescription.cmake.in
|
||||
)
|
||||
|
||||
install ( FILES ${finders} DESTINATION share/cmake/Modules )
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@
|
|||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/svn.h.in ${CMAKE_CURRENT_SOURCE_DIR}/${includedir}/svn.h)
|
||||
endmacro(SETUP_SVNH)
|
||||
|
||||
|
||||
#
|
||||
# Specific Apple OSX setup
|
||||
#
|
||||
|
|
@ -147,7 +148,10 @@
|
|||
if(${ARGV0}_FOUND)
|
||||
if(NOT ${ARGV0}_FIND_QUIETLY)
|
||||
if(${ARGV0}_FOUND)
|
||||
message(STATUS "Found ${ARGV0} : ${${ARGV0}_LIBRARIES}")
|
||||
message(STATUS "Found ${ARGV0}:")
|
||||
foreach(library ${${ARGV0}_LIBRARIES})
|
||||
message(STATUS " ${library}")
|
||||
endforeach(library)
|
||||
endif(${ARGV0}_FOUND)
|
||||
endif(NOT ${ARGV0}_FIND_QUIETLY)
|
||||
else(${ARGV0}_FOUND)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,132 @@
|
|||
# - Returns a version string from Git
|
||||
#
|
||||
# These functions force a re-configure on each git commit so that you can
|
||||
# trust the values of the variables in your build system.
|
||||
#
|
||||
# get_git_head_revision(<refspecvar> <hashvar> [<additional arguments to git describe> ...])
|
||||
#
|
||||
# Returns the refspec and sha hash of the current head revision
|
||||
#
|
||||
# git_describe(<var> [<additional arguments to git describe> ...])
|
||||
#
|
||||
# Returns the results of git describe on the source tree, and adjusting
|
||||
# the output so that it tests false if an error occurs.
|
||||
#
|
||||
# git_get_exact_tag(<var> [<additional arguments to git describe> ...])
|
||||
#
|
||||
# Returns the results of git describe --exact-match on the source tree,
|
||||
# and adjusting the output so that it tests false if there was no exact
|
||||
# matching tag.
|
||||
#
|
||||
# Requires CMake 2.6 or newer (uses the 'function' command)
|
||||
#
|
||||
# Original Author:
|
||||
# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
|
||||
# http://academic.cleardefinition.com
|
||||
# Iowa State University HCI Graduate Program/VRAC
|
||||
#
|
||||
# Copyright Iowa State University 2009-2010.
|
||||
# Distributed under the Boost Software License, Version 1.0.
|
||||
# (See accompanying file LICENSE_1_0.txt or copy at
|
||||
# http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
if(__get_git_revision_description)
|
||||
return()
|
||||
endif()
|
||||
set(__get_git_revision_description YES)
|
||||
|
||||
# We must run the following at "include" time, not at function call time,
|
||||
# to find the path to this module rather than the path to a calling list file
|
||||
get_filename_component(_gitdescmoddir ${CMAKE_CURRENT_LIST_FILE} PATH)
|
||||
|
||||
function(get_git_head_revision _refspecvar _hashvar)
|
||||
set(GIT_PARENT_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
set(GIT_DIR "${GIT_PARENT_DIR}/.git")
|
||||
while(NOT EXISTS "${GIT_DIR}") # .git dir not found, search parent directories
|
||||
set(GIT_PREVIOUS_PARENT "${GIT_PARENT_DIR}")
|
||||
get_filename_component(GIT_PARENT_DIR ${GIT_PARENT_DIR} PATH)
|
||||
if(GIT_PARENT_DIR STREQUAL GIT_PREVIOUS_PARENT)
|
||||
# We have reached the root directory, we are not in git
|
||||
set(${_refspecvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
|
||||
set(${_hashvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
|
||||
message("-- Git repository informations not found.")
|
||||
return()
|
||||
endif()
|
||||
set(GIT_DIR "${GIT_PARENT_DIR}/.git")
|
||||
message("-- Git repository in ${GIT_PARENT_DIR}.")
|
||||
endwhile()
|
||||
# check if this is a submodule
|
||||
if(NOT IS_DIRECTORY ${GIT_DIR})
|
||||
file(READ ${GIT_DIR} submodule)
|
||||
string(REGEX REPLACE "gitdir: (.*)\n$" "\\1" GIT_DIR_RELATIVE ${submodule})
|
||||
get_filename_component(SUBMODULE_DIR ${GIT_DIR} PATH)
|
||||
get_filename_component(GIT_DIR ${SUBMODULE_DIR}/${GIT_DIR_RELATIVE} ABSOLUTE)
|
||||
endif()
|
||||
set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data")
|
||||
if(NOT EXISTS "${GIT_DATA}")
|
||||
file(MAKE_DIRECTORY "${GIT_DATA}")
|
||||
endif()
|
||||
|
||||
if(NOT EXISTS "${GIT_DIR}/HEAD")
|
||||
return()
|
||||
endif()
|
||||
set(HEAD_FILE "${GIT_DATA}/HEAD")
|
||||
configure_file("${GIT_DIR}/HEAD" "${HEAD_FILE}" COPYONLY)
|
||||
|
||||
configure_file("${_gitdescmoddir}/GetGitRevisionDescription.cmake.in"
|
||||
"${GIT_DATA}/grabRef.cmake"
|
||||
@ONLY)
|
||||
include("${GIT_DATA}/grabRef.cmake")
|
||||
|
||||
set(${_refspecvar} "${HEAD_REF}" PARENT_SCOPE)
|
||||
set(${_hashvar} "${HEAD_HASH}" PARENT_SCOPE)
|
||||
endfunction()
|
||||
|
||||
function(git_describe _var)
|
||||
if(NOT GIT_FOUND)
|
||||
find_package(Git QUIET)
|
||||
endif()
|
||||
get_git_head_revision(refspec hash)
|
||||
if(NOT GIT_FOUND)
|
||||
set(${_var} "GIT-NOTFOUND" PARENT_SCOPE)
|
||||
return()
|
||||
endif()
|
||||
if(NOT hash)
|
||||
set(${_var} "HEAD-HASH-NOTFOUND" PARENT_SCOPE)
|
||||
return()
|
||||
endif()
|
||||
|
||||
# TODO sanitize
|
||||
#if((${ARGN}" MATCHES "&&") OR
|
||||
# (ARGN MATCHES "||") OR
|
||||
# (ARGN MATCHES "\\;"))
|
||||
# message("Please report the following error to the project!")
|
||||
# message(FATAL_ERROR "Looks like someone's doing something nefarious with git_describe! Passed arguments ${ARGN}")
|
||||
#endif()
|
||||
|
||||
#message(STATUS "Arguments to execute_process: ${ARGN}")
|
||||
|
||||
execute_process(COMMAND
|
||||
"${GIT_EXECUTABLE}"
|
||||
describe
|
||||
${hash}
|
||||
${ARGN}
|
||||
WORKING_DIRECTORY
|
||||
"${CMAKE_SOURCE_DIR}"
|
||||
RESULT_VARIABLE
|
||||
res
|
||||
OUTPUT_VARIABLE
|
||||
out
|
||||
ERROR_QUIET
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
if(NOT res EQUAL 0)
|
||||
set(out "${out}-${res}-NOTFOUND")
|
||||
endif()
|
||||
|
||||
set(${_var} "${out}" PARENT_SCOPE)
|
||||
endfunction()
|
||||
|
||||
function(git_get_exact_tag _var)
|
||||
git_describe(out --exact-match ${ARGN})
|
||||
set(${_var} "${out}" PARENT_SCOPE)
|
||||
endfunction()
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
#
|
||||
# Internal file for GetGitRevisionDescription.cmake
|
||||
#
|
||||
# Requires CMake 2.6 or newer (uses the 'function' command)
|
||||
#
|
||||
# Original Author:
|
||||
# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
|
||||
# http://academic.cleardefinition.com
|
||||
# Iowa State University HCI Graduate Program/VRAC
|
||||
#
|
||||
# Copyright Iowa State University 2009-2010.
|
||||
# Distributed under the Boost Software License, Version 1.0.
|
||||
# (See accompanying file LICENSE_1_0.txt or copy at
|
||||
# http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
set(HEAD_HASH)
|
||||
|
||||
file(READ "@HEAD_FILE@" HEAD_CONTENTS LIMIT 1024)
|
||||
|
||||
string(STRIP "${HEAD_CONTENTS}" HEAD_CONTENTS)
|
||||
if(HEAD_CONTENTS MATCHES "ref")
|
||||
# named branch
|
||||
string(REPLACE "ref: " "" HEAD_REF "${HEAD_CONTENTS}")
|
||||
if(EXISTS "@GIT_DIR@/${HEAD_REF}")
|
||||
configure_file("@GIT_DIR@/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
|
||||
elseif(EXISTS "@GIT_DIR@/logs/${HEAD_REF}")
|
||||
configure_file("@GIT_DIR@/logs/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
|
||||
set(HEAD_HASH "${HEAD_REF}")
|
||||
endif()
|
||||
else()
|
||||
# detached HEAD
|
||||
configure_file("@GIT_DIR@/HEAD" "@GIT_DATA@/head-ref" COPYONLY)
|
||||
endif()
|
||||
|
||||
if(NOT HEAD_HASH)
|
||||
file(READ "@GIT_DATA@/head-ref" HEAD_HASH LIMIT 1024)
|
||||
string(STRIP "${HEAD_HASH}" HEAD_HASH)
|
||||
endif()
|
||||
|
|
@ -16,6 +16,7 @@ hcl = Hugo Clement <alliance-users@asim.lip6.fr>
|
|||
javid = Farakh Javid <alliance-users@asim.lip6.fr>
|
||||
karim = Karim Dioury <alliance-users@asim.lip6.fr>
|
||||
labiadh = Forgotten Author (labiadh) <alliance-users@asim.lip6.fr>
|
||||
liyao = Yao Li <alliance-users@asim.lip6.fr>
|
||||
ludo = Ludovic Jacomme <alliance-users@asim.lip6.fr>
|
||||
masson = Christian Masson <alliance-users@asim.lip6.fr>
|
||||
mitri = Forgotten Author (mitri) <alliance-users@asim.lip6.fr>
|
||||
|
|
|
|||
Loading…
Reference in New Issue