Skip to content

Commit e37dada

Browse files
committed
chore(macOS): Added default values to build settings file.
Also replaced the template file with a default file for build settings which can be overridden by environment variables. Signed-off-by: Iva Horn <[email protected]>
1 parent aad16e4 commit e37dada

File tree

4 files changed

+0
-28
lines changed

4 files changed

+0
-28
lines changed

shell_integration/MacOSX/NextcloudIntegration/.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,3 @@
22
# SPDX-License-Identifier: GPL-2.0-or-later
33

44
DerivedData
5-
6-
# exception
7-
!NextcloudDev/Build.xcconfig.template

shell_integration/MacOSX/NextcloudIntegration/NextcloudDev/Build.xcconfig.template

Lines changed: 0 additions & 18 deletions
This file was deleted.

shell_integration/MacOSX/NextcloudIntegration/NextcloudDev/Craft.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ if [ -z "${CODE_SIGN_IDENTITY}" ]; then
2020
exit 1
2121
fi
2222

23-
if [ ! -f "$SOURCE_ROOT/NextcloudDev/Build.xcconfig" ]; then
24-
cp "$SOURCE_ROOT/NextcloudDev/Build.xcconfig.example" "$SOURCE_ROOT/NextcloudDev/Build.xcconfig"
25-
echo "Automatically created Build.xcconfig from template because it was not present yet."
26-
fi
27-
2823
DESKTOP_CLIENT_PROJECT_ROOT="$SOURCE_ROOT/../../.."
2924

3025
if [ -d "$DESKTOP_CLIENT_PROJECT_ROOT/admin/osx/mac-crafter" ]; then

shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.pbxproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,6 @@
198198
53FE14662B8F78B6006C4193 /* ShareOptionsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareOptionsView.swift; sourceTree = "<group>"; };
199199
AA02B2AA2E7048C600C72B34 /* Keychain.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Keychain.swift; sourceTree = "<group>"; };
200200
AA0A6B1D2E8EA94F007F4A7A /* Craft.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = Craft.sh; sourceTree = "<group>"; };
201-
AA1191B52E8EAFF900E21C7B /* Build.xcconfig.template */ = {isa = PBXFileReference; lastKnownFileType = text; path = Build.xcconfig.template; sourceTree = "<group>"; };
202201
AA27A4E32E93C0D700665051 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
203202
AA7F17E02E7017230000E928 /* Authentication.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Authentication.storyboard; sourceTree = "<group>"; };
204203
AA7F17E22E70173E0000E928 /* AuthenticationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationViewController.swift; sourceTree = "<group>"; };
@@ -389,7 +388,6 @@
389388
isa = PBXGroup;
390389
children = (
391390
AA826BEE2E8EAA7500CE49C4 /* Build.xcconfig */,
392-
AA1191B52E8EAFF900E21C7B /* Build.xcconfig.template */,
393391
AA0A6B1D2E8EA94F007F4A7A /* Craft.sh */,
394392
);
395393
path = NextcloudDev;

0 commit comments

Comments
 (0)