From 9b250b95390643382fa8a4951e8ed65daca2b946 Mon Sep 17 00:00:00 2001 From: mösi Date: Mon, 3 Nov 2008 15:42:12 +0000 Subject: • 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. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.neo-layout.org@1099 b9310e46-f624-0410-8ea1-cfbb3a30dc96 --- windows/neo-vars/Make-Build.bat | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'windows/neo-vars/Make-Build.bat') 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" -- cgit v1.2.3