Skip to content

Commit

Permalink
Update more files to build 10.9 wrappers.
Browse files Browse the repository at this point in the history
Update tools.
  • Loading branch information
letiemble committed Aug 25, 2014
1 parent 006cb53 commit dc70372
Show file tree
Hide file tree
Showing 72 changed files with 598 additions and 420 deletions.
5 changes: 3 additions & 2 deletions Makefile
@@ -1,10 +1,10 @@
## =======================================
## __ __ _ _
## __ __ _ _
## | \/ | ___ _ __ ___ | |__ (_) ___
## | |\/| |/ _ \| '_ \ / _ \| '_ \| |/ __|
## | | | | (_) | | | | (_) | |_) | | (__
## |_| |_|\___/|_| |_|\___/|_.__// |\___|
## |__/
## |__/
## Top level makefile
## =======================================

Expand Down Expand Up @@ -57,6 +57,7 @@ $(DIST_DIR):
$(MKDIR) $@/10.6
$(MKDIR) $@/10.7
$(MKDIR) $@/10.8
$(MKDIR) $@/10.9

clean: $(DIRS_CLEAN)
$(RMRF) "$(BUILD_DIR)"
Expand Down
5 changes: 3 additions & 2 deletions Monobjc.mk
Expand Up @@ -53,20 +53,21 @@ export TAR=tar
export XBUILD=xbuild /p:Configuration=Release /verbosity:minimal

# Compute the version parts
export MONOBJC_VERSION=5.1
export MONOBJC_VERSION=6.0
export MONOBJC_VERSION_MAJOR=$(shell echo $(MONOBJC_VERSION) | cut -d "." -f1)
export MONOBJC_VERSION_MINOR=$(shell echo $(MONOBJC_VERSION) | cut -d "." -f2)

export MIN_OSX_VERSION?=10.6
export MIN_OSX_VERSION_MAJOR=$(shell echo $(MIN_OSX_VERSION) | cut -d "." -f1)
export MIN_OSX_VERSION_MINOR=$(shell echo $(MIN_OSX_VERSION) | cut -d "." -f2)
export MAX_OSX_VERSION?=10.8
export MAX_OSX_VERSION?=10.9
export MAX_OSX_VERSION_MAJOR=$(shell echo $(MAX_OSX_VERSION) | cut -d "." -f1)
export MAX_OSX_VERSION_MINOR=$(shell echo $(MAX_OSX_VERSION) | cut -d "." -f2)

export BUILD_FOR_OSX_10_6?=$(shell echo "$(MIN_OSX_VERSION_MINOR) <=6 && $(MAX_OSX_VERSION_MINOR) >=6" | bc)
export BUILD_FOR_OSX_10_7?=$(shell echo "$(MIN_OSX_VERSION_MINOR) <=7 && $(MAX_OSX_VERSION_MINOR) >=7" | bc)
export BUILD_FOR_OSX_10_8?=$(shell echo "$(MIN_OSX_VERSION_MINOR) <=8 && $(MAX_OSX_VERSION_MINOR) >=8" | bc)
export BUILD_FOR_OSX_10_9?=$(shell echo "$(MIN_OSX_VERSION_MINOR) <=9 && $(MAX_OSX_VERSION_MINOR) >=9" | bc)

# Compute the build number
export DATE_REFERENCE=$(shell date -j -f "%Y-%m-%d" "2007-07-01" "+%s")
Expand Down
6 changes: 3 additions & 3 deletions Monobjc.sh
Expand Up @@ -12,7 +12,7 @@ echo "======================================="
echo

COMMAND=$1
VERSION="5.0.0.0"
VERSION="6.0.0.0"
HASH="d5a8d181860c16be"

# Probe to check if Mono runtime is installed
Expand All @@ -34,7 +34,7 @@ fi
#
function install {

VERSIONS="10.6 10.7 10.8"
VERSIONS="10.6 10.7 10.8 10.9"

# Perform the installation for each version
for version in $VERSIONS; do
Expand Down Expand Up @@ -120,7 +120,7 @@ EOF
#
function uninstall {

VERSIONS="10.6 10.7 10.8"
VERSIONS="10.6 10.7 10.8 10.9"
ASSEMBLIES=`gacutil -l | grep Monobjc | awk -F"," '{ print $1 }' | sort -u`

# Remove assemblies from the GAC
Expand Down
25 changes: 20 additions & 5 deletions libraries/Makefile
Expand Up @@ -52,6 +52,13 @@ DIRS_10_8= \
Monobjc.GLKit \
Monobjc.SceneKit \

DIRS_10_9= \
$(DIRS_10_8) \
Monobjc.AVKit \
Monobjc.GameController \
Monobjc.MapKit \
Monobjc.SpriteKit \

ifeq ($(BUILD_FOR_OSX_10_6),1)
DIRS_10_6_ALL=$(DIRS_10_6:%=%-10_6-all)
DIRS_10_6_CLEAN=$(DIRS_10_6:%=%-10_6-clean)
Expand All @@ -67,6 +74,11 @@ ifeq ($(BUILD_FOR_OSX_10_8),1)
DIRS_10_8_CLEAN=$(DIRS_10_8:%=%-10_8-clean)
endif

ifeq ($(BUILD_FOR_OSX_10_9),1)
DIRS_10_9_ALL=$(DIRS_10_9:%=%-10_9-all)
DIRS_10_9_CLEAN=$(DIRS_10_9:%=%-10_9-clean)
endif

DEFINES_COMMON=DUMMY
ifeq ($(DEBUG_MODE),true)
DEFINES_COMMON+=,DEBUG
Expand All @@ -78,8 +90,9 @@ endif
DEFINES_10_6=$(DEFINES_COMMON),MACOSX_10_4,MACOSX_10_5,MACOSX_10_6
DEFINES_10_7=$(DEFINES_10_6),MACOSX_10_7
DEFINES_10_8=$(DEFINES_10_7),MACOSX_10_8
DEFINES_10_9=$(DEFINES_10_8),MACOSX_10_9

DOC_XML_DIR=$(DIST_DIR)/10.8
DOC_XML_DIR=$(DIST_DIR)/10.9
DOC_XML_FILES=$(wildcard $(DOC_XML_DIR)/Monobjc*.xml)
DOC_XML_NAMES=$(basename $(notdir $(DOC_XML_FILES)))
DOC_BUILD_DIR=$(BUILD_DIR)/monodoc
Expand All @@ -89,12 +102,12 @@ DOC_DIST_DIR=$(DIST_DIR)/monodoc
# Targets
# ----------------------------------------

all: generate-wrappers $(DIRS_10_6_ALL) $(DIRS_10_7_ALL) $(DIRS_10_8_ALL)
all: generate-wrappers $(DIRS_10_6_ALL) $(DIRS_10_7_ALL) $(DIRS_10_8_ALL) $(DIRS_10_9_ALL)

generate-wrappers:
$(MAKE) -C $(TOOLS_DIR) generate-wrappers

clean: $(DIRS_10_6_CLEAN) $(DIRS_10_7_CLEAN) $(DIRS_10_8_CLEAN)
clean: $(DIRS_10_6_CLEAN) $(DIRS_10_7_CLEAN) $(DIRS_10_8_CLEAN) $(DIRS_10_9_CLEAN)
$(RMRF) $(DOC_BUILD_DIR)
$(RMRF) $(DOC_DIST_DIR)

Expand All @@ -120,10 +133,10 @@ generate-doc:
# $(word 2,$(subst -, ,$@)) returns the <VERSION> (i.e. 10_8)
# $(word 3,$(subst -, ,$@)) returns the <ACTION> (i.e. all)
#
$(DIRS_10_6_ALL) $(DIRS_10_7_ALL) $(DIRS_10_8_ALL):
$(DIRS_10_6_ALL) $(DIRS_10_7_ALL) $(DIRS_10_8_ALL) $(DIRS_10_9_ALL):
$(MAKE) -C $(word 1,$(subst -, ,$@)) DEST_DIR="$(DIST_DIR)/$(subst _,.,$(word 2,$(subst -, ,$@)))" DEFINES="$(DEFINES_$(word 2,$(subst -, ,$@)))" all

$(DIRS_10_6_CLEAN) $(DIRS_10_7_CLEAN) $(DIRS_10_8_CLEAN):
$(DIRS_10_6_CLEAN) $(DIRS_10_7_CLEAN) $(DIRS_10_8_CLEAN) $(DIRS_10_9_CLEAN):
$(MAKE) -C $(word 1,$(subst -, ,$@)) clean

# ----------------------------------------
Expand All @@ -133,9 +146,11 @@ $(DIRS_10_6_CLEAN) $(DIRS_10_7_CLEAN) $(DIRS_10_8_CLEAN):
.PHONY: subdirs $(DIRS_10_6_ALL)
.PHONY: subdirs $(DIRS_10_7_ALL)
.PHONY: subdirs $(DIRS_10_8_ALL)
.PHONY: subdirs $(DIRS_10_9_ALL)
.PHONY: subdirs $(DIRS_10_6_CLEAN)
.PHONY: subdirs $(DIRS_10_7_CLEAN)
.PHONY: subdirs $(DIRS_10_8_CLEAN)
.PHONY: subdirs $(DIRS_10_9_CLEAN)

.PHONY: \
all \
Expand Down
36 changes: 19 additions & 17 deletions libraries/Monobjc.AVFoundation/Monobjc.AVFoundation.csproj
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>10.0.0</ProductVersion>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{12672822-5B47-4C34-8D49-C78F5C76635C}</ProjectGuid>
<OutputType>Library</OutputType>
Expand Down Expand Up @@ -34,6 +34,9 @@
<Reference Include="System.Core" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\MonobjcAssemblyInfo.cs" />
<Compile Include="AVFoundation_Extensions\Handlers.cs" />
<Compile Include="AVFoundation_C\AVAsset.Class.cs" />
<Compile Include="AVFoundation_C\AVAsset.cs" />
<Compile Include="AVFoundation_C\AVAsset.Protocols.cs" />
Expand Down Expand Up @@ -61,6 +64,7 @@
<Compile Include="AVFoundation_C\AVAssetReaderVideoCompositionOutput.Constructors.cs" />
<Compile Include="AVFoundation_C\AVAssetReaderVideoCompositionOutput.cs" />
<Compile Include="AVFoundation_C\AVAssetTrack.Class.cs" />
<Compile Include="AVFoundation_C\AVAssetTrack.Constants.cs" />
<Compile Include="AVFoundation_C\AVAssetTrack.cs" />
<Compile Include="AVFoundation_C\AVAssetTrack.Protocols.cs" />
<Compile Include="AVFoundation_C\AVAssetTrackSegment.Class.cs" />
Expand Down Expand Up @@ -114,6 +118,7 @@
<Compile Include="AVFoundation_C\AVCaptureInput.Class.cs" />
<Compile Include="AVFoundation_C\AVCaptureInput.cs" />
<Compile Include="AVFoundation_C\AVCaptureInputPort.Class.cs" />
<Compile Include="AVFoundation_C\AVCaptureInputPort.Constants.cs" />
<Compile Include="AVFoundation_C\AVCaptureInputPort.cs" />
<Compile Include="AVFoundation_C\AVCaptureMovieFileOutput.Class.cs" />
<Compile Include="AVFoundation_C\AVCaptureMovieFileOutput.cs" />
Expand Down Expand Up @@ -144,6 +149,12 @@
<Compile Include="AVFoundation_C\AVCompositionTrackSegment.cs" />
<Compile Include="AVFoundation_C\AVFrameRateRange.Class.cs" />
<Compile Include="AVFoundation_C\AVFrameRateRange.cs" />
<Compile Include="AVFoundation_C\AVMediaSelectionGroup.Class.cs" />
<Compile Include="AVFoundation_C\AVMediaSelectionGroup.cs" />
<Compile Include="AVFoundation_C\AVMediaSelectionGroup.Protocols.cs" />
<Compile Include="AVFoundation_C\AVMediaSelectionOption.Class.cs" />
<Compile Include="AVFoundation_C\AVMediaSelectionOption.cs" />
<Compile Include="AVFoundation_C\AVMediaSelectionOption.Protocols.cs" />
<Compile Include="AVFoundation_C\AVMetadataItem.Class.cs" />
<Compile Include="AVFoundation_C\AVMetadataItem.cs" />
<Compile Include="AVFoundation_C\AVMetadataItem.Protocols.cs" />
Expand Down Expand Up @@ -198,6 +209,8 @@
<Compile Include="AVFoundation_C\AVPlayerItemErrorLogEvent.Class.cs" />
<Compile Include="AVFoundation_C\AVPlayerItemErrorLogEvent.cs" />
<Compile Include="AVFoundation_C\AVPlayerItemErrorLogEvent.Protocols.cs" />
<Compile Include="AVFoundation_C\AVPlayerItemOutput.Class.cs" />
<Compile Include="AVFoundation_C\AVPlayerItemOutput.cs" />
<Compile Include="AVFoundation_C\AVPlayerItemTrack.Class.cs" />
<Compile Include="AVFoundation_C\AVPlayerItemTrack.cs" />
<Compile Include="AVFoundation_C\AVPlayerLayer.Class.cs" />
Expand Down Expand Up @@ -234,37 +247,26 @@
<Compile Include="AVFoundation_C\AVVideoCompositionLayerInstruction.cs" />
<Compile Include="AVFoundation_C\AVVideoCompositionLayerInstruction.Protocols.cs" />
<Compile Include="AVFoundation_C\NSCoder_AVFoundationAdditions.cs" />
<Compile Include="AVFoundation_C\NSValue_AVFoundationAdditions.cs" />
<Compile Include="AVFoundation_P\AVAsynchronousKeyValueLoading.Constants.cs" />
<Compile Include="AVFoundation_P\AVAsynchronousKeyValueLoading.Protocol.cs" />
<Compile Include="AVFoundation_P\AVAudioPlayer.Delegate.cs" />
<Compile Include="AVFoundation_P\AVAudioPlayerDelegate.Protocol.cs" />
<Compile Include="AVFoundation_P\AVAudioRecorder.Delegate.cs" />
<Compile Include="AVFoundation_P\AVAudioRecorderDelegate.Protocol.cs" />
<Compile Include="AVFoundation_P\AVCaptureAudioDataOutputSampleBufferDelegate.Protocol.cs" />
<Compile Include="AVFoundation_P\AVCaptureFileOutput.Delegate.cs" />
<Compile Include="AVFoundation_P\AVCaptureFileOutputDelegate.Protocol.cs" />
<Compile Include="AVFoundation_P\AVCaptureFileOutputRecordingDelegate.Protocol.cs" />
<Compile Include="AVFoundation_P\AVCaptureVideoDataOutputSampleBufferDelegate.Protocol.cs" />
<Compile Include="AVFoundation_P\AVVideoCompositionValidationHandling.Protocol.cs" />
<Compile Include="AVFoundation_T\AVFoundationFramework.AudioSettings.Constants.cs" />
<Compile Include="AVFoundation_T\AVFoundationFramework.Constants.cs" />
<Compile Include="AVFoundation_T\AVFoundationFramework.Error.Constants.cs" />
<Compile Include="AVFoundation_T\AVFoundationFramework.Functions.cs" />
<Compile Include="AVFoundation_T\AVFoundationFramework.ID3.Constants.cs" />
<Compile Include="AVFoundation_T\AVFoundationFramework.iTunes.Constants.cs" />
<Compile Include="AVFoundation_T\AVFoundationFramework.QuickTime.Constants.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\MonobjcAssemblyInfo.cs" />
<Compile Include="AVFoundation_C\NSValue_AVFoundationAdditions.cs" />
<Compile Include="AVFoundation_P\AVAudioPlayer.Delegate.cs" />
<Compile Include="AVFoundation_P\AVAudioRecorder.Delegate.cs" />
<Compile Include="AVFoundation_P\AVCaptureFileOutput.Delegate.cs" />
<Compile Include="AVFoundation_P\AVVideoCompositionValidationHandling.Protocol.cs" />
<Compile Include="AVFoundation_C\AVMediaSelectionGroup.Class.cs" />
<Compile Include="AVFoundation_C\AVMediaSelectionGroup.cs" />
<Compile Include="AVFoundation_C\AVMediaSelectionGroup.Protocols.cs" />
<Compile Include="AVFoundation_C\AVMediaSelectionOption.Class.cs" />
<Compile Include="AVFoundation_C\AVMediaSelectionOption.cs" />
<Compile Include="AVFoundation_C\AVMediaSelectionOption.Protocols.cs" />
<Compile Include="AVFoundation_C\AVPlayerItemOutput.Class.cs" />
<Compile Include="AVFoundation_C\AVPlayerItemOutput.cs" />
<Compile Include="AVFoundation_Extensions\Handlers.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Monobjc.Foundation\Monobjc.Foundation.csproj">
Expand Down
17 changes: 17 additions & 0 deletions libraries/Monobjc.AVFoundation/Properties/AssemblyInfo.cs
Expand Up @@ -39,4 +39,21 @@

#if TESTING
[assembly: InternalsVisibleTo("Monobjc.AVFoundation.Tests")]
[assembly: AssemblyConfigurationAttribute("Debug")]
#else
[assembly: AssemblyConfigurationAttribute("Release")]
#endif

#if MACOSX_10_9
[assembly: AssemblyVersionAttribute("10.9.0.0")]
[assembly: AssemblyFileVersionAttribute("10.9.0.0")]
#elif MACOSX_10_8
[assembly: AssemblyVersionAttribute("10.8.0.0")]
[assembly: AssemblyFileVersionAttribute("10.8.0.0")]
#elif MACOSX_10_7
[assembly: AssemblyVersionAttribute("10.7.0.0")]
[assembly: AssemblyFileVersionAttribute("10.7.0.0")]
#else
[assembly: AssemblyVersionAttribute("10.6.0.0")]
[assembly: AssemblyFileVersionAttribute("10.6.0.0")]
#endif
12 changes: 0 additions & 12 deletions libraries/Monobjc.AVFoundation/Properties/MonobjcAssemblyInfo.cs
Expand Up @@ -24,15 +24,3 @@
using System.Reflection;

[assembly: ObjectiveCFramework(true, "AVFoundation")]
[assembly: AssemblyConfigurationAttribute("Release")]

#if MACOSX_10_8
[assembly: AssemblyVersionAttribute("10.8.0.0")]
[assembly: AssemblyFileVersionAttribute("10.8.0.0")]
#elif MACOSX_10_7
[assembly: AssemblyVersionAttribute("10.7.0.0")]
[assembly: AssemblyFileVersionAttribute("10.7.0.0")]
#else
[assembly: AssemblyVersionAttribute("10.6.0.0")]
[assembly: AssemblyFileVersionAttribute("10.6.0.0")]
#endif
17 changes: 17 additions & 0 deletions libraries/Monobjc.Accounts/Properties/AssemblyInfo.cs
Expand Up @@ -39,4 +39,21 @@

#if TESTING
[assembly: InternalsVisibleTo("Monobjc.Accounts.Tests")]
[assembly: AssemblyConfigurationAttribute("Debug")]
#else
[assembly: AssemblyConfigurationAttribute("Release")]
#endif

#if MACOSX_10_9
[assembly: AssemblyVersionAttribute("10.9.0.0")]
[assembly: AssemblyFileVersionAttribute("10.9.0.0")]
#elif MACOSX_10_8
[assembly: AssemblyVersionAttribute("10.8.0.0")]
[assembly: AssemblyFileVersionAttribute("10.8.0.0")]
#elif MACOSX_10_7
[assembly: AssemblyVersionAttribute("10.7.0.0")]
[assembly: AssemblyFileVersionAttribute("10.7.0.0")]
#else
[assembly: AssemblyVersionAttribute("10.6.0.0")]
[assembly: AssemblyFileVersionAttribute("10.6.0.0")]
#endif
12 changes: 0 additions & 12 deletions libraries/Monobjc.Accounts/Properties/MonobjcAssemblyInfo.cs
Expand Up @@ -24,15 +24,3 @@
using System.Reflection;

[assembly: ObjectiveCFramework(true, "Accounts")]
[assembly: AssemblyConfigurationAttribute("Release")]

#if MACOSX_10_8
[assembly: AssemblyVersionAttribute("10.8.0.0")]
[assembly: AssemblyFileVersionAttribute("10.8.0.0")]
#elif MACOSX_10_7
[assembly: AssemblyVersionAttribute("10.7.0.0")]
[assembly: AssemblyFileVersionAttribute("10.7.0.0")]
#else
[assembly: AssemblyVersionAttribute("10.6.0.0")]
[assembly: AssemblyFileVersionAttribute("10.6.0.0")]
#endif
17 changes: 17 additions & 0 deletions libraries/Monobjc.AddressBook/Properties/AssemblyInfo.cs
Expand Up @@ -39,4 +39,21 @@

#if TESTING
[assembly: InternalsVisibleTo("Monobjc.AddressBook.Tests")]
[assembly: AssemblyConfigurationAttribute("Debug")]
#else
[assembly: AssemblyConfigurationAttribute("Release")]
#endif

#if MACOSX_10_9
[assembly: AssemblyVersionAttribute("10.9.0.0")]
[assembly: AssemblyFileVersionAttribute("10.9.0.0")]
#elif MACOSX_10_8
[assembly: AssemblyVersionAttribute("10.8.0.0")]
[assembly: AssemblyFileVersionAttribute("10.8.0.0")]
#elif MACOSX_10_7
[assembly: AssemblyVersionAttribute("10.7.0.0")]
[assembly: AssemblyFileVersionAttribute("10.7.0.0")]
#else
[assembly: AssemblyVersionAttribute("10.6.0.0")]
[assembly: AssemblyFileVersionAttribute("10.6.0.0")]
#endif
12 changes: 0 additions & 12 deletions libraries/Monobjc.AddressBook/Properties/MonobjcAssemblyInfo.cs
Expand Up @@ -24,15 +24,3 @@
using System.Reflection;

[assembly: ObjectiveCFramework(true, "AddressBook")]
[assembly: AssemblyConfigurationAttribute("Release")]

#if MACOSX_10_8
[assembly: AssemblyVersionAttribute("10.8.0.0")]
[assembly: AssemblyFileVersionAttribute("10.8.0.0")]
#elif MACOSX_10_7
[assembly: AssemblyVersionAttribute("10.7.0.0")]
[assembly: AssemblyFileVersionAttribute("10.7.0.0")]
#else
[assembly: AssemblyVersionAttribute("10.6.0.0")]
[assembly: AssemblyFileVersionAttribute("10.6.0.0")]
#endif
4 changes: 1 addition & 3 deletions libraries/Monobjc.AppKit/Monobjc.AppKit.csproj
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>10.0.0</ProductVersion>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{66872377-EFC8-4AAC-BC0E-2084E967F8B1}</ProjectGuid>
<OutputType>Library</OutputType>
Expand Down Expand Up @@ -1121,8 +1121,6 @@
<Compile Include="AppKit_C\NSWorkspace.cs" />
<Compile Include="QuartzCore_S\CATransform3D64.cs" />
<Compile Include="AppKit_P\NSControl.Delegate.cs" />
<Compile Include="QuartzCore_C\CIImage_AutoAdjustmentAdditions.Constants.cs" />
<Compile Include="QuartzCore_C\CIImage_AutoAdjustmentAdditions.cs" />
<Compile Include="AppKit_P\NSTextStorage.Delegate.cs" />
<Compile Include="AppKit_Extensions\NSCellStateValueExtensions.cs" />
<Compile Include="AppKit_Extensions\NSImage.Extensions.cs" />
Expand Down

0 comments on commit dc70372

Please sign in to comment.