From 22f41a6983b66c54b4cb46d695921dcfd93af769 Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Mon, 18 Aug 2008 11:41:58 +0200
Subject: [PATCH] lib: add @release tag

Signed-off-by: Julien Danjou <julien@danjou.info>
---
 CMakeLists.txt                          | 27 ++++++---------------------
 awesomeConfig.cmake                     |  2 ++
 lib/awful.lua.in                        |  1 +
 lib/{beautiful.lua => beautiful.lua.in} |  1 +
 lib/{tabulous.lua => tabulous.lua.in}   |  1 +
 5 files changed, 11 insertions(+), 21 deletions(-)
 rename lib/{beautiful.lua => beautiful.lua.in} (98%)
 rename lib/{tabulous.lua => tabulous.lua.in} (99%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0947a5a6..b81e4a44 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,9 +22,9 @@ include_directories(
     ${AWESOME_OPTIONAL_INCLUDE_DIRS})
 
 set(AWE_LUA_FILES
-    ${SOURCE_DIR}/lib/tabulous.lua
-    ${SOURCE_DIR}/lib/beautiful.lua)
-set(awful_lua ${BUILD_DIR}/lib/awful.lua)
+    ${BUILD_DIR}/lib/tabulous.lua
+    ${BUILD_DIR}/lib/beautiful.lua
+    ${BUILD_DIR}/lib/awful.lua)
 
 set(AWE_CONF_FILE_DEFAULT ${BUILD_DIR}/awesomerc.lua)
 set(AWE_CONF_FILE rc.lua)
@@ -247,11 +247,6 @@ if(GENERATE_LUADOC)
 
     if(NOT BUILD_DIR STREQUAL SOURCE_DIR)
         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()
 
     # {{{ setup a command for ${capi_lua}
@@ -304,7 +299,7 @@ if(GENERATE_LUADOC)
     # }}}
 
     # 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)
         set(luadoc_srcs ${luadoc_srcs} ${filename})
     endforeach()
@@ -312,7 +307,7 @@ if(GENERATE_LUADOC)
     add_custom_target(luadoc ALL
         COMMAND ${LUADOC_EXECUTABLE} ${luadoc_srcs} -d ${BUILD_DIR}/luadoc
         WORKING_DIRECTORY ${BUILD_DIR}/lib
-        DEPENDS ${AWE_LUA_FILES} ${capi_lua} ${awful_lua})
+        DEPENDS ${AWE_LUA_FILES} ${capi_lua})
 endif()
 # }}}
 
@@ -320,7 +315,6 @@ endif()
 if(LUAC_EXECUTABLE)
     foreach(luafile ${AWE_LUA_FILES})
         string(REGEX REPLACE ".lua\$" ".luac" luacfile ${luafile})
-        string(REPLACE ${SOURCE_DIR} ${BUILD_DIR} luacfile ${luacfile})
 
         add_custom_command(
             COMMAND ${LUAC_EXECUTABLE} -o ${luacfile} ${luafile}
@@ -330,15 +324,6 @@ if(LUAC_EXECUTABLE)
         set(AWE_LUAC_FILES ${AWE_LUAC_FILES} ${luacfile})
     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)
         FILE(MAKE_DIRECTORY ${BUILD_DIR}/lib)
     endif()
@@ -357,7 +342,7 @@ endif()
 
 # {{{ Installation
 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}
         RENAME ${AWE_CONF_FILE})
 if(GENERATE_MANPAGES)
diff --git a/awesomeConfig.cmake b/awesomeConfig.cmake
index 1cd1f554..3adb82f5 100644
--- a/awesomeConfig.cmake
+++ b/awesomeConfig.cmake
@@ -285,6 +285,8 @@ set(AWESOME_CONFIGURE_FILES
     awesomerc.lua.in
     themes/default.in
     lib/awful.lua.in
+    lib/beautiful.lua.in
+    lib/tabulous.lua.in
     awesome-version-internal.h.in
     awesome.doxygen.in)
 
diff --git a/lib/awful.lua.in b/lib/awful.lua.in
index 99d8e8db..571f1033 100644
--- a/lib/awful.lua.in
+++ b/lib/awful.lua.in
@@ -1,6 +1,7 @@
 ---------------------------------------------------------------------------
 -- @author Julien Danjou &lt;julien@danjou.info&gt;
 -- @copyright 2008 Julien Danjou
+-- @release @AWESOME_VERSION@
 ---------------------------------------------------------------------------
 
 -- Grab environment we need
diff --git a/lib/beautiful.lua b/lib/beautiful.lua.in
similarity index 98%
rename from lib/beautiful.lua
rename to lib/beautiful.lua.in
index 7491dc06..c2dcdd8d 100644
--- a/lib/beautiful.lua
+++ b/lib/beautiful.lua.in
@@ -2,6 +2,7 @@
 -- @author Damien Leone &lt;damien.leone@gmail.com&gt;
 -- @author Julien Danjou &lt;julien@danjou.info&gt;
 -- @copyright 2008 Damien Leone, Julien Danjou
+-- @release @AWESOME_VERSION@
 ----------------------------------------------------------------------------
 
 -- Grab environment
diff --git a/lib/tabulous.lua b/lib/tabulous.lua.in
similarity index 99%
rename from lib/tabulous.lua
rename to lib/tabulous.lua.in
index df1ad6b5..cec465c5 100644
--- a/lib/tabulous.lua
+++ b/lib/tabulous.lua.in
@@ -2,6 +2,7 @@
 -- @author Lucas de Vries &lt;lucasdevries@gmail.com&gt;
 -- @author Julien Danjou &lt;julien@danjou.info&gt;
 -- @copyright 2008 Julien Danjou, Lucas de Vries
+-- @release @AWESOME_VERSION@
 ---------------------------------------------------------------------------
 
 -- Grab environment we need
-- 
2.11.4.GIT