Skip to content

Commit 770db84

Browse files
committed
commit server; delete xcstate; document build.sh more; decrease MSV to 14.3
1 parent bb51368 commit 770db84

File tree

11 files changed

+871
-19
lines changed

11 files changed

+871
-19
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ libqalc/result
22
Makefile.in
33
.DS_Store
44
frameworks
5+
node_modules

README.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
Maculate offers a Swift—native frontend for Qalculate, the ultimate desktop calculator. In observance of Qalculate's GPL license, Maculate is licensed freely under the GPLv2.
44

5-
![SCR-20241126-rxsp](https://github.com/user-attachments/assets/e3e6bf65-f430-43dd-b890-8a762ba04e93)
5+
![](https://github.com/user-attachments/assets/e3e6bf65-f430-43dd-b890-8a762ba04e93)
66

77
<a href="https://apps.apple.com/us/app/maculate/id6738711535">![Mac App Store Badge](https://github.com/user-attachments/assets/4fd17854-b560-4e9e-803d-a5193e1a9a71)</a>
88

9-
It supports just about anything you could imagine, including hundreds of units and dozens of constants, unit conversions, solving for unknown values, factorizing equations, calculus: differentiate and integrate, calculate in different base systems, calculate with time, account for uncertainty, economics, matrices and vectors, combinatorics, complex Numbers, variable assignment, and much much more
9+
It supports just about anything you could imagine, including hundreds of units and dozens of constants, unit conversions, solving for unknown values, factorizing equations, calculus: differentiate and integrate, calculate in different base systems, calculate with time, account for uncertainty, economics, matrices and vectors, combinatorics, complex numbers, variable assignment, and much much more
1010

1111
For a full list of features, refer to the Qalculate documentation. Please note that Maculate does not currently support the following features: plotting, loading & exporting datasets, real time currency conversion
1212

@@ -31,6 +31,12 @@ Maculate is open source, but the source code is not under any sort of warranty.
3131

3232
We generally regard the codebase as being well-written and documented, so it could serve as a good basis to libqalculate.
3333

34+
### DRM
35+
36+
The currency conversion feature makes calls to a server hosted at `maculate.toastcat.club`. This server is developed within this repository. It currently acts as a simple anonymizing proxy. These requests include [Reciepts](https://developer.apple.com/documentation/appstorereceipts/validating_receipts_on_the_device) signed by Apple, which are used to verify the purchase of the app. Hence, the currency conversion feature is not available in the open source version of Maculate out of the box, but you can host your own server with relative ease.
37+
38+
Please note that the server is licensed under the AGPLv3, wheras the rest of the project is licensed under the GPLv2.
39+
3440
## Support Matrix
3541

3642
| | macOS | iOS | iPadOS | Notes |

libqalc/build.sh

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ for lib in icuuc icudata icui18n; do
5858
done
5959

6060
###################
61-
# Code Signing #
61+
# Patching #
6262
###################
6363

6464
# when the libraries are built, they are built inside nix's directories,
@@ -77,13 +77,18 @@ find "$FRAMEWORKS_DIR" -name "*.dylib" | while read -r dylib; do
7777
done
7878
done
7979

80+
###################
81+
# Code Signing #
82+
###################
83+
8084
# find all dylibs and sign them.
8185
# hardcoded to Toastcat LLC. You can change this to your own certificate.
8286
find $FRAMEWORKS_DIR -name "*.dylib" -exec codesign --force \
8387
--timestamp --sign "Apple Development: Evan Boehs (668LYMH4FH)" {} \;
8488

85-
find $FRAMEWORKS_DIR -name "*.a" -exec chmod +w {} \; -exec codesign --force \
86-
--timestamp --sign "Apple Development: Evan Boehs (668LYMH4FH)" {} \;
89+
# .a files don't need to be signed, they are merged into the final binary
90+
#find $FRAMEWORKS_DIR -name "*.a" -exec chmod +w {} \; -exec codesign --force \
91+
# --timestamp --sign "Apple Development: Evan Boehs (668LYMH4FH)" {} \;
8792

8893
###################
8994
# Post-Process #

libqalc/default.nix

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,6 @@ pkgs.stdenv.mkDerivation rec {
6060
--replace 'printf(_("aborted"))' 'printf("%s", _("aborted"))'
6161
'';
6262

63-
/*preBuild = ''
64-
pushd docs/reference
65-
doxygen Doxyfile
66-
popd
67-
'';*/
68-
6963
postInstall = ''
7064
# Ensure all headers from propagatedBuildInputs are copied to the include directory
7165
mkdir -p $out/include

maculate.xcodeproj/project.pbxproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@
573573
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
574574
CODE_SIGN_ENTITLEMENTS = maculate/maculate.entitlements;
575575
CODE_SIGN_STYLE = Automatic;
576-
CURRENT_PROJECT_VERSION = 10;
576+
CURRENT_PROJECT_VERSION = 12;
577577
DEAD_CODE_STRIPPING = YES;
578578
DEVELOPMENT_ASSET_PATHS = "\"maculate/Preview Content\"";
579579
DEVELOPMENT_TEAM = APTCP6Z8HA;
@@ -592,8 +592,8 @@
592592
"$(inherited)",
593593
"$(PROJECT_DIR)/libqalc/result/lib",
594594
);
595-
MACOSX_DEPLOYMENT_TARGET = 14.6;
596-
MARKETING_VERSION = 0.1;
595+
MACOSX_DEPLOYMENT_TARGET = 14.3;
596+
MARKETING_VERSION = 0.1.1;
597597
PRODUCT_BUNDLE_IDENTIFIER = com.toastcat.maculate;
598598
PRODUCT_NAME = "$(TARGET_NAME)";
599599
SWIFT_EMIT_LOC_STRINGS = YES;
@@ -611,7 +611,7 @@
611611
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
612612
CODE_SIGN_ENTITLEMENTS = maculate/maculate.entitlements;
613613
CODE_SIGN_STYLE = Automatic;
614-
CURRENT_PROJECT_VERSION = 10;
614+
CURRENT_PROJECT_VERSION = 12;
615615
DEAD_CODE_STRIPPING = YES;
616616
DEBUG_INFORMATION_FORMAT = dwarf;
617617
DEVELOPMENT_ASSET_PATHS = "\"maculate/Preview Content\"";
@@ -631,8 +631,8 @@
631631
"$(inherited)",
632632
"$(PROJECT_DIR)/libqalc/result/lib",
633633
);
634-
MACOSX_DEPLOYMENT_TARGET = 14.6;
635-
MARKETING_VERSION = 0.1;
634+
MACOSX_DEPLOYMENT_TARGET = 14.3;
635+
MARKETING_VERSION = 0.1.1;
636636
PRODUCT_BUNDLE_IDENTIFIER = com.toastcat.maculate;
637637
PRODUCT_NAME = "$(TARGET_NAME)";
638638
SWIFT_EMIT_LOC_STRINGS = YES;
@@ -741,7 +741,7 @@
741741
"@loader_path/Frameworks",
742742
);
743743
LIBRARY_SEARCH_PATHS = "$(inherited)";
744-
MACOSX_DEPLOYMENT_TARGET = 14.6;
744+
MACOSX_DEPLOYMENT_TARGET = 14.3;
745745
MARKETING_VERSION = 1.0;
746746
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c++";
747747
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20";
@@ -780,7 +780,7 @@
780780
"@loader_path/Frameworks",
781781
);
782782
LIBRARY_SEARCH_PATHS = "$(inherited)";
783-
MACOSX_DEPLOYMENT_TARGET = 14.6;
783+
MACOSX_DEPLOYMENT_TARGET = 14.3;
784784
MARKETING_VERSION = 1.0;
785785
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c++";
786786
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20";
Binary file not shown.

0 commit comments

Comments
 (0)