Unterscheidung in src und out

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

20 files changed, 12 insertions, 5 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
diff --git a/windows/neo-vars/Source/_subwcrev1.tmpl.ahk b/windows/neo-vars/src/Source/_subwcrev1.tmpl.ahk
index 888b651..888b651 100644
--- a/windows/neo-vars/Source/_subwcrev1.tmpl.ahk
+++ b/windows/neo-vars/src/Source/_subwcrev1.tmpl.ahk
diff --git a/windows/neo-vars/Source/_subwcrev1.tmpl.bat b/windows/neo-vars/src/Source/_subwcrev1.tmpl.bat
index b958643..b958643 100644
--- a/windows/neo-vars/Source/_subwcrev1.tmpl.bat
+++ b/windows/neo-vars/src/Source/_subwcrev1.tmpl.bat
diff --git a/windows/neo-vars/Source/_subwcrev2.tmpl.ahk b/windows/neo-vars/src/Source/_subwcrev2.tmpl.ahk
index 89b9549..89b9549 100644
--- a/windows/neo-vars/Source/_subwcrev2.tmpl.ahk
+++ b/windows/neo-vars/src/Source/_subwcrev2.tmpl.ahk
diff --git a/windows/neo-vars/Source/keydefinitions.ahk b/windows/neo-vars/src/Source/keydefinitions.ahk
index cfc8821..cfc8821 100644
--- a/windows/neo-vars/Source/keydefinitions.ahk
+++ b/windows/neo-vars/src/Source/keydefinitions.ahk
diff --git a/windows/neo-vars/Source/keyhooks.ahk b/windows/neo-vars/src/Source/keyhooks.ahk
index ff818f6..ff818f6 100644
--- a/windows/neo-vars/Source/keyhooks.ahk
+++ b/windows/neo-vars/src/Source/keyhooks.ahk
diff --git a/windows/neo-vars/Source/makecompose.ahk b/windows/neo-vars/src/Source/makecompose.ahk
index 1f98aad..c7b7242 100644
--- a/windows/neo-vars/Source/makecompose.ahk
+++ b/windows/neo-vars/src/Source/makecompose.ahk
@@ -1882,8 +1882,8 @@ FileDelete,%FTo%
 FileAppend,%Composita%,%FTo%

 }

 

-EncodeUnicodeFile("..\..\Compose\en_US.UTF-8","Source\en_us.ahk"   ,5609)

-EncodeUnicodeFile("..\..\Compose\Compose.neo","Source\neocomp.ahk" ,1067)

+EncodeUnicodeFile("..\..\..\Compose\en_US.UTF-8","Source\en_us.ahk"   ,5609)

+EncodeUnicodeFile("..\..\..\Compose\Compose.neo","Source\neocomp.ahk" ,1067)

 

 ; MsgBox % EncodeUni(DecodeUni("U20ACU0041U0070"))

 

diff --git a/windows/neo-vars/Source/neo20-all.ahk b/windows/neo-vars/src/Source/neo20-all.ahk
index 38eb336..38eb336 100644
--- a/windows/neo-vars/Source/neo20-all.ahk
+++ b/windows/neo-vars/src/Source/neo20-all.ahk
diff --git a/windows/neo-vars/Source/neovarscomp.ahk b/windows/neo-vars/src/Source/neovarscomp.ahk
index 9ae608c..9ae608c 100644
--- a/windows/neo-vars/Source/neovarscomp.ahk
+++ b/windows/neo-vars/src/Source/neovarscomp.ahk
diff --git a/windows/neo-vars/Source/recycle.ahk b/windows/neo-vars/src/Source/recycle.ahk
index d0fd704..d0fd704 100644
--- a/windows/neo-vars/Source/recycle.ahk
+++ b/windows/neo-vars/src/Source/recycle.ahk
diff --git a/windows/neo-vars/Source/shortcuts.ahk b/windows/neo-vars/src/Source/shortcuts.ahk
index e0d2cc5..e0d2cc5 100644
--- a/windows/neo-vars/Source/shortcuts.ahk
+++ b/windows/neo-vars/src/Source/shortcuts.ahk
diff --git a/windows/neo-vars/Source/varsfunctions.ahk b/windows/neo-vars/src/Source/varsfunctions.ahk
index 4ea6229..4ea6229 100644
--- a/windows/neo-vars/Source/varsfunctions.ahk
+++ b/windows/neo-vars/src/Source/varsfunctions.ahk
diff --git a/windows/neo-vars/ebene1.png b/windows/neo-vars/src/ebene1.png
index 6929759..6929759 100644
--- a/windows/neo-vars/ebene1.png
+++ b/windows/neo-vars/src/ebene1.png
diff --git a/windows/neo-vars/ebene2.png b/windows/neo-vars/src/ebene2.png
index 433f89a..433f89a 100644
--- a/windows/neo-vars/ebene2.png
+++ b/windows/neo-vars/src/ebene2.png
diff --git a/windows/neo-vars/ebene3.png b/windows/neo-vars/src/ebene3.png
index 5ad6231..5ad6231 100644
--- a/windows/neo-vars/ebene3.png
+++ b/windows/neo-vars/src/ebene3.png
diff --git a/windows/neo-vars/ebene4.png b/windows/neo-vars/src/ebene4.png
index c9a1f32..c9a1f32 100644
--- a/windows/neo-vars/ebene4.png
+++ b/windows/neo-vars/src/ebene4.png
diff --git a/windows/neo-vars/ebene5.png b/windows/neo-vars/src/ebene5.png
index 8cfce0d..8cfce0d 100644
--- a/windows/neo-vars/ebene5.png
+++ b/windows/neo-vars/src/ebene5.png
diff --git a/windows/neo-vars/ebene6.png b/windows/neo-vars/src/ebene6.png
index 2e508cf..2e508cf 100644
--- a/windows/neo-vars/ebene6.png
+++ b/windows/neo-vars/src/ebene6.png
diff --git a/windows/neo-vars/neo_disabled.ico b/windows/neo-vars/src/neo_disabled.ico
index 1e2c2af..1e2c2af 100644
--- a/windows/neo-vars/neo_disabled.ico
+++ b/windows/neo-vars/src/neo_disabled.ico
diff --git a/windows/neo-vars/neo_enabled.ico b/windows/neo-vars/src/neo_enabled.ico
index bf8f8be..bf8f8be 100644
--- a/windows/neo-vars/neo_enabled.ico
+++ b/windows/neo-vars/src/neo_enabled.ico