Neuer Build-Prozess mit eingechecktem Compose-Compilat und separatem Make-Compose.

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

windows/neo-vars/src/Make-Build.bat

@@ -16,18 +16,13 @@ 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 svnversiondir1=.
-set svnversiondir2=..\..\..\Compose
 
-:next1
 echo Generating Version File
 "%SubWCRev%" "%svnversiondir1%" "%ahkrevtemplate1%" "%ahkrevoutput1%"
 "%SubWCRev%" "%svnversiondir1%" "%batrevtemplate1%" "%batrevoutput1%"
-"%SubWCRev%" "%svnversiondir2%" "%ahkrevtemplate2%" "%ahkrevoutput2%"
 call "%batrevoutput1%"
 
 set fnexe=%outdir%\neo20.exe
@@ -35,19 +30,9 @@ set fnexe=%outdir%\neo20.exe
 if errorlevel 1 (
   set fnexe=%outdir%\neo20-r%Revision%.exe
 )
-"%SubWCRev%" "%svnversiondir2%" -nm
-if errorlevel 1 (
-  set fnexe=%outdir%\neo20-r%Revision%.exe
-)
-
-echo Compiling Compose sequences
-%ahkpath%\AutoHotkey %Ssrcdir%\makecompose.ahk
-
-rem echo Killing the old (AHK)Driver
-rem tskill %fn%
 
 echo removing old version(s) of NEO AHK Exe file
-del %outdir%\neo20-r*.exe 2> nul
+del "%outdir%\neo20-r*.exe" 2> nul
 
 set fnahk=%srcdir%\neo20-all.ahk
 

windows/neo-vars/src/Make-Compose.bat

@@ -0,0 +1,38 @@
+@echo off
+
+echo Setting local path variables
+:: TortoiseSVN and its clever tool SubWCRev
+set Tsvnpath=C:\Programme\TortoiseSVN\bin
+set SubWCRev=%Tsvnpath%\SubWCRev.exe
+
+set  ahkpath=C:\Programme\AutoHotkey
+set  AutoHotKey=%ahkpath%\AutoHotKey.exe
+
+REM The path to the authohotkey directory in the local svn copy, MUST be "."
+set srcdir=.
+set outdir=..\out
+set Ssrcdir=%srcdir%\Source
+set batrevtemplate2=%Ssrcdir%\_subwcrev2.tmpl.bat
+set   batrevoutput2=%Ssrcdir%\_subwcrev2.bat
+
+REM The path to the directory used for generating a consistent SVN version (revision number)
+set svnversiondir2=..\..\..\Compose
+
+echo Generating Version File
+"%SubWCRev%" "%svnversiondir2%" "%batrevtemplate2%" "%batrevoutput2%"
+call "%batrevoutput2%"
+
+set fncomp=%Ssrcdir%\Compose.generated.ahk
+"%SubWCRev%" "%svnversiondir2%" -nm
+if errorlevel 1 (
+  set fncomp=%Ssrcdir%\Compose-tainted.generated.ahk
+)
+
+echo Deleting old Compose sequences
+del "%Ssrcdir%\Compose.generated.ahk" "%Ssrcdir%\Compose-tainted.generated.ahk" 2> nul
+
+echo Compiling Compose sequences
+"%AutoHotkey%" "%Ssrcdir%\makecompose.ahk" "%CompRevision%" "%fncomp%" "%svnversiondir2%\en_US.UTF-8" "%svnversiondir2%\Compose.neo"
+
+echo Compose Update complete! You can now close this log-window.
+pause

windows/neo-vars/src/Source/_subwcrev2.tmpl.ahk

@@ -1 +0,0 @@
-CompRevision:="$WCREV$$WCMODS?M:$$WCMIXED?X:$"

windows/neo-vars/src/Source/_subwcrev2.tmpl.bat

@@ -0,0 +1 @@
+set CompRevision=$WCREV$$WCMODS?M:$$WCMIXED?X:$

windows/neo-vars/src/Source/makecompose.ahk

@@ -1823,14 +1823,20 @@ SetFormat, Integer, d
 
 VarSetCapacity(Composita,10240000) ; 10 MB
 
-EncodeUnicodeFile(FFrom,FTo,NumLines) {
-Composita := ""
-Count := 0
-Miss := 0
-FileRead, FileContents, %FFrom%
-ProgressTop := "Converting " . FFrom . "..."
-Loop, parse, FileContents, `n, `r  ; Specifying `n prior to `r allows both Windows and Unix files to be parsed.
-{
+EncodeUnicodeFile(FFrom,FTo) {
+  Composita := ""
+  Miss := 0
+  FileRead, FileContents, %FFrom%
+  ProgressTop := "Converting " . FFrom . "..."
+
+  Loop, parse, FileContents, `n, `r  ; Specifying `n prior to `r allows both Windows and Unix files to be parsed.
+  {
+    NumLines := A_Index
+  }
+
+  Count := 0
+  Loop, parse, FileContents, `n, `r  ; Specifying `n prior to `r allows both Windows and Unix files to be parsed.
+  {
     Count := Count + 1
     ProgressVal := Count/NumLines*100
     ProgressInd := "Lines: " . Count . ", Errors: " . Miss
@@ -1891,13 +1897,28 @@ Loop, parse, FileContents, `n, `r  ; Specifying `n prior to `r allows both Windo
       Composita := Composita "; illegal " Xkbsym " in " A_LoopField "`r`n"
       Miss := Miss + 1
     }
-}
-FileDelete,%FTo%
-FileAppend,%Composita%,%FTo%
+  }
+  Progress,off
+  FileAppend,%Composita%,%FTo%
 }
 
-EncodeUnicodeFile("..\..\..\Compose\en_US.UTF-8","Source\en_us.ahk"   ,5609)
-EncodeUnicodeFile("..\..\..\Compose\Compose.neo","Source\neocomp.ahk" ,1067)
+NumPars = %0%
+if (NumPars < 2) {
+  MsgBox,Zu wenige Parameter`, Minimum=2
+  exit
+}
+
+CompRevision = %1%
+OutputFile = %2%
+
+FileDelete,%OutputFile%
+FileAppend,CompRevision := "%CompRevision%"`r`n, %OutputFile%
+
+loop %Numpars% {
+  if (A_Index < 3)
+    continue
+  EncodeUnicodeFile(%A_Index%, OutputFile)
+}
 
 ; MsgBox % EncodeUni(DecodeUni("U20ACU0041U0070"))
 

windows/neo-vars/src/neo20-all.ahk

@@ -4,11 +4,10 @@ SetWorkingDir, %A_ScriptDir%
 
 ; Revision Information (don't moun)
 #Include *i Source\_subwcrev1.ahk
-#Include *i Source\_subwcrev2.ahk
 
 ; die Compose-Definitionen
-#Include *i Source\en_us.ahk
-#Include *i Source\neocomp.ahk
+#Include *i Source\Compose.generated.ahk
+#Include *i Source\Compose-tainted.generated.ahk
 #Include    Source\neovarscomp.ahk
 
 ; Hier liegt die Tastaturbelegung