Verzeichnisstruktur in windows/neo-vars umgestellt. Dabei auch Make-Batchdateien, Sourcedatei und .gitignore angepasst
This commit is contained in:
parent
403bbd3fc7
commit
1f1f88c837
25
.gitignore
vendored
25
.gitignore
vendored
@ -46,13 +46,15 @@
|
||||
# /windows/kbdneo2/Treiber/AHK_für_kbdneo2/
|
||||
/windows/kbdneo2/Treiber/AHK_für_kbdneo2/kbdneo_ahk.exe
|
||||
|
||||
# /windows/neo-vars/out/
|
||||
/windows/neo-vars/out/neo20-custom.exe
|
||||
/windows/neo-vars/out/neo20-r*.exe
|
||||
# /windows/neo-vars/bin/
|
||||
/windows/neo-vars/bin/neo20-custom.exe
|
||||
/windows/neo-vars/bin/neo20-r*.exe
|
||||
|
||||
# /windows/neo-vars/build/
|
||||
/windows/neo-vars/build/Kopie von make-build.bat
|
||||
/windows/neo-vars/build/Kopie von make-compose.bat
|
||||
|
||||
# /windows/neo-vars/src/
|
||||
/windows/neo-vars/src/Kopie von make-build.bat
|
||||
/windows/neo-vars/src/Kopie von make-compose.bat
|
||||
/windows/neo-vars/src/_local_paths.bat
|
||||
/windows/neo-vars/src/ebene1.png
|
||||
/windows/neo-vars/src/ebene2.png
|
||||
@ -61,15 +63,12 @@
|
||||
/windows/neo-vars/src/ebene5.png
|
||||
/windows/neo-vars/src/ebene6.png
|
||||
/windows/neo-vars/src/neo20-r*.ahk
|
||||
/windows/neo-vars/src/z-dh-local-make-build.bat
|
||||
/windows/neo-vars/src/z-dh-local-make-compose.bat
|
||||
|
||||
# /windows/neo-vars/src/source/
|
||||
/windows/neo-vars/src/source/_subwcrev1.bat
|
||||
/windows/neo-vars/src/source/_subwcrev1.generated.ahk
|
||||
/windows/neo-vars/src/source/_svnversion.generated.txt
|
||||
/windows/neo-vars/src/source/_subwcrev2.bat
|
||||
/windows/neo-vars/src/source/Compose-tainted.generated.ahk
|
||||
/windows/neo-vars/src/_subwcrev1.bat
|
||||
/windows/neo-vars/src/_subwcrev1.generated.ahk
|
||||
/windows/neo-vars/src/_svnversion.generated.txt
|
||||
/windows/neo-vars/src/_subwcrev2.bat
|
||||
/windows/neo-vars/src/Compose-tainted.generated.ahk
|
||||
|
||||
# /yaml/
|
||||
/yaml/.git
|
||||
|
@ -11,13 +11,12 @@ set SubWCRev=%Tsvnpath%\SubWCRev.exe
|
||||
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.generated.ahk
|
||||
set batrevtemplate1=%Ssrcdir%\_subwcrev1.tmpl.bat
|
||||
set batrevoutput1=%Ssrcdir%\_subwcrev1.bat
|
||||
set srcdir=..\src
|
||||
set bindir=..\bin
|
||||
set ahkrevtemplate1=%srcdir%\_subwcrev1.tmpl.ahk
|
||||
set ahkrevoutput1=%srcdir%\_subwcrev1.generated.ahk
|
||||
set batrevtemplate1=%srcdir%\_subwcrev1.tmpl.bat
|
||||
set batrevoutput1=%srcdir%\_subwcrev1.bat
|
||||
|
||||
set NEO2AppData=%APPDATA%\NEO2
|
||||
set customahk=%NEO2AppData%\custom.ahk
|
||||
@ -31,7 +30,7 @@ echo Generating Version File
|
||||
"%SubWCRev%" "%svnversiondir1%" "%batrevtemplate1%" "%batrevoutput1%"
|
||||
call "%batrevoutput1%"
|
||||
|
||||
set fnexe=%outdir%\neo20-custom.exe
|
||||
set fnexe=%bindir%\neo20-custom.exe
|
||||
|
||||
set fnahk=%srcdir%\neo20-all.ahk
|
||||
|
@ -11,13 +11,12 @@ set SubWCRev=%Tsvnpath%\SubWCRev.exe
|
||||
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.generated.ahk
|
||||
set batrevtemplate1=%Ssrcdir%\_subwcrev1.tmpl.bat
|
||||
set batrevoutput1=%Ssrcdir%\_subwcrev1.bat
|
||||
set srcdir=..\src
|
||||
set bindir=..\bin
|
||||
set ahkrevtemplate1=%srcdir%\_subwcrev1.tmpl.ahk
|
||||
set ahkrevoutput1=%srcdir%\_subwcrev1.generated.ahk
|
||||
set batrevtemplate1=%srcdir%\_subwcrev1.tmpl.bat
|
||||
set batrevoutput1=%srcdir%\_subwcrev1.bat
|
||||
|
||||
set NEO2AppData=%APPDATA%\NEO2
|
||||
set customahk=%NEO2AppData%\custom.ahk
|
||||
@ -31,14 +30,14 @@ echo Generating Version File
|
||||
"%SubWCRev%" "%svnversiondir1%" "%batrevtemplate1%" "%batrevoutput1%"
|
||||
call "%batrevoutput1%"
|
||||
|
||||
set fnexe=%outdir%\neo20.exe
|
||||
set fnexe=%bindir%\neo20.exe
|
||||
"%SubWCRev%" "%svnversiondir1%" -nm
|
||||
if errorlevel 1 (
|
||||
set fnexe=%outdir%\neo20-r%Revision%.exe
|
||||
set fnexe=%bindir%\neo20-r%Revision%.exe
|
||||
)
|
||||
|
||||
echo removing old version(s) of NEO AHK Exe file
|
||||
del "%outdir%\neo20-r*.exe" 2> nul
|
||||
del "%bindir%\neo20-r*.exe" 2> nul
|
||||
|
||||
set fnahk=%srcdir%\neo20-all.ahk
|
||||
|
38
windows/neo-vars/build/make-compose.bat
Normal file
38
windows/neo-vars/build/make-compose.bat
Normal file
@ -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%\AutoHotKeyU32.exe
|
||||
|
||||
REM The path to the authohotkey directory in the local svn copy, MUST be "."
|
||||
set srcdir=..\src
|
||||
set bindir=..\bin
|
||||
set batrevtemplate2=%srcdir%\_subwcrev2.tmpl.bat
|
||||
set batrevoutput2=%srcdir%\_subwcrev2.bat
|
||||
|
||||
REM The path to the directory used for generating a consistent SVN version (revision number)
|
||||
set gitversiondir=..\..\..\Compose
|
||||
|
||||
echo Generating Version File
|
||||
"%SubWCRev%" "%gitversiondir%" "%batrevtemplate2%" "%batrevoutput2%"
|
||||
call "%batrevoutput2%"
|
||||
|
||||
set fncomp=%srcdir%\compose.generated.ahk
|
||||
"%SubWCRev%" "%gitversiondir%" -nm
|
||||
if errorlevel 1 (
|
||||
set fncomp=%srcdir%\compose-tainted.generated.ahk
|
||||
)
|
||||
|
||||
echo Deleting old Compose sequences
|
||||
del "%srcdir%\Compose.generated.ahk" "%srcdir%\Compose-tainted.generated.ahk" 2> nul
|
||||
SET CompRevision=0815
|
||||
|
||||
echo Compiling Compose sequences
|
||||
"%AutoHotkey%" "%srcdir%\makecompose.ahk" "%CompRevision%" "%fncomp%" "%gitversiondir%\src\en_US.UTF-8" "%gitversiondir%\src\base.module" "%gitversiondir%\src\greek.module" "%gitversiondir%\src\math.module" "%gitversiondir%\src\lang.module" "%gitversiondir%\src\weiter_Definitionen.txt"
|
||||
|
||||
echo Compose Update complete! You can now close this log-window.
|
||||
pause
|
@ -1,38 +0,0 @@
|
||||
@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%\src\en_US.UTF-8" "%svnversiondir2%\src\base.module" "%svnversiondir2%\src\greek.module" "%svnversiondir2%\src\math.module" "%svnversiondir2%\src\lang.module" "%svnversiondir2%\src\weiter_Definitionen.txt"
|
||||
|
||||
echo Compose Update complete! You can now close this log-window.
|
||||
pause
|
@ -5,45 +5,45 @@ SetWorkingDir, %A_ScriptDir%
|
||||
|
||||
|
||||
; Revision Information (don't moun)
|
||||
#include *i source\_subwcrev1.generated.ahk
|
||||
#include *i _subwcrev1.generated.ahk
|
||||
|
||||
; die Compose-Definitionen
|
||||
#include *i source\compose.generated.ahk
|
||||
#include *i source\compose-tainted.generated.ahk
|
||||
#include source\compose-gen.ahk
|
||||
#include *i compose.generated.ahk
|
||||
#include *i compose-tainted.generated.ahk
|
||||
#include compose-gen.ahk
|
||||
|
||||
; Hier liegt die Tastaturbelegung
|
||||
#include source\keydefinitions.ahk
|
||||
#include keydefinitions.ahk
|
||||
|
||||
; Shortcuts, um die Zeichen wieder sauber zur Applikation bringen zu können
|
||||
#include source\performance.ahk
|
||||
#include source\shortcuts.ahk
|
||||
#include performance.ahk
|
||||
#include shortcuts.ahk
|
||||
|
||||
; Good-old AHK-Skripts, enthalten die ersten Key-Hooks für Mod-Tasten
|
||||
; Achtung: Hinter dem ersten Keyboard-Hook werden keine globalen Variablen
|
||||
; mehr gesetzt!
|
||||
#include source\initialize.ahk
|
||||
#include source\resources.ahk
|
||||
#include initialize.ahk
|
||||
#include resources.ahk
|
||||
|
||||
; Das Herz von neo20.ahk: die Tasten- und Zeichen-Behandlungsroutinen
|
||||
#include source\varsfunctions.ahk
|
||||
#include varsfunctions.ahk
|
||||
|
||||
; Die Bildschirmtastatur
|
||||
#include source\screenkeyboard.ahk
|
||||
#include screenkeyboard.ahk
|
||||
|
||||
; Mitgelieferte Belegungsvarianten
|
||||
#include source\langstastatur.ahk
|
||||
#include source\einhandneo.ahk
|
||||
#include source\lernmodus.ahk
|
||||
#include source\nordtast.ahk
|
||||
#include source\qwertz.ahk
|
||||
#include source\tools.ahk
|
||||
#include langstastatur.ahk
|
||||
#include einhandneo.ahk
|
||||
#include lernmodus.ahk
|
||||
#include nordtast.ahk
|
||||
#include qwertz.ahk
|
||||
#include tools.ahk
|
||||
|
||||
; individuelle Einstellungen
|
||||
#include *i %A_AppData%\Neo2\custom.ahk
|
||||
|
||||
#include source\tray.ahk
|
||||
#include source\keyhooks.ahk
|
||||
#include source\levelfunctions.ahk
|
||||
#include source\keyboardleds.ahk
|
||||
#include tray.ahk
|
||||
#include keyhooks.ahk
|
||||
#include levelfunctions.ahk
|
||||
#include keyboardleds.ahk
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user