Skip to content

Commit

Permalink
build: Replace all MonoMac references
Browse files Browse the repository at this point in the history
  • Loading branch information
hbons committed Sep 10, 2017
1 parent 73938bf commit 0fc9756
Show file tree
Hide file tree
Showing 13 changed files with 39 additions and 43 deletions.
4 changes: 2 additions & 2 deletions SparkleShare/Mac/AppDelegate.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SparkleShare, a collaboration and sharing tool.
// SparkleShare, a collaboration and sharing tool.
// Copyright (C) 2010 Hylke Bons <[email protected]>
//
// This program is free software: you can redistribute it and/or modify
Expand All @@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.


using MonoMac.AppKit;
using AppKit;

namespace SparkleShare
{
Expand Down
17 changes: 7 additions & 10 deletions SparkleShare/Mac/Controller.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SparkleShare, a collaboration and sharing tool.
// SparkleShare, a collaboration and sharing tool.
// Copyright (C) 2010 Hylke Bons <[email protected]>
//
// This program is free software: you can redistribute it and/or modify
Expand All @@ -20,13 +20,11 @@
using System.IO;
using System.Threading;

using Mono.Unix.Native;
using MonoMac.Foundation;
using MonoMac.AppKit;
using Foundation;
using AppKit;

using Sparkles;
using Sparkles.Git;
using System.Linq;

namespace SparkleShare {

Expand Down Expand Up @@ -91,11 +89,10 @@ public override void SetFolderIcon ()
}


public override void CreateStartupItem ()
{
// There aren't any bindings in MonoMac to support this yet, so
// we call out to an applescript to do the job

// There aren't any bindings in Xamarin.Mac to support this yet, so
// we call out to an applescript to do the job
public override void CreateStartupItem ()
{
string args = "-e 'tell application \"System Events\" to " +
"make login item at end with properties " +
"{path:\"" + NSBundle.MainBundle.BundlePath + "\", hidden:false}'";
Expand Down
4 changes: 2 additions & 2 deletions SparkleShare/Mac/MainMenu.xib.designer.cs

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

6 changes: 3 additions & 3 deletions SparkleShare/Mac/UserInterface/About.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SparkleShare, a collaboration and sharing tool.
// SparkleShare, a collaboration and sharing tool.
// Copyright (C) 2010 Hylke Bons <[email protected]>
//
// This program is free software: you can redistribute it and/or modify
Expand All @@ -18,8 +18,8 @@
using System;
using System.Drawing;

using MonoMac.AppKit;
using MonoMac.Foundation;
using AppKit;
using Foundation;

namespace SparkleShare {

Expand Down
4 changes: 2 additions & 2 deletions SparkleShare/Mac/UserInterface/Bubbles.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SparkleShare, a collaboration and sharing tool.
// SparkleShare, a collaboration and sharing tool.
// Copyright (C) 2010 Hylke Bons <[email protected]>
//
// This program is free software: you can redistribute it and/or modify
Expand All @@ -16,7 +16,7 @@


using System;
using MonoMac.Foundation;
using Foundation;

namespace SparkleShare {

Expand Down
8 changes: 4 additions & 4 deletions SparkleShare/Mac/UserInterface/EventLog.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SparkleShare, a collaboration and sharing tool.
// SparkleShare, a collaboration and sharing tool.
// Copyright (C) 2010 Hylke Bons <[email protected]>
//
// This program is free software: you can redistribute it and/or modify
Expand All @@ -19,9 +19,9 @@
using System.Drawing;
using System.IO;

using MonoMac.AppKit;
using MonoMac.Foundation;
using MonoMac.WebKit;
using AppKit;
using Foundation;
using WebKit;

namespace SparkleShare {

Expand Down
6 changes: 3 additions & 3 deletions SparkleShare/Mac/UserInterface/Note.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SparkleShare, a collaboration and sharing tool.
// SparkleShare, a collaboration and sharing tool.
// Copyright (C) 2010 Hylke Bons <[email protected]>
//
// This program is free software: you can redistribute it and/or modify
Expand All @@ -18,8 +18,8 @@
using System;
using System.Drawing;

using MonoMac.AppKit;
using MonoMac.Foundation;
using AppKit;
using Foundation;

namespace SparkleShare {

Expand Down
8 changes: 4 additions & 4 deletions SparkleShare/Mac/UserInterface/Setup.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SparkleShare, a collaboration and sharing tool.
// SparkleShare, a collaboration and sharing tool.
// Copyright (C) 2010 Hylke Bons <[email protected]>
//
// This program is free software: you can redistribute it and/or modify
Expand All @@ -21,9 +21,9 @@
using System.IO;

using Mono.Unix;
using MonoMac.Foundation;
using MonoMac.AppKit;
using MonoMac.WebKit;
using Foundation;
using AppKit;
using WebKit;

using Sparkles;

Expand Down
6 changes: 3 additions & 3 deletions SparkleShare/Mac/UserInterface/SetupWindow.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SparkleShare, an instant update workflow to Git.
// SparkleShare, an instant update workflow to Git.
// Copyright (C) 2010 Hylke Bons <[email protected]>
//
// This program is free software: you can redistribute it and/or modify
Expand All @@ -18,8 +18,8 @@
using System.Collections.Generic;
using System.Drawing;

using MonoMac.Foundation;
using MonoMac.AppKit;
using Foundation;
using AppKit;

namespace SparkleShare {

Expand Down
4 changes: 2 additions & 2 deletions SparkleShare/Mac/UserInterface/StatusIcon.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SparkleShare, an instant update workflow to Git.
// SparkleShare, an instant update workflow to Git.
// Copyright (C) 2010 Hylke Bons <[email protected]>
//
// This program is free software: you can redistribute it and/or modify
Expand All @@ -19,7 +19,7 @@
using System.Collections.Generic;
using System.Drawing;

using MonoMac.AppKit;
using AppKit;

namespace SparkleShare {

Expand Down
6 changes: 3 additions & 3 deletions SparkleShare/Mac/UserInterface/UserInterface.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SparkleShare, a collaboration and sharing tool.
// SparkleShare, a collaboration and sharing tool.
// Copyright (C) 2010 Hylke Bons <[email protected]>
//
// This program is free software: you can redistribute it and/or modify
Expand All @@ -17,8 +17,8 @@

using System;

using MonoMac.AppKit;
using MonoMac.Foundation;
using AppKit;
using Foundation;

namespace SparkleShare {

Expand Down
6 changes: 3 additions & 3 deletions SparkleShare/Mac/Watcher.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Originally taken from:
// Originally taken from:
// https://github.com/jesse99/Continuum/blob/master/source/shared/DirectoryWatcher.cs
// Modified to use MonoMac and integrate into SparkleShare
// Modified to use Xamarin.Mac and integrate into SparkleShare
//
// Copyright (C) 2008 Jesse Jones
// Copyright (C) 2012 Hylke Bons
Expand Down Expand Up @@ -30,7 +30,7 @@
using System.Runtime.InteropServices;
using System.IO;

using MonoMac.Foundation;
using Foundation;

namespace SparkleShare {

Expand Down
3 changes: 1 addition & 2 deletions SparkleShare/Mac/packReleaseDist.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,5 @@ cp ${MONO_PATH}/lib/libMonoPosixHelper.dylib ../MacOS/
sed -i .bak 's/libMonoPosixHelper.dylib/@executable_path\/libMonoPosixHelper.dylib/' ./config

# merge all Assemblies into one Mac binary
mkbundle --static --deps --config ./config -o ../MacOS/SparkleShare SparkleShare.exe Sparkles.dll MonoMac.dll Sparkles.Git.dll
mkbundle --static --deps --config ./config -o ../MacOS/SparkleShare SparkleShare.exe Sparkles.dll Xamarin.Mac.dll Sparkles.Git.dll
rm *.dll *.exe

0 comments on commit 0fc9756

Please sign in to comment.