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

6 files changed, 42 insertions, 15 deletions

diff --git a/windows/neo-vars/Make-Build.bat b/windows/neo-vars/Make-Build.bat
index 2801584..9024562 100644
--- a/windows/neo-vars/Make-Build.bat
+++ b/windows/neo-vars/Make-Build.bat
@@ -1,24 +1,46 @@
 @echo off

 

 echo Setting local path variables

-REM The path to the Auto Hotkeyprogram:

-set ahk=C:\Programme\AutoHotkey

-REM The path to the authohotkey directory in the local svn copy:

-set svn=.

-REM The filename of the joined script:

-set fn=neo20-vars

+:: TortoiseSVN and its clever tool SubWCRev

+set Tsvnpath=C:\Programme\TortoiseSVN\bin

+set SubWCRev=%Tsvnpath%\SubWCRev.exe

+

+set  ahkpath=C:\Programme\AutoHotkey

+set  Ahk2Exe=%ahkpath%\Compiler\Ahk2Exe.exe

+

+REM The path to the authohotkey directory in the local svn copy, MUST be "."

+set srcdir=.

+set ahkrevtemplate=%srcdir%\_subwcrev.tmpl.ahk

+set   ahkrevoutput=%srcdir%\_subwcrev.ahk

+set batrevtemplate=%srcdir%\_subwcrev.tmpl.bat

+set   batrevoutput=%srcdir%\_subwcrev.bat

+

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

+set svnversiondir=..

+

+: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%"

+

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

+

+echo Compiling Compose sequences

+%srcdir%\makecompose.ahk

 

 rem echo Killing the old (AHK)Driver

 rem tskill %fn%

 

+echo removing old version(s) of NEO AHK Exe file

+del %srcdir%\neo20-r*.exe 2> nul

+

 echo Compiling the new Driver using Autohotkey

-"%ahk%\Compiler\Ahk2Exe.exe" /in "%svn%\%fn%.ahk" /out "%svn%\%fn%.exe" /icon "%svn%\neo.ico"

+"%Ahk2Exe%" /in "neo20-vars.ahk" /out "%fn%.exe" /icon "%srcdir%\neo.ico"

 

 echo Driver Update complete! You can now close this log-window.

-

-REM Start the new Driver

-rem %fn%.exe

-

-REM wie kann man hier mit der Skriptabarbeitung weitermachen? Unter Windows XP scheint es nicht möglich zu sein, dies mit "Bordmitteln" zu erreichen, es gibt hierfür jedoch extere Programme, etwa:

-REM  Start the new driver asynchronously, using "Hidden Start" (hstart.exe) from http://www.ntwind.com/software/utilities/hstart/

-REM hstart.exe /NOCONSOLE /D="." "%fn%.exe"
\ No newline at end of file
+pause
\ No newline at end of file
diff --git a/windows/neo-vars/_subwcrev.tmpl.ahk b/windows/neo-vars/_subwcrev.tmpl.ahk
new file mode 100644
index 0000000..72cca0d
--- /dev/null
+++ b/windows/neo-vars/_subwcrev.tmpl.ahk
@@ -0,0 +1 @@
+Revision:="$WCREV$$WCMODS?M:$$WCMIXED?X:$"
\ No newline at end of file
diff --git a/windows/neo-vars/_subwcrev.tmpl.bat b/windows/neo-vars/_subwcrev.tmpl.bat
new file mode 100644
index 0000000..b958643
--- /dev/null
+++ b/windows/neo-vars/_subwcrev.tmpl.bat
@@ -0,0 +1 @@
+set Revision=$WCREV$$WCMODS?M:$$WCMIXED?X:$

diff --git a/windows/neo-vars/neo20-vars.ahk b/windows/neo-vars/neo20-vars.ahk
index 9342e9e..5225856 100644
--- a/windows/neo-vars/neo20-vars.ahk
+++ b/windows/neo-vars/neo20-vars.ahk
@@ -1,5 +1,8 @@
 #MaxThreadsPerHotKey 4

 

+; Revision Information

+#Include %a_scriptdir%\_subwcrev.ahk

+

 ; die Compose-Definitionen

 #Include %a_scriptdir%\en_us.ahk

 #Include %a_scriptdir%\neocomp.ahk

diff --git a/windows/neo-vars/neo20-vars.exe b/windows/neo-vars/neo20-vars.exe
deleted file mode 100644
index ee5dd16..0000000
--- a/windows/neo-vars/neo20-vars.exe
+++ /dev/null
diff --git a/windows/neo-vars/recycle.ahk b/windows/neo-vars/recycle.ahk
index 047c1cd..ea732f7 100644
--- a/windows/neo-vars/recycle.ahk
+++ b/windows/neo-vars/recycle.ahk
@@ -9,7 +9,7 @@ SetCapsLockState Off
 SetNumLockState Off

 SetScrollLockState Off

 

-name=Neo 2.0 (%A_ScriptName%) ($Revision$)

+name=Neo 2.0 (%A_ScriptName%) (r%Revision%)

 enable=Aktiviere %name%

 disable=Deaktiviere %name%

 #usehook on