From a35c0d48b07d6ee80e518fa1f98a50784faab1c5 Mon Sep 17 00:00:00 2001
From: Gustavo Jose de Sousa <gustavo.sousa@intel.com>
Date: Thu, 21 Jan 2016 10:10:44 -0200
Subject: [PATCH] waf: ardupilotwaf: rename program to ap_program

Make the rename so that there is no name clashes when defining it as a taskgen
method.
---
 APMrover2/wscript                  | 2 +-
 AntennaTracker/wscript             | 2 +-
 ArduCopter/wscript                 | 2 +-
 ArduPlane/wscript                  | 2 +-
 Tools/CPUInfo/wscript              | 2 +-
 Tools/Replay/wscript               | 2 +-
 Tools/ardupilotwaf/ardupilotwaf.py | 8 ++++----
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/APMrover2/wscript b/APMrover2/wscript
index 8cf10db3aa..9cf8bdb5c8 100644
--- a/APMrover2/wscript
+++ b/APMrover2/wscript
@@ -27,7 +27,7 @@ def build(bld):
         use='mavlink',
     )
 
-    ardupilotwaf.program(
+    ardupilotwaf.ap_program(
         bld,
         program_name='ardurover',
         use=vehicle + '_libs',
diff --git a/AntennaTracker/wscript b/AntennaTracker/wscript
index 04e9268b3b..5dbc583fef 100644
--- a/AntennaTracker/wscript
+++ b/AntennaTracker/wscript
@@ -15,7 +15,7 @@ def build(bld):
         use='mavlink',
     )
 
-    ardupilotwaf.program(
+    ardupilotwaf.ap_program(
         bld,
         program_name='antennatracker',
         use=vehicle + '_libs',
diff --git a/ArduCopter/wscript b/ArduCopter/wscript
index 500b38e9d6..9f126bd87d 100644
--- a/ArduCopter/wscript
+++ b/ArduCopter/wscript
@@ -36,7 +36,7 @@ def build(bld):
         use='mavlink',
     )
 
-    ardupilotwaf.program(
+    ardupilotwaf.ap_program(
         bld,
         program_name='arducopter',
         use=vehicle + '_libs',
diff --git a/ArduPlane/wscript b/ArduPlane/wscript
index cb8ec66820..95689e9417 100644
--- a/ArduPlane/wscript
+++ b/ArduPlane/wscript
@@ -37,7 +37,7 @@ def build(bld):
         use='mavlink',
     )
 
-    ardupilotwaf.program(
+    ardupilotwaf.ap_program(
         bld,
         program_name='arduplane',
         use=vehicle + '_libs',
diff --git a/Tools/CPUInfo/wscript b/Tools/CPUInfo/wscript
index 20ac8eb5bf..58048cebd7 100644
--- a/Tools/CPUInfo/wscript
+++ b/Tools/CPUInfo/wscript
@@ -4,7 +4,7 @@
 import ardupilotwaf
 
 def build(bld):
-    ardupilotwaf.program(
+    ardupilotwaf.ap_program(
         bld,
         use='ap',
         blddestdir='tools',
diff --git a/Tools/Replay/wscript b/Tools/Replay/wscript
index 20ac8eb5bf..58048cebd7 100644
--- a/Tools/Replay/wscript
+++ b/Tools/Replay/wscript
@@ -4,7 +4,7 @@
 import ardupilotwaf
 
 def build(bld):
-    ardupilotwaf.program(
+    ardupilotwaf.ap_program(
         bld,
         use='ap',
         blddestdir='tools',
diff --git a/Tools/ardupilotwaf/ardupilotwaf.py b/Tools/ardupilotwaf/ardupilotwaf.py
index d0e41b5247..aec7571572 100644
--- a/Tools/ardupilotwaf/ardupilotwaf.py
+++ b/Tools/ardupilotwaf/ardupilotwaf.py
@@ -75,7 +75,7 @@ def get_all_libraries(bld):
     libraries.extend(['AP_HAL', 'AP_HAL_Empty'])
     return libraries
 
-def program(bld, blddestdir='bin',
+def ap_program(bld, blddestdir='bin',
             use_legacy_defines=True,
             program_name=None,
             **kw):
@@ -105,7 +105,7 @@ def program(bld, blddestdir='bin',
 
 def example(bld, **kw):
     kw['blddestdir'] = 'examples'
-    program(bld, **kw)
+    ap_program(bld, **kw)
 
 # NOTE: Code in libraries/ is compiled multiple times. So ensure each
 # compilation is independent by providing different index for each.
@@ -163,7 +163,7 @@ def find_tests(bld, use=[]):
     includes = [bld.srcnode.abspath() + '/tests/']
 
     for f in bld.path.ant_glob(incl='*.cpp'):
-        program(
+        ap_program(
             bld,
             features=features,
             includes=includes,
@@ -181,7 +181,7 @@ def find_benchmarks(bld, use=[]):
     includes = [bld.srcnode.abspath() + '/benchmarks/']
 
     for f in bld.path.ant_glob(incl='*.cpp'):
-        program(
+        ap_program(
             bld,
             features=common_features(bld) + ['gbenchmark'],
             includes=includes,