commit 2703b934fb71581898d55cc182533918c46f496b
parent ff3478054f5c259eea5b2fac5c0f706627c2d35d
Author: Marc Stibane <marc@taler.net>
Date: Fri, 13 Jan 2023 23:15:59 +0100
Naming of the framework
Diffstat:
7 files changed, 98 insertions(+), 98 deletions(-)
diff --git a/QuickJS-rt.xcodeproj/project.pbxproj b/QuickJS-rt.xcodeproj/project.pbxproj
@@ -578,7 +578,7 @@
4E3290E7296CEFA1006D0E3C /* libsodium.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E329075296CEAD2006D0E3C /* libsodium.a */; };
4E3290E8296CEFA1006D0E3C /* libunicode.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E328F15296CDF66006D0E3C /* libunicode.a */; };
4E3290E9296CF154006D0E3C /* cutils.c in Sources */ = {isa = PBXBuildFile; fileRef = 4E328EC7296CCC48006D0E3C /* cutils.c */; };
- 4E579B1829702D9E007B89A4 /* TalerWalletcore.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E579B1529702ACA007B89A4 /* TalerWalletcore.m */; };
+ 4E579B1829702D9E007B89A4 /* FTalerWalletcore.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E579B1529702ACA007B89A4 /* FTalerWalletcore.m */; };
4E579B1929702DBB007B89A4 /* taler_wallet_core_lib.c in Sources */ = {isa = PBXBuildFile; fileRef = 4EE2123A296DBF17000D7228 /* taler_wallet_core_lib.c */; };
4E579B1B29702E53007B89A4 /* libbf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E328E95296CC59E006D0E3C /* libbf.a */; platformFilter = ios; };
4E579B1C29702E53007B89A4 /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E328C6C296C9A27006D0E3C /* libcurl.a */; platformFilter = ios; };
@@ -594,9 +594,9 @@
4E579B2629702E54007B89A4 /* libtart.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E328E7D296CC0BC006D0E3C /* libtart.a */; platformFilter = ios; };
4E579B2729702E54007B89A4 /* libunicode.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E328EB2296CCB85006D0E3C /* libunicode.a */; platformFilter = ios; };
4E579B2829702E54007B89A4 /* libwallet_core.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4EE21223296DBC7D000D7228 /* libwallet_core.a */; platformFilter = ios; };
- 4E579B2929702F58007B89A4 /* TalerWalletcore.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E579B1029702103007B89A4 /* TalerWalletcore.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 4E579B2929702F58007B89A4 /* FTalerWalletcore.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E579B1029702103007B89A4 /* FTalerWalletcore.h */; settings = {ATTRIBUTES = (Public, ); }; };
4E579B2A29702F7C007B89A4 /* taler_wallet_core_lib.h in Headers */ = {isa = PBXBuildFile; fileRef = 4EBF870C296EF4D400241F24 /* taler_wallet_core_lib.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 4E579B2C29702FFE007B89A4 /* TalerWalletcore-Bridging-Header.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E579B2B29702FFE007B89A4 /* TalerWalletcore-Bridging-Header.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 4E579B2C29702FFE007B89A4 /* FTalerWalletcore-Bridging-Header.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E579B2B29702FFE007B89A4 /* FTalerWalletcore-Bridging-Header.h */; settings = {ATTRIBUTES = (Public, ); }; };
4E5C307F296C7DAA0031A049 /* aesni.c in Sources */ = {isa = PBXBuildFile; fileRef = 4E5C307D296C7DAA0031A049 /* aesni.c */; };
4E5C3080296C7DAA0031A049 /* aes.c in Sources */ = {isa = PBXBuildFile; fileRef = 4E5C307E296C7DAA0031A049 /* aes.c */; };
4E5C308A296C7FEA0031A049 /* base64.c in Sources */ = {isa = PBXBuildFile; fileRef = 4E5C3085296C7FEA0031A049 /* base64.c */; };
@@ -1418,10 +1418,10 @@
4E328F6B296CE801006D0E3C /* libmbedcrypto.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libmbedcrypto.a; sourceTree = BUILT_PRODUCTS_DIR; };
4E328FD1296CE95C006D0E3C /* libcurl.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libcurl.a; sourceTree = BUILT_PRODUCTS_DIR; };
4E329075296CEAD2006D0E3C /* libsodium.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsodium.a; sourceTree = BUILT_PRODUCTS_DIR; };
- 4E579B0E29702103007B89A4 /* TalerWalletcore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TalerWalletcore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
- 4E579B1029702103007B89A4 /* TalerWalletcore.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TalerWalletcore.h; sourceTree = "<group>"; };
- 4E579B1529702ACA007B89A4 /* TalerWalletcore.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TalerWalletcore.m; sourceTree = "<group>"; };
- 4E579B2B29702FFE007B89A4 /* TalerWalletcore-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "TalerWalletcore-Bridging-Header.h"; sourceTree = "<group>"; };
+ 4E579B0E29702103007B89A4 /* FTalerWalletcore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FTalerWalletcore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+ 4E579B1029702103007B89A4 /* FTalerWalletcore.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FTalerWalletcore.h; sourceTree = "<group>"; };
+ 4E579B1529702ACA007B89A4 /* FTalerWalletcore.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FTalerWalletcore.m; sourceTree = "<group>"; };
+ 4E579B2B29702FFE007B89A4 /* FTalerWalletcore-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "FTalerWalletcore-Bridging-Header.h"; sourceTree = "<group>"; };
4E5C3076296C7A5C0031A049 /* libmbedcrypto.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libmbedcrypto.a; sourceTree = BUILT_PRODUCTS_DIR; };
4E5C307D296C7DAA0031A049 /* aesni.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = aesni.c; sourceTree = "<group>"; };
4E5C307E296C7DAA0031A049 /* aes.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = aes.c; sourceTree = "<group>"; };
@@ -1622,7 +1622,7 @@
4EE211FB296DB6D1000D7228 /* libprelude.a */,
4EE21223296DBC7D000D7228 /* libwallet_core.a */,
4EE21233296DBEE1000D7228 /* libtalerwalletcore.a */,
- 4E579B0E29702103007B89A4 /* TalerWalletcore.framework */,
+ 4E579B0E29702103007B89A4 /* FTalerWalletcore.framework */,
);
name = Products;
sourceTree = "<group>";
@@ -2453,9 +2453,9 @@
4E579B552970650F007B89A4 /* xcode */ = {
isa = PBXGroup;
children = (
- 4E579B1029702103007B89A4 /* TalerWalletcore.h */,
- 4E579B1529702ACA007B89A4 /* TalerWalletcore.m */,
- 4E579B2B29702FFE007B89A4 /* TalerWalletcore-Bridging-Header.h */,
+ 4E579B1029702103007B89A4 /* FTalerWalletcore.h */,
+ 4E579B1529702ACA007B89A4 /* FTalerWalletcore.m */,
+ 4E579B2B29702FFE007B89A4 /* FTalerWalletcore-Bridging-Header.h */,
);
path = xcode;
sourceTree = "<group>";
@@ -2709,8 +2709,8 @@
buildActionMask = 2147483647;
files = (
4E579B2A29702F7C007B89A4 /* taler_wallet_core_lib.h in Headers */,
- 4E579B2C29702FFE007B89A4 /* TalerWalletcore-Bridging-Header.h in Headers */,
- 4E579B2929702F58007B89A4 /* TalerWalletcore.h in Headers */,
+ 4E579B2C29702FFE007B89A4 /* FTalerWalletcore-Bridging-Header.h in Headers */,
+ 4E579B2929702F58007B89A4 /* FTalerWalletcore.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -3113,9 +3113,9 @@
productReference = 4E329075296CEAD2006D0E3C /* libsodium.a */;
productType = "com.apple.product-type.library.static";
};
- 4E579B0D29702103007B89A4 /* TalerWalletcore */ = {
+ 4E579B0D29702103007B89A4 /* FTalerWalletcore */ = {
isa = PBXNativeTarget;
- buildConfigurationList = 4E579B1229702103007B89A4 /* Build configuration list for PBXNativeTarget "TalerWalletcore" */;
+ buildConfigurationList = 4E579B1229702103007B89A4 /* Build configuration list for PBXNativeTarget "FTalerWalletcore" */;
buildPhases = (
4E579B0929702103007B89A4 /* Headers */,
4E579B0A29702103007B89A4 /* Sources */,
@@ -3126,9 +3126,9 @@
);
dependencies = (
);
- name = TalerWalletcore;
- productName = TalerWalletcore;
- productReference = 4E579B0E29702103007B89A4 /* TalerWalletcore.framework */;
+ name = FTalerWalletcore;
+ productName = FTalerWalletcore;
+ productReference = 4E579B0E29702103007B89A4 /* FTalerWalletcore.framework */;
productType = "com.apple.product-type.framework";
};
4E5C3075296C7A5C0031A049 /* mbedcrypto */ = {
@@ -3371,7 +3371,7 @@
4EE211FA296DB6D1000D7228 /* prelude */,
4EE21222296DBC7C000D7228 /* wallet_core */,
4EE21232296DBEE1000D7228 /* talerwalletcore */,
- 4E579B0D29702103007B89A4 /* TalerWalletcore */,
+ 4E579B0D29702103007B89A4 /* FTalerWalletcore */,
);
};
/* End PBXProject section */
@@ -4172,7 +4172,7 @@
buildActionMask = 2147483647;
files = (
4E579B1929702DBB007B89A4 /* taler_wallet_core_lib.c in Sources */,
- 4E579B1829702D9E007B89A4 /* TalerWalletcore.m in Sources */,
+ 4E579B1829702D9E007B89A4 /* FTalerWalletcore.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -5642,7 +5642,7 @@
"-DCONFIG_BIGNUM",
"-fno-omit-frame-pointer",
);
- PRODUCT_BUNDLE_IDENTIFIER = Fesh.TalerWalletcore;
+ PRODUCT_BUNDLE_IDENTIFIER = net.taler.ftalerwalletcore;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
SUPPORTS_MACCATALYST = NO;
@@ -5680,7 +5680,7 @@
"-DCONFIG_BIGNUM",
"-fno-omit-frame-pointer",
);
- PRODUCT_BUNDLE_IDENTIFIER = Fesh.TalerWalletcore;
+ PRODUCT_BUNDLE_IDENTIFIER = net.taler.ftalerwalletcore;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
SUPPORTS_MACCATALYST = NO;
@@ -6192,7 +6192,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
- 4E579B1229702103007B89A4 /* Build configuration list for PBXNativeTarget "TalerWalletcore" */ = {
+ 4E579B1229702103007B89A4 /* Build configuration list for PBXNativeTarget "FTalerWalletcore" */ = {
isa = XCConfigurationList;
buildConfigurations = (
4E579B1329702103007B89A4 /* Debug */,
diff --git a/xcode/FTalerWalletcore-Bridging-Header.h b/xcode/FTalerWalletcore-Bridging-Header.h
@@ -0,0 +1 @@
+#import <taler_wallet_core_lib.h>
diff --git a/xcode/FTalerWalletcore.h b/xcode/FTalerWalletcore.h
@@ -0,0 +1,29 @@
+/*
+ * This file is part of GNU Taler
+ * (C) 2021 Taler Systems S.A.
+ *
+ * GNU Taler is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 3, or (at your option) any later version.
+ *
+ * GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
+ */
+#import <Foundation/Foundation.h>
+
+//! Project version number for TalerWalletcore.
+FOUNDATION_EXPORT double TalerWalletcoreVersionNumber;
+
+//! Project version string for TalerWalletcore.
+FOUNDATION_EXPORT const unsigned char TalerWalletcoreVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <TalerWalletcore/PublicHeader.h>
+
+#import <FTalerWalletcore-Bridging-Header.h>
+
+struct TALER_WALLET_Instance *
+TALER_WALLET_test(int wait);
diff --git a/xcode/FTalerWalletcore.m b/xcode/FTalerWalletcore.m
@@ -0,0 +1,45 @@
+/*
+ * This file is part of GNU Taler
+ * (C) 2021 Taler Systems S.A.
+ *
+ * GNU Taler is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 3, or (at your option) any later version.
+ *
+ * GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
+ */
+#import "FTalerWalletcore.h"
+
+static void TALER_WALLET_test_handler(void *cls, const char *message)
+{
+ printf("got message: %s\n", message);
+}
+
+struct TALER_WALLET_Instance *
+TALER_WALLET_test(int wait)
+{
+ struct TALER_WALLET_Instance *wh = TALER_WALLET_create();
+
+ TALER_WALLET_set_message_handler(wh, &TALER_WALLET_test_handler, NULL);
+
+ TALER_WALLET_run(wh);
+
+ TALER_WALLET_send_request(wh, "{\"operation\": \"init\", \"payload\": {\"skipDefaults\": true}}");
+
+ TALER_WALLET_send_request(wh, "{\"operation\": \"getVersion\"}");
+
+ //TALER_WALLET_send_request(wh, "{}");
+
+ if (wait) {
+ // Wait for wallet thread to finish.
+ // If we don't call this, main() exits
+ // and the wallet thread is killed.
+ TALER_WALLET_join(wh);
+ }
+ return wh;
+}
diff --git a/xcode/TalerWalletcore-Bridging-Header.h b/xcode/TalerWalletcore-Bridging-Header.h
@@ -1 +0,0 @@
-#import "taler_wallet_core_lib.h"
diff --git a/xcode/TalerWalletcore.h b/xcode/TalerWalletcore.h
@@ -1,29 +0,0 @@
-/*
- * This file is part of GNU Taler
- * (C) 2021 Taler Systems S.A.
- *
- * GNU Taler is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3, or (at your option) any later version.
- *
- * GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
- */
-#import <Foundation/Foundation.h>
-
-//! Project version number for TalerWalletcore.
-FOUNDATION_EXPORT double TalerWalletcoreVersionNumber;
-
-//! Project version string for TalerWalletcore.
-FOUNDATION_EXPORT const unsigned char TalerWalletcoreVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <TalerWalletcore/PublicHeader.h>
-
-#import "taler_wallet_core_lib.h"
-
-struct TALER_WALLET_Instance *
-TALER_WALLET_test(int wait);
diff --git a/xcode/TalerWalletcore.m b/xcode/TalerWalletcore.m
@@ -1,45 +0,0 @@
-/*
- * This file is part of GNU Taler
- * (C) 2021 Taler Systems S.A.
- *
- * GNU Taler is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3, or (at your option) any later version.
- *
- * GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
- */
-#import "TalerWalletcore.h"
-
-static void TALER_WALLET_test_handler(void *cls, const char *message)
-{
- printf("got message: %s\n", message);
-}
-
-struct TALER_WALLET_Instance *
-TALER_WALLET_test(int wait)
-{
- struct TALER_WALLET_Instance *wh = TALER_WALLET_create();
-
- TALER_WALLET_set_message_handler(wh, &TALER_WALLET_test_handler, NULL);
-
- TALER_WALLET_run(wh);
-
- TALER_WALLET_send_request(wh, "{\"operation\": \"init\", \"payload\": {\"skipDefaults\": true}}");
-
- TALER_WALLET_send_request(wh, "{\"operation\": \"getVersion\"}");
-
- //TALER_WALLET_send_request(wh, "{}");
-
- if (wait) {
- // Wait for wallet thread to finish.
- // If we don't call this, main() exits
- // and the wallet thread is killed.
- TALER_WALLET_join(wh);
- }
- return wh;
-}
