Skip to content

Feature/keyboarding #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
KenZook wants to merge 17 commits into from
Closed

Feature/keyboarding #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c987cd8
Keyboarding: Getting available keyman keyboards
ermshiperete May 28, 2013
06adf2d
Keyboarding: use same interface on Windows + Linux
ermshiperete Jun 7, 2013
5385be0
Keyboarding: Implement getting active keyboard on Windows
ermshiperete May 29, 2013
2b1f9b9
Keyboarding: Remove KeyboardHelper
ermshiperete May 29, 2013
6091ac4
Keyboarding: Remove IIMEKeyboardSwitcher interface
ermshiperete May 29, 2013
bd9a855
Fix clean target of C++ projects
ermshiperete Jun 5, 2013
2901a76
Fix resource leak
ermshiperete Jun 26, 2013
2db57a5
Fix clean target of C++ views project
ermshiperete Jul 9, 2013
540ba21
Merge branch 'develop' into feature/Keyboarding
ermshiperete Jul 10, 2013
e013614
Use .NET InputLanguage for switching keyboards on Windows
ermshiperete Jul 11, 2013
3421a57
Fix weird problem with manifest file
ermshiperete Aug 16, 2013
77b76fb
Merge develop into feature/Keyboarding
ermshiperete Aug 26, 2013
e89abaa
FWNX-1122, FLEx side of moving Keyboarding to Palaso
ermshiperete Aug 26, 2013
342c3c0
Properly shutdown keyboard controller
ermshiperete Aug 26, 2013
e9617ba
Fix failing tests on Linux
ermshiperete Aug 27, 2013
0a7d958
Import SSL certificates before build package
marksvc Aug 29, 2013
2a503b6
LT-14853 FW LDML reader sets WindowsLcid
JohnThomson Sep 11, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Bin/mkComFWDlgs-tst.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ if "%BUILD_ONLY_NOTEST%"=="DONTRUN" shift

set BUILD_MAKEFILE=%BUILD_ROOT%\src\CommonCOMDlgs\Test\testCmnFWDlgs.mak

rem ***** Create the version include file *****
%BUILD_ROOT%\bin\nant\bin\nant.exe -buildfile:"%BUILD_ROOT%\bld\Version.build.xml" -D:BUILD_ROOT="%BUILD_ROOT%" -D:BUILD_LEVEL=%BUILD_LEVEL%

call %BUILD_ROOT%\bld\_mkcore.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
set BUILD_MAKEFILE=

Expand Down
3 changes: 0 additions & 3 deletions Bin/mkComFWDlgs.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ call %0\..\_EnsureRoot.bat

set BUILD_MAKEFILE=%BUILD_ROOT%\Src\CommonCOMDlgs\CmnFwDlgs.mak

rem ***** Create the version include file *****
%BUILD_ROOT%\bin\nant\bin\nant.exe -buildfile:"%BUILD_ROOT%\bld\Version.build.xml" -D:BUILD_ROOT="%BUILD_ROOT%" -D:BUILD_LEVEL=%BUILD_LEVEL%

call %BUILD_ROOT%\bld\_mkcore.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

set BUILD_MAKEFILE=
Expand Down
3 changes: 0 additions & 3 deletions Bin/mkGenLib-tst.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ if "%BUILD_ONLY_NOTEST%"=="DONTRUN" shift

set BUILD_MAKEFILE=%BUILD_ROOT%\src\Generic\Test\testGenericLib.mak

rem ***** Create the version include file *****
%BUILD_ROOT%\bin\nant\bin\nant.exe -buildfile:"%BUILD_ROOT%\bld\Version.build.xml" -D:BUILD_ROOT="%BUILD_ROOT%" -D:BUILD_LEVEL=%BUILD_LEVEL%

call %BUILD_ROOT%\bld\_mkcore.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
set BUILD_MAKEFILE=

Expand Down
58 changes: 0 additions & 58 deletions Bin/mkall.bat
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions Bin/mkallbld.bat
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions Bin/mkfwk-tst.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ if "%BUILD_ONLY_NOTEST%"=="DONTRUN" shift

set BUILD_MAKEFILE=%BUILD_ROOT%\src\Kernel\Test\testFwKernel.mak

rem ***** Create the version include file *****
%BUILD_ROOT%\bin\nant\bin\nant.exe -buildfile:"%BUILD_ROOT%\bld\Version.build.xml" -D:BUILD_ROOT="%BUILD_ROOT%" -D:BUILD_LEVEL=%BUILD_LEVEL%

call %BUILD_ROOT%\bld\_mkcore.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
set BUILD_MAKEFILE=

Expand Down
3 changes: 0 additions & 3 deletions Bin/mkfwk.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ call %0\..\_EnsureRoot.bat

set BUILD_MAKEFILE=%BUILD_ROOT%\src\Kernel\FwKernel.mak

rem ***** Create the version include file *****
%BUILD_ROOT%\bin\nant\bin\nant.exe -buildfile:"%BUILD_ROOT%\bld\Version.build.xml" -D:BUILD_ROOT="%BUILD_ROOT%" -D:BUILD_LEVEL=%BUILD_LEVEL%

call %BUILD_ROOT%\bld\_mkcore.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

set BUILD_MAKEFILE=
3 changes: 0 additions & 3 deletions Bin/mkgrc.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ call %0\..\_EnsureRoot.bat

set BUILD_MAKEFILE=%BUILD_ROOT%\src\Graphite\GrCompiler\GrCompiler.mak

rem ***** Create the version include file *****
%BUILD_ROOT%\bin\nant\bin\nant.exe -buildfile:"%BUILD_ROOT%\bld\Version.build.xml" -D:BUILD_ROOT="%BUILD_ROOT%" -D:BUILD_LEVEL=%BUILD_LEVEL%

call %BUILD_ROOT%\bld\_mkcore.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

set BUILD_MAKEFILE=
3 changes: 0 additions & 3 deletions Bin/mkgre.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ call %0\..\_EnsureRoot.bat

set BUILD_MAKEFILE=%BUILD_ROOT%\src\Graphite\GrEngine\GrEngine.mak

rem ***** Create the version include file *****
%BUILD_ROOT%\bin\nant\bin\nant.exe -buildfile:"%BUILD_ROOT%\bld\Version.build.xml" -D:BUILD_ROOT="%BUILD_ROOT%" -D:BUILD_LEVEL=%BUILD_LEVEL%

call %BUILD_ROOT%\bld\_mkcore.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

set BUILD_MAKEFILE=
3 changes: 0 additions & 3 deletions Bin/mkhv.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ call %0\..\_EnsureRoot.bat

set BUILD_MAKEFILE=%BUILD_ROOT%\Samples\HelloWorld\HelloView\HelloView.mak

rem ***** Create the version include file *****
%BUILD_ROOT%\bin\nant\bin\nant.exe -buildfile:"%BUILD_ROOT%\bld\Version.build.xml" -D:BUILD_ROOT="%BUILD_ROOT%" -D:BUILD_LEVEL=%BUILD_LEVEL%

call %BUILD_ROOT%\bld\_mkcore.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

set BUILD_MAKEFILE=
3 changes: 0 additions & 3 deletions Bin/mkhw.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ call %0\..\_EnsureRoot.bat

set BUILD_MAKEFILE=%BUILD_ROOT%\Samples\HelloWorld\Simple\HelloWorld.mak

rem ***** Create the version include file *****
%BUILD_ROOT%\bin\nant\bin\nant.exe -buildfile:"%BUILD_ROOT%\bld\Version.build.xml" -D:BUILD_ROOT="%BUILD_ROOT%" -D:BUILD_LEVEL=%BUILD_LEVEL%

call %BUILD_ROOT%\bld\_mkcore.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

set BUILD_MAKEFILE=
3 changes: 0 additions & 3 deletions Bin/mkhwt.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ call %0\..\_EnsureRoot.bat

set BUILD_MAKEFILE=%BUILD_ROOT%\Samples\HelloWorld\Toolbar\HelloWorld.mak

rem ***** Create the version include file *****
%BUILD_ROOT%\bin\nant\bin\nant.exe -buildfile:"%BUILD_ROOT%\bld\Version.build.xml" -D:BUILD_ROOT="%BUILD_ROOT%" -D:BUILD_LEVEL=%BUILD_LEVEL%

call %BUILD_ROOT%\bld\_mkcore.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

set BUILD_MAKEFILE=
3 changes: 0 additions & 3 deletions Bin/mkhwv.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ call %0\..\_EnsureRoot.bat

set BUILD_MAKEFILE=%BUILD_ROOT%\Samples\HelloWorld\Viewbar\HelloWorld.mak

rem ***** Create the version include file *****
%BUILD_ROOT%\bin\nant\bin\nant.exe -buildfile:"%BUILD_ROOT%\bld\Version.build.xml" -D:BUILD_ROOT="%BUILD_ROOT%" -D:BUILD_LEVEL=%BUILD_LEVEL%

call %BUILD_ROOT%\bld\_mkcore.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

set BUILD_MAKEFILE=
3 changes: 0 additions & 3 deletions Bin/mkhwx.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ call %0\..\_EnsureRoot.bat

set BUILD_MAKEFILE=%BUILD_ROOT%\Samples\HelloWorld\ActiveX\HelloWorld.mak

rem ***** Create the version include file *****
%BUILD_ROOT%\bin\nant\bin\nant.exe -buildfile:"%BUILD_ROOT%\bld\Version.build.xml" -D:BUILD_ROOT="%BUILD_ROOT%" -D:BUILD_LEVEL=%BUILD_LEVEL%

call %BUILD_ROOT%\bld\_mkcore.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

set BUILD_MAKEFILE=
3 changes: 0 additions & 3 deletions Bin/mklg-tst.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ if "%BUILD_ONLY_NOTEST%"=="DONTRUN" shift

set BUILD_MAKEFILE=%BUILD_ROOT%\src\Language\Test\testLanguage.mak

rem ***** Create the version include file *****
%BUILD_ROOT%\bin\nant\bin\nant.exe -buildfile:"%BUILD_ROOT%\bld\Version.build.xml" -D:BUILD_ROOT="%BUILD_ROOT%" -D:BUILD_LEVEL=%BUILD_LEVEL%

call %BUILD_ROOT%\bld\_mkcore.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
set BUILD_MAKEFILE=

Expand Down
3 changes: 0 additions & 3 deletions Bin/mklg.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ call %0\..\_EnsureRoot.bat

set BUILD_MAKEFILE=%BUILD_ROOT%\Src\Language\Language.mak

rem ***** Create the version include file *****
%BUILD_ROOT%\bin\nant\bin\nant.exe -buildfile:"%BUILD_ROOT%\bld\Version.build.xml" -D:BUILD_ROOT="%BUILD_ROOT%" -D:BUILD_LEVEL=%BUILD_LEVEL%

call %BUILD_ROOT%\bld\_mkcore.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

set BUILD_MAKEFILE=
20 changes: 0 additions & 20 deletions Bin/mksql-tst.bat
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions Bin/mksql.bat
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions Bin/mktlbs.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ call %0\..\_EnsureRoot.bat

set BUILD_MAKEFILE=%BUILD_ROOT%\Src\Language\Language.mak

rem ***** Create the version include file *****
%BUILD_ROOT%\bin\nant\bin\nant.exe -buildfile:"%BUILD_ROOT%\bld\Version.build.xml" -D:BUILD_ROOT="%BUILD_ROOT%" -D:BUILD_LEVEL=%BUILD_LEVEL%

call %BUILD_ROOT%\bld\_mkcore.bat dirs %BUILD_OUTPUT%\Common\LanguageTlb.tlb

set BUILD_MAKEFILE=%BUILD_ROOT%\Src\Kernel\FwKernel.mak
Expand Down
3 changes: 0 additions & 3 deletions Bin/mktv.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ call %0\..\_EnsureRoot.bat

set BUILD_MAKEFILE=%BUILD_ROOT%\test\testviewer\testviewer.mak

rem ***** Create the version include file *****
%BUILD_ROOT%\bin\nant\bin\nant.exe -buildfile:"%BUILD_ROOT%\bld\Version.build.xml" -D:BUILD_ROOT="%BUILD_ROOT%" -D:BUILD_LEVEL=%BUILD_LEVEL%

call %BUILD_ROOT%\bld\_mkcore.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

set BUILD_MAKEFILE=
3 changes: 0 additions & 3 deletions Bin/mkvw-tst.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ if "%BUILD_ONLY_NOTEST%"=="DONTRUN" shift

set BUILD_MAKEFILE=%BUILD_ROOT%\src\Views\Test\testViews.mak

rem ***** Create the version include file *****
%BUILD_ROOT%\bin\nant\bin\nant.exe -buildfile:"%BUILD_ROOT%\bld\Version.build.xml" -D:BUILD_ROOT="%BUILD_ROOT%" -D:BUILD_LEVEL=%BUILD_LEVEL%

call %BUILD_ROOT%\bld\_mkcore.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
set BUILD_MAKEFILE=

Expand Down
3 changes: 0 additions & 3 deletions Bin/mkvw.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ call %0\..\_EnsureRoot.bat

set BUILD_MAKEFILE=%BUILD_ROOT%\Src\Views\Views.mak

rem ***** Create the version include file *****
%BUILD_ROOT%\bin\nant\bin\nant.exe -buildfile:"%BUILD_ROOT%\bld\Version.build.xml" -D:BUILD_ROOT="%BUILD_ROOT%" -D:BUILD_LEVEL=%BUILD_LEVEL%

call %BUILD_ROOT%\bld\_mkcore.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

set BUILD_MAKEFILE=
13 changes: 0 additions & 13 deletions Bin/mkwfiutil.bat
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Bld/_init.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ COPYFILE=copy
DELETEFILE=del
TYPEFILE=type
MD=$(BUILD_ROOT)\bin\mkdir.exe -p
DELNODE=$(BUILD_ROOT)\bin\delnode.exe
DELNODE=rmdir /s /q
FIXCOMHEADER=$(BUILD_ROOT)\bin\FixGenComHeaderFile.exe

# next 4 are for .NET
Expand Down
2 changes: 1 addition & 1 deletion Build/Agent/dependencies.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# any=@precise.any

[common]
any=build-essential automake uuid-dev libenchant-dev xutils-dev libboost-dev libboost-test-dev graphicsmagick-libmagick-dev-compat libxklavier-dev libgraphite-dev libgtkmm-2.4-dev mono-gmcs mono-devel gtk-sharp2 git-gui openjdk-6-jre unzip gawk tofrodos ttf-mscorefonts-installer ttf-sil-charis xvfb xserver-xephyr metacity ibus bison mono-devel libgif-dev libjpeg-dev libexif-dev libhunspell-dev libtool xulrunner-geckofx geckofx
any=build-essential automake uuid-dev libenchant-dev xutils-dev libboost-dev libboost-test-dev graphicsmagick-libmagick-dev-compat libxklavier-dev libgraphite-dev libgtkmm-2.4-dev mono-gmcs mono-devel gtk-sharp2 git-gui openjdk-6-jre unzip gawk tofrodos ttf-mscorefonts-installer ttf-sil-charis xvfb xserver-xephyr metacity ibus bison mono-devel libgif-dev libjpeg-dev libexif-dev libhunspell-dev libtool xulrunner-geckofx geckofx wget

[precise]
any=libtiff4-dev
Expand Down
8 changes: 8 additions & 0 deletions Build/Linux.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,14 @@
<Target Name="linuxLibs" DependsOnTargets="iculibs">
<Exec Command="make externaltargets" WorkingDirectory="$(fwrt)" Condition="'$(action)'!='clean'"/>
<Exec Command="make externaltargets-test" WorkingDirectory="$(fwrt)" Condition="'$(action)'=='test'"/>
<!-- Always copy from Release -->
<CreateItem Include="$(dir-fwoutputlibPlatform)/Release/*.*">
<Output TaskParameter="Include" ItemName="LinuxReleaseLibs"/>
</CreateItem>
<Copy SourceFiles="@(LinuxReleaseLibs)"
DestinationFolder="$(dir-outputBase)"
SkipUnchangedFiles="true" OverwriteReadOnlyFiles="true"
Condition="'$(action)'!='clean'"/>
<CreateItem Include="$(dir-fwoutputlibPlatformBase)/*.*">
<Output TaskParameter="Include" ItemName="LinuxDebugLibs"/>
</CreateItem>
Expand Down
6 changes: 5 additions & 1 deletion Build/RegFree.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,13 @@
<ItemGroup>
<Fragments Include="$(OutDir)/../../DistFiles/*.fragment.manifest"/>
</ItemGroup>
<Target Name="RegFree" Condition="'$(OS)'=='Windows_NT'" Inputs="$(Executable)" Outputs="$(Executable).manifest">
<Target Name="CreateManifest" Condition="'$(OS)'=='Windows_NT'" Inputs="@(Dlls)" Outputs="$(Executable).manifest">
<RegFree Executable="$(Executable)" Dlls="@(Dlls)" Fragments="@(Fragments)"
NoTypeLib="$(OutDir)Graphite.dll" />
</Target>
<Target Name="AttachManifest" Condition="'$(OS)'=='Windows_NT'" DependsOnTargets="CreateManifest">
<Exec Command="mt.exe -outputresource:$(Executable) -manifest $(Executable).manifest"/>
</Target>
<Target Name="RegFree" Condition="'$(OS)'=='Windows_NT'" DependsOnTargets="CreateManifest;AttachManifest">
</Target>
</Project>
Loading