Skip to content

Commit

Permalink
Remove Swift ice.xcodeproj (#1670)
Browse files Browse the repository at this point in the history
Remove Swift ice.xcodeproj. The Make build system now regenerates this file every time
it is invoked

Closes #1669
  • Loading branch information
externl authored Jan 16, 2024
1 parent 2c997fb commit 9b86faa
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 21,221 deletions.
5 changes: 5 additions & 0 deletions .github/actions/setup-dependencies/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ runs:
shell: bash
if: runner.os == 'macOS'

- name: Install xcodeproj gem
run: gem install xcodeproj
shell: bash
if: runner.os == 'macOS'

- name: Install apt dependencies
run: sudo apt-get update && sudo apt-get install -y python3 python3-pip nodejs libbz2-dev libssl-dev libffi-dev libmcpp-dev libedit-dev liblmdb-dev libexpat1-dev libsystemd-dev openjdk-17-jdk ruby ruby-dev php-cli php-dev
shell: bash
Expand Down
1 change: 1 addition & 0 deletions swift/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
/docs
ice-test.xcodeproj
ice.xcodeproj
8 changes: 7 additions & 1 deletion swift/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ CONFIG ?= $(if $(filter $(OPTIMIZE),no),Debug,Release)
PROJECT ?= ice.xcodeproj
# PROJECT ?= $(if $(filter $(ICE_BIN_DIST), swift all),ice-test.xcodeproj,ice.xcodeproj)

RAKE ?= rake
RAKE_TASK ?= icebdistproj

# $(call make-xcodebuild-rule,$1=rule,$2=platform,$3=scheme,$4=target)
define make-xcodebuild-rule
$1:: $(PROJECT)
Expand All @@ -31,7 +34,10 @@ all:: tests
carthage-bootstrap:
$(Q)cd .. && carthage bootstrap --cache-builds --use-xcframeworks --platform macOS,iOS

tests srcs:: carthage-bootstrap
rake: carthage-bootstrap
$(Q)$(RAKE) $(RAKE_TASK)

tests srcs:: rake

install::
@echo nothing to install
Expand Down
20,985 changes: 0 additions & 20,985 deletions swift/ice.xcodeproj/project.pbxproj

This file was deleted.

This file was deleted.

114 changes: 0 additions & 114 deletions swift/ice.xcodeproj/xcshareddata/xcschemes/Ice iOS.xcscheme

This file was deleted.

114 changes: 0 additions & 114 deletions swift/ice.xcodeproj/xcshareddata/xcschemes/Ice macOS.xcscheme

This file was deleted.

0 comments on commit 9b86faa

Please sign in to comment.