From 9b250b95390643382fa8a4951e8ed65daca2b946 Mon Sep 17 00:00:00 2001
From: mösi <mösi@b9310e46-f624-0410-8ea1-cfbb3a30dc96>
Date: Mon, 3 Nov 2008 15:42:12 +0000
Subject: • getrennte Revisionsnummern für das AHK-Skript und das an völlig
 anderer Stelle liegende Compose-Directory implementiert. Sollte später durch
 einen Konsistenzcheck ersetzt werden, damit man nur eine Revisionsnummer
 braucht.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.neo-layout.org@1099 b9310e46-f624-0410-8ea1-cfbb3a30dc96
---
 windows/neo-vars/Source/_subwcrev.tmpl.ahk  | 1 -
 windows/neo-vars/Source/_subwcrev.tmpl.bat  | 1 -
 windows/neo-vars/Source/_subwcrev1.tmpl.ahk | 1 +
 windows/neo-vars/Source/_subwcrev1.tmpl.bat | 1 +
 windows/neo-vars/Source/_subwcrev2.tmpl.ahk | 1 +
 windows/neo-vars/Source/neo20-all.ahk       | 3 ++-
 windows/neo-vars/Source/recycle.ahk         | 2 +-
 7 files changed, 6 insertions(+), 4 deletions(-)
 delete mode 100644 windows/neo-vars/Source/_subwcrev.tmpl.ahk
 delete mode 100644 windows/neo-vars/Source/_subwcrev.tmpl.bat
 create mode 100644 windows/neo-vars/Source/_subwcrev1.tmpl.ahk
 create mode 100644 windows/neo-vars/Source/_subwcrev1.tmpl.bat
 create mode 100644 windows/neo-vars/Source/_subwcrev2.tmpl.ahk

(limited to 'windows/neo-vars/Source')

diff --git a/windows/neo-vars/Source/_subwcrev.tmpl.ahk b/windows/neo-vars/Source/_subwcrev.tmpl.ahk
deleted file mode 100644
index 72cca0d..0000000
--- a/windows/neo-vars/Source/_subwcrev.tmpl.ahk
+++ /dev/null
@@ -1 +0,0 @@
-Revision:="$WCREV$$WCMODS?M:$$WCMIXED?X:$"
\ No newline at end of file
diff --git a/windows/neo-vars/Source/_subwcrev.tmpl.bat b/windows/neo-vars/Source/_subwcrev.tmpl.bat
deleted file mode 100644
index b958643..0000000
--- a/windows/neo-vars/Source/_subwcrev.tmpl.bat
+++ /dev/null
@@ -1 +0,0 @@
-set Revision=$WCREV$$WCMODS?M:$$WCMIXED?X:$
diff --git a/windows/neo-vars/Source/_subwcrev1.tmpl.ahk b/windows/neo-vars/Source/_subwcrev1.tmpl.ahk
new file mode 100644
index 0000000..888b651
--- /dev/null
+++ b/windows/neo-vars/Source/_subwcrev1.tmpl.ahk
@@ -0,0 +1 @@
+Revision:="$WCREV$$WCMODS?M:$$WCMIXED?X:$"
diff --git a/windows/neo-vars/Source/_subwcrev1.tmpl.bat b/windows/neo-vars/Source/_subwcrev1.tmpl.bat
new file mode 100644
index 0000000..b958643
--- /dev/null
+++ b/windows/neo-vars/Source/_subwcrev1.tmpl.bat
@@ -0,0 +1 @@
+set Revision=$WCREV$$WCMODS?M:$$WCMIXED?X:$
diff --git a/windows/neo-vars/Source/_subwcrev2.tmpl.ahk b/windows/neo-vars/Source/_subwcrev2.tmpl.ahk
new file mode 100644
index 0000000..89b9549
--- /dev/null
+++ b/windows/neo-vars/Source/_subwcrev2.tmpl.ahk
@@ -0,0 +1 @@
+CompRevision:="$WCREV$$WCMODS?M:$$WCMIXED?X:$"
diff --git a/windows/neo-vars/Source/neo20-all.ahk b/windows/neo-vars/Source/neo20-all.ahk
index 532a00e..38eb336 100644
--- a/windows/neo-vars/Source/neo20-all.ahk
+++ b/windows/neo-vars/Source/neo20-all.ahk
@@ -2,7 +2,8 @@
 #Include %a_scriptdir%\..
 
 ; Revision Information (don't moun)
-#Include *i %a_scriptdir%\_subwcrev.ahk
+#Include *i %a_scriptdir%\_subwcrev1.ahk
+#Include *i %a_scriptdir%\_subwcrev2.ahk
 
 ; die Compose-Definitionen
 #Include *i %a_scriptdir%\en_us.ahk
diff --git a/windows/neo-vars/Source/recycle.ahk b/windows/neo-vars/Source/recycle.ahk
index 3397cd0..d0fd704 100644
--- a/windows/neo-vars/Source/recycle.ahk
+++ b/windows/neo-vars/Source/recycle.ahk
@@ -11,7 +11,7 @@ SetCapsLockState Off
 SetNumLockState Off
 SetScrollLockState Off
 
-name=Neo 2.0 (%A_ScriptName%) (r%Revision%)
+name=Neo 2.0 (%A_ScriptName%) (r%Revision%-r%CompRevision%)
 enable=Aktiviere %name%
 disable=Deaktiviere %name%
 #usehook on
-- 
cgit v1.2.3