code synchronization at 2018-04-21@13:50

qiufudong · Apr 21, 2018 · 44239bf · 44239bf
1 parent 9cf94a6
commit 44239bf
Show file tree

Hide file tree

Showing 4,205 changed files with 1,848,722 additions and 40,000 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,6 @@ activate
 out
 *.out
 *.db
-*tag*
 .gdbinit
 .gdbinitkernel
 .gdbinitframework
@@ -28,6 +27,7 @@ build/cmd/win32/Python27/Lib/encodings/*.pyc
 *.d
 build/scripts/config_mk.py
 build/scripts/*.pyc
-tmp
 $Recycle.Bin
 .sconsign.dblite
+ckhobbit*.map
+projects/autogen/*
diff --git a/.travis.yml b/.travis.yml
@@ -17,12 +17,15 @@ env:
   - secure: h4xzPrWIwRbdOTxq1jTzAd8aFM7LLrmCvGyDcQqbccBbGkVOvTJ7+CC936G4OkkouO/m6bPKrTlK8DVBQI/b1mvKHFQYAnjyZeo9dl6ofNgHYMfYxnuhBSjQHzDYnsuS+Qa2xVIwOXgeyxZJh68YLRRvDWbtQ/3seWacSDNEVY6ZN+KmPn3CFIFozDdj5x+lN1mOBbvdQ1rtgSSak2ykiCCj9fqquGEJjo0a3C5C389B+dYW+AQergci8/NM505ggNi/tkFolriFo+swP9jDv+yGFiNB8icXvwJjI6KIKaVn6D/9Ueapg5JOrRfHslILQjNd6pHIcPFxAf9MEL10xlfkqC8PQu8AlrKH/Px2JQxEHQX6sygS2n2HdDyA9aXudBDbtBi4ldC17BV3hFKEuZuOyBauqWRJ5WhMXfu3iWUj1Hs5YjUDQL3k41m7QeKOFDJIzZ3UuMKXxA92PfdRY1T5YHutgQM/t5+QWUzJ8X3YffMSFHurgwGEJiW+WimneAn0BMtzSQwitzSwPQe8H+IQhkETelvbVx1c9kzncccE5JdDqwJSqHqFPJ289McO+IKLn0EXcOpRJFeD2I6+s3h573OK8RSGPiP+WJVph5Mccq4ZBtTt+4py969hnQsakMLbmVxR/rsVwjvJ6eRmeuyxK44qP9utLgPYZBLX4Vk=
   - secure: RF26URENpnNmbf1yK7/wzoeiROtFUIQSHILPtiWmPRk21nRah05bPGsWt00ayL4kn2rh+QAd4yKj+nfMl3JgKKxVCoLV4DNYBQ4m8RJYBVysVT7DGpQc6Kb9womoMovDlFSG2/vPf/INz/xaPIymGDW37JigJqtA/nwRMrX7cnxJVsaSLGAf9l+EW31d+VMR4nKAf9JVDfScWPej27mpQFzFSaIGr/8xGNWatknaaMD+4x0gJHdlZ6mLraY1qW8fiGPtyTrK3v4WCykLzRySzUsezBKd+fHuAado8TcKvY8xRXYor8xDKFd0tEPnF6aHgx5ZHzohrHpsq1xGhm2RVDz/ROC8OWTE962IVu3k07rBT85vd6wdWfudnR5pwgP7iLt8jSYSBV6nOpKJhJ9iFbZ+SYTn0sEOyfKuCithgmrVTHsQObtl2tPE96eM6WOCc3iLxm85cVXNdzZnBH4MOEGHkCZuUgsuFmUdsGiTXdb3ROtB0zGkrD+Enj9/BB08v7bZNCX/kKoqE2frB/wXHu6K2O3GAYgcztIh+ueU3yu/LflPuKB8e6HkoG0K9Jggs1M7NFJGBI9lYTuVmGGLPhCpf2cG6GKEOTOa3KHknV2UvGTDPRO5TlnD2KQ6n9Bm/0BN2O8qgFIYLboRVTePz4MZQIzCu9uBuPm437IzNAc=
 before_install:
-- sudo apt update -qq
 - while [ $? -ne 0 ]; do sudo apt update -qq; done
+- sudo apt purge oracle-java8-installer oracle-java9-installer
+- sudo apt autoremove
+- sudo apt install -qq scons
 - sudo apt install -qq gcc-multilib
 - sudo apt install -qq libssl-dev libssl-dev:i386
 - sudo apt install -qq libncurses5-dev libncurses5-dev:i386
 - sudo apt install -qq libreadline-dev libreadline-dev:i386
+- sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 60
 install:
 - pwd
 - cd ${HOME}

diff --git a/3rdparty/experimental/ramfs/README b/3rdparty/experimental/ramfs/README
@@ -0,0 +1 @@
+This software component is used to help users port third-party programs, but WITHOUT ANY WARRANTY. The entire risk as to the quality and performance of the program is with you. Should the program prove defective, you assume the cost of all necessary servicing, repair or correction. The use of third-party programs must also follow its own permissive license.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		This software component is used to help users port third-party programs, but WITHOUT ANY WARRANTY. The entire risk as to the quality and performance of the program is with you. Should the program prove defective, you assume the cost of all necessary servicing, repair or correction. The use of third-party programs must also follow its own permissive license.