From 8664b39f39997c7d6c5b5a99ab7fa4a39057c476 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Bigaret?=
 <sebastien.bigaret@telecom-bretagne.eu>
Date: Tue, 28 Jun 2011 10:43:19 +0200
Subject: [PATCH] New field package_date + release_date=date of last commit in
 core

---
 updateReleaseInfo.sh | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/updateReleaseInfo.sh b/updateReleaseInfo.sh
index 1fc4f616..e4010026 100755
--- a/updateReleaseInfo.sh
+++ b/updateReleaseInfo.sh
@@ -3,14 +3,25 @@
 # mise à jour de ReleaseInfo.java avec les nums. de release Praxis core+GUI
 # et date courante
 
-core=$(cd ~/Projets/praxis-git/praxis-core; git rev-parse --verify HEAD | cut -c -10)
-swing=$(cd ~/Projets/praxis-git/praxis-swing-gui; git rev-parse --verify HEAD | cut -c -10)
-echo core:$core GUI:$swing 1>&2
+# git log --pretty=format:'%H %ai' HEAD -1
+# git log --pretty=format:'%h, %ad' --date=short -1
+
+#core=$(cd ~/Projets/praxis-git/praxis-core; git rev-parse --verify HEAD | cut -c -10)
+#swing=$(cd ~/Projets/praxis-git/praxis-swing-gui; git rev-parse --verify HEAD | cut -c -10)
+core=$(cd ~/Projets/praxis-git/praxis-core; git log --pretty=format:'%H %ad' --date=short HEAD -1)
+swing=$(cd ~/Projets/praxis-git/praxis-swing-gui; git log --pretty=format:'%H %ad --date=short' HEAD -1)
+
+core_htag=${core%% *}
+swing_htag=${swing%% *}
+
+echo core:${core_htag:0:10} GUI:${swing_htag:0:10} 1>&2
+
 cd ~/Projets/praxis-git/praxis-core/src/eu/telecom_bretagne/praxis/common
-sed -e 's|\(public *static *final *String *release *= *"\)[^"]*";|\1'"core:$core GUI:$swing\";|" ReleaseInfo.java > ReleaseInfo.java.sed
+sed -i -e 's|\(public *static *final *String *release *= *"\)[^"]*";|\1'"core:${core_htag:0:10} GUI:${swing_htag:0:10}\";|" ReleaseInfo.java
+
+sed -i -e 's|\(public *static *final *String *release_date *= *"\)[^"]*";|\1'"${core#* }\";|" ReleaseInfo.java
 
 today=$(date +"%Y-%m-%d")
-sed -e 's|\(public *static *final *String *release_date *= *"\)[^"]*";|\1'"$today\";|" ReleaseInfo.java.sed > ReleaseInfo.java
+sed -i -e 's|\(public *static *final *String *package_date *= *"\)[^"]*";|\1'"$today\";|" ReleaseInfo.java
 
-/bin/rm ReleaseInfo.java.sed
 
-- 
GitLab