Skip to content

fix: avoid name collision on cpp files #379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mlecoq wants to merge 1 commit into from
Closed

fix: avoid name collision on cpp files #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions android/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@ include_directories(
)

if (USE_SQLCIPHER)
include_directories(../cpp/sqlcipher)
include_directories(../cpp/opsqlite/sqlcipher)
endif()

if (USE_LIBSQL)
include_directories(src/main/jniLibs/include)
include_directories(../cpp/opsqlite/libsql)
endif()

separate_arguments(SQLITE_FLAGS_LIST UNIX_COMMAND "${SQLITE_FLAGS}")
Expand All @@ -24,18 +25,18 @@ add_definitions(
add_library(
${PACKAGE_NAME}
SHARED
../cpp/OPSqlite.cpp
../cpp/utils.cpp
../cpp/OPThreadPool.cpp
../cpp/SmartHostObject.cpp
../cpp/PreparedStatementHostObject.cpp
../cpp/DumbHostObject.cpp
../cpp/DBHostObject.cpp
../cpp/opsqlite/OPSqlite.cpp
../cpp/opsqlite/utils.cpp
../cpp/opsqlite/OPThreadPool.cpp
../cpp/opsqlite/SmartHostObject.cpp
../cpp/opsqlite/PreparedStatementHostObject.cpp
../cpp/opsqlite/DumbHostObject.cpp
../cpp/opsqlite/DBHostObject.cpp
cpp-adapter.cpp
)

if (USE_SQLCIPHER)
target_sources(${PACKAGE_NAME} PRIVATE ../cpp/sqlcipher/sqlite3.h ../cpp/sqlcipher/sqlite3.c ../cpp/bridge.cpp ../cpp/bridge.h)
target_sources(${PACKAGE_NAME} PRIVATE ../cpp/opsqlite/sqlcipher/sqlite3.h ../cpp/opsqlite/sqlcipher/sqlite3.c ../cpp/opsqlite/bridge.cpp ../cpp/opsqlite/bridge.h)

add_definitions(
-DOP_SQLITE_USE_SQLCIPHER=1
Expand All @@ -47,13 +48,13 @@ if (USE_SQLCIPHER)

find_package(openssl REQUIRED CONFIG)
elseif (USE_LIBSQL)
target_sources(${PACKAGE_NAME} PRIVATE ../cpp/libsql/bridge.cpp)
target_sources(${PACKAGE_NAME} PRIVATE ../cpp/opsqlite/libsql/bridge.cpp)

add_definitions(
-DOP_SQLITE_USE_LIBSQL=1
)
else()
target_sources(${PACKAGE_NAME} PRIVATE ../cpp/sqlite3.c ../cpp/bridge.cpp)
target_sources(${PACKAGE_NAME} PRIVATE ../cpp/sqlite3.c ../cpp/opsqlite/bridge.cpp)
endif()

if (USE_CRSQLITE)
Expand Down
4 changes: 2 additions & 2 deletions android/cpp-adapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "OPSqlite.hpp"
#include "logs.h"
#include "opsqlite/OPSqlite.hpp"
#include "opsqlite/logs.h"
#include <ReactCommon/CallInvokerHolder.h>
#include <fbjni/fbjni.h>
#include <jni.h>
Expand Down
14 changes: 7 additions & 7 deletions cpp/DBHostObject.cpp → cpp/opsqlite/DBHostObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#include "DBHostObject.h"
#include "PreparedStatementHostObject.h"
#include "opsqlite/DBHostObject.h"
#include "opsqlite/PreparedStatementHostObject.h"
#if OP_SQLITE_USE_LIBSQL
#include "libsql/bridge.hpp"
#include "opsqlite/libsql/bridge.hpp"
#else
#include "bridge.h"
#include "opsqlite/bridge.h"
#endif
#include "logs.h"
#include "macros.hpp"
#include "utils.hpp"
#include "opsqlite/logs.h"
#include "opsqlite/macros.hpp"
#include "opsqlite/utils.hpp"
#include <iostream>
#include <utility>

Expand Down
6 changes: 3 additions & 3 deletions cpp/DBHostObject.h → cpp/opsqlite/DBHostObject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#pragma once

#include "OPThreadPool.h"
#include "types.hpp"
#include "opsqlite/OPThreadPool.h"
#include "opsqlite/types.hpp"
#include <ReactCommon/CallInvoker.h>
#include <jsi/jsi.h>
#include <set>
#ifdef OP_SQLITE_USE_LIBSQL
#include "libsql/bridge.hpp"
#include "opsqlite/libsql/bridge.hpp"
#else
#ifdef __ANDROID__
#include "sqlite3.h"
Expand Down
6 changes: 3 additions & 3 deletions cpp/DumbHostObject.cpp → cpp/opsqlite/DumbHostObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "DumbHostObject.h"
#include "SmartHostObject.h"
#include "utils.hpp"
#include "opsqlite/DumbHostObject.h"
#include "opsqlite/SmartHostObject.h"
#include "opsqlite/utils.hpp"
#include <iostream>

namespace opsqlite {
Expand Down
4 changes: 2 additions & 2 deletions cpp/DumbHostObject.h → cpp/opsqlite/DumbHostObject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#include "SmartHostObject.h"
#include "types.hpp"
#include "opsqlite/SmartHostObject.h"
#include "opsqlite/types.hpp"
#include <any>
#include <jsi/jsi.h>
#include <stdio.h>
Expand Down
18 changes: 9 additions & 9 deletions cpp/OPSqlite.cpp → cpp/opsqlite/OPSqlite.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
#include "OPSqlite.hpp"
#include "DBHostObject.h"
#include "DumbHostObject.h"
#include "OPThreadPool.h"
#include "opsqlite/OPSqlite.hpp"
#include "opsqlite/DBHostObject.h"
#include "opsqlite/DumbHostObject.h"
#include "opsqlite/OPThreadPool.h"
#ifdef OP_SQLITE_USE_LIBSQL
#include "libsql/bridge.hpp"
#include "opsqlite/libsql/bridge.hpp"
#else
#include "bridge.h"
#include "opsqlite/bridge.h"
#endif
#include "logs.h"
#include "macros.hpp"
#include "utils.hpp"
#include "opsqlite/logs.h"
#include "opsqlite/macros.hpp"
#include "opsqlite/utils.hpp"
#include <iostream>
#include <string>
#include <unordered_map>
Expand Down
0 cpp/OPSqlite.hpp → cpp/opsqlite/OPSqlite.hpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion cpp/OPThreadPool.cpp → cpp/opsqlite/OPThreadPool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "OPThreadPool.h"
#include "opsqlite/OPThreadPool.h"

namespace opsqlite {

Expand Down
0 cpp/OPThreadPool.h → cpp/opsqlite/OPThreadPool.h
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions cpp/PreparedStatementHostObject.cpp → cpp/opsqlite/PreparedStatementHostObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#include "PreparedStatementHostObject.h"
#include "opsqlite/PreparedStatementHostObject.h"
#if OP_SQLITE_USE_LIBSQL
#include "libsql/bridge.hpp"
#include "opsqlite/libsql/bridge.hpp"
#else
#include "bridge.h"
#include "opsqlite/bridge.h"
#endif
#include "macros.hpp"
#include "utils.hpp"
#include "opsqlite/macros.hpp"
#include "opsqlite/utils.hpp"

namespace opsqlite {

Expand Down
6 changes: 3 additions & 3 deletions cpp/PreparedStatementHostObject.h → cpp/opsqlite/PreparedStatementHostObject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
#include <jsi/jsi.h>
#include <memory>
#ifdef OP_SQLITE_USE_LIBSQL
#include "libsql.h"
#include "libsql/bridge.hpp"
#include <libsql.h>
#include "opsqlite/libsql/bridge.hpp"
#else
#ifdef __ANDROID__
#include "sqlite3.h"
#else
#include <sqlite3.h>
#endif
#endif
#include "OPThreadPool.h"
#include "opsqlite/OPThreadPool.h"
#include <string>
#include <utility>

Expand Down
4 changes: 2 additions & 2 deletions cpp/SmartHostObject.cpp → cpp/opsqlite/SmartHostObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "SmartHostObject.h"
#include "utils.hpp"
#include "opsqlite/SmartHostObject.h"
#include "opsqlite/utils.hpp"

namespace opsqlite {

Expand Down
2 changes: 1 addition & 1 deletion cpp/SmartHostObject.h → cpp/opsqlite/SmartHostObject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "types.hpp"
#include "opsqlite/types.hpp"
#include <any>
#include <jsi/jsi.h>
#include <vector>
Expand Down
12 changes: 6 additions & 6 deletions cpp/bridge.cpp → cpp/opsqlite/bridge.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
// Allows a clear defined boundary between the JSI and the SQLite operations
// so that threading operations are safe and contained within DBHostObject

#include "bridge.h"
#include "DBHostObject.h"
#include "DumbHostObject.h"
#include "SmartHostObject.h"
#include "logs.h"
#include "utils.hpp"
#include "opsqlite/bridge.h"
#include "opsqlite/DBHostObject.h"
#include "opsqlite/DumbHostObject.h"
#include "opsqlite/SmartHostObject.h"
#include "opsqlite/logs.h"
#include "opsqlite/utils.hpp"
#include <filesystem>
#include <iostream>
#include <sstream>
Expand Down
8 changes: 4 additions & 4 deletions cpp/bridge.h → cpp/opsqlite/bridge.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#pragma once

#include "DumbHostObject.h"
#include "SmartHostObject.h"
#include "types.hpp"
#include "utils.hpp"
#include "opsqlite/DumbHostObject.h"
#include "opsqlite/SmartHostObject.h"
#include "opsqlite/types.hpp"
#include "opsqlite/utils.hpp"
#ifdef __ANDROID__
#include "sqlite3.h"
#else
Expand Down
0 cpp/libsql/LICENSE.txt → cpp/opsqlite/libsql/LICENSE.txt
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions cpp/libsql/bridge.cpp → cpp/opsqlite/libsql/bridge.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#include "bridge.hpp"
#include "DumbHostObject.h"
#include "SmartHostObject.h"
#include "libsql.h"
#include "logs.h"
#include "utils.hpp"
#include "opsqlite/libsql/bridge.hpp"
#include "opsqlite/DumbHostObject.h"
#include "opsqlite/SmartHostObject.h"
#include <libsql.h>
#include "opsqlite/logs.h"
#include "opsqlite/utils.hpp"
#include <filesystem>
#include <iostream>
#include <unordered_map>
Expand Down
10 changes: 5 additions & 5 deletions cpp/libsql/bridge.hpp → cpp/opsqlite/libsql/bridge.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#pragma once

#include "DumbHostObject.h"
#include "SmartHostObject.h"
#include "libsql.h"
#include "types.hpp"
#include "utils.hpp"
#include "opsqlite/DumbHostObject.h"
#include "opsqlite/SmartHostObject.h"
#include <libsql.h>
#include "opsqlite/types.hpp"
#include "opsqlite/utils.hpp"
#include <vector>

#define LIBSQL_INT 1
Expand Down
0 cpp/logs.h → cpp/opsqlite/logs.h
View file
Open in desktop
File renamed without changes.
0 cpp/macros.hpp → cpp/opsqlite/macros.hpp
View file
Open in desktop
File renamed without changes.
0 cpp/sqlcipher/LICENSE.txt → cpp/opsqlite/sqlcipher/LICENSE.txt
View file
Open in desktop
File renamed without changes.
0 cpp/sqlcipher/sqlite3.c → cpp/opsqlite/sqlcipher/sqlite3.c
View file
Open in desktop
File renamed without changes.
0 cpp/sqlcipher/sqlite3.h → cpp/opsqlite/sqlcipher/sqlite3.h
View file
Open in desktop
File renamed without changes.
0 cpp/types.hpp → cpp/opsqlite/types.hpp
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions cpp/utils.cpp → cpp/opsqlite/utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#include "utils.hpp"
#include "SmartHostObject.h"
#include "types.hpp"
#include "opsqlite/utils.hpp"
#include "opsqlite/SmartHostObject.h"
#include "opsqlite/types.hpp"
#ifndef OP_SQLITE_USE_LIBSQL
#include "bridge.h"
#include "opsqlite/bridge.h"
#endif
#include "OPThreadPool.h"
#include "macros.hpp"
#include "opsqlite/OPThreadPool.h"
#include "opsqlite/macros.hpp"
#include <fstream>
#include <sys/stat.h>
#include <utility>
Expand Down
8 changes: 4 additions & 4 deletions cpp/utils.hpp → cpp/opsqlite/utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#pragma once

#include "DumbHostObject.h"
#include "SmartHostObject.h"
#include "types.hpp"
#include "opsqlite/DumbHostObject.h"
#include "opsqlite/SmartHostObject.h"
#include "opsqlite/types.hpp"
#include <jsi/jsi.h>
#ifdef __ANDROID__
#include "sqlite3.h"
Expand All @@ -12,7 +12,7 @@
#include <ReactCommon/CallInvoker.h>
#include <string>
#include <vector>
#include "OPThreadPool.h"
#include "opsqlite/OPThreadPool.h"

namespace opsqlite {

Expand Down
2 changes: 1 addition & 1 deletion ios/OPSQLite.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#import "OPSQLite.h"
#import "../cpp/OPSqlite.hpp"
#import "opsqlite/OPSqlite.hpp"
#import <React/RCTBridge+Private.h>
#import <React/RCTLog.h>
#import <React/RCTUtils.h>
Expand Down
7 changes: 4 additions & 3 deletions op-sqlite.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,21 +120,22 @@ Pod::Spec.new do |s|
:GCC_PREPROCESSOR_DEFINITIONS => "",
:CLANG_CXX_LANGUAGE_STANDARD => "c++20",
:GCC_OPTIMIZATION_LEVEL => "2",
:HEADER_SEARCH_PATHS => "\"$(PODS_TARGET_SRCROOT)/cpp\"",
}

exclude_files = []

if use_sqlcipher then
log_message.call("[OP-SQLITE] using SQLCipher")
exclude_files += ["cpp/sqlite3.c", "cpp/sqlite3.h", "cpp/libsql/bridge.c", "cpp/libsql/bridge.h", "cpp/libsql/bridge.cpp", "cpp/libsql/libsql.h", "ios/libsql.xcframework/**/*"]
exclude_files += ["cpp/sqlite3.c", "cpp/sqlite3.h", "cpp/opsqlite/libsql/bridge.c", "cpp/opsqlite/libsql/bridge.h", "cpp/opsqlite/libsql/bridge.cpp", "cpp/opsqlite/libsql/libsql.h", "ios/libsql.xcframework/**/*"]
xcconfig[:GCC_PREPROCESSOR_DEFINITIONS] += " OP_SQLITE_USE_SQLCIPHER=1 HAVE_FULLFSYNC=1 SQLITE_HAS_CODEC SQLITE_TEMP_STORE=3 SQLITE_EXTRA_INIT=sqlcipher_extra_init SQLITE_EXTRA_SHUTDOWN=sqlcipher_extra_shutdown"
s.dependency "OpenSSL-Universal"
elsif use_libsql then
log_message.call("[OP-SQLITE] ⚠️ Using libsql. If you have libsql questions please ask in the Turso Discord server.")
exclude_files += ["cpp/sqlite3.c", "cpp/sqlite3.h", "cpp/sqlcipher/sqlite3.c", "cpp/sqlcipher/sqlite3.h", "cpp/bridge.h", "cpp/bridge.cpp"]
exclude_files += ["cpp/sqlite3.c", "cpp/sqlite3.h", "cpp/opsqlite/sqlcipher/sqlite3.c", "cpp/opsqlite/sqlcipher/sqlite3.h", "cpp/opsqlite/bridge.h", "cpp/opsqlite/bridge.cpp"]
else
log_message.call("[OP-SQLITE] using pure SQLite")
exclude_files += ["cpp/sqlcipher/sqlite3.c", "cpp/sqlcipher/sqlite3.h", "cpp/libsql/bridge.c", "cpp/libsql/bridge.h", "cpp/libsql/bridge.cpp", "cpp/libsql/libsql.h", "ios/libsql.xcframework/**/*"]
exclude_files += ["cpp/opsqlite/sqlcipher/sqlite3.c", "cpp/opsqlite/sqlcipher/sqlite3.h", "cpp/opsqlite/libsql/bridge.c", "cpp/opsqlite/libsql/bridge.h", "cpp/opsqlite/libsql/bridge.cpp", "cpp/opsqlite/libsql/libsql.h", "ios/libsql.xcframework/**/*"]
end

# Exclude xcframeworks that aren't being used
Expand Down