Permalink
Browse files

rebar: fix loading of version string from vsn.mk

  • Loading branch information...
1 parent bf30d1a commit 21228ba71f69adc4bb00cd6509c3460206e91ce0 @tuncer tuncer committed with vinoski Oct 11, 2011
Showing with 2 additions and 4 deletions.
  1. +1 −1 include.mk.in
  2. +1 −1 src/yaws.app.src
  3. +0 −2 vsn.mk
View
@@ -91,7 +91,7 @@ endif
# Hmm, don't know if you are supposed to like this better... ;-)
-APPSCRIPT = '$$vsn=shift; $$mods=""; while(@ARGV){ $$_=shift; s/^([A-Z].*)$$/\'\''$$1\'\''/; $$mods.=", " if $$mods; $$mods .= $$_; } while(<>) { s/\{vsn, git\}/\{vsn, "$$vsn"\}/; s/\{modules,\[\]\}/\{modules,\[$$mods\]\}/; print; }'
+APPSCRIPT = '$$vsn=shift; $$mods=""; while(@ARGV){ $$_=shift; s/^([A-Z].*)$$/\'\''$$1\'\''/; $$mods.=", " if $$mods; $$mods .= $$_; } while(<>) { s/\{vsn, \{cmd, .*\}\}/\{vsn, "$$vsn"\}/; s/\{modules,\[\]\}/\{modules,\[$$mods\]\}/; print; }'
# Targets
View
@@ -1,6 +1,6 @@
{application,yaws,
[{description,"yaws WWW server"},
- {vsn, git},
+ {vsn, {cmd, "sed -e 's/^.*=//' vsn.mk 2>/dev/null"}},
{modules,[]},
{registered, []},
{mod,{yaws_app,[]}},
View
2 vsn.mk
@@ -1,3 +1 @@
YAWS_VSN=1.91
-
-

0 comments on commit 21228ba

Please sign in to comment.