lib: add @release tag
Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
parent
70d89c4452
commit
22f41a6983
|
@ -22,9 +22,9 @@ include_directories(
|
||||||
${AWESOME_OPTIONAL_INCLUDE_DIRS})
|
${AWESOME_OPTIONAL_INCLUDE_DIRS})
|
||||||
|
|
||||||
set(AWE_LUA_FILES
|
set(AWE_LUA_FILES
|
||||||
${SOURCE_DIR}/lib/tabulous.lua
|
${BUILD_DIR}/lib/tabulous.lua
|
||||||
${SOURCE_DIR}/lib/beautiful.lua)
|
${BUILD_DIR}/lib/beautiful.lua
|
||||||
set(awful_lua ${BUILD_DIR}/lib/awful.lua)
|
${BUILD_DIR}/lib/awful.lua)
|
||||||
|
|
||||||
set(AWE_CONF_FILE_DEFAULT ${BUILD_DIR}/awesomerc.lua)
|
set(AWE_CONF_FILE_DEFAULT ${BUILD_DIR}/awesomerc.lua)
|
||||||
set(AWE_CONF_FILE rc.lua)
|
set(AWE_CONF_FILE rc.lua)
|
||||||
|
@ -247,11 +247,6 @@ if(GENERATE_LUADOC)
|
||||||
|
|
||||||
if(NOT BUILD_DIR STREQUAL SOURCE_DIR)
|
if(NOT BUILD_DIR STREQUAL SOURCE_DIR)
|
||||||
file(MAKE_DIRECTORY ${BUILD_DIR}/lib)
|
file(MAKE_DIRECTORY ${BUILD_DIR}/lib)
|
||||||
# setup symlink so everything is in one directory
|
|
||||||
foreach(lua_file ${AWE_LUA_FILES})
|
|
||||||
execute_process(COMMAND ${LN_EXECUTABLE} -s -f ${lua_file}
|
|
||||||
WORKING_DIRECTORY ${BUILD_DIR}/lib)
|
|
||||||
endforeach()
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# {{{ setup a command for ${capi_lua}
|
# {{{ setup a command for ${capi_lua}
|
||||||
|
@ -304,7 +299,7 @@ if(GENERATE_LUADOC)
|
||||||
# }}}
|
# }}}
|
||||||
|
|
||||||
# dont include full path names in documentation
|
# dont include full path names in documentation
|
||||||
foreach(filename ${AWE_LUA_FILES} ${capi_lua} ${awful_lua})
|
foreach(filename ${AWE_LUA_FILES} ${capi_lua})
|
||||||
get_filename_component(filename ${filename} NAME)
|
get_filename_component(filename ${filename} NAME)
|
||||||
set(luadoc_srcs ${luadoc_srcs} ${filename})
|
set(luadoc_srcs ${luadoc_srcs} ${filename})
|
||||||
endforeach()
|
endforeach()
|
||||||
|
@ -312,7 +307,7 @@ if(GENERATE_LUADOC)
|
||||||
add_custom_target(luadoc ALL
|
add_custom_target(luadoc ALL
|
||||||
COMMAND ${LUADOC_EXECUTABLE} ${luadoc_srcs} -d ${BUILD_DIR}/luadoc
|
COMMAND ${LUADOC_EXECUTABLE} ${luadoc_srcs} -d ${BUILD_DIR}/luadoc
|
||||||
WORKING_DIRECTORY ${BUILD_DIR}/lib
|
WORKING_DIRECTORY ${BUILD_DIR}/lib
|
||||||
DEPENDS ${AWE_LUA_FILES} ${capi_lua} ${awful_lua})
|
DEPENDS ${AWE_LUA_FILES} ${capi_lua})
|
||||||
endif()
|
endif()
|
||||||
# }}}
|
# }}}
|
||||||
|
|
||||||
|
@ -320,7 +315,6 @@ endif()
|
||||||
if(LUAC_EXECUTABLE)
|
if(LUAC_EXECUTABLE)
|
||||||
foreach(luafile ${AWE_LUA_FILES})
|
foreach(luafile ${AWE_LUA_FILES})
|
||||||
string(REGEX REPLACE ".lua\$" ".luac" luacfile ${luafile})
|
string(REGEX REPLACE ".lua\$" ".luac" luacfile ${luafile})
|
||||||
string(REPLACE ${SOURCE_DIR} ${BUILD_DIR} luacfile ${luacfile})
|
|
||||||
|
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
COMMAND ${LUAC_EXECUTABLE} -o ${luacfile} ${luafile}
|
COMMAND ${LUAC_EXECUTABLE} -o ${luacfile} ${luafile}
|
||||||
|
@ -330,15 +324,6 @@ if(LUAC_EXECUTABLE)
|
||||||
set(AWE_LUAC_FILES ${AWE_LUAC_FILES} ${luacfile})
|
set(AWE_LUAC_FILES ${AWE_LUAC_FILES} ${luacfile})
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
# Special case for awful.lua
|
|
||||||
string(REGEX REPLACE ".lua\$" ".luac" luacfile ${awful_lua})
|
|
||||||
add_custom_command(
|
|
||||||
COMMAND ${LUAC_EXECUTABLE} -o ${luacfile} ${awful_lua}
|
|
||||||
OUTPUT ${luacfile}
|
|
||||||
DEPENDS ${awful_lua})
|
|
||||||
|
|
||||||
set(AWE_LUAC_FILES ${AWE_LUAC_FILES} ${luacfile})
|
|
||||||
|
|
||||||
if(NOT EXISTS ${BUILD_DIR}/lib)
|
if(NOT EXISTS ${BUILD_DIR}/lib)
|
||||||
FILE(MAKE_DIRECTORY ${BUILD_DIR}/lib)
|
FILE(MAKE_DIRECTORY ${BUILD_DIR}/lib)
|
||||||
endif()
|
endif()
|
||||||
|
@ -357,7 +342,7 @@ endif()
|
||||||
|
|
||||||
# {{{ Installation
|
# {{{ Installation
|
||||||
install(TARGETS ${PROJECT_AWE_NAME} ${PROJECT_AWECLIENT_NAME} RUNTIME DESTINATION bin)
|
install(TARGETS ${PROJECT_AWE_NAME} ${PROJECT_AWECLIENT_NAME} RUNTIME DESTINATION bin)
|
||||||
install(FILES ${AWE_LUA_FILES} ${awful_lua} ${AWE_LUAC_FILES} DESTINATION ${AWESOME_LUA_LIB_PATH})
|
install(FILES ${AWE_LUA_FILES} ${AWE_LUAC_FILES} DESTINATION ${AWESOME_LUA_LIB_PATH})
|
||||||
install(FILES ${AWE_CONF_FILE_DEFAULT} DESTINATION ${AWESOME_SYSCONFDIR}
|
install(FILES ${AWE_CONF_FILE_DEFAULT} DESTINATION ${AWESOME_SYSCONFDIR}
|
||||||
RENAME ${AWE_CONF_FILE})
|
RENAME ${AWE_CONF_FILE})
|
||||||
if(GENERATE_MANPAGES)
|
if(GENERATE_MANPAGES)
|
||||||
|
|
|
@ -285,6 +285,8 @@ set(AWESOME_CONFIGURE_FILES
|
||||||
awesomerc.lua.in
|
awesomerc.lua.in
|
||||||
themes/default.in
|
themes/default.in
|
||||||
lib/awful.lua.in
|
lib/awful.lua.in
|
||||||
|
lib/beautiful.lua.in
|
||||||
|
lib/tabulous.lua.in
|
||||||
awesome-version-internal.h.in
|
awesome-version-internal.h.in
|
||||||
awesome.doxygen.in)
|
awesome.doxygen.in)
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
---------------------------------------------------------------------------
|
---------------------------------------------------------------------------
|
||||||
-- @author Julien Danjou <julien@danjou.info>
|
-- @author Julien Danjou <julien@danjou.info>
|
||||||
-- @copyright 2008 Julien Danjou
|
-- @copyright 2008 Julien Danjou
|
||||||
|
-- @release @AWESOME_VERSION@
|
||||||
---------------------------------------------------------------------------
|
---------------------------------------------------------------------------
|
||||||
|
|
||||||
-- Grab environment we need
|
-- Grab environment we need
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
-- @author Damien Leone <damien.leone@gmail.com>
|
-- @author Damien Leone <damien.leone@gmail.com>
|
||||||
-- @author Julien Danjou <julien@danjou.info>
|
-- @author Julien Danjou <julien@danjou.info>
|
||||||
-- @copyright 2008 Damien Leone, Julien Danjou
|
-- @copyright 2008 Damien Leone, Julien Danjou
|
||||||
|
-- @release @AWESOME_VERSION@
|
||||||
----------------------------------------------------------------------------
|
----------------------------------------------------------------------------
|
||||||
|
|
||||||
-- Grab environment
|
-- Grab environment
|
|
@ -2,6 +2,7 @@
|
||||||
-- @author Lucas de Vries <lucasdevries@gmail.com>
|
-- @author Lucas de Vries <lucasdevries@gmail.com>
|
||||||
-- @author Julien Danjou <julien@danjou.info>
|
-- @author Julien Danjou <julien@danjou.info>
|
||||||
-- @copyright 2008 Julien Danjou, Lucas de Vries
|
-- @copyright 2008 Julien Danjou, Lucas de Vries
|
||||||
|
-- @release @AWESOME_VERSION@
|
||||||
---------------------------------------------------------------------------
|
---------------------------------------------------------------------------
|
||||||
|
|
||||||
-- Grab environment we need
|
-- Grab environment we need
|
Loading…
Reference in New Issue