Rename sources, headers, and binaries to typical C-style names

- Sources and headers are now prefixed with pdalc_ and are all in lowercase
- Removed capi directories
- Prefixed tests with test_
- Added pdalc.h

Author: jimmysoda

.gitlab-ci.yml

@@ -76,7 +76,7 @@ test-x64-windows-release:
     - set GDAL_DATA=%VCPKG_ROOT%\installed\x64-windows\share\gdal
     - set PROJ_LIB=%VCPKG_ROOT%\installed\x64-windows\share\proj4
     - copy proj_4_9.dll proj.dll
-    - "%CI_PROJECT_DIR%/build/build-x64-windows-release/bin/test_pdal_c"
+    - "%CI_PROJECT_DIR%/build/build-x64-windows-release/bin/test_pdalc"
   cache:
     key: build-x64-windows-release
     paths:
@@ -92,7 +92,7 @@ test-x64-windows-debug:
     - set GDAL_DATA=%VCPKG_ROOT%\installed\x64-windows\share\gdal
     - set PROJ_LIB=%VCPKG_ROOT%\installed\x64-windows\share\proj4
     - copy proj_4_9_d.dll proj.dll
-    - "%CI_PROJECT_DIR%/build/build-x64-windows-debug/bin/test_pdal_cd"
+    - "%CI_PROJECT_DIR%/build/build-x64-windows-debug/bin/test_pdalcd"
   cache:
     key: build-x64-windows-debug
     paths:
@@ -180,8 +180,8 @@ build-x64-linux-debug-alpine:
 .job_template: &test-linux
   stage: test
   script:
-    - rm -rf coverage_pdal_c
-    - make coverage_pdal_c
+    - rm -rf coverage_pdalc
+    - make coverage_pdalc
   cache:
     key: "$CI_JOB_NAME"
     policy: pull
@@ -199,7 +199,7 @@ test-x64-linux-release-alpine:
     - cd build/build-x64-linux-release-alpine
   artifacts:
     paths:
-      - build/build-x64-linux-release-alpine/coverage_pdal_c
+      - build/build-x64-linux-release-alpine/coverage_pdalc
 
 test-x64-linux-debug-alpine:
   <<: *test-linux
@@ -214,5 +214,5 @@ test-x64-linux-debug-alpine:
     - cd build/build-x64-linux-debug-alpine
   artifacts:
     paths:
-      - build/build-x64-linux-debug-alpine/coverage_pdal_c
+      - build/build-x64-linux-debug-alpine/coverage_pdalc
 

.vscode/launch.json

@@ -8,7 +8,7 @@
 			"name": "test_pdal_c x64-windows",
 			"type": "cppvsdbg",
 			"request": "launch",
-			"program": "${workspaceFolder}\\build\\x64-windows\\bin\\test_pdal_cd.exe",
+			"program": "${workspaceFolder}\\build\\x64-windows\\bin\\test_pdalcd.exe",
 			"args": [],
 			"stopAtEntry": false,
 			"cwd": "${env:VCPKG_ROOT}\\installed\\x64-windows\\debug\\bin",

CMakeLists.txt

@@ -43,9 +43,9 @@ if(CMAKE_COMPILER_IS_GNUCXX)
 	endif()
 endif()
 
-add_subdirectory("source/pdal/capi")
+add_subdirectory("source/pdal")
 add_subdirectory("doc")
 
 include(CTest)
 add_subdirectory("tests/data")
-add_subdirectory("tests/pdal/capi")
+add_subdirectory("tests/pdal")

source/pdal/capi/CMakeLists.txt source/pdal/CMakeLists.txtsource/pdal/capi/CMakeLists.txt renamed to source/pdal/CMakeLists.txt

@@ -1,26 +1,27 @@
-set(TARGET pdal_c)
+set(TARGET pdalc)
 
 find_package(PDAL REQUIRED CONFIG)
 message(STATUS "Found PDAL ${PDAL_VERSION}")
 
 set(SOURCES
-	Config.cpp
-	DimType.cpp
-	Pipeline.cpp
-	PointLayout.cpp
-	PointView.cpp
-	PointViewIterator.cpp
+	pdalc_config.cpp
+	pdalc_dimtype.cpp
+	pdalc_pipeline.cpp
+	pdalc_pointlayout.cpp
+	pdalc_pointview.cpp
+	pdalc_pointviewiterator.cpp
 )
 
 set(HEADERS
-	Config.h
-	Defines.h
-	DimType.h
-	Forward.h
-	Pipeline.h
-	PointLayout.h
-	PointView.h
-	PointViewIterator.h
+	pdalc.h
+	pdalc_config.h
+	pdalc_defines.h
+	pdalc_dimtype.h
+	pdalc_forward.h
+	pdalc_pipeline.h
+	pdalc_pointlayout.h
+	pdalc_pointview.h
+	pdalc_pointviewiterator.h
 )
 
 set(DEPENDENCIES

source/pdal/capi/Defines.h

@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) Simverge Software LLC - All Rights Reserved
+ */
+
+#ifndef PDALC_H
+#define PDALC_H
+
+#include "pdalc_config.h"
+#include "pdalc_dimtype.h"
+#include "pdalc_pipeline.h"
+#include "pdalc_pointlayout.h"
+#include "pdalc_pointview.h"
+#include "pdalc_pointviewiterator.h"
+
+#endif

source/pdal/pdalc.h

@@ -2,7 +2,7 @@
  * Copyright (c) Simverge Software LLC - All Rights Reserved
  */
 
-#include "Config.h"
+#include "pdalc_config.h"
 
 #include <pdal/pdal_config.hpp>
 

source/pdal/capi/Config.cpp source/pdal/pdalc_config.cppsource/pdal/capi/Config.cpp renamed to source/pdal/pdalc_config.cpp

@@ -2,14 +2,14 @@
  * Copyright (c) Simverge Software LLC - All Rights Reserved
  */
 
-#ifndef PDAL_CAPI_CONFIG_H
-#define PDAL_CAPI_CONFIG_H
+#ifndef PDALC_CONFIG_H
+#define PDALC_CONFIG_H
 
-#include "Forward.h"
+#include "pdalc_forward.h"
 
 /**
- * @file Config.h
- * Functions to PDAL version and configuration information.
+ * @file pdalc_config.h
+ * Functions to retrieve PDAL version and configuration information.
  */
 
 #ifdef __cplusplus
@@ -34,7 +34,7 @@ namespace pdal
 			 * @param size The size of the provided buffer
 			 * @return The size of the retrieved version string
 			 */
-			PDAL_C_API size_t PDALFullVersionString(char *version, size_t size);
+			PDALC_API size_t PDALFullVersionString(char *version, size_t size);
 
 			/**
 			 * Retrieves the PDAL version string.
@@ -47,7 +47,7 @@ namespace pdal
 			 * @param size The size of the provided buffer
 			 * @return The size of the retrieved version string
 			 */
-			PDAL_C_API size_t PDALVersionString(char *version, size_t size);
+			PDALC_API size_t PDALVersionString(char *version, size_t size);
 
 			/**
 			 * Returns an integer representation of the PDAL version.
@@ -59,7 +59,7 @@ namespace pdal
 			 * 
 			 * @return An integer representation of the PDAL version
 			 */
-			PDAL_C_API int PDALVersionInteger();
+			PDALC_API int PDALVersionInteger();
 
 			/**
 			 * Retrieves PDAL's Git commit SHA1 as a string.
@@ -70,7 +70,7 @@ namespace pdal
 			 * @param size The size of the provided buffer
 			 * @return The size of the retrieved SHA1 string
 			 */
-			PDAL_C_API size_t PDALSha1(char *sha1, size_t size);
+			PDALC_API size_t PDALSha1(char *sha1, size_t size);
 
 			/**
 			 * Returns the PDAL major version number.
@@ -79,7 +79,7 @@ namespace pdal
 			 * 
 			 * @return The major version
 			 */
-			PDAL_C_API int PDALVersionMajor();
+			PDALC_API int PDALVersionMajor();
 
 			/**
 			 * Returns the PDAL minor version number.
@@ -88,7 +88,7 @@ namespace pdal
 			 * 
 			 * @return The minor version
 			 */
-			PDAL_C_API int PDALVersionMinor();
+			PDALC_API int PDALVersionMinor();
 
 			/**
 			 * Returns the PDAL patch version number.
@@ -97,7 +97,7 @@ namespace pdal
 			 * 
 			 * @return The patch version
 			 */
-			PDAL_C_API int PDALVersionPatch();
+			PDALC_API int PDALVersionPatch();
 
 			/**
 			 * Retrieves PDAL debugging information.
@@ -108,7 +108,7 @@ namespace pdal
 			 * @param size The size of the provided buffer
 			 * @return The size of the retrieved debugging information
 			 */
-			PDAL_C_API size_t PDALDebugInformation(char *info, size_t size);
+			PDALC_API size_t PDALDebugInformation(char *info, size_t size);
 
 			/**
 			 * Retrieves the path to the PDAL installation.
@@ -119,7 +119,7 @@ namespace pdal
 			 * @param size The size of the provided buffer
 			 * @return The size of the retrieved installation path
 			 */
-			PDAL_C_API size_t PDALPluginInstallPath(char *path, size_t size);
+			PDALC_API size_t PDALPluginInstallPath(char *path, size_t size);
 
 #ifdef __cplusplus
 		}

source/pdal/capi/Config.h source/pdal/pdalc_config.hsource/pdal/capi/Config.h renamed to source/pdal/pdalc_config.h

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) Simverge Software LLC - All Rights Reserved
+ */
+
+#ifndef PDALC_DEFINES_H
+#define PDALC_DEFINES_H
+
+// Visual Studio
+#if defined(_MSC_VER)
+#define PDALC_EXPORT_API __declspec(dllexport)
+#define PDALC_IMPORT_API __declspec(dllimport)
+#define PDALC_STATIC_API
+
+// GCC-compatible
+#elif defined(__GNUC__)
+#if defined(__ELF__)
+#define PDALC_EXPORT_API __attribute__((visibility("default")))
+#define PDALC_IMPORT_API __attribute__((visibility("default")))
+#define PDALC_STATIC_API __attribute__((visibility("default")))
+// Use symbols compatible with Visual Studio in Windows
+#elif defined(_WIN32)
+#define PDALC_EXPORT_API __declspec(dllexport)
+#define PDALC_IMPORT_API __declspec(dllimport)
+#define PDALC_STATIC_API
+// Unknown platform
+#else
+#define PDALC_EXPORT_API
+#define PDALC_IMPORT_API
+#define PDALC_STATIC_API
+#endif
+
+// Unknown compiler
+#else
+#define PDALC_EXPORT_API
+#define PDALC_IMPORT_API
+#define PDALC_STATIC_API
+
+#endif
+
+#endif

source/pdal/pdalc_defines.h

@@ -2,7 +2,7 @@
  * Copyright (c) Simverge Software LLC - All Rights Reserved
  */
 
-#include "DimType.h"
+#include "pdal/pdalc_dimtype.h"
 #include <pdal/DimType.hpp>
 
 namespace pdal