Permalink
Browse files

Update script. Update submodules.

  • Loading branch information...
1 parent fa2d0d8 commit 53918329dd6c5c00dd0b52e58c56d85c1e9094a3 @letiemble letiemble committed Sep 19, 2011
View
@@ -1,6 +1,6 @@
[submodule "tools"]
path = tools
- url = git://github.com/Monobjc/monobjc-tools.git
+ url = git@github.com:Monobjc/monobjc-tools.git
[submodule "samples"]
path = samples
- url = git://github.com/Monobjc/monobjc-samples.git
+ url = git@github.com:Monobjc/monobjc-samples.git
View
@@ -24,7 +24,7 @@ fi
#
function install {
- VERSIONS="10.5 10.6"
+ VERSIONS="10.5 10.6 10.7"
# Perform the installation for each version
for version in $VERSIONS; do
@@ -92,10 +92,11 @@ EOF
ln -s "$MONO_DIR/bin/pkg-config" "/usr/bin/pkg-config"
# Copy the helper tools
- cp "./dist/Monobjc.Sdp.exe" "$MONO_DIR/lib/mono/2.0/Monobjc.Sdp.exe"
+ cp "./dist/Monobjc.Sdp.exe" "$MONO_DIR/lib/mono/4.0/Monobjc.Sdp.exe"
# Copy the NAnt tasks
- cp "./dist/Monobjc.NAnt.dll" "$MONO_DIR/share/NAnt/bin/extensions/common/2.0/"
+ mkdir -p "$MONO_DIR/share/NAnt/bin/extensions/common/4.0/"
+ cp "./dist/Monobjc.NAnt.dll" "$MONO_DIR/share/NAnt/bin/extensions/common/4.0/"
# Copy the runtime wrappers and soft-link them
cp "./dist/monobjc" "$MONO_DIR/bin/monobjc"
@@ -114,7 +115,7 @@ EOF
#
function uninstall {
- VERSIONS="10.5 10.6"
+ VERSIONS="10.5 10.6 10.7"
ASSEMBLIES=`gacutil -l | grep Monobjc | awk -F"," '{ print $1 }' | sort -u`
# Remove assemblies from the GAC
@@ -139,8 +140,11 @@ function uninstall {
rm -f "$MONO_DIR/bin/monobjc"
rm -f "$MONO_DIR/bin/monobjc-nunit"
+ # Remove the helper tools
+ rm -f "$MONO_DIR/lib/mono/4.0/Monobjc.Sdp.exe"
+
# Remove the NAnt tasks
- rm -f "$MONO_DIR/share/NAnt/bin/extensions/common/2.0/Monobjc.NAnt.dll"
+ rm -f "$MONO_DIR/share/NAnt/bin/extensions/common/4.0/Monobjc.NAnt.dll"
}
# Main entry point
@@ -0,0 +1,53 @@
+//
+// This file is part of Monobjc, a .NET/Objective-C bridge
+// Copyright (C) 2007-2011 - Laurent Etiemble
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+using System;
+using System.Globalization;
+
+namespace Monobjc.AppKit
+{
+ public partial class NSScrollView
+ {
+ /// <summary>
+ /// <para>Returns the receiver’s content view, the view that clips the document view.</para>
+ /// <para>Original signature is '- (NSClipView *)contentView'</para>
+ /// <para>Available in Mac OS X v10.0 and later.</para>
+ /// </summary>
+ public virtual NSClipView ContentView
+ {
+ get { return ObjectiveCRuntime.SendMessage<NSClipView>(this, "contentView"); }
+ set { ObjectiveCRuntime.SendMessage(this, "setContentView:", value); }
+ }
+
+#if MACOSX_10_7
+ /// <summary>
+ /// <para>Returns the receiver’s content view, the view that clips the document view.</para>
+ /// <para>Original signature is '- (NSClipView *)contentView'</para>
+ /// <para>Available in Mac OS X v10.0 and later.</para>
+ /// </summary>
+ NSView INSTextFinderBarContainer.ContentView
+ {
+ get { return ObjectiveCRuntime.SendMessage<NSView>(this, "contentView"); }
+ }
+#endif
+ }
+}
@@ -1403,6 +1403,7 @@
<Compile Include="QuartzCore_T\QuartzCoreFramework.Functions.cs" />
<Compile Include="QuartzCore_Extensions\CVDisplayLink.Extensions.cs" />
<Compile Include="CoreData_Extensions\NSFetchRequest.cs" />
+ <Compile Include="AppKit_Extensions\NSScrollView.Extensions.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Monobjc\Monobjc.csproj">

0 comments on commit 5391832

Please sign in to comment.