Improvements in Swift xcframework generation

Author: marcobambini

Makefile

@@ -340,16 +340,24 @@ define PLIST
 </plist>
 endef
 
+define MODULEMAP
+framework module CloudSync {\
+  umbrella header \"CloudSync.h\"\
+  export *\
+}
+endef
+
 LIB_NAMES = ios.dylib ios-sim.dylib macos.dylib
 FMWK_NAMES = ios-arm64 ios-arm64_x86_64-simulator macos-arm64_x86_64
 $(DIST_DIR)/%.xcframework: $(LIB_NAMES)
 	@$(foreach i,1 2 3,\
 		lib=$(word $(i),$(LIB_NAMES)); \
 		fmwk=$(word $(i),$(FMWK_NAMES)); \
 		mkdir -p $(DIST_DIR)/$$fmwk/CloudSync.framework/Headers; \
-		cp src/sqlite3ext.h $(DIST_DIR)/$$fmwk/CloudSync.framework/Headers/; \
+		mkdir -p $(DIST_DIR)/$$fmwk/CloudSync.framework/Modules; \
 		cp src/cloudsync.h $(DIST_DIR)/$$fmwk/CloudSync.framework/Headers/CloudSync.h; \
 		printf "$(PLIST)" > $(DIST_DIR)/$$fmwk/CloudSync.framework/Info.plist; \
+		printf "$(MODULEMAP)" > $(DIST_DIR)/$$fmwk/CloudSync.framework/Modules/module.modulemap; \
 		mv $(DIST_DIR)/$$lib $(DIST_DIR)/$$fmwk/CloudSync.framework/CloudSync; \
 		install_name_tool -id "@rpath/CloudSync.framework/CloudSync" $(DIST_DIR)/$$fmwk/CloudSync.framework/CloudSync; \
 	)

src/cloudsync.c

@@ -3169,6 +3169,10 @@ void cloudsync_commit_alter (sqlite3_context *context, int argc, sqlite3_value *
 
 // MARK: - Main Entrypoint -
 
+int cloudsync_autoinit (void) {
+    return sqlite3_auto_extension((void *)sqlite3_cloudsync_init);
+}
+
 int cloudsync_register (sqlite3 *db, char **pzErrMsg) {
     int rc = SQLITE_OK;
 

src/cloudsync.h

@@ -20,10 +20,10 @@
 extern "C" {
 #endif
 
-#define CLOUDSYNC_VERSION                       "0.8.23"
+#define CLOUDSYNC_VERSION                       "0.8.24"
 
 int sqlite3_cloudsync_init (sqlite3 *db, char **pzErrMsg, const sqlite3_api_routines *pApi);
-int cloudsync_register (sqlite3 *db, char **pzErrMsg);
+int cloudsync_autoinit (void);
 
 #ifdef __cplusplus
 }