• 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.

git-svn-id: https://svn.neo-layout.org@1099 b9310e46-f624-0410-8ea1-cfbb3a30dc96

7 files changed, 18 insertions, 16 deletions

diff --git a/windows/neo-vars/Make-Build.bat b/windows/neo-vars/Make-Build.bat
index 282a304..3c7fc8c 100644
--- a/windows/neo-vars/Make-Build.bat
+++ b/windows/neo-vars/Make-Build.bat
@@ -11,23 +11,23 @@ set  Ahk2Exe=%ahkpath%\Compiler\Ahk2Exe.exe
 REM The path to the authohotkey directory in the local svn copy, MUST be "."

 set srcdir=.

 set Ssrcdir=%srcdir%\Source

-set ahkrevtemplate=%Ssrcdir%\_subwcrev.tmpl.ahk

-set   ahkrevoutput=%Ssrcdir%\_subwcrev.ahk

-set batrevtemplate=%Ssrcdir%\_subwcrev.tmpl.bat

-set   batrevoutput=%Ssrcdir%\_subwcrev.bat

+set ahkrevtemplate1=%Ssrcdir%\_subwcrev1.tmpl.ahk

+set   ahkrevoutput1=%Ssrcdir%\_subwcrev1.ahk

+set batrevtemplate1=%Ssrcdir%\_subwcrev1.tmpl.bat

+set   batrevoutput1=%Ssrcdir%\_subwcrev1.bat

+set ahkrevtemplate2=%Ssrcdir%\_subwcrev2.tmpl.ahk

+set   ahkrevoutput2=%Ssrcdir%\_subwcrev2.ahk

 

 REM The path to the directory used for generating a consistent SVN version (revision number)

-set svnversiondir=..

+set svnversiondir1=.

+set svnversiondir2=..\..\Compose

 

 :next1

 echo Generating Version File

-"%SubWCRev%" "%svnversiondir%" "%ahkrevtemplate%" "%ahkrevoutput%" -nm

-if errorlevel 1 (

-  echo Inconsistent Revision! Aborting

-REM  goto :eof

-)

-"%SubWCRev%" "%svnversiondir%" "%batrevtemplate%" "%batrevoutput%"

-call "%batrevoutput%"

+"%SubWCRev%" "%svnversiondir1%" "%ahkrevtemplate1%" "%ahkrevoutput1%"

+"%SubWCRev%" "%svnversiondir1%" "%batrevtemplate1%" "%batrevoutput1%"

+"%SubWCRev%" "%svnversiondir2%" "%ahkrevtemplate2%" "%ahkrevoutput2%"

+call "%batrevoutput1%"

 

 set fn=%srcdir%\neo20-r%Revision%

 

@@ -43,7 +43,7 @@ del %srcdir%\neo20-r*.exe %srcdir%\neo20-r*.ahk 2> nul
 echo creating all-in-one script

 echo ; Gesamtdatei > %fn%.ahk

 

-for %%i in (_subwcrev en_us neocomp neovarscomp keydefinitions shortcuts recycle keyhooks varsfunctions) do (type "%Ssrcdir%\%%i.ahk" >> "%fn%.ahk")

+for %%i in (_subwcrev1 _subwcrev2 en_us neocomp neovarscomp keydefinitions shortcuts recycle keyhooks varsfunctions) do (type "%Ssrcdir%\%%i.ahk" >> "%fn%.ahk")

 

 echo Compiling the new Driver using Autohotkey

 "%Ahk2Exe%" /in "%fn%.ahk" /out "%fn%.exe" /icon "%srcdir%\neo_enabled.ico"

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/_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/_subwcrev.tmpl.bat b/windows/neo-vars/Source/_subwcrev1.tmpl.bat
index b958643..b958643 100644
--- a/windows/neo-vars/Source/_subwcrev.tmpl.bat
+++ b/windows/neo-vars/Source/_subwcrev1.tmpl.bat
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