[pyqgis-console] Fix pyqgis.pap building targets/script for auto-completion in console

- Add fixed default pyqgis.pap

python/CMakeLists.txt

@@ -155,7 +155,7 @@ IF(WITH_QSCIAPI)
   SET(PAP_NAME "pyqgis-master.pap")
   ADD_CUSTOM_COMMAND(TARGET qsci-pap-master
     POST_BUILD
-    COMMAND ${PYTHON_EXECUTABLE} "${APIS_SRC_DIR}/generate_console_pap.py" "${PAP_NAME}" "${APIS_SRC_DIR}" "${APIS_BIN_DIR}"
+    COMMAND ${PYTHON_EXECUTABLE} "${APIS_SRC_DIR}/generate_console_pap.py" "${PAP_NAME}" "${APIS_SRC_DIR}" "${APIS_BIN_DIR}" "${APIS_BIN_DIR}"
     WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
     COMMENT "Generating local-only ${PAP_NAME} for console auto-completion (MAY TAKE > 1 MINUTE!)" VERBATIM)
 
@@ -168,7 +168,7 @@ IF(WITH_QSCIAPI)
   SET(PAP_NAME "pyqgis.pap")
   ADD_CUSTOM_COMMAND(TARGET qsci-pap-src
     POST_BUILD
-    COMMAND ${PYTHON_EXECUTABLE} "${APIS_SRC_DIR}/generate_console_pap.py" "${PAP_NAME}" "${APIS_SRC_DIR}" "${APIS_SRC_DIR}"
+    COMMAND ${PYTHON_EXECUTABLE} "${APIS_SRC_DIR}/generate_console_pap.py" "${PAP_NAME}" "${APIS_SRC_DIR}" "${APIS_BIN_DIR}" "${APIS_SRC_DIR}"
     WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
     COMMENT "Generating ${PAP_NAME} for console auto-completion (MAY TAKE > 1 MINUTE!)" VERBATIM)
 

python/qsci_apis/generate_console_pap.py

@@ -69,16 +69,17 @@ class PrepareAPIs(QObject):
 
 
 if __name__ == '__main__':
-    if len(sys.argv) != 4:
+    if len(sys.argv) != 5:
         print 'Usage: python <script> <pap_name_w-ext> ' \
-              '<APIs_dir_path> <output_dir>'
+              '<apis_src_dir> <api_bin_dir> <output_dir>'
         sys.exit(1)
     pap_name = sys.argv[1]
     api_src_dir = sys.argv[2]
-    output_dir = sys.argv[3]
+    api_bin_dir = sys.argv[3]
+    output_dir = sys.argv[4]
 
     api_files = [
-        os.path.join(output_dir, 'PyQGIS.api'),
+        os.path.join(api_bin_dir, 'PyQGIS.api'),
         os.path.join(api_src_dir, 'Python-2.7.api'),
         os.path.join(api_src_dir, 'PyQt4-4.7.4.api'),
         os.path.join(api_src_dir, 'OSGeo_GDAL-OGR-1.9.1.api')