Unterscheidung in src und out

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

1 files changed, 10 insertions, 3 deletions

diff --git a/windows/neo-vars/Make-Build.bat b/windows/neo-vars/src/Make-Build.bat
index 3c7fc8c..8cf0c8f 100644
--- a/windows/neo-vars/Make-Build.bat
+++ b/windows/neo-vars/src/Make-Build.bat
@@ -10,6 +10,7 @@ set  Ahk2Exe=%ahkpath%\Compiler\Ahk2Exe.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 ahkrevtemplate1=%Ssrcdir%\_subwcrev1.tmpl.ahk

 set   ahkrevoutput1=%Ssrcdir%\_subwcrev1.ahk

@@ -20,7 +21,7 @@ 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

+set svnversiondir2=..\..\..\Compose

 

 :next1

 echo Generating Version File

@@ -29,7 +30,13 @@ echo Generating Version File
 "%SubWCRev%" "%svnversiondir2%" "%ahkrevtemplate2%" "%ahkrevoutput2%"

 call "%batrevoutput1%"

 

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

+set fnahk=%srcdir%\neo20-r%Revision%.ahk

+"%SubWCRev%" "%svnversiondir1%" -nm

+if errorlevel 1 (

+  set fnexe=%outdir%\neo20-r%Revision%.exe

+) else (

+  set fnexe=%outdir%\neo20.exe

+)

 

 echo Compiling Compose sequences

 %Ssrcdir%\makecompose.ahk

@@ -46,7 +53,7 @@ echo ; Gesamtdatei > %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"

+"%Ahk2Exe%" /in "%fnahk%" /out "%fnexe%" /icon "%srcdir%\neo_enabled.ico"

 

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

 pause
\ No newline at end of file