Attachment 32893 Details for Bug 25655 – Combined patch.

[patch] Combined patch.

0001-Allow-model-specific-multi-layout-configuration.patch (text/plain), 12.89 KB, created by Rami Ylimaki on 2010-01-29 02:38:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rami Ylimaki

Created: 2010-01-29 02:38:20 UTC

Size: 12.89 KB

patch

obsolete

>From e3d6aa2102f968718b4aadac7a63ec264f50350f Mon Sep 17 00:00:00 2001
>From: Rami Ylimaki <ext-rami.ylimaki@nokia.com>
>Date: Fri, 29 Jan 2010 11:33:37 +0200
>Subject: [PATCH] Allow model specific multi-layout configuration.
>
>Previously it wasn't possible to customize 2nd, 3rd and 4th layout
>based on model. Also rename the configuration files and scripts to
>reflect added model column.
>
>Signed-off-by: Tomas Hanak <ext-tomas.3.hanak@nokia.com>
>Signed-off-by: Rami Ylimaki <ext-rami.ylimaki@nokia.com>
>---
> rules/HDR                |   12 +++++-----
> rules/Makefile.am        |   54 +++++++++++++++++++++++-----------------------
> rules/base.l2_s.part     |    1 -
> rules/base.l3_s.part     |    1 -
> rules/base.l4_s.part     |    1 -
> rules/base.ml2_s.part    |    3 ++
> rules/base.ml3_s.part    |    3 ++
> rules/base.ml4_s.part    |    3 ++
> rules/bin/Makefile.am    |    4 +-
> rules/bin/ln_s.sh        |   20 -----------------
> rules/bin/lnv_s.sh       |   12 ----------
> rules/bin/mln_s.sh       |   20 +++++++++++++++++
> rules/bin/mlnvn_s.sh     |   12 ++++++++++
> rules/compat/Makefile.am |   24 ++++++++++----------
> rules/extras/Makefile.am |   24 ++++++++++----------
> 15 files changed, 100 insertions(+), 94 deletions(-)
> delete mode 100644 rules/base.l2_s.part
> delete mode 100644 rules/base.l3_s.part
> delete mode 100644 rules/base.l4_s.part
> create mode 100644 rules/base.ml2_s.part
> create mode 100644 rules/base.ml3_s.part
> create mode 100644 rules/base.ml4_s.part
> delete mode 100755 rules/bin/ln_s.sh
> delete mode 100755 rules/bin/lnv_s.sh
> create mode 100755 rules/bin/mln_s.sh
> create mode 100755 rules/bin/mlnvn_s.sh
>
>diff --git a/rules/HDR b/rules/HDR
>index 717fdea..3f3919d 100644
>--- a/rules/HDR
>+++ b/rules/HDR
>@@ -8,12 +8,12 @@
> ! model		layout				=	symbols
> ! model		layout[1]			=	symbols
> ! model		layout[1]	variant[1]	=	symbols
>-! layout[2]	=	symbols
>-! layout[3]	=	symbols
>-! layout[4]	=	symbols
>-! layout[2]	variant[2]	=	symbols
>-! layout[3]	variant[3]	=	symbols
>-! layout[4]	variant[4]	=	symbols
>+! model		layout[2]	=	symbols
>+! model		layout[3]	=	symbols
>+! model		layout[4]	=	symbols
>+! model		layout[2]	variant[2]	=	symbols
>+! model		layout[3]	variant[3]	=	symbols
>+! model		layout[4]	variant[4]	=	symbols
> ! model		=	symbols
> ! model		layout		=	compat
> ! model		layout[1]	=	compat
>diff --git a/rules/Makefile.am b/rules/Makefile.am
>index 18b8b1a..5f39217 100644
>--- a/rules/Makefile.am
>+++ b/rules/Makefile.am
>@@ -34,12 +34,12 @@ HDR compat/base.mlv_s.part   extras/base.mlv_s.part   base.mlv_s.part \
> HDR compat/base.ml_s.part    extras/base.ml_s.part    base.ml_s.part  \
> HDR compat/base.ml1_s.part   extras/base.ml1_s.part   base.ml1_s.part \
> HDR compat/base.ml1v1_s.part extras/base.ml1v1_s.part \
>-HDR compat/base.l2_s.part    extras/base.l2_s.part    base.l2_s.part  \
>-HDR compat/base.l3_s.part    extras/base.l3_s.part    base.l3_s.part  \
>-HDR compat/base.l4_s.part    extras/base.l4_s.part    base.l4_s.part  \
>-HDR compat/base.l2v2_s.part  extras/base.l2v2_s.part \
>-HDR compat/base.l3v3_s.part  extras/base.l3v3_s.part \
>-HDR compat/base.l4v4_s.part  extras/base.l4v4_s.part \
>+HDR compat/base.ml2_s.part    extras/base.ml2_s.part    base.ml2_s.part  \
>+HDR compat/base.ml3_s.part    extras/base.ml3_s.part    base.ml3_s.part  \
>+HDR compat/base.ml4_s.part    extras/base.ml4_s.part    base.ml4_s.part  \
>+HDR compat/base.ml2v2_s.part  extras/base.ml2v2_s.part \
>+HDR compat/base.ml3v3_s.part  extras/base.ml3v3_s.part \
>+HDR compat/base.ml4v4_s.part  extras/base.ml4v4_s.part \
> HDR base.m_s.part \
> HDR base.ml_c.part \
> HDR base.ml1_c.part \
>@@ -65,12 +65,12 @@ HDR compat/base.mlv_s.part   extras/base.mlv_s.part   base.mlv_s.part \
> HDR compat/base.ml_s.part    extras/base.ml_s.part    base.ml_s.part  \
> HDR compat/base.ml1_s.part   extras/base.ml1_s.part   base.ml1_s.part \
> HDR compat/base.ml1v1_s.part extras/base.ml1v1_s.part \
>-HDR compat/base.l2_s.part    extras/base.l2_s.part    base.l2_s.part  \
>-HDR compat/base.l3_s.part    extras/base.l3_s.part    base.l3_s.part  \
>-HDR compat/base.l4_s.part    extras/base.l4_s.part    base.l4_s.part  \
>-HDR compat/base.l2v2_s.part  extras/base.l2v2_s.part \
>-HDR compat/base.l3v3_s.part  extras/base.l3v3_s.part \
>-HDR compat/base.l4v4_s.part  extras/base.l4v4_s.part \
>+HDR compat/base.ml2_s.part    extras/base.ml2_s.part    base.ml2_s.part  \
>+HDR compat/base.ml3_s.part    extras/base.ml3_s.part    base.ml3_s.part  \
>+HDR compat/base.ml4_s.part    extras/base.ml4_s.part    base.ml4_s.part  \
>+HDR compat/base.ml2v2_s.part  extras/base.ml2v2_s.part \
>+HDR compat/base.ml3v3_s.part  extras/base.ml3v3_s.part \
>+HDR compat/base.ml4v4_s.part  extras/base.ml4v4_s.part \
> HDR evdev.m_s.part \
> HDR base.ml_c.part \
> HDR base.ml1_c.part \
>@@ -97,12 +97,12 @@ HDR extras/base.mlv_s.part   base.mlv_s.part \
> HDR extras/base.ml_s.part    base.ml_s.part  \
> HDR extras/base.ml1_s.part   base.ml1_s.part \
> HDR extras/base.ml1v1_s.part \
>-HDR extras/base.l2_s.part    base.l2_s.part  \
>-HDR extras/base.l3_s.part    base.l3_s.part  \
>-HDR extras/base.l4_s.part    base.l4_s.part  \
>-HDR extras/base.l2v2_s.part \
>-HDR extras/base.l3v3_s.part \
>-HDR extras/base.l4v4_s.part \
>+HDR extras/base.ml2_s.part    base.ml2_s.part  \
>+HDR extras/base.ml3_s.part    base.ml3_s.part  \
>+HDR extras/base.ml4_s.part    base.ml4_s.part  \
>+HDR extras/base.ml2v2_s.part \
>+HDR extras/base.ml3v3_s.part \
>+HDR extras/base.ml4v4_s.part \
> HDR base.m_s.part \
> HDR base.ml_c.part \
> HDR base.ml1_c.part \
>@@ -127,12 +127,12 @@ HDR extras/base.mlv_s.part   base.mlv_s.part \
> HDR extras/base.ml_s.part    base.ml_s.part  \
> HDR extras/base.ml1_s.part   base.ml1_s.part \
> HDR extras/base.ml1v1_s.part \
>-HDR extras/base.l2_s.part    base.l2_s.part  \
>-HDR extras/base.l3_s.part    base.l3_s.part  \
>-HDR extras/base.l4_s.part    base.l4_s.part  \
>-HDR extras/base.l2v2_s.part \
>-HDR extras/base.l3v3_s.part \
>-HDR extras/base.l4v4_s.part \
>+HDR extras/base.ml2_s.part    base.ml2_s.part  \
>+HDR extras/base.ml3_s.part    base.ml3_s.part  \
>+HDR extras/base.ml4_s.part    base.ml4_s.part  \
>+HDR extras/base.ml2v2_s.part \
>+HDR extras/base.ml3v3_s.part \
>+HDR extras/base.ml4v4_s.part \
> HDR evdev.m_s.part \
> HDR base.ml_c.part \
> HDR base.ml1_c.part \
>@@ -159,9 +159,9 @@ base.m_g.part \
> base.mlv_s.part \
> base.ml_s.part \
> base.ml1_s.part \
>-base.l2_s.part \
>-base.l3_s.part \
>-base.l4_s.part \
>+base.ml2_s.part \
>+base.ml3_s.part \
>+base.ml4_s.part \
> base.m_s.part \
> base.ml_c.part \
> base.ml1_c.part \
>diff --git a/rules/base.l2_s.part b/rules/base.l2_s.part
>deleted file mode 100644
>index 03a7aaf..0000000
>--- a/rules/base.l2_s.part
>+++ /dev/null
>@@ -1 +0,0 @@
>-  *		=	+%l[2]%(v[2]):2
>diff --git a/rules/base.l3_s.part b/rules/base.l3_s.part
>deleted file mode 100644
>index 0947c11..0000000
>--- a/rules/base.l3_s.part
>+++ /dev/null
>@@ -1 +0,0 @@
>-  *		=	+%l[3]%(v[3]):3
>diff --git a/rules/base.l4_s.part b/rules/base.l4_s.part
>deleted file mode 100644
>index 23ccc22..0000000
>--- a/rules/base.l4_s.part
>+++ /dev/null
>@@ -1 +0,0 @@
>-  *		=	+%l[4]%(v[4]):4
>diff --git a/rules/base.ml2_s.part b/rules/base.ml2_s.part
>new file mode 100644
>index 0000000..27f9975
>--- /dev/null
>+++ b/rules/base.ml2_s.part
>@@ -0,0 +1,3 @@
>+  nokiarx51	cz(qwerty)	=	+nokia_vndr/rx-51(cz_qwerty):2
>+  nokiarx51	*		=	+nokia_vndr/rx-51(%l[2]%_v[2]):2
>+  *		*		=	+%l[2]%(v[2]):2
>diff --git a/rules/base.ml3_s.part b/rules/base.ml3_s.part
>new file mode 100644
>index 0000000..6077525
>--- /dev/null
>+++ b/rules/base.ml3_s.part
>@@ -0,0 +1,3 @@
>+  nokiarx51	cz(qwerty)	=	+nokia_vndr/rx-51(cz_qwerty):3
>+  nokiarx51	*		=	+nokia_vndr/rx-51(%l[3]%_v[3]):3
>+  *		*		=	+%l[3]%(v[3]):3
>diff --git a/rules/base.ml4_s.part b/rules/base.ml4_s.part
>new file mode 100644
>index 0000000..8d92f39
>--- /dev/null
>+++ b/rules/base.ml4_s.part
>@@ -0,0 +1,3 @@
>+  nokiarx51	cz(qwerty)	=	+nokia_vndr/rx-51(cz_qwerty):4
>+  nokiarx51	*		=	+nokia_vndr/rx-51(%l[4]%_v[4]):4
>+  *		*		=	+%l[4]%(v[4]):4
>diff --git a/rules/bin/Makefile.am b/rules/bin/Makefile.am
>index b9785b1..9907780 100644
>--- a/rules/bin/Makefile.am
>+++ b/rules/bin/Makefile.am
>@@ -1,6 +1,6 @@
> transform_scripts= \
>-ln_s.sh \
>-lnv_s.sh \
>+mln_s.sh \
>+mlnvn_s.sh \
> ml_s.sh \
> mlv_s.sh \
> ml1_s.sh \
>diff --git a/rules/bin/ln_s.sh b/rules/bin/ln_s.sh
>deleted file mode 100755
>index 07ac2f0..0000000
>--- a/rules/bin/ln_s.sh
>+++ /dev/null
>@@ -1,20 +0,0 @@
>-#!/bin/sh
>-
>-variant=$1
>-
>-INDIR=$2
>-OUTFILE=base.l${variant}_s.part
>-
>-> $OUTFILE
>-
>-awk '{ 
>-  if (index($2, "(") == 0) {
>-    printf "  %s		=	+%s%%(v['${variant}']):'${variant}'\n", $1, $2; 
>-  } else {
>-    printf "  %s		=	+%s:'${variant}'\n", $1, $2; 
>-  }
>-}' < $INDIR/layoutsMapping.lst >> $OUTFILE
>-
>-awk '{ 
>-  printf "  %s(%s)	=	+%s(%s):'${variant}'\n", $1, $2, $3, $4; 
>-}' < $INDIR/variantsMapping.lst >> $OUTFILE
>diff --git a/rules/bin/lnv_s.sh b/rules/bin/lnv_s.sh
>deleted file mode 100755
>index fc0d420..0000000
>--- a/rules/bin/lnv_s.sh
>+++ /dev/null
>@@ -1,12 +0,0 @@
>-#!/bin/sh
>-
>-variant=$1
>-
>-INDIR=$2
>-OUTFILE=base.l${variant}v${variant}_s.part
>-
>-> $OUTFILE
>-
>-awk '{ 
>-  printf "  %s		%s	=	+%s(%s):'${variant}'\n", $1, $2, $3, $4; 
>-}' < $INDIR/variantsMapping.lst >> $OUTFILE
>diff --git a/rules/bin/mln_s.sh b/rules/bin/mln_s.sh
>new file mode 100755
>index 0000000..67fd8a0
>--- /dev/null
>+++ b/rules/bin/mln_s.sh
>@@ -0,0 +1,20 @@
>+#!/bin/sh
>+
>+variant=$1
>+
>+INDIR=$2
>+OUTFILE=base.ml${variant}_s.part
>+
>+> $OUTFILE
>+
>+awk '{
>+  if (index($2, "(") == 0) {
>+    printf "  *		%s		=	+%s%%(v['${variant}']):'${variant}'\n", $1, $2;
>+  } else {
>+    printf "  *		%s		=	+%s:'${variant}'\n", $1, $2;
>+  }
>+}' < $INDIR/layoutsMapping.lst >> $OUTFILE
>+
>+awk '{
>+  printf "  *		%s(%s)	=	+%s(%s):'${variant}'\n", $1, $2, $3, $4;
>+}' < $INDIR/variantsMapping.lst >> $OUTFILE
>diff --git a/rules/bin/mlnvn_s.sh b/rules/bin/mlnvn_s.sh
>new file mode 100755
>index 0000000..1a5f40f
>--- /dev/null
>+++ b/rules/bin/mlnvn_s.sh
>@@ -0,0 +1,12 @@
>+#!/bin/sh
>+
>+variant=$1
>+
>+INDIR=$2
>+OUTFILE=base.ml${variant}v${variant}_s.part
>+
>+> $OUTFILE
>+
>+awk '{
>+  printf "  *		%s		%s	=	+%s(%s):'${variant}'\n", $1, $2, $3, $4;
>+}' < $INDIR/variantsMapping.lst >> $OUTFILE
>diff --git a/rules/compat/Makefile.am b/rules/compat/Makefile.am
>index 755be6d..1032c41 100644
>--- a/rules/compat/Makefile.am
>+++ b/rules/compat/Makefile.am
>@@ -6,12 +6,12 @@ dist_parts=base.o_s.part
> scripts_dir=$(srcdir)/../bin
> 
> scripts= \
>-base.l2_s.part \
>-base.l3_s.part \
>-base.l4_s.part \
>-base.l2v2_s.part \
>-base.l3v3_s.part \
>-base.l4v4_s.part \
>+base.ml2_s.part \
>+base.ml3_s.part \
>+base.ml4_s.part \
>+base.ml2v2_s.part \
>+base.ml3v3_s.part \
>+base.ml4v4_s.part \
> base.ml_s.part \
> base.ml1_s.part \
> base.mlv_s.part \
>@@ -28,22 +28,22 @@ noinst_SCRIPTS=
> 
> endif
> 
>-base.l2_s.part: $(scripts_dir)/ln_s.sh $(transform_files)
>+base.ml2_s.part: $(scripts_dir)/mln_s.sh $(transform_files)
> 	sh $< 2 $(srcdir)
> 
>-base.l3_s.part: $(scripts_dir)/ln_s.sh $(transform_files)
>+base.ml3_s.part: $(scripts_dir)/mln_s.sh $(transform_files)
> 	sh $< 3 $(srcdir)
> 
>-base.l4_s.part: $(scripts_dir)/ln_s.sh $(transform_files)
>+base.ml4_s.part: $(scripts_dir)/mln_s.sh $(transform_files)
> 	sh $< 4 $(srcdir)
> 
>-base.l2v2_s.part: $(scripts_dir)/lnv_s.sh $(transform_files)
>+base.ml2v2_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files)
> 	sh $< 2 $(srcdir)
> 
>-base.l3v3_s.part: $(scripts_dir)/lnv_s.sh $(transform_files)
>+base.ml3v3_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files)
> 	sh $< 3 $(srcdir)
> 
>-base.l4v4_s.part: $(scripts_dir)/lnv_s.sh $(transform_files)
>+base.ml4v4_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files)
> 	sh $< 4 $(srcdir)
> 
> base.ml_s.part: $(scripts_dir)/ml_s.sh $(transform_files)
>diff --git a/rules/extras/Makefile.am b/rules/extras/Makefile.am
>index ad71f2e..21ccc8b 100644
>--- a/rules/extras/Makefile.am
>+++ b/rules/extras/Makefile.am
>@@ -3,12 +3,12 @@ transform_files=layoutsMapping.lst variantsMapping.lst
> scripts_dir=$(srcdir)/../bin
> 
> scripts= \
>-base.l2_s.part \
>-base.l3_s.part \
>-base.l4_s.part \
>-base.l2v2_s.part \
>-base.l3v3_s.part \
>-base.l4v4_s.part \
>+base.ml2_s.part \
>+base.ml3_s.part \
>+base.ml4_s.part \
>+base.ml2v2_s.part \
>+base.ml3v3_s.part \
>+base.ml4v4_s.part \
> base.ml_s.part \
> base.ml1_s.part \
> base.mlv_s.part \
>@@ -17,22 +17,22 @@ base.ml_s.part
> 
> noinst_SCRIPTS=$(scripts)
> 
>-base.l2_s.part: $(scripts_dir)/ln_s.sh $(transform_files)
>+base.ml2_s.part: $(scripts_dir)/mln_s.sh $(transform_files)
> 	sh $< 2 $(srcdir)
> 
>-base.l3_s.part: $(scripts_dir)/ln_s.sh $(transform_files)
>+base.ml3_s.part: $(scripts_dir)/mln_s.sh $(transform_files)
> 	sh $< 3 $(srcdir)
> 
>-base.l4_s.part: $(scripts_dir)/ln_s.sh $(transform_files)
>+base.ml4_s.part: $(scripts_dir)/mln_s.sh $(transform_files)
> 	sh $< 4 $(srcdir)
> 
>-base.l2v2_s.part: $(scripts_dir)/lnv_s.sh $(transform_files)
>+base.ml2v2_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files)
> 	sh $< 2 $(srcdir)
> 
>-base.l3v3_s.part: $(scripts_dir)/lnv_s.sh $(transform_files)
>+base.ml3v3_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files)
> 	sh $< 3 $(srcdir)
> 
>-base.l4v4_s.part: $(scripts_dir)/lnv_s.sh $(transform_files)
>+base.ml4v4_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files)
> 	sh $< 4 $(srcdir)
> 
> base.ml_s.part: $(scripts_dir)/ml_s.sh $(transform_files)
>-- 
>1.6.0.4
>

Actions: View | Splinter Review

Attachments on bug 25655: 32119 | 32121 | 32893

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.