waf: ardupilotwaf: prefix build context methods with ap_

It helps to distinguish between things from waf and things from ardupilotwaf.
2016-01-22 21:00:13 +00:00 · 2016-01-22 21:00:13 +00:00 · c2e3f05dbf
parent a2d2661765
commit c2e3f05dbf
86 changed files with 90 additions and 90 deletions
--- a/APMrover2/wscript
+++ b/APMrover2/wscript
@ -6,7 +6,7 @@ def build(bld):
    bld.ap_stlib(
        name=vehicle + '_libs',
        vehicle=vehicle,
-        libraries=bld.common_vehicle_libraries() + [
+        libraries=bld.ap_common_vehicle_libraries() + [
            'APM_Control',
            'AP_Arming',
            'AP_Camera',
--- a/AntennaTracker/wscript
+++ b/AntennaTracker/wscript
@ -6,7 +6,7 @@ def build(bld):
    bld.ap_stlib(
        name=vehicle + '_libs',
        vehicle=vehicle,
-        libraries=bld.common_vehicle_libraries() + [
+        libraries=bld.ap_common_vehicle_libraries() + [
            'PID',
        ],
        use='mavlink',
--- a/ArduCopter/wscript
+++ b/ArduCopter/wscript
@ -6,7 +6,7 @@ def build(bld):
    bld.ap_stlib(
        name=vehicle + '_libs',
        vehicle=vehicle,
-        libraries=bld.common_vehicle_libraries() + [
+        libraries=bld.ap_common_vehicle_libraries() + [
            'AP_ADSB',
            'AC_AttitudeControl',
            'AC_Fence',
--- a/ArduPlane/wscript
+++ b/ArduPlane/wscript
@ -6,7 +6,7 @@ def build(bld):
    bld.ap_stlib(
        name=vehicle + '_libs',
        vehicle=vehicle,
-        libraries=bld.common_vehicle_libraries() + [
+        libraries=bld.ap_common_vehicle_libraries() + [
            'APM_Control',
            'APM_OBC',
            'AP_ADSB',
--- a/Tools/Hello/wscript
+++ b/Tools/Hello/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/Tools/ardupilotwaf/ardupilotwaf.py
+++ b/Tools/ardupilotwaf/ardupilotwaf.py
@ -65,7 +65,7 @@ IGNORED_AP_LIBRARIES = [
 ]

@conf
-def get_all_libraries(bld):
+def ap_get_all_libraries(bld):
    libraries = []
    for lib_node in bld.srcnode.ant_glob('libraries/*', dir=True):
        name = lib_node.name
@ -78,7 +78,7 @@ def get_all_libraries(bld):
    return libraries

@conf
-def common_vehicle_libraries(bld):
+def ap_common_vehicle_libraries(bld):
    return COMMON_VEHICLE_DEPENDENT_LIBRARIES

@conf
@ -111,7 +111,7 @@ def ap_program(bld, blddestdir='bin',
    )

@conf
-def example(bld, **kw):
+def ap_example(bld, **kw):
    kw['blddestdir'] = 'examples'
    ap_program(bld, **kw)

@ -159,7 +159,7 @@ def ap_stlib(bld, **kw):
    bld.stlib(**kw)

@conf
-def find_tests(bld, use=[]):
+def ap_find_tests(bld, use=[]):
    if not bld.env.HAS_GTEST:
        return

@ -185,7 +185,7 @@ def find_tests(bld, use=[]):
        )

@conf
-def find_benchmarks(bld, use=[]):
+def ap_find_benchmarks(bld, use=[]):
    if not bld.env.HAS_GBENCHMARK:
        return

--- a/libraries/AC_PID/examples/AC_PID_test/wscript
+++ b/libraries/AC_PID/examples/AC_PID_test/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_ADC/examples/AP_ADC_test/wscript
+++ b/libraries/AP_ADC/examples/AP_ADC_test/wscript
@ -5,6 +5,6 @@ def build(bld):
    if bld.env.BOARD in ['sitl']:
        return

-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_AHRS/examples/AHRS_Test/wscript
+++ b/libraries/AP_AHRS/examples/AHRS_Test/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_Airspeed/examples/Airspeed/wscript
+++ b/libraries/AP_Airspeed/examples/Airspeed/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_Baro/examples/BARO_generic/wscript
+++ b/libraries/AP_Baro/examples/BARO_generic/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_BattMonitor/examples/AP_BattMonitor_test/wscript
+++ b/libraries/AP_BattMonitor/examples/AP_BattMonitor_test/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_Common/examples/AP_Common/wscript
+++ b/libraries/AP_Common/examples/AP_Common/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_Compass/examples/AP_Compass_test/wscript
+++ b/libraries/AP_Compass/examples/AP_Compass_test/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_Declination/examples/AP_Declination_test/wscript
+++ b/libraries/AP_Declination/examples/AP_Declination_test/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_GPS/examples/GPS_AUTO_test/wscript
+++ b/libraries/AP_GPS/examples/GPS_AUTO_test/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_GPS/examples/GPS_UBLOX_passthrough/wscript
+++ b/libraries/AP_GPS/examples/GPS_UBLOX_passthrough/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL/examples/AnalogIn/wscript
+++ b/libraries/AP_HAL/examples/AnalogIn/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL/examples/Printf/wscript
+++ b/libraries/AP_HAL/examples/Printf/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL/examples/RCInput/wscript
+++ b/libraries/AP_HAL/examples/RCInput/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL/examples/RCInputToRCOutput/wscript
+++ b/libraries/AP_HAL/examples/RCInputToRCOutput/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL/examples/RCOutput/wscript
+++ b/libraries/AP_HAL/examples/RCOutput/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL/examples/Storage/wscript
+++ b/libraries/AP_HAL/examples/Storage/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL/examples/UART_test/wscript
+++ b/libraries/AP_HAL/examples/UART_test/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL_AVR/examples/ArduCopterLibs/wscript
+++ b/libraries/AP_HAL_AVR/examples/ArduCopterLibs/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL_AVR/examples/ArduPlaneLibs/wscript
+++ b/libraries/AP_HAL_AVR/examples/ArduPlaneLibs/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL_AVR/examples/Blink/wscript
+++ b/libraries/AP_HAL_AVR/examples/Blink/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL_AVR/examples/Console/wscript
+++ b/libraries/AP_HAL_AVR/examples/Console/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL_AVR/examples/I2CDriver_HMC5883L/wscript
+++ b/libraries/AP_HAL_AVR/examples/I2CDriver_HMC5883L/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL_AVR/examples/LCDTest/wscript
+++ b/libraries/AP_HAL_AVR/examples/LCDTest/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL_AVR/examples/RCInputTest/wscript
+++ b/libraries/AP_HAL_AVR/examples/RCInputTest/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL_AVR/examples/RCJitterTest/wscript
+++ b/libraries/AP_HAL_AVR/examples/RCJitterTest/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL_AVR/examples/RCPassthroughTest/wscript
+++ b/libraries/AP_HAL_AVR/examples/RCPassthroughTest/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL_AVR/examples/SPIDriver_MPU6000/wscript
+++ b/libraries/AP_HAL_AVR/examples/SPIDriver_MPU6000/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL_AVR/examples/Scheduler/wscript
+++ b/libraries/AP_HAL_AVR/examples/Scheduler/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL_AVR/examples/Semaphore/wscript
+++ b/libraries/AP_HAL_AVR/examples/Semaphore/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL_AVR/examples/Storage/wscript
+++ b/libraries/AP_HAL_AVR/examples/Storage/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL_AVR/examples/UARTDriver/wscript
+++ b/libraries/AP_HAL_AVR/examples/UARTDriver/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL_AVR/examples/UtilityStringTest/wscript
+++ b/libraries/AP_HAL_AVR/examples/UtilityStringTest/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL_FLYMAPLE/examples/AP_Baro_BMP085_test/wscript
+++ b/libraries/AP_HAL_FLYMAPLE/examples/AP_Baro_BMP085_test/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL_FLYMAPLE/examples/AnalogIn/wscript
+++ b/libraries/AP_HAL_FLYMAPLE/examples/AnalogIn/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL_FLYMAPLE/examples/Blink/wscript
+++ b/libraries/AP_HAL_FLYMAPLE/examples/Blink/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL_FLYMAPLE/examples/Console/wscript
+++ b/libraries/AP_HAL_FLYMAPLE/examples/Console/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL_FLYMAPLE/examples/I2CDriver_HMC5883L/wscript
+++ b/libraries/AP_HAL_FLYMAPLE/examples/I2CDriver_HMC5883L/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL_FLYMAPLE/examples/RCInput/wscript
+++ b/libraries/AP_HAL_FLYMAPLE/examples/RCInput/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL_FLYMAPLE/examples/RCPassthroughTest/wscript
+++ b/libraries/AP_HAL_FLYMAPLE/examples/RCPassthroughTest/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL_FLYMAPLE/examples/SPIDriver/wscript
+++ b/libraries/AP_HAL_FLYMAPLE/examples/SPIDriver/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL_FLYMAPLE/examples/Scheduler/wscript
+++ b/libraries/AP_HAL_FLYMAPLE/examples/Scheduler/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL_FLYMAPLE/examples/Semaphore/wscript
+++ b/libraries/AP_HAL_FLYMAPLE/examples/Semaphore/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL_FLYMAPLE/examples/Storage/wscript
+++ b/libraries/AP_HAL_FLYMAPLE/examples/Storage/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL_FLYMAPLE/examples/UARTDriver/wscript
+++ b/libraries/AP_HAL_FLYMAPLE/examples/UARTDriver/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL_FLYMAPLE/examples/UtilityStringTest/wscript
+++ b/libraries/AP_HAL_FLYMAPLE/examples/UtilityStringTest/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL_FLYMAPLE/examples/empty_example/wscript
+++ b/libraries/AP_HAL_FLYMAPLE/examples/empty_example/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL_Linux/benchmarks/wscript
+++ b/libraries/AP_HAL_Linux/benchmarks/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.find_benchmarks(
+    bld.ap_find_benchmarks(
        use='ap',
    )
--- a/libraries/AP_HAL_Linux/examples/BusTest/wscript
+++ b/libraries/AP_HAL_Linux/examples/BusTest/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_HAL_PX4/examples/simple/wscript
+++ b/libraries/AP_HAL_PX4/examples/simple/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_InertialSensor/examples/INS_generic/wscript
+++ b/libraries/AP_InertialSensor/examples/INS_generic/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_InertialSensor/examples/VibTest/wscript
+++ b/libraries/AP_InertialSensor/examples/VibTest/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_Math/benchmarks/wscript
+++ b/libraries/AP_Math/benchmarks/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.find_benchmarks(
+    bld.ap_find_benchmarks(
        use='ap',
    )
--- a/libraries/AP_Math/examples/eulers/wscript
+++ b/libraries/AP_Math/examples/eulers/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_Math/examples/location/wscript
+++ b/libraries/AP_Math/examples/location/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_Math/examples/polygon/wscript
+++ b/libraries/AP_Math/examples/polygon/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_Math/examples/rotations/wscript
+++ b/libraries/AP_Math/examples/rotations/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_Math/tests/wscript
+++ b/libraries/AP_Math/tests/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.find_tests(
+    bld.ap_find_tests(
        use='ap',
    )
--- a/libraries/AP_Mission/examples/AP_Mission_test/wscript
+++ b/libraries/AP_Mission/examples/AP_Mission_test/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_Motors/examples/AP_Motors_Time_test/wscript
+++ b/libraries/AP_Motors/examples/AP_Motors_Time_test/wscript
@ -5,6 +5,6 @@ def build(bld):
    # TODO: Test code doesn't build. Fix or delete the test.
    return

-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_Motors/examples/AP_Motors_test/wscript
+++ b/libraries/AP_Motors/examples/AP_Motors_test/wscript
@ -5,6 +5,6 @@ def build(bld):
    # TODO: Test code doesn't build. Fix or delete the test.
    return

-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_Mount/examples/trivial_AP_Mount/wscript
+++ b/libraries/AP_Mount/examples/trivial_AP_Mount/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_Notify/examples/AP_Notify_test/wscript
+++ b/libraries/AP_Notify/examples/AP_Notify_test/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_Notify/examples/ToshibaLED_test/wscript
+++ b/libraries/AP_Notify/examples/ToshibaLED_test/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_OpticalFlow/examples/AP_OpticalFlow_test/wscript
+++ b/libraries/AP_OpticalFlow/examples/AP_OpticalFlow_test/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_Parachute/examples/AP_Parachute_test/wscript
+++ b/libraries/AP_Parachute/examples/AP_Parachute_test/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_RangeFinder/examples/RFIND_test/wscript
+++ b/libraries/AP_RangeFinder/examples/RFIND_test/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/AP_Scheduler/examples/Scheduler_test/wscript
+++ b/libraries/AP_Scheduler/examples/Scheduler_test/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/DataFlash/examples/DataFlash_test/wscript
+++ b/libraries/DataFlash/examples/DataFlash_test/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/Filter/examples/Derivative/wscript
+++ b/libraries/Filter/examples/Derivative/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/Filter/examples/Filter/wscript
+++ b/libraries/Filter/examples/Filter/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/Filter/examples/LowPassFilter/wscript
+++ b/libraries/Filter/examples/LowPassFilter/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/Filter/examples/LowPassFilter2p/wscript
+++ b/libraries/Filter/examples/LowPassFilter2p/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/GCS_Console/examples/Console/wscript
+++ b/libraries/GCS_Console/examples/Console/wscript
@ -5,6 +5,6 @@ def build(bld):
    # TODO: Test code doesn't build. Fix or delete the test.
    return

-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/GCS_MAVLink/examples/routing/wscript
+++ b/libraries/GCS_MAVLink/examples/routing/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/PID/examples/pid/wscript
+++ b/libraries/PID/examples/pid/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/RC_Channel/examples/RC_Channel/wscript
+++ b/libraries/RC_Channel/examples/RC_Channel/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/RC_Channel/examples/RC_UART/wscript
+++ b/libraries/RC_Channel/examples/RC_UART/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/libraries/StorageManager/examples/StorageTest/wscript
+++ b/libraries/StorageManager/examples/StorageTest/wscript
@ -2,6 +2,6 @@
 # encoding: utf-8

 def build(bld):
-    bld.example(
+    bld.ap_example(
        use='ap',
    )
--- a/2
+++ b/2
@ -141,7 +141,7 @@ def build(bld):
    bld.ap_stlib(
        name='ap',
        vehicle='UNKNOWN',
-        libraries=bld.get_all_libraries(),
+        libraries=bld.ap_get_all_libraries(),
        use='mavlink',
    )
    # TODO: Currently each vehicle also generate its own copy of the