@cpp.js/package-gdal 1.0.0-beta.23 → 2.0.0-beta.1

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @cpp.js/package-gdal
 
+## 1.0.0
+
+### Major Changes
+
+- 🚀 first stable release
+
+### Patch Changes
+
+- Updated dependencies
+  - @cpp.js/package-expat@1.0.0
+  - @cpp.js/package-geos@1.0.0
+  - @cpp.js/package-geotiff@1.0.0
+  - @cpp.js/package-iconv@1.0.0
+  - @cpp.js/package-proj@1.0.0
+  - @cpp.js/package-spatialite@1.0.0
+  - @cpp.js/package-sqlite3@1.0.0
+  - @cpp.js/package-tiff@1.0.0
+  - @cpp.js/package-webp@1.0.0
+  - @cpp.js/package-zlib@1.0.0
+
 ## 1.0.0-beta.23
 
 ### Patch Changes

package/README.md

@@ -47,4 +47,4 @@ std::string Native::sample() {
 ## License
 This project includes the precompiled GDAL library, which is distributed under the [MIT License](https://github.com/OSGeo/gdal/blob/master/LICENSE.TXT).
 
-GDAL Homepage: <https://gdal.org/>
+GDAL Homepage: [https://gdal.org/](https://gdal.org/)

package/cppjs.build.js

@@ -6,6 +6,7 @@ const platformCmake = {
 
 export default {
     getURL: (version) => `https://github.com/OSGeo/gdal/releases/download/v${version}/gdal-${version}.tar.gz`,
+    copyToSource: { 'assets/gdal_empty_file.cpp': 'gcore/gdal_empty_file.cpp' },
     replaceList: [
         {
             regex: ' iconv_open',
@@ -27,10 +28,14 @@ export default {
             replacement: '',
             paths: ['gdal.cmake'],
         },
+        {
+            regex: 'add_library\\(\\$\\{GDAL_LIB_TARGET_NAME\\} gcore/gdal.h\\)',
+            replacement: 'add_library(${GDAL_LIB_TARGET_NAME} gcore/gdal.h gcore/gdal_empty_file.cpp)',
+            paths: ['gdal.cmake'],
+        },
     ],
-    buildType: 'cmake', // cmake, configure,
-    useIOSCMake: true,
-    getBuildParams: (platform, depPaths, ext) => [
+    buildType: 'cmake',
+    getBuildParams: (platform, depPaths) => [
         ...(platformCmake[platform] || []),
         '-DBUILD_APPS=OFF', '-DBUILD_TESTING=OFF', '-DACCEPT_MISSING_SQLITE3_MUTEX_ALLOC=ON',
         '-DOGR_ENABLE_DRIVER_GPSBABEL=OFF', '-DGDAL_USE_HDF5=OFF', '-DGDAL_USE_HDFS=OFF',

package/cppjs.config.js

@@ -1,88 +1,14 @@
-import expat from '@cpp.js/package-expat/cppjs.config.js';
-import geos from '@cpp.js/package-geos/cppjs.config.js';
-import geotiff from '@cpp.js/package-geotiff/cppjs.config.js';
-import iconv from '@cpp.js/package-iconv/cppjs.config.js';
-import proj from '@cpp.js/package-proj/cppjs.config.js';
-import spatialite from '@cpp.js/package-spatialite/cppjs.config.js';
-import sqlite3 from '@cpp.js/package-sqlite3/cppjs.config.js';
-import tiff from '@cpp.js/package-tiff/cppjs.config.js';
-import webp from '@cpp.js/package-webp/cppjs.config.js';
-import zlib from '@cpp.js/package-zlib/cppjs.config.js';
+import gdalWasm from '@cpp.js/package-gdal-wasm/cppjs.config.js';
+import gdalAndroid from '@cpp.js/package-gdal-android/cppjs.config.js';
+import gdalIos from '@cpp.js/package-gdal-ios/cppjs.config.js';
 
 export default {
-    general: {
-        name: 'gdal',
-    },
-    export: {
-        type: 'cmake',
-    },
-    dependencies: [
-        expat,
-        geos,
-        geotiff,
-        iconv,
-        proj,
-        spatialite,
-        sqlite3,
-        tiff,
-        webp,
-        zlib,
-    ],
-    paths: {
-        config: import.meta.url,
-        base: '../..',
-        output: 'dist',
-    },
-    platform: {
-        'Android-arm64-v8a': {
-            data: {
-                'share/gdal': 'gdal',
-            },
-            env: {
-                GDAL_DATA: '_CPPJS_DATA_PATH_/gdal',
-                DXF_FEATURE_LIMIT_PER_BLOCK: '-1',
-                GDAL_ENABLE_DEPRECATED_DRIVER_GTM: 'YES',
-                // CPL_DEBUG: 'ON',
-                CPL_LOG_ERRORS: 'ON',
-            },
-        },
-        'iOS-iphoneos': {
-            data: {
-                'share/gdal': 'gdal',
-            },
-            env: {
-                GDAL_DATA: '_CPPJS_DATA_PATH_/gdal',
-                DXF_FEATURE_LIMIT_PER_BLOCK: '-1',
-                GDAL_ENABLE_DEPRECATED_DRIVER_GTM: 'YES',
-                // CPL_DEBUG: 'ON',
-                CPL_LOG_ERRORS: 'ON',
-            },
-        },
-        'Emscripten-x86_64-browser': {
-            data: {
-                'share/gdal': '/usr/share/gdal',
-            },
-            env: {
-                GDAL_DATA: '/usr/share/gdal',
-                DXF_FEATURE_LIMIT_PER_BLOCK: '-1',
-                GDAL_NUM_THREADS: '0',
-                GDAL_ENABLE_DEPRECATED_DRIVER_GTM: 'YES',
-                // CPL_DEBUG: 'ON',
-                CPL_LOG_ERRORS: 'ON',
-            },
-        },
-        'Emscripten-x86_64-node': {
-            data: {
-                'share/gdal': 'gdal',
-            },
-            env: {
-                GDAL_DATA: '_CPPJS_DATA_PATH_/gdal',
-                DXF_FEATURE_LIMIT_PER_BLOCK: '-1',
-                GDAL_NUM_THREADS: '0',
-                GDAL_ENABLE_DEPRECATED_DRIVER_GTM: 'YES',
-                // CPL_DEBUG: 'ON',
-                CPL_LOG_ERRORS: 'ON',
-            },
-        },
-    },
+  dependencies: [
+    gdalWasm,
+    gdalAndroid,
+    gdalIos,
+  ],
+  paths: {
+    config: import.meta.url
+  }
 };

package/package.json

@@ -1,27 +1,12 @@
 {
   "name": "@cpp.js/package-gdal",
-  "version": "1.0.0-beta.23",
-  "nativeVersion": "3.10.0",
+  "version": "2.0.0-beta.1",
+  "nativeVersion": "3.12.1",
   "description": "This package provides the precompiled GDAL, built using Cpp.js, for seamless integration into JavaScript, WebAssembly, and React Native projects. It enables advanced geospatial data processing, including raster and vector data manipulation, format conversion, and spatial analysis, ensuring high performance and cross-platform compatibility. Perfect for web, server-side, and mobile geospatial applications.",
   "homepage": "https://github.com/bugra9/cpp.js/tree/main/packages/cppjs-package-gdal#readme",
   "repository": "https://github.com/bugra9/cpp.js.git",
-  "license": "MIT",
   "type": "module",
-  "dependencies": {
-    "@cpp.js/package-expat": "^1.0.0-beta.23",
-    "@cpp.js/package-geos": "^1.0.0-beta.23",
-    "@cpp.js/package-geotiff": "^1.0.0-beta.23",
-    "@cpp.js/package-iconv": "^1.0.0-beta.23",
-    "@cpp.js/package-proj": "^1.0.0-beta.24",
-    "@cpp.js/package-spatialite": "^1.0.0-beta.24",
-    "@cpp.js/package-sqlite3": "^1.0.0-beta.25",
-    "@cpp.js/package-tiff": "^1.0.0-beta.26",
-    "@cpp.js/package-webp": "^1.0.0-beta.24",
-    "@cpp.js/package-zlib": "^1.0.0-beta.29"
-  },
-  "devDependencies": {
-    "cpp.js": "^1.0.0-beta.33"
-  },
+  "license": "MIT",
   "keywords": [
     "gdal",
     "libgdal",
@@ -29,11 +14,10 @@
     "webassembly",
     "react-native"
   ],
-  "scripts": {
-    "build": "cppjs build",
-    "build:wasm": "cppjs build -p WebAssembly",
-    "build:android": "cppjs build -p Android",
-    "build:ios": "cppjs build -p iOS",
-    "clear": "rm -rf .cppjs dist *.xcframework"
+  "devDependencies": {
+    "@cpp.js/package-gdal-wasm": "^2.0.0-beta.1",
+    "@cpp.js/package-gdal-android": "^2.0.0-beta.1",
+    "@cpp.js/package-gdal-ios": "^2.0.0-beta.1",
+    "cpp.js": "^2.0.0-beta.1"
   }
 }

package/dist/prebuilt/Android-arm64-v8a/include/cpl_atomic_ops.h

@@ -1,90 +0,0 @@
-/**********************************************************************
- * $Id$
- *
- * Name:     cpl_atomic_ops.h
- * Project:  CPL - Common Portability Library
- * Purpose:  Atomic operation functions.
- * Author:   Even Rouault, <even dot rouault at spatialys.com>
- *
- **********************************************************************
- * Copyright (c) 2009-2010, Even Rouault <even dot rouault at spatialys.com>
- *
- * SPDX-License-Identifier: MIT
- ****************************************************************************/
-
-#ifndef CPL_ATOMIC_OPS_INCLUDED
-#define CPL_ATOMIC_OPS_INCLUDED
-
-#include "cpl_port.h"
-
-CPL_C_START
-
-/** Add a value to a pointed integer in a thread and SMP-safe way
- * and return the resulting value of the operation.
- *
- * This function, which in most cases is implemented by a few
- * efficient machine instructions, guarantees that the value pointed
- * by ptr will be incremented in a thread and SMP-safe way.
- * The variables for this function must be aligned on a 32-bit boundary.
- *
- * Depending on the platforms, this function can also act as a
- * memory barrier, but this should not be assumed.
- *
- * Current platforms/architectures where an efficient implementation
- * exists are MacOSX, MS Windows, i386/x86_64 with GCC and platforms
- * supported by GCC 4.1 or higher. For other platforms supporting
- * the pthread library, and when GDAL is configured with thread-support,
- * the atomicity will be done with a mutex, but with
- * reduced efficiency. For the remaining platforms, a simple addition
- * with no locking will be done...
- *
- * @param ptr a pointer to an integer to increment
- * @param increment the amount to add to the pointed integer
- * @return the pointed value AFTER the result of the addition
- */
-int CPL_DLL CPLAtomicAdd(volatile int *ptr, int increment);
-
-/** Increment of 1 the pointed integer in a thread and SMP-safe way
- * and return the resulting value of the operation.
- *
- * @see CPLAtomicAdd for the details and guarantees of this atomic
- *      operation
- *
- * @param ptr a pointer to an integer to increment
- * @return the pointed value AFTER the operation: *ptr + 1
- */
-#define CPLAtomicInc(ptr) CPLAtomicAdd(ptr, 1)
-
-/** Decrement of 1 the pointed integer in a thread and SMP-safe way
- * and return the resulting value of the operation.
- *
- * @see CPLAtomicAdd for the details and guarantees of this atomic
- *      operation
- *
- * @param ptr a pointer to an integer to decrement
- * @return the pointed value AFTER the operation: *ptr - 1
- */
-#define CPLAtomicDec(ptr) CPLAtomicAdd(ptr, -1)
-
-/** Compares *ptr with oldval. If *ptr == oldval, then *ptr is assigned
- * newval and TRUE is returned. Otherwise nothing is done, and FALSE is
- * returned.
- *
- * Current platforms/architectures where an efficient implementation
- * exists are MacOSX, MS Windows, i386/x86_64 with GCC and platforms
- * supported by GCC 4.1 or higher. For other platforms supporting
- * the pthread library, and when GDAL is configured with thread-support,
- * the atomicity will be done with a mutex, but with
- * reduced efficiency. For the remaining platforms, a simple compare and
- * exchange with no locking will be done...
- *
- * @param ptr a pointer to an integer (aligned on 32bit boundary).
- * @param oldval old value
- * @param newval new value
- * @return TRUE if the exchange has been done
- */
-int CPLAtomicCompareAndExchange(volatile int *ptr, int oldval, int newval);
-
-CPL_C_END
-
-#endif /* CPL_ATOMIC_OPS_INCLUDED */

package/dist/prebuilt/Android-arm64-v8a/include/cpl_auto_close.h

@@ -1,73 +0,0 @@
-/**********************************************************************
- * $Id$
- *
- * Name:     cpl_auto_close.h
- * Project:  CPL - Common Portability Library
- * Purpose:  CPL Auto Close handling
- * Author:   Liu Yimin, ymwh@foxmail.com
- *
- **********************************************************************
- * Copyright (c) 2018, Liu Yimin
- *
- * SPDX-License-Identifier: MIT
- ****************************************************************************/
-
-#ifndef CPL_AUTO_CLOSE_H_INCLUDED
-#define CPL_AUTO_CLOSE_H_INCLUDED
-
-#if defined(__cplusplus)
-#include <type_traits>
-
-/************************************************************************/
-/*                           CPLAutoClose                               */
-/************************************************************************/
-
-/**
- * The class use the destructor to automatically close the resource.
- * Example:
- *     GDALDatasetH hDset = GDALOpen(path,GA_ReadOnly);
- *     CPLAutoClose<GDALDatasetH,void(*)(void*)>
- * autoclosehDset(hDset,GDALClose); Or: GDALDatasetH hDset =
- * GDALOpen(path,GA_ReadOnly); CPL_AUTO_CLOSE_WARP(hDset,GDALClose);
- */
-template <typename _Ty, typename _Dx> class CPLAutoClose
-{
-    static_assert(!std::is_const<_Ty>::value && std::is_pointer<_Ty>::value,
-                  "_Ty must is pointer type,_Dx must is function type");
-
-  private:
-    _Ty &m_ResourcePtr;
-    _Dx m_CloseFunc;
-
-  private:
-    CPLAutoClose(const CPLAutoClose &) = delete;
-    void operator=(const CPLAutoClose &) = delete;
-
-  public:
-    /**
-     * @brief Constructor.
-     * @param ptr Pointer to the resource object.
-     * @param dt  Resource release(close) function.
-     */
-    explicit CPLAutoClose(_Ty &ptr, _Dx dt)
-        : m_ResourcePtr(ptr), m_CloseFunc(dt)
-    {
-    }
-
-    /**
-     * @brief Destructor.
-     */
-    ~CPLAutoClose()
-    {
-        if (m_ResourcePtr && m_CloseFunc)
-            m_CloseFunc(m_ResourcePtr);
-    }
-};
-
-#define CPL_AUTO_CLOSE_WARP(hObject, closeFunc)                                \
-    CPLAutoClose<decltype(hObject), decltype(closeFunc) *>                     \
-        tAutoClose##hObject(hObject, closeFunc)
-
-#endif /* __cplusplus */
-
-#endif /* CPL_AUTO_CLOSE_H_INCLUDED */

package/dist/prebuilt/Android-arm64-v8a/include/cpl_compressor.h

@@ -1,112 +0,0 @@
-/**********************************************************************
- * Project:  CPL - Common Portability Library
- * Purpose:  Registry of compression/decompression functions
- * Author:   Even Rouault <even.rouault at spatialys.com>
- *
- **********************************************************************
- * Copyright (c) 2021, Even Rouault <even.rouault at spatialys.com>
- *
- * SPDX-License-Identifier: MIT
- ****************************************************************************/
-
-#ifndef CPL_COMPRESSOR_H_INCLUDED
-#define CPL_COMPRESSOR_H_INCLUDED
-
-#include "cpl_port.h"
-
-#include <stdbool.h>
-
-/**
- * \file cpl_compressor.h
- *
- * API for compressors and decompressors of binary buffers.
- */
-
-CPL_C_START
-
-/** Callback of a compressor/decompressor.
- *
- * For a compressor, input is uncompressed data, and output compressed data.
- * For a decompressor, input is compressed data, and output uncompressed data.
- *
- * Valid situations for output_data and output_size are:
- * <ul>
- * <li>output_data != NULL and *output_data != NULL and output_size != NULL and
- * *output_size != 0. The caller provides the output
- * buffer in *output_data and its size in *output_size. In case of successful
- * operation, *output_size will be updated to the actual size.
- * This mode is the one that is always guaranteed to be implemented efficiently.
- * In case of failure due to insufficient space, it will be updated to the size
- * needed (if known), or 0 (if unknown)</li>
- * <li>output_data == NULL and output_size != NULL. *output_size will be updated
- * with the minimum size the output buffer should be (if known), or 0 (if
- * unknown).</li> <li>output_data != NULL and *output_data == NULL and
- * output_size != NULL. *output_data will be allocated using VSIMalloc(), and
- * should be freed by the caller with VSIFree(). *output_size will be updated to
- * the size of the output buffer.</li>
- * </ul>
- *
- * @param input_data Input data. Should not be NULL.
- * @param input_size Size of input data, in bytes.
- * @param output_data Pointer to output data.
- * @param output_size Pointer to output size.
- * @param options NULL terminated list of options. Or NULL.
- * @param compressor_user_data User data provided at registration time.
- * @return true in case of success.
- */
-typedef bool (*CPLCompressionFunc)(const void *input_data, size_t input_size,
-                                   void **output_data, size_t *output_size,
-                                   CSLConstList options,
-                                   void *compressor_user_data);
-
-/** Type of compressor */
-typedef enum
-{
-    /** Compressor */
-    CCT_COMPRESSOR,
-    /** Filter */
-    CCT_FILTER
-} CPLCompressorType;
-
-/** Compressor/decompressor description */
-typedef struct
-{
-    /** Structure version. Should be set to 1 */
-    int nStructVersion;
-    /** Id of the compressor/decompressor. Should NOT be NULL. */
-    const char *pszId;
-    /** Compressor type */
-    CPLCompressorType eType;
-    /** Metadata, as a NULL terminated list of strings. Or NULL.
-     * The OPTIONS metadata key is reserved for compressors/decompressors to
-     * provide the available options as a XML string of the form
-     * &lt;Options&gt;
-     *   &lt;Option name='' type='' description='' default=''/&gt;
-     * &lt;/Options&gt;
-     */
-    CSLConstList papszMetadata;
-    /** Compressor/decompressor callback. Should NOT be NULL. */
-    CPLCompressionFunc pfnFunc;
-    /** User data to provide to the callback. May be NULL. */
-    void *user_data;
-} CPLCompressor;
-
-bool CPL_DLL CPLRegisterCompressor(const CPLCompressor *compressor);
-
-bool CPL_DLL CPLRegisterDecompressor(const CPLCompressor *decompressor);
-
-char CPL_DLL **CPLGetCompressors(void);
-
-char CPL_DLL **CPLGetDecompressors(void);
-
-const CPLCompressor CPL_DLL *CPLGetCompressor(const char *pszId);
-
-const CPLCompressor CPL_DLL *CPLGetDecompressor(const char *pszId);
-
-/*! @cond Doxygen_Suppress */
-void CPL_DLL CPLDestroyCompressorRegistry(void);
-/*! @endcond */
-
-CPL_C_END
-
-#endif  // CPL_COMPRESSOR_H_INCLUDED