From 62526cc7158b2eb28303bd977f50799995f1a938 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Fri, 18 Mar 2005 17:05:46 +0000 Subject: [PATCH] Moved keymaps to the common place for data files like timezones git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@11904 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/bin/keymap/Jamfile | 32 ----------------- src/data/etc/Jamfile | 1 + .../etc/keymaps}/Albanian.keymap | 0 .../etc/keymaps}/American.keymap | 0 .../etc/keymaps}/Arabic(102).keymap | 0 .../etc/keymaps}/Belgian.keymap | 0 .../etc/keymaps}/Bulgarian(Cyrillic).keymap | 0 .../etc/keymaps}/Byelorussian.keymap | 0 .../etc/keymaps}/Canadian-French.keymap | 0 .../keymap => data/etc/keymaps}/Czech.keymap | 0 .../keymap => data/etc/keymaps}/Danish.keymap | 0 .../keymap => data/etc/keymaps}/Dutch.keymap | 0 .../etc/keymaps}/Estonian.keymap | 0 .../etc/keymaps}/Faeroese.keymap | 0 .../keymap => data/etc/keymaps}/French.keymap | 0 .../keymap => data/etc/keymaps}/German.keymap | 0 .../keymap => data/etc/keymaps}/Greek.keymap | 0 .../keymap => data/etc/keymaps}/Hebrew.keymap | 0 .../etc/keymaps}/Hungarian.keymap | 0 .../etc/keymaps}/ISO-9995.keymap | 0 .../etc/keymaps}/Icelandic.keymap | 0 .../keymap => data/etc/keymaps}/Irish.keymap | 0 .../etc/keymaps}/Italian.keymap | 0 src/data/etc/keymaps/Jamfile | 34 +++++++++++++++++++ .../etc/keymaps}/Japanese.keymap | 0 .../etc/keymaps}/Lithuanian(Baltic).keymap | 0 .../etc/keymaps}/Macedonian.keymap | 0 .../etc/keymaps}/Norwegian.keymap | 0 .../keymap => data/etc/keymaps}/Polish.keymap | 0 .../etc/keymaps}/Portuguese.keymap | 0 .../etc/keymaps}/Romanian.keymap | 0 .../etc/keymaps}/Russian.keymap | 0 .../etc/keymaps}/Serbian(Cyrillic).keymap | 0 .../etc/keymaps}/Serbian(Latin).keymap | 0 .../keymap => data/etc/keymaps}/Slovak.keymap | 0 .../etc/keymaps}/Slovene.keymap | 0 .../etc/keymaps}/Spanish.keymap | 0 .../etc/keymaps}/Swedish.keymap | 0 .../etc/keymaps}/Swiss-French.keymap | 0 .../etc/keymaps}/Swiss-German.keymap | 0 .../etc/keymaps}/Turkish(type-F).keymap | 0 .../etc/keymaps}/Turkish(type-Q).keymap | 0 .../etc/keymaps}/US-International.keymap | 0 .../etc/keymaps}/Ukrainian.keymap | 0 .../etc/keymaps}/United-Kingdom.keymap | 0 45 files changed, 35 insertions(+), 32 deletions(-) rename src/{apps/bin/keymap => data/etc/keymaps}/Albanian.keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/American.keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/Arabic(102).keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/Belgian.keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/Bulgarian(Cyrillic).keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/Byelorussian.keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/Canadian-French.keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/Czech.keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/Danish.keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/Dutch.keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/Estonian.keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/Faeroese.keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/French.keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/German.keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/Greek.keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/Hebrew.keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/Hungarian.keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/ISO-9995.keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/Icelandic.keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/Irish.keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/Italian.keymap (100%) create mode 100644 src/data/etc/keymaps/Jamfile rename src/{apps/bin/keymap => data/etc/keymaps}/Japanese.keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/Lithuanian(Baltic).keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/Macedonian.keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/Norwegian.keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/Polish.keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/Portuguese.keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/Romanian.keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/Russian.keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/Serbian(Cyrillic).keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/Serbian(Latin).keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/Slovak.keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/Slovene.keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/Spanish.keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/Swedish.keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/Swiss-French.keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/Swiss-German.keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/Turkish(type-F).keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/Turkish(type-Q).keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/US-International.keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/Ukrainian.keymap (100%) rename src/{apps/bin/keymap => data/etc/keymaps}/United-Kingdom.keymap (100%) diff --git a/src/apps/bin/keymap/Jamfile b/src/apps/bin/keymap/Jamfile index ab2c91e82e..86507b342a 100644 --- a/src/apps/bin/keymap/Jamfile +++ b/src/apps/bin/keymap/Jamfile @@ -1,8 +1,5 @@ SubDir OBOS_TOP src apps bin keymap ; -NotFile keymap_files ; -Depends files : keymap_files ; - BinCommand keymap : key_map.cpp Keymap.cpp @@ -12,32 +9,3 @@ Package haiku-inputkit-cvs : keymap : boot home config bin ; -rule MkKeymapComp -{ - local binary = $(1) ; - local source = $(2) ; - - SEARCH on $(source) = $(SEARCH_SOURCE) ; - MakeLocate $(binary) : [ FDirName $(OBOS_ETC_DIR) Keymap ] ; - - LocalDepends keymap_files : $(binary) ; - Depends $(binary) : $(source) keymap ; - MkKeymapComp1 $(binary) : keymap $(source) ; - LocalClean clean : $(binary) ; -} - -actions MkKeymapComp1 -{ - $(2[1]) -o "$(1)" -c "$(2[2-])" ; -} - -local keymapFiles = [ GLOB $(SUBDIR) : *.keymap ] ; - -# generate the binary file for the keymap files -local keymapFile ; -for keymapFile in [ FGristFiles $(keymapFiles:D=) ] { - local binary = $(keymapFile:BG=keymap) ; - MkKeymapComp $(binary) : $(keymapFile) ; - Package haiku-inputkit-cvs : $(binary) : boot home config settings Keymap ; -} - diff --git a/src/data/etc/Jamfile b/src/data/etc/Jamfile index 3ec8a8678f..2e82ea318e 100644 --- a/src/data/etc/Jamfile +++ b/src/data/etc/Jamfile @@ -1,3 +1,4 @@ SubDir OBOS_TOP src data etc ; +SubInclude OBOS_TOP src data etc keymaps ; SubInclude OBOS_TOP src data etc timezones ; diff --git a/src/apps/bin/keymap/Albanian.keymap b/src/data/etc/keymaps/Albanian.keymap similarity index 100% rename from src/apps/bin/keymap/Albanian.keymap rename to src/data/etc/keymaps/Albanian.keymap diff --git a/src/apps/bin/keymap/American.keymap b/src/data/etc/keymaps/American.keymap similarity index 100% rename from src/apps/bin/keymap/American.keymap rename to src/data/etc/keymaps/American.keymap diff --git a/src/apps/bin/keymap/Arabic(102).keymap b/src/data/etc/keymaps/Arabic(102).keymap similarity index 100% rename from src/apps/bin/keymap/Arabic(102).keymap rename to src/data/etc/keymaps/Arabic(102).keymap diff --git a/src/apps/bin/keymap/Belgian.keymap b/src/data/etc/keymaps/Belgian.keymap similarity index 100% rename from src/apps/bin/keymap/Belgian.keymap rename to src/data/etc/keymaps/Belgian.keymap diff --git a/src/apps/bin/keymap/Bulgarian(Cyrillic).keymap b/src/data/etc/keymaps/Bulgarian(Cyrillic).keymap similarity index 100% rename from src/apps/bin/keymap/Bulgarian(Cyrillic).keymap rename to src/data/etc/keymaps/Bulgarian(Cyrillic).keymap diff --git a/src/apps/bin/keymap/Byelorussian.keymap b/src/data/etc/keymaps/Byelorussian.keymap similarity index 100% rename from src/apps/bin/keymap/Byelorussian.keymap rename to src/data/etc/keymaps/Byelorussian.keymap diff --git a/src/apps/bin/keymap/Canadian-French.keymap b/src/data/etc/keymaps/Canadian-French.keymap similarity index 100% rename from src/apps/bin/keymap/Canadian-French.keymap rename to src/data/etc/keymaps/Canadian-French.keymap diff --git a/src/apps/bin/keymap/Czech.keymap b/src/data/etc/keymaps/Czech.keymap similarity index 100% rename from src/apps/bin/keymap/Czech.keymap rename to src/data/etc/keymaps/Czech.keymap diff --git a/src/apps/bin/keymap/Danish.keymap b/src/data/etc/keymaps/Danish.keymap similarity index 100% rename from src/apps/bin/keymap/Danish.keymap rename to src/data/etc/keymaps/Danish.keymap diff --git a/src/apps/bin/keymap/Dutch.keymap b/src/data/etc/keymaps/Dutch.keymap similarity index 100% rename from src/apps/bin/keymap/Dutch.keymap rename to src/data/etc/keymaps/Dutch.keymap diff --git a/src/apps/bin/keymap/Estonian.keymap b/src/data/etc/keymaps/Estonian.keymap similarity index 100% rename from src/apps/bin/keymap/Estonian.keymap rename to src/data/etc/keymaps/Estonian.keymap diff --git a/src/apps/bin/keymap/Faeroese.keymap b/src/data/etc/keymaps/Faeroese.keymap similarity index 100% rename from src/apps/bin/keymap/Faeroese.keymap rename to src/data/etc/keymaps/Faeroese.keymap diff --git a/src/apps/bin/keymap/French.keymap b/src/data/etc/keymaps/French.keymap similarity index 100% rename from src/apps/bin/keymap/French.keymap rename to src/data/etc/keymaps/French.keymap diff --git a/src/apps/bin/keymap/German.keymap b/src/data/etc/keymaps/German.keymap similarity index 100% rename from src/apps/bin/keymap/German.keymap rename to src/data/etc/keymaps/German.keymap diff --git a/src/apps/bin/keymap/Greek.keymap b/src/data/etc/keymaps/Greek.keymap similarity index 100% rename from src/apps/bin/keymap/Greek.keymap rename to src/data/etc/keymaps/Greek.keymap diff --git a/src/apps/bin/keymap/Hebrew.keymap b/src/data/etc/keymaps/Hebrew.keymap similarity index 100% rename from src/apps/bin/keymap/Hebrew.keymap rename to src/data/etc/keymaps/Hebrew.keymap diff --git a/src/apps/bin/keymap/Hungarian.keymap b/src/data/etc/keymaps/Hungarian.keymap similarity index 100% rename from src/apps/bin/keymap/Hungarian.keymap rename to src/data/etc/keymaps/Hungarian.keymap diff --git a/src/apps/bin/keymap/ISO-9995.keymap b/src/data/etc/keymaps/ISO-9995.keymap similarity index 100% rename from src/apps/bin/keymap/ISO-9995.keymap rename to src/data/etc/keymaps/ISO-9995.keymap diff --git a/src/apps/bin/keymap/Icelandic.keymap b/src/data/etc/keymaps/Icelandic.keymap similarity index 100% rename from src/apps/bin/keymap/Icelandic.keymap rename to src/data/etc/keymaps/Icelandic.keymap diff --git a/src/apps/bin/keymap/Irish.keymap b/src/data/etc/keymaps/Irish.keymap similarity index 100% rename from src/apps/bin/keymap/Irish.keymap rename to src/data/etc/keymaps/Irish.keymap diff --git a/src/apps/bin/keymap/Italian.keymap b/src/data/etc/keymaps/Italian.keymap similarity index 100% rename from src/apps/bin/keymap/Italian.keymap rename to src/data/etc/keymaps/Italian.keymap diff --git a/src/data/etc/keymaps/Jamfile b/src/data/etc/keymaps/Jamfile new file mode 100644 index 0000000000..0dd6748b43 --- /dev/null +++ b/src/data/etc/keymaps/Jamfile @@ -0,0 +1,34 @@ +SubDir OBOS_TOP src data etc keymaps ; + +NotFile keymap_files ; +Depends files : keymap_files ; + +rule MkKeymapComp +{ + local binary = $(1) ; + local source = $(2) ; + + SEARCH on $(source) = $(SEARCH_SOURCE) ; + MakeLocate $(binary) : [ FDirName $(OBOS_ETC_DIR) Keymap ] ; + + LocalDepends keymap_files : $(binary) ; + Depends $(binary) : $(source) keymap ; + MkKeymapComp1 $(binary) : keymap $(source) ; + LocalClean clean : $(binary) ; +} + +actions MkKeymapComp1 +{ + $(2[1]) -o "$(1)" -c "$(2[2-])" ; +} + +local keymapFiles = [ GLOB $(SUBDIR) : *.keymap ] ; + +# generate the binary file for the keymap files +local keymapFile ; +for keymapFile in [ FGristFiles $(keymapFiles:D=) ] { + local binary = $(keymapFile:BG=keymap) ; + MkKeymapComp $(binary) : $(keymapFile) ; + Package haiku-inputkit-cvs : $(binary) : boot home config settings Keymap ; +} + diff --git a/src/apps/bin/keymap/Japanese.keymap b/src/data/etc/keymaps/Japanese.keymap similarity index 100% rename from src/apps/bin/keymap/Japanese.keymap rename to src/data/etc/keymaps/Japanese.keymap diff --git a/src/apps/bin/keymap/Lithuanian(Baltic).keymap b/src/data/etc/keymaps/Lithuanian(Baltic).keymap similarity index 100% rename from src/apps/bin/keymap/Lithuanian(Baltic).keymap rename to src/data/etc/keymaps/Lithuanian(Baltic).keymap diff --git a/src/apps/bin/keymap/Macedonian.keymap b/src/data/etc/keymaps/Macedonian.keymap similarity index 100% rename from src/apps/bin/keymap/Macedonian.keymap rename to src/data/etc/keymaps/Macedonian.keymap diff --git a/src/apps/bin/keymap/Norwegian.keymap b/src/data/etc/keymaps/Norwegian.keymap similarity index 100% rename from src/apps/bin/keymap/Norwegian.keymap rename to src/data/etc/keymaps/Norwegian.keymap diff --git a/src/apps/bin/keymap/Polish.keymap b/src/data/etc/keymaps/Polish.keymap similarity index 100% rename from src/apps/bin/keymap/Polish.keymap rename to src/data/etc/keymaps/Polish.keymap diff --git a/src/apps/bin/keymap/Portuguese.keymap b/src/data/etc/keymaps/Portuguese.keymap similarity index 100% rename from src/apps/bin/keymap/Portuguese.keymap rename to src/data/etc/keymaps/Portuguese.keymap diff --git a/src/apps/bin/keymap/Romanian.keymap b/src/data/etc/keymaps/Romanian.keymap similarity index 100% rename from src/apps/bin/keymap/Romanian.keymap rename to src/data/etc/keymaps/Romanian.keymap diff --git a/src/apps/bin/keymap/Russian.keymap b/src/data/etc/keymaps/Russian.keymap similarity index 100% rename from src/apps/bin/keymap/Russian.keymap rename to src/data/etc/keymaps/Russian.keymap diff --git a/src/apps/bin/keymap/Serbian(Cyrillic).keymap b/src/data/etc/keymaps/Serbian(Cyrillic).keymap similarity index 100% rename from src/apps/bin/keymap/Serbian(Cyrillic).keymap rename to src/data/etc/keymaps/Serbian(Cyrillic).keymap diff --git a/src/apps/bin/keymap/Serbian(Latin).keymap b/src/data/etc/keymaps/Serbian(Latin).keymap similarity index 100% rename from src/apps/bin/keymap/Serbian(Latin).keymap rename to src/data/etc/keymaps/Serbian(Latin).keymap diff --git a/src/apps/bin/keymap/Slovak.keymap b/src/data/etc/keymaps/Slovak.keymap similarity index 100% rename from src/apps/bin/keymap/Slovak.keymap rename to src/data/etc/keymaps/Slovak.keymap diff --git a/src/apps/bin/keymap/Slovene.keymap b/src/data/etc/keymaps/Slovene.keymap similarity index 100% rename from src/apps/bin/keymap/Slovene.keymap rename to src/data/etc/keymaps/Slovene.keymap diff --git a/src/apps/bin/keymap/Spanish.keymap b/src/data/etc/keymaps/Spanish.keymap similarity index 100% rename from src/apps/bin/keymap/Spanish.keymap rename to src/data/etc/keymaps/Spanish.keymap diff --git a/src/apps/bin/keymap/Swedish.keymap b/src/data/etc/keymaps/Swedish.keymap similarity index 100% rename from src/apps/bin/keymap/Swedish.keymap rename to src/data/etc/keymaps/Swedish.keymap diff --git a/src/apps/bin/keymap/Swiss-French.keymap b/src/data/etc/keymaps/Swiss-French.keymap similarity index 100% rename from src/apps/bin/keymap/Swiss-French.keymap rename to src/data/etc/keymaps/Swiss-French.keymap diff --git a/src/apps/bin/keymap/Swiss-German.keymap b/src/data/etc/keymaps/Swiss-German.keymap similarity index 100% rename from src/apps/bin/keymap/Swiss-German.keymap rename to src/data/etc/keymaps/Swiss-German.keymap diff --git a/src/apps/bin/keymap/Turkish(type-F).keymap b/src/data/etc/keymaps/Turkish(type-F).keymap similarity index 100% rename from src/apps/bin/keymap/Turkish(type-F).keymap rename to src/data/etc/keymaps/Turkish(type-F).keymap diff --git a/src/apps/bin/keymap/Turkish(type-Q).keymap b/src/data/etc/keymaps/Turkish(type-Q).keymap similarity index 100% rename from src/apps/bin/keymap/Turkish(type-Q).keymap rename to src/data/etc/keymaps/Turkish(type-Q).keymap diff --git a/src/apps/bin/keymap/US-International.keymap b/src/data/etc/keymaps/US-International.keymap similarity index 100% rename from src/apps/bin/keymap/US-International.keymap rename to src/data/etc/keymaps/US-International.keymap diff --git a/src/apps/bin/keymap/Ukrainian.keymap b/src/data/etc/keymaps/Ukrainian.keymap similarity index 100% rename from src/apps/bin/keymap/Ukrainian.keymap rename to src/data/etc/keymaps/Ukrainian.keymap diff --git a/src/apps/bin/keymap/United-Kingdom.keymap b/src/data/etc/keymaps/United-Kingdom.keymap similarity index 100% rename from src/apps/bin/keymap/United-Kingdom.keymap rename to src/data/etc/keymaps/United-Kingdom.keymap