Commit graph

2725 commits

Author SHA1 Message Date
glasseyes
35d4e92ab0 [linux] set the version of keyman-config 2018-09-20 09:29:11 +07:00
glasseyes
aed4cf2458 [linux] versioning of reconf depending on git tags
and whether JENKINS is set
2018-09-20 08:58:17 +07:00
glasseyes
452fc8d87c [linux] kmfl_compiler.c to use config.h VERSION 2018-09-20 08:54:55 +07:00
glasseyes
b9649c7409 [linux] and escape the top_builddir to pass it through 2018-09-18 16:54:41 +07:00
glasseyes
532042f58c [linux] include dirs relative to top_builddir 2018-09-18 16:43:44 +07:00
glasseyes
3f1a387f5e [linux] move copy include files to after configure 2018-09-18 16:27:20 +07:00
glasseyes
3b06732d7c [linux] copy include files to build kmfl dir
so that local build can find them
2018-09-18 16:12:16 +07:00
glasseyes
e4d38582da [linux] add keyman-config/build to .gitignore 2018-09-18 15:55:50 +07:00
Daniel Glassey
b65f0f7f12
Merge branch 'master' into linux-1176-localinstall 2018-09-18 15:54:07 +07:00
glasseyes
ce9aa2b7f2 [linux] separate configure, build and install steps
build steps are now:
make configure (if needed)
make
sudo make install

or:
make fullbuild
sudo make install
2018-09-18 15:45:19 +07:00
Daniel Glassey
3f474c64fe
[linux] convert kb icons to png instead of bmp (#1191)
* [linux] convert kb icons to png instead of bmp

make them antialiased 64x64 so that can be resized ok in the
ibus status indicator and the ibus keyboard selector

* [linux] move linux specific gitignore to linux/.gitignore
2018-09-18 15:28:53 +07:00
glasseyes
7b6e971912 [linux] refactor keyman image search into a function
resize icons back to 16x16 on load to display in km-config
2018-09-18 10:58:55 +07:00
Marc Durdin
5af662a40a
Merge pull request #1194 from keymanapp/windows-sil-logo
[Windows] Update splash screens and about screens to show SIL logo
2018-09-18 12:14:37 +10:00
Marc Durdin
b23bae7306 [Windows] Update Keyman Desktop About and Keyman Developer Install for SIL logo 2018-09-18 11:10:05 +10:00
Marc Durdin
9511e8f5f4 [Developer] Update splash and about forms for SIL logo; adjust vm test 2018-09-18 10:45:06 +10:00
Marc Durdin
b7775f1343 [Windows] Add SIL logo to Desktop setup 2018-09-18 10:45:06 +10:00
Marc Durdin
6fc443984f [Windows] Add SIL logo to Desktop splash screen 2018-09-18 10:45:06 +10:00
Marc Durdin
f314c25db5
Merge pull request #1171 from keymanapp/windows-versioning-tidyup
[Windows] Remove 10.0 version content and make versioning less visible for subsequent releases
2018-09-18 10:19:52 +10:00
Marc Durdin
8499f6cb09
Merge pull request #1175 from keymanapp/windows-versioning-installer
[Windows] Refactor WiX installers for Windows, Windows Engine and Developer to remove versioned paths and registry for simplified future upgrades
2018-09-18 10:19:29 +10:00
Marc Durdin
2c7f4fdbf5 [Windows] Remove temp keymanversion.inc file 2018-09-18 10:18:55 +10:00
glasseyes
9aeedcf8cf [linux] rename dist target to sources 2018-09-17 19:34:56 +07:00
glasseyes
edda7cccf0 [linux] keyman-config debian control typo (from #1180) 2018-09-17 16:55:37 +07:00
Daniel Glassey
1eb0fd411e
Merge pull request #1180 from keymanapp/linux-buildsys
[linux] Linux buildsys
2018-09-17 16:54:08 +07:00
glasseyes
12dc10c6ab [linux] another problem from patch in makefile 2018-09-17 16:31:55 +07:00
glasseyes
9a9d063667 [linux] whitespace error in earlier commit 2018-09-17 16:27:49 +07:00
glasseyes
a54349ee91 [linux] fix README instructions for local build 2018-09-17 16:25:15 +07:00
glasseyes
70e871e7af [linux] after testing, fix last commit 2018-09-17 16:23:11 +07:00
Marc Durdin
0cf28cfc76 [Windows] Remove manual edit requirement for keymanversion.* and fixup build dependencies that arise as a result 2018-09-17 18:57:17 +10:00
glasseyes
3c685c129a [linux] make uninstall (for /usr/local/ install)
move restore of package kmfl.xml to after the rest of uninstall
2018-09-17 15:45:17 +07:00
glasseyes
4def814908 [linux] install and use icons in local install 2018-09-17 15:13:46 +07:00
Marc Durdin
b75bafa307 [Windows] Fixup global-versions dependency 2018-09-17 14:08:10 +10:00
glasseyes
c3963575a7 python 3.5 compatible string in make step 2018-09-17 10:57:56 +07:00
glasseyes
4e058aabff tmp python site packages dir depends on python version 2018-09-17 10:48:22 +07:00
glasseyes
d46dc1aa8b update README.md for new build scripts
rename tmpbuild make target to tmpinstall
2018-09-17 10:07:53 +07:00
glasseyes
c169d9ec95 include keyman-config in tmpbuild
sudo make install now installs keyman-config as well
2018-09-17 09:28:17 +07:00
Marc Durdin
63580a9b8c [Windows] Complete version independent build setup 2018-09-17 11:56:55 +10:00
Marc Durdin
46b39cbcc9 [Windows] Additional tweaks for versioning and automated tests 2018-09-17 11:02:14 +10:00
Marc Durdin
58b1ba40a6 [Windows] First pass automated installer build and test 2018-09-17 08:56:04 +10:00
Marc Durdin
1e1240cbe3 [Windows] Avoid errors appearing when online update check fails for any reason 2018-09-17 08:55:41 +10:00
Marc Durdin
214a0294a3 [Windows] Update additional paths and registry settings to make them version-free 2018-09-17 08:55:03 +10:00
Marc Durdin
fec1610199 Fixup paths in registry settings 2018-09-17 08:42:27 +10:00
glasseyes
671360915f keyman-config: move imports to after args parse
so that -h can be run without dependencies installed
2018-09-15 17:49:28 +07:00
glasseyes
ca330e24f2 keyman-config: fix making dist on its own 2018-09-15 17:49:28 +07:00
glasseyes
18e037d66f deb.sh: package version suffix to be +dist not just dist 2018-09-15 17:49:28 +07:00
glasseyes
7fbba6036f use date of last git commit not current date for VERSION
more things needed in some README.repo

cow.sh: make it compatible with xenial
  set DIST for use with optional local .pbuilderrc, also in deb.sh
  link linux/.pbuilderrc to ~/.pbuilderrc if it doesn't exist
2018-09-15 17:49:28 +07:00
glasseyes
41017d3896 ignore generated keyman-config manpages 2018-09-15 17:49:28 +07:00
glasseyes
1c7fbb896c [linux] make the cow hook executable
run the cow hook after deb is copied to location
2018-09-15 17:49:28 +07:00
glasseyes
bb3140707f fix last commit 2018-09-15 17:49:28 +07:00
glasseyes
0c3d077dda [linux] touch cow Packages file if it doesn't exist 2018-09-15 17:49:27 +07:00
glasseyes
b1e48b344b [linux] keyman-config include README.md in dist on xenial
make deb now builds dist rather than devdist
include README.md in Debian package
improve keyman-config dependencies and keyman package description
2018-09-15 17:49:27 +07:00