From d4487ddb52deb48475285045f6f7f7149221b0b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?m=C3=B6si?= <mösi@b9310e46-f624-0410-8ea1-cfbb3a30dc96>
Date: Tue, 18 Nov 2008 15:40:37 +0000
Subject: =?UTF-8?q?Build-Prozess=20wieder=20in=20Ordnung=20gebracht:=20die?=
 =?UTF-8?q?=20generierte=20=5Fsubwcrev1.generated.ahk,=20die=20dort=20nur?=
 =?UTF-8?q?=20eingecheckt=20war,=20damit=20auch=20im=20AHK-Skript=20eine?=
 =?UTF-8?q?=20Revision=20angezeigt=20wird=20und=20nicht=20nur=20im=20.EXE,?=
 =?UTF-8?q?=20wurde=20wieder=20entfernt.=20Nach=20M=C3=B6glichkeit=20werde?=
 =?UTF-8?q?n=20zwei=20SVN-Clients=20gesucht:=20TortoiseSVN=20und=20CollabN?=
 =?UTF-8?q?et-SVN-CLI,=20und=20mit=20deren=20Bordmitteln=20wird=20beim=20A?=
 =?UTF-8?q?HK-Skript=20dynamisch=20die=20aktuelle=20Revision=20und=20der?=
 =?UTF-8?q?=20Consistentcy=20State=20eruiert=20(der=20Output=20der=20beide?=
 =?UTF-8?q?n=20Tools=20ist=20unterschiedlich,=20aber=20das=20st=C3=B6rt=20?=
 =?UTF-8?q?im=20Moment=20kaum).=20Was=20fehlt=20ist=20eine=20sinnvolle=20L?=
 =?UTF-8?q?=C3=B6sung=20f=C3=BCr=20den=20Anwender,=20der=20sich=20die=20ei?=
 =?UTF-8?q?nzelnen=20AHK-Sourcefiles=20ohne=20Subversion=20runterl=C3=A4dt?=
 =?UTF-8?q?=20oder=20einen=20anderen=20SVN-Client=20verwendet.=20In=20dies?=
 =?UTF-8?q?en=20F=C3=A4llen=20wird=20derzeit=20=E2=80=9Er<unknown>?=
 =?UTF-8?q?=E2=80=9C=20ausgegeben.=20Nicht=20h=C3=BCbsch,=20aber=20immerhi?=
 =?UTF-8?q?n=20etwas.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.neo-layout.org@1220 b9310e46-f624-0410-8ea1-cfbb3a30dc96
---
 windows/neo-vars/src/neo20-all.ahk                 |  1 -
 .../neo-vars/src/source/_subwcrev1.generated.ahk   |  1 -
 windows/neo-vars/src/source/initialize.ahk         | 30 ++++++++++++++++++++++
 3 files changed, 30 insertions(+), 2 deletions(-)
 delete mode 100644 windows/neo-vars/src/source/_subwcrev1.generated.ahk

(limited to 'windows')

diff --git a/windows/neo-vars/src/neo20-all.ahk b/windows/neo-vars/src/neo20-all.ahk
index 8e0b183..1c2c776 100644
--- a/windows/neo-vars/src/neo20-all.ahk
+++ b/windows/neo-vars/src/neo20-all.ahk
@@ -4,7 +4,6 @@ SetWorkingDir, %A_ScriptDir%
 
 ; Revision Information (don't moun)
 #include *i source\_subwcrev1.generated.ahk
-#include *i source\_subwcrev1.ahk
 
 ; die Compose-Definitionen
 #include *i source\compose.generated.ahk
diff --git a/windows/neo-vars/src/source/_subwcrev1.generated.ahk b/windows/neo-vars/src/source/_subwcrev1.generated.ahk
deleted file mode 100644
index 925ed05..0000000
--- a/windows/neo-vars/src/source/_subwcrev1.generated.ahk
+++ /dev/null
@@ -1 +0,0 @@
-Revision:="1209"
diff --git a/windows/neo-vars/src/source/initialize.ahk b/windows/neo-vars/src/source/initialize.ahk
index 976afcf..48cecd5 100644
--- a/windows/neo-vars/src/source/initialize.ahk
+++ b/windows/neo-vars/src/source/initialize.ahk
@@ -1,3 +1,33 @@
+if (A_IsCompiled) {
+; Revisionsinformation bereits verfügbar
+} else {
+; Revisionsinformation nicht verfügbar oder nicht zuverlässig, neu generieren
+  if (FileExist(".svn")<>False) {
+    ; .svn existiert, scheint also ausgecheckt worden zu sein
+    RegRead,TSVNPath,HKLM,SOFTWARE\TortoiseSVN,Directory
+    RegRead,SVNPath,HKLM,SOFTWARE\CollabNet\Subversion\1.5.4\Client,Install Location
+    if (TSVNPath<>"") {
+      ; fein, TSVN ist installiert!
+      RunWait, "%TSVNPath%bin\SubWCRev.exe" "." "Source\_subwcrev1.tmpl.ahk" "Source\_subwcrev1.generated.ahk",,Hide
+      FileRead,TSVNRevFull,Source\_subwcrev1.generated.ahk
+      RegExMatch(TSVNRevFull,"""(.*)""",SubPat)
+      Revision := SubPat1
+    } else if (SVNPath<>"") {
+      ; fein, CollabNet-SVN-Client ist installiert!
+      RunWait, %comspec% /c ""%SVNPath%\svnversion.exe" "." >"Source\_svnversion.generated.txt"",,Hide
+      FileRead,SVNRevFull,Source\_svnversion.generated.txt
+      RegExMatch(SVNRevFull,"(.*)$",SubPat)
+      Revision := SubPat1
+    } else {
+      ; nichts installiert. Was jetzt?
+      Revision := "<unknown>"
+    }
+  } else {
+    ; kein .svn-Verzeichnis. Was jetzt?
+    Revision := "<unknown>"
+  }
+}
+
 name=Neo 2.0 r%Revision%-r%CompRevision% (%A_ScriptName%)
 enable=Aktiviere %name%
 disable=Deaktiviere %name%
-- 
cgit v1.2.3