[PATCH] .version_stamp fix when not a git repo

if the source is not a git repo, there will be no
${SOURCE_DIR}/.version_stamp because .version_stamp is not
in the tree
---
 awesomeConfig.cmake |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/awesomeConfig.cmake b/awesomeConfig.cmake
index 5b70bc1..d48a152 100644
--- a/awesomeConfig.cmake
+++ b/awesomeConfig.cmake
 <at>  <at>  -88,9 +88,6  <at>  <at>  if(EXISTS ${SOURCE_DIR}/.git/HEAD AND GIT_EXECUTABLE)
     file(WRITE ${VERSION_STAMP_FILE} ${VERSION})
     # create a version_stamp target later
     set(BUILD_FROM_GIT TRUE)
-else()
-    # get version from version stamp
-    file(READ ${SOURCE_DIR}/.version_stamp VERSION)
 endif()
 # }}}

--

-- 
1.5.4.5

Re: awing preparations

At 1214858949 time_t, Pierre Habouzit wrote:
> Merging this allow my branch to in the end, replace {key*,mouse}.[hc]
> with awing methods. This becomes quite easy if the modules only interact
> with a few really simple interfaces that should not vary a lot.

Pushed.

Cheers,
--

-- 
Julien Danjou
// ᐰ <julien@...>   http://julien.danjou.info
// 9A0D 5FD9 EB42 22F6 8974  C95C A462 B51E C2FE E5CD

Re: [PATCH] .version_stamp fix when not a git repo

At 1214884044 time_t, Matt McCormick (thewtex) wrote:
> if the source is not a git repo, there will be no
> ${SOURCE_DIR}/.version_stamp because .version_stamp is not
> in the tree

Nack.

I need this to set a version number when I'll release.
If you're not using git, then you have to create .version_stamp yourself
and set a version number, since you're not the releaser.

Cheers,
--

-- 
Julien Danjou
// ᐰ <julien@...>   http://julien.danjou.info
// 9A0D 5FD9 EB42 22F6 8974  C95C A462 B51E C2FE E5CD

Re: [PATCH] .version_stamp fix when not a git repo

Re: [PATCH] .version_stamp fix when not a git repo

[PATCH] Build system improvements.

Add missing -f so that ln doesn't complain about target existing.
Be sure that the toplevel makefile is silent instead of custom  <at> 's.

Signed-off-by: Pierre Habouzit <madcoder@...>
---
 CMakeLists.txt |    2 +-
 Makefile       |   29 ++++++++++++++++++-----------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9efdd4e..c36b1ca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
 <at>  <at>  -249,7 +249,7  <at>  <at>  if(GENERATE_LUADOC)
         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 ${lua_file}
+            execute_process(COMMAND ${LN_EXECUTABLE} -s -f ${lua_file}
                             WORKING_DIRECTORY ${BUILD_DIR}/lib)
         endforeach()
     endif()
diff --git a/Makefile b/Makefile
index e7de882..425d6fe 100644
--- a/Makefile
+++ b/Makefile
 <at>  <at>  -1,24 +1,31  <at>  <at> 
 builddir=.build-$(shell hostname)-$(shell gcc -dumpmachine)-$(shell gcc -dumpversion)

+ifeq (,$(VERBOSE))
+    MAKEFLAGS:=$(MAKEFLAGS)s
+    ECHO=echo
+else
+    ECHO= <at> :
+endif
+
 all: cmake
-	 <at> echo "Building…"
-	make -C build
+	$(ECHO) "Building…"
+	$(MAKE) -C build

 install: cmake
-	 <at> echo "Installing…"
-	make -C build install
+	$(ECHO) "Installing…"
+	$(MAKE) -C build install

 cmake: build/cmake-stamp
 build/cmake-stamp: build CMakeLists.txt awesomeConfig.cmake
-	 <at> echo "Running cmake…"
+	$(ECHO) "Running cmake…"
 	cd ${builddir} && cmake "$ <at> " ..
 	touch ${builddir}/cmake-stamp

 build: awesome awesome-client
-	 <at> echo -n "Creating new build directory…"
-	 <at> mkdir -p ${builddir}
-	 <at> ln -s -f ${builddir} build
-	 <at> echo " done"
+	$(ECHO) -n "Creating new build directory…"
+	mkdir -p ${builddir}
+	ln -s -f ${builddir} build
+	$(ECHO) " done"

 awesome:
 	 <at> ln -s -f ${builddir}/awesome awesome
 <at>  <at>  -27,8 +34,8  <at>  <at>  awesome-client:
 	 <at> ln -s -f ${builddir}/awesome-client awesome-client

 clean:
-	 <at> echo -n "Cleaning up build directory…"
+	$(ECHO) -n "Cleaning up build directory…"
 	 <at> rm -rf ${builddir} build
-	 <at> echo " done"
+	$(ECHO) " done"

 .PHONY: clean
--

-- 
1.5.6.1.218.g2294e

Re: [PATCH] .version_stamp fix when not a git repo

At 1214926854 time_t, Matthew McCormick (thewtex) wrote:
>    Perhaps this is more satisfactory.

Yes and no: you will end up with no version defined, which is not
better.

--

-- 
Julien Danjou
// ᐰ <julien@...>   http://julien.danjou.info
// 9A0D 5FD9 EB42 22F6 8974  C95C A462 B51E C2FE E5CD

Re: [PATCH] Build system improvements.

At 1214939949 time_t, Pierre Habouzit wrote:

Thanks, pushed.

Cheers,
--

-- 
Julien Danjou
// ᐰ <julien@...>   http://julien.danjou.info
// 9A0D 5FD9 EB42 22F6 8974  C95C A462 B51E C2FE E5CD

[awesome bugs] #227 - tasklist does not update if more than one tag is active

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY.

A new Flyspray task has been opened.  Details are below. 

User who did this - voltaic (voltaic) 

Attached to Project - awesome
Summary - tasklist does not update if more than one tag is active
Task Type - Bug Report
Category - Statusbars
Status - Unconfirmed
Assigned To - 
Operating System - Linux
Severity - Medium
Priority - Normal
Reported Version - 2.3.2
Due in Version - Undecided
Due Date - Undecided
Details - The following occurs when tasklist is set to show "tags":

If tag 1 is active and the user toggles tag 2 to become active, the tasklist only shows clients associated
with tag 1. Once focus is shifted to a different client (either through mouse or keyboard) the tasklist
updates and all the clients in view are listed. Spawning a new client while tag 1 and tag 2 are in view also
causes the tasklist to update.

It looks like the tasklist stops being updated if more than one tag is toggled.

More information can be found at the following URL:
http://awesome.naquadah.org/bugs/index.php?do=details&task_id=227

You are receiving this message because you have requested it from the Flyspray bugtracking system.  If you
did not expect this message or don't want to receive mails in future, you can change your notification
settings at the URL shown above.

--

-- 
To unsubscribe, send mail to awesome-unsubscribe@...

[PATCH] Revamp the toplevel Makefile.

This fixes among things:
* cmake has a clean target that doesn't redo cmake, use it, implement
  distclean for what clean did.
* cmake is aware that it has to reconfigure, let id be clever about that
  instead of being half clever ourselves.
* Don't have a *build* symlink and a *build* target, this is confusing.
* Forward things we don't know about to cmake.

Signed-off-by: Pierre Habouzit <madcoder@...>
---
 Makefile |   47 +++++++++++++++++++++++++----------------------
 1 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/Makefile b/Makefile
index 425d6fe..d4ed269 100644
--- a/Makefile
+++ b/Makefile
 <at>  <at>  -7,35 +7,38  <at>  <at>  else
     ECHO= <at> :
 endif

-all: cmake
-	$(ECHO) "Building…"
-	$(MAKE) -C build
+TARGETS=awesome awesome-client
+BUILDLN=build

-install: cmake
-	$(ECHO) "Installing…"
-	$(MAKE) -C build install
+all: $(TARGETS) $(BUILDLN)

-cmake: build/cmake-stamp
-build/cmake-stamp: build CMakeLists.txt awesomeConfig.cmake
-	$(ECHO) "Running cmake…"
-	cd ${builddir} && cmake "$ <at> " ..
-	touch ${builddir}/cmake-stamp
+$(TARGETS): cmake-build
+	ln -s -f ${builddir}/$ <at>  $ <at> 

-build: awesome awesome-client
-	$(ECHO) -n "Creating new build directory…"
+$(BUILDLN):
+	ln -s -f ${builddir} $(BUILDLN)
+
+cmake ${builddir}/CMakeCache.txt:
 	mkdir -p ${builddir}
-	ln -s -f ${builddir} build
-	$(ECHO) " done"
+	$(ECHO) "Running cmake…"
+	cd ${builddir} && cmake "$( <at> D)" ..

-awesome:
-	 <at> ln -s -f ${builddir}/awesome awesome
+cmake-build: ${builddir}/CMakeCache.txt
+	$(ECHO) "Building…"
+	$(MAKE) -C ${builddir}

-awesome-client:
-	 <at> ln -s -f ${builddir}/awesome-client awesome-client
+install: cmake-build
+	$(ECHO) "Installing…"
+	$(MAKE) -C ${builddir} install

-clean:
+distclean:
 	$(ECHO) -n "Cleaning up build directory…"
-	 <at> rm -rf ${builddir} build
+	$(RM) -r ${builddir} $(BUILDLN) $(TARGETS)
 	$(ECHO) " done"

-.PHONY: clean
+%:
+	$(ECHO) "Running make $ <at> …"
+	$(MAKE) -C ${builddir} $ <at> 
+	$(and $(filter clean,$ <at> ),$(RM) $(BUILDLN) $(TARGETS))
+
+.PHONY: cmake-build cmake install $(BUILDLN)
--

-- 
1.5.6.1.218.g2294e