Skip to content

Commit

Permalink
Fix sparkle pod, update syncthing to v1.13.1, write syncthing logfile…
Browse files Browse the repository at this point in the history
… to disk (#146)

* Remove unvendored Sparkle pod
* README.md: Add note about prerequistes
* Update bundled syncthing with 1.13.1 (was 1.13.0)
* Vendor update Sparkle with Cocoapods from 1.19.0 to 1.24.0
* Fixup Pod to build for both Intel and Apple M1 Silicon

* Manual fixing of Pod was needed after install
- Set MACOSX_DEPLOYMENT_TARGET = 10.10
- ONLY_ACTIVE_ARCH = NO because of Intel and Apple M1 silicon
- Use the new syncthing.xcworkspace in the build process from the toplevel Makefile
- Add note about git submodule in the README.md for building the dmg with the script

* Cleanup README.md and add forgotten xcworkspace due to gitignore entry

* syncthing/DaemonProcess.swift: Add -logfile=default (fixes #91)

* Add note about written logfile

* Remove travis CI, as we already use TeamCity hosted on build.syncthing.net

Co-authored-by: Jerry Jacobs <jerry@xor-gate.org>
  • Loading branch information
xor-gate and Jerry Jacobs authored Feb 12, 2021
1 parent a32475a commit 0eb861f
Show file tree
Hide file tree
Showing 271 changed files with 616 additions and 7,563 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ build
.DS_Store
*.xcodeproj/xcuserdata
*.xcodeproj/project.xcworkspace
*.xcworkspace
3 changes: 0 additions & 3 deletions .travis.yml

This file was deleted.

9 changes: 6 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
all: debug
debug:
xcodebuild -derivedDataPath $(PWD) -configuration Debug -scheme syncthing
xcodebuild -workspace "syncthing.xcworkspace" -derivedDataPath $(PWD) -configuration Debug -scheme Pods-syncthing
xcodebuild -workspace "syncthing.xcworkspace" -derivedDataPath $(PWD) -configuration Debug -scheme syncthing
release:
xcodebuild -derivedDataPath $(PWD) -configuration Release -scheme syncthing
xcodebuild -workspace "syncthing.xcworkspace" -derivedDataPath $(PWD) -configuration Release -scheme Pods-syncthing
xcodebuild -workspace "syncthing.xcworkspace" -derivedDataPath $(PWD) -configuration Release -scheme syncthing
release-dmg:
xcodebuild -derivedDataPath $(PWD) -configuration Release -scheme syncthing-dmg
xcodebuild -workspace "syncthing.xcworkspace" -derivedDataPath $(PWD) -configuration Release -scheme Pods-syncthing
xcodebuild -workspace "syncthing.xcworkspace" -derivedDataPath $(PWD) -configuration Release -scheme syncthing-dmg
clean:
rm -Rf Build Index Logs ModuleCache.noindex info.plist
13 changes: 1 addition & 12 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,7 @@
# Uncomment the next line to define a global platform for your project
# platform :ios, '9.0'
platform :osx, '10.10'

target 'syncthing' do
# Uncomment the next line if you're using Swift or would like to use dynamic frameworks
# use_frameworks!

# Pods for syncthing
pod 'Sparkle'
end

target 'xgsyncthing' do
# Uncomment the next line if you're using Swift or would like to use dynamic frameworks
# use_frameworks!

# Pods for xgsyncthing

end
10 changes: 5 additions & 5 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
PODS:
- Sparkle (1.19.0)
- Sparkle (1.24.0)

DEPENDENCIES:
- Sparkle

SPEC REPOS:
https://github.com/cocoapods/specs.git:
trunk:
- Sparkle

SPEC CHECKSUMS:
Sparkle: 8486d2493599665e466b5076e72b28849776e32f
Sparkle: 270cd27377bf04e9c128af06e3a22d0f572d6ee3

PODFILE CHECKSUM: cfdb8a3378b1b495daea77b42c215d837eacb638
PODFILE CHECKSUM: 3ebbf6b550b5a6127592510655bd0fce30bd33c9

COCOAPODS: 1.5.3
COCOAPODS: 1.10.1
1 change: 0 additions & 1 deletion Pods/Headers/Public/Sparkle/Sparkle/SPUDownloadData.h

This file was deleted.

1 change: 0 additions & 1 deletion Pods/Headers/Public/Sparkle/Sparkle/SPUDownloader.h

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion Pods/Headers/Public/Sparkle/Sparkle/SPUDownloaderSession.h

This file was deleted.

1 change: 0 additions & 1 deletion Pods/Headers/Public/Sparkle/Sparkle/SPUURLRequest.h

This file was deleted.

1 change: 0 additions & 1 deletion Pods/Headers/Public/Sparkle/Sparkle/SUAppcast.h

This file was deleted.

1 change: 0 additions & 1 deletion Pods/Headers/Public/Sparkle/Sparkle/SUAppcastItem.h

This file was deleted.

1 change: 0 additions & 1 deletion Pods/Headers/Public/Sparkle/Sparkle/SUErrors.h

This file was deleted.

1 change: 0 additions & 1 deletion Pods/Headers/Public/Sparkle/Sparkle/SUExport.h

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion Pods/Headers/Public/Sparkle/Sparkle/SUUpdater.h

This file was deleted.

1 change: 0 additions & 1 deletion Pods/Headers/Public/Sparkle/Sparkle/SUUpdaterDelegate.h

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion Pods/Headers/Public/Sparkle/Sparkle/Sparkle.h

This file was deleted.

10 changes: 5 additions & 5 deletions Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 0eb861f

Please sign in to comment.