You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ad...@apache.org on 2016/12/10 07:49:54 UTC

[4/7] incubator-mynewt-site git commit: Merge remote-tracking branch 'upstream/master'

Merge remote-tracking branch 'upstream/master'


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/commit/a60194e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/tree/a60194e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/diff/a60194e6

Branch: refs/heads/master
Commit: a60194e6cac773d92c426f80b396598cbf4f75dc
Parents: a80db0d 3fdca23
Author: Gavin Jefferies <ga...@runtime.io>
Authored: Fri Dec 9 18:42:10 2016 -0800
Committer: Gavin Jefferies <ga...@runtime.io>
Committed: Fri Dec 9 18:42:10 2016 -0800

----------------------------------------------------------------------
 README.md                                       |  11 +-
 build.py                                        |  21 +-
 custom-theme/FW-dist.png                        | Bin 0 -> 103732 bytes
 custom-theme/about.html                         |  41 +-
 custom-theme/base.html                          |  36 +-
 custom-theme/community.html                     |  51 +--
 custom-theme/css/custom.css                     | 106 ++---
 custom-theme/css/v2.css                         |  64 ++-
 custom-theme/download.html                      |   2 -
 custom-theme/events.html                        |   1 -
 custom-theme/footer.html                        |  28 +-
 custom-theme/img/FWdist.png                     | Bin 0 -> 103765 bytes
 custom-theme/img/MicrochipPIC32.jpg             | Bin 0 -> 7163 bytes
 custom-theme/img/arm_logo.gif                   | Bin 0 -> 1582 bytes
 custom-theme/img/atmel.png                      | Bin 0 -> 17367 bytes
 custom-theme/img/cross-platform.svg             |   6 +
 custom-theme/img/cross-platforms.png            | Bin 0 -> 14324 bytes
 custom-theme/img/logo.pdf                       | Bin 0 -> 263048 bytes
 custom-theme/img/logo.png                       | Bin 0 -> 151595 bytes
 custom-theme/img/nimble-full-perf.png           | Bin 0 -> 65334 bytes
 custom-theme/img/riscv-logo.png                 | Bin 0 -> 15999 bytes
 custom-theme/js/base.js                         |  38 +-
 custom-theme/js/custom.js                       |  16 -
 custom-theme/landing.html                       | 224 +++++----
 custom-theme/main-banner.html                   |  13 +-
 custom-theme/nav.html                           |  13 +-
 custom-theme/pages/ble.html                     | 144 ++++++
 custom-theme/pages/configurability.html         |  19 +
 custom-theme/pages/securitybullets.html         |  40 ++
 custom-theme/quick-start.html                   |   8 +-
 custom-theme/secondary-banner.html              |  16 +-
 custom-theme/talks.html                         |  63 +++
 custom-theme/toc.html                           |   1 -
 docs/about.md                                   |  11 +-
 docs/network/ble/ble_hs/ble_att/ble_att.md      |  24 +
 .../ble/ble_hs/ble_att/functions/ble_att_mtu.md |  20 +
 .../functions/ble_att_set_preferred_mtu.md      |  23 +
 .../ble_att/functions/ble_att_svr_read_local.md |  28 ++
 .../functions/ble_att_svr_write_local.md        |  28 ++
 docs/network/ble/ble_hs/ble_gap/ble_gap.md      |  37 ++
 .../ble_hs/ble_gap/definitions/ble_gap_defs.md  | 454 +++++++++++++++++++
 .../ble_gap/functions/ble_gap_adv_active.md     |  21 +
 .../functions/ble_gap_adv_rsp_set_fields.md     |  25 +
 .../ble_gap/functions/ble_gap_adv_set_fields.md |  25 +
 .../ble_gap/functions/ble_gap_adv_start.md      |  37 ++
 .../ble_gap/functions/ble_gap_adv_stop.md       |  22 +
 .../ble_gap/functions/ble_gap_conn_active.md    |  21 +
 .../ble_gap/functions/ble_gap_conn_cancel.md    |  21 +
 .../ble_gap/functions/ble_gap_conn_find.md      |  27 ++
 .../ble_gap/functions/ble_gap_conn_rssi.md      |  28 ++
 .../ble_hs/ble_gap/functions/ble_gap_connect.md |  37 ++
 .../ble_hs/ble_gap/functions/ble_gap_disc.md    |  33 ++
 .../ble_gap/functions/ble_gap_disc_active.md    |  21 +
 .../ble_gap/functions/ble_gap_disc_cancel.md    |  22 +
 .../functions/ble_gap_security_initiate.md      |  25 +
 .../ble_gap/functions/ble_gap_terminate.md      |  28 ++
 .../ble_gap/functions/ble_gap_update_params.md  |  29 ++
 .../ble_hs/ble_gap/functions/ble_gap_wl_set.md  |  27 ++
 docs/network/ble/ble_hs/ble_gattc/ble_gattc.md  |  40 ++
 .../ble_gattc/definitions/ble_gattc_defs.md     |  91 ++++
 .../functions/ble_gattc_disc_all_chrs.md        |  33 ++
 .../functions/ble_gattc_disc_all_dscs.md        |  33 ++
 .../functions/ble_gattc_disc_all_svcs.md        |  26 ++
 .../functions/ble_gattc_disc_chrs_by_uuid.md    |  35 ++
 .../functions/ble_gattc_disc_svc_by_uuid.md     |  31 ++
 .../functions/ble_gattc_exchange_mtu.md         |  29 ++
 .../functions/ble_gattc_find_inc_svcs.md        |  33 ++
 .../ble_gattc/functions/ble_gattc_indicate.md   |  27 ++
 .../ble_gattc/functions/ble_gattc_notify.md     |  27 ++
 .../functions/ble_gattc_notify_custom.md        |  29 ++
 .../ble_gattc/functions/ble_gattc_read.md       |  31 ++
 .../functions/ble_gattc_read_by_uuid.md         |  34 ++
 .../ble_gattc/functions/ble_gattc_read_long.md  |  31 ++
 .../ble_gattc/functions/ble_gattc_read_mult.md  |  33 ++
 .../ble_gattc/functions/ble_gattc_write.md      |  33 ++
 .../ble_gattc/functions/ble_gattc_write_flat.md |  35 ++
 .../ble_gattc/functions/ble_gattc_write_long.md |  33 ++
 .../functions/ble_gattc_write_no_rsp.md         |  29 ++
 .../functions/ble_gattc_write_no_rsp_flat.md    |  31 ++
 .../functions/ble_gattc_write_reliable.md       |  30 ++
 docs/network/ble/ble_hs/ble_gatts/ble_gatts.md  |  27 ++
 .../ble_gatts/definitions/ble_gatts_defs.md     | 246 ++++++++++
 .../ble_gatts/functions/ble_gatts_add_svcs.md   |  23 +
 .../ble_gatts/functions/ble_gatts_count_cfg.md  |  27 ++
 .../functions/ble_gatts_count_resources.md      |  27 ++
 .../ble_gatts/functions/ble_gatts_find_chr.md   |  31 ++
 .../ble_gatts/functions/ble_gatts_find_dsc.md   |  31 ++
 .../ble_gatts/functions/ble_gatts_find_svc.md   |  27 ++
 .../functions/ble_gatts_register_svcs.md        |  30 ++
 docs/network/ble/ble_hs/ble_hs.md               |  22 +
 docs/network/ble/ble_hs/ble_hs_id/ble_hs_id.md  |  42 ++
 .../ble_hs_id/functions/ble_hs_id_copy_addr.md  |  31 ++
 .../ble_hs_id/functions/ble_hs_id_gen_rnd.md    |  27 ++
 .../ble_hs_id/functions/ble_hs_id_set_rnd.md    |  23 +
 docs/network/ble/ble_hs/ble_hs_return_codes.md  | 264 +++++++++++
 .../ble/ble_hs/init/definitions/init_defs.md    | 159 +++++++
 .../ble/ble_hs/init/functions/ble_hs_init.md    |  27 ++
 .../ble/ble_hs/init/functions/ble_hs_start.md   |  21 +
 .../ble/ble_hs/init/functions/ble_hs_synced.md  |  21 +
 docs/network/ble/ble_hs/init/init.md            |  23 +
 .../functions/ble_eddystone_set_adv_data_uid.md |  29 ++
 .../functions/ble_eddystone_set_adv_data_url.md |  35 ++
 .../other/functions/ble_hs_mbuf_att_pkt.md      |  21 +
 .../other/functions/ble_hs_mbuf_from_flat.md    |  27 ++
 .../other/functions/ble_hs_mbuf_to_flat.md      |  32 ++
 .../other/functions/ble_ibeacon_set_adv_data.md |  30 ++
 .../other/functions/ble_uuid_128_to_16.md       |  23 +
 .../other/functions/ble_uuid_16_to_128.md       |  27 ++
 docs/network/ble/ble_hs/other/other.md          |  27 ++
 docs/network/ble/bletiny/bletiny_api.md         | 120 +++++
 .../core_os/event_queue/os_eventq_dflt_get.md   |  42 ++
 .../core_os/event_queue/os_eventq_dflt_set.md   |  45 ++
 docs/os/core_os/event_queue/os_eventq_inited.md |  47 ++
 docs/os/get_started/pics/ft232h.png             | Bin 0 -> 572354 bytes
 docs/os/get_started/pics/m0pro.png              | Bin 0 -> 613306 bytes
 docs/os/get_started/pics/nrf52dk.png            | Bin 0 -> 517522 bytes
 docs/os/get_started/serial_access.md            | 137 ++++++
 docs/os/modules/fcb/fcb.md                      | 100 ++++
 docs/os/modules/fcb/fcb_append.md               |  29 ++
 docs/os/modules/fcb/fcb_append_finish.md        |  25 +
 docs/os/modules/fcb/fcb_append_to_scratch.md    |  23 +
 docs/os/modules/fcb/fcb_clear.md                |  23 +
 docs/os/modules/fcb/fcb_getnext.md              |  28 ++
 docs/os/modules/fcb/fcb_init.md                 |  25 +
 docs/os/modules/fcb/fcb_is_empty.md             |  23 +
 docs/os/modules/fcb/fcb_offset_last_n.md        |  28 ++
 docs/os/modules/fcb/fcb_rotate.md               |  22 +
 docs/os/modules/fcb/fcb_walk.md                 |  32 ++
 docs/os/modules/split/split.md                  | 420 +++++++++++++++++
 docs/os/tutorials/add_newtmgr.md                | 191 ++++++++
 docs/os/tutorials/add_shell.md                  | 140 ++++++
 docs/os/tutorials/bleprph/bleprph-app.md        | 108 +++++
 docs/os/tutorials/bleprph/bleprph-gap-event.md  | 161 +++++++
 docs/os/tutorials/pics/LightBlue-1.jpg          | Bin 0 -> 90014 bytes
 docs/os/tutorials/pics/LightBlue-2.jpg          | Bin 0 -> 121238 bytes
 docs/os/tutorials/pics/LightBlue-3.jpg          | Bin 0 -> 122447 bytes
 docs/os/tutorials/pics/LightBlue-4.jpg          | Bin 0 -> 94431 bytes
 docs/os/tutorials/pics/LightBlue-5.jpg          | Bin 0 -> 53663 bytes
 docs/os/tutorials/pics/LightBlue-6.jpg          | Bin 0 -> 97461 bytes
 docs/os/tutorials/pics/arduino_wifi.png         | Bin 0 -> 944943 bytes
 docs/os/tutorials/pics/task_lesson.png          | Bin 0 -> 12931 bytes
 docs/os/tutorials/tasks_lesson.md               | 415 +++++++++++++++++
 docs/os/tutorials/wi-fi_on_arduino.md           | 294 ++++++++++++
 docs/pages/ble.md                               |   8 +
 docs/pages/configurability.md                   |   8 +
 docs/pages/securitybullets.md                   |   8 +
 docs/talks.md                                   |   0
 mkdocs.yml                                      |  24 +-
 148 files changed, 6339 insertions(+), 357 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/a60194e6/build.py
----------------------------------------------------------------------
diff --cc build.py
index 0521db7,dd97f1b..a1339cd
--- a/build.py
+++ b/build.py
@@@ -47,10 -52,19 +52,20 @@@ def buildForReal(site_branch)
      for version in cfg['extra']['versions']:
          sh.git('checkout', version['branch'], '--', 'docs', 'mkdocs.yml')
          deployVersion(version)
 +    sh.git('checkout', '--', 'docs', 'mkdocs.yml')
  
+ def buildForTest():
+     print "Building site pages..."
+     updateConfigVersion('develop')
+     sh.rm('-rf', 'site')
+     sh.mkdocs('build', '--clean')
+     sh.git('checkout', '--', 'mkdocs.yml')
+ 
+     cfg = config.load_config()
+     for version in cfg['extra']['versions']:
+         deployVersion(version)
+ 
  def deployVersion(version):
-     mygit.checkout(version['branch'])
      buildTo(version['branch'])
      if version['latest']:
          buildTo('latest')