Added a google analytics make file. Tapku now downloads automatically…

… from github. Coreplot no longer builds armv6
mono · Dec 14, 2012 · cd5fdc5 · cd5fdc5
1 parent 92b142c
commit cd5fdc5
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 51 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,3 +25,9 @@ Kiip/binding/libKiip.a
 
 /FlurryAnalytics/binding/libFlurry.a
 CorePlot/binding/CorePlot_0.9/
+
+GoogleAnalytics/binding/ios/temp.dll
+
+GoogleAnalytics/binding/ios/temp.dll
+
+GoogleAnalytics/binding/ios/temp.dll
diff --git a/CorePlot/binding/CorePlotiOS.dll b/CorePlot/binding/CorePlotiOS.dll
diff --git a/CorePlot/binding/Makefile b/CorePlot/binding/Makefile
@@ -27,10 +27,6 @@ libCorePlot-CocoaTouch-i386.a: CorePlot_$(VERSION)/License.txt
 	$(XBUILD) -project $(PROJECT) -target $(TARGET) -sdk iphonesimulator -configuration Release clean build
 	mv -f $(PROJECT_ROOT)/../build/Release-iphonesimulator/lib$(TARGET).a $@
 
-libCorePlot-CocoaTouch-armv6.a: CorePlot_$(VERSION)
-	$(XBUILD) -project $(PROJECT) -target $(TARGET) -sdk iphoneos -arch armv6 -configuration Release clean build
-	mv -f $(PROJECT_ROOT)/../build/Release-iphoneos/lib$(TARGET).a $@
-
 libCorePlot-CocoaTouch-armv7.a: CorePlot_$(VERSION)
 	$(XBUILD) -project $(PROJECT) -target $(TARGET) -sdk iphoneos -arch armv7 -configuration Release clean build
 	mv -f $(PROJECT_ROOT)/../build/Release-iphoneos/lib$(TARGET).a $@
@@ -39,7 +35,7 @@ libCorePlot-CocoaTouch-armv7.a: CorePlot_$(VERSION)
 #libCorePlot-CocoaTouch.a: CorePlot-$(VERSION).zip
 #	unzip -p $^ CorePlot_$(VERSION)/Binaries/iOS/$@ > $@
 
-libCorePlot-CocoaTouch.a: libCorePlot-CocoaTouch-i386.a libCorePlot-CocoaTouch-armv6.a libCorePlot-CocoaTouch-armv7.a
+libCorePlot-CocoaTouch.a: libCorePlot-CocoaTouch-i386.a libCorePlot-CocoaTouch-armv7.a
 	lipo -create -output $@ $^
 
 CorePlotMacOS.dll: Makefile coreplot.cs enums.cs extras.cs

diff --git a/GoogleAdMobAds/binding/GoogleAdMobAds.dll b/GoogleAdMobAds/binding/GoogleAdMobAds.dll
diff --git a/GoogleAnalytics/Makefile b/GoogleAnalytics/Makefile
@@ -0,0 +1,2 @@
+ASSEMBLY=GoogleAnalytics.dll
+include ../Rules.make
diff --git a/GoogleAnalytics/binding/GoogleAnalytics.dll b/GoogleAnalytics/binding/GoogleAnalytics.dll
diff --git a/GoogleAnalytics/sample/sample.csproj b/GoogleAnalytics/sample/sample.csproj
@@ -12,58 +12,58 @@
     <AssemblyName>sample</AssemblyName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
-    <DebugSymbols>true</DebugSymbols>
+    <DebugSymbols>True</DebugSymbols>
     <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
+    <Optimize>False</Optimize>
     <OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
     <DefineConstants>DEBUG;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <MtouchDebug>true</MtouchDebug>
-    <MtouchProfiling>true</MtouchProfiling>
+    <ConsolePause>False</ConsolePause>
+    <MtouchDebug>True</MtouchDebug>
+    <MtouchProfiling>True</MtouchProfiling>
     <MtouchLink>None</MtouchLink>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
     <DebugType>none</DebugType>
-    <Optimize>false</Optimize>
+    <Optimize>False</Optimize>
     <OutputPath>bin\iPhoneSimulator\Release</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
+    <ConsolePause>False</ConsolePause>
     <MtouchLink>None</MtouchLink>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
-    <DebugSymbols>true</DebugSymbols>
+    <DebugSymbols>True</DebugSymbols>
     <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
+    <Optimize>False</Optimize>
     <OutputPath>bin\iPhone\Debug</OutputPath>
     <DefineConstants>DEBUG;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
+    <ConsolePause>False</ConsolePause>
     <CodesignKey>iPhone Developer</CodesignKey>
-    <MtouchDebug>true</MtouchDebug>
-    <MtouchProfiling>true</MtouchProfiling>
+    <MtouchDebug>True</MtouchDebug>
+    <MtouchProfiling>True</MtouchProfiling>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
     <DebugType>none</DebugType>
-    <Optimize>false</Optimize>
+    <Optimize>False</Optimize>
     <OutputPath>bin\iPhone\Release</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
+    <ConsolePause>False</ConsolePause>
     <CodesignKey>iPhone Developer</CodesignKey>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="monotouch" />
+    <Reference Include="MonoTouch.Dialog-1" />
     <Reference Include="GoogleAnalytics">
-      <HintPath>..\binaries\GoogleAnalytics.dll</HintPath>
+      <HintPath>..\binding\GoogleAnalytics.dll</HintPath>
     </Reference>
-    <Reference Include="MonoTouch.Dialog-1" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Info.plist" />

diff --git a/Tapku/binding/Makefile b/Tapku/binding/Makefile
@@ -4,32 +4,25 @@ PROJECT_ROOT=tapkulibrary/src
 PROJECT=$(PROJECT_ROOT)/TapkuLibrary.xcodeproj
 TARGET=TapkuLibrary
 
-all: TapkuLibrary.dll
+all: Tapku.dll
 
+tapku-ios-sdk:
+	git clone git://github.com/devinross/tapkulibrary.git
 
-libTapkuLibrary-i386.a:
+libTapkuLibrary-i386.a: tapku-ios-sdk
 	$(XBUILD) -project $(PROJECT) -target $(TARGET) -sdk iphonesimulator -configuration Release clean build
 	-mv $(PROJECT_ROOT)/build/Release-iphonesimulator/lib$(TARGET).a $@
 
-
-libTapkuLibrary-armv6.a:
-	$(XBUILD) -project $(PROJECT) -target $(TARGET) -sdk iphoneos -arch armv6 -configuration Release clean build
-	-mv $(PROJECT_ROOT)/build/Release-iphoneos/lib$(TARGET).a $@
-
-libTapkuLibrary-armv7.a:
+libTapkuLibrary-armv7.a: tapku-ios-sdk
 	$(XBUILD) -project $(PROJECT) -target $(TARGET) -sdk iphoneos -arch armv7 -configuration Release clean build
 	-mv $(PROJECT_ROOT)/build/Release-iphoneos/lib$(TARGET).a $@
 
 
-libTapkuLibraryUniversal.a: lib$(TARGET)-armv7.a lib$(TARGET)-armv6.a lib$(TARGET)-i386.a
+libTapkuLibraryUniversal.a:  lib$(TARGET)-armv7.a lib$(TARGET)-i386.a
 	lipo -create -output $@ $^
 
 
-TapkuLibrary.dll: AssemblyInfo.cs Tapku.cs lib$(TARGET)Universal.a
-	make libTapkuLibrary-i386.a
-	make libTapkuLibrary-armv6.a
-	make libTapkuLibrary-armv7.a
-	make libTapkuLibraryUniversal.a
+Tapku.dll: AssemblyInfo.cs Tapku.cs lib$(TARGET)Universal.a
 	$(BTOUCH)  Tapku.cs AssemblyInfo.cs Enums.cs --out=$@ --link-with=libTapkuLibraryUniversal.a,libTapkuLibraryUniversal.a
 
 clean:

diff --git a/Tapku/sample/TapkuSample/TapkuSample.csproj b/Tapku/sample/TapkuSample/TapkuSample.csproj
@@ -12,64 +12,64 @@
     <AssemblyName>TapkuSample</AssemblyName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
-    <DebugSymbols>true</DebugSymbols>
+    <DebugSymbols>True</DebugSymbols>
     <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
+    <Optimize>False</Optimize>
     <OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
     <DefineConstants>DEBUG;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
+    <ConsolePause>False</ConsolePause>
     <MtouchLink>None</MtouchLink>
-    <MtouchDebug>true</MtouchDebug>
+    <MtouchDebug>True</MtouchDebug>
     <MtouchI18n />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
     <DebugType>none</DebugType>
-    <Optimize>false</Optimize>
+    <Optimize>False</Optimize>
     <OutputPath>bin\iPhoneSimulator\Release</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
+    <ConsolePause>False</ConsolePause>
     <MtouchLink>None</MtouchLink>
     <MtouchI18n />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
-    <DebugSymbols>true</DebugSymbols>
+    <DebugSymbols>True</DebugSymbols>
     <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
+    <Optimize>False</Optimize>
     <OutputPath>bin\iPhone\Debug</OutputPath>
     <DefineConstants>DEBUG;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <MtouchDebug>true</MtouchDebug>
+    <ConsolePause>False</ConsolePause>
+    <MtouchDebug>True</MtouchDebug>
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchI18n />
     <MtouchLink>None</MtouchLink>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
     <DebugType>none</DebugType>
-    <Optimize>false</Optimize>
+    <Optimize>False</Optimize>
     <OutputPath>bin\iPhone\Release</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
+    <ConsolePause>False</ConsolePause>
     <CodesignKey>iPhone Developer: James Clancey (MPFNK7YA6W)</CodesignKey>
     <MtouchI18n />
     <IpaPackageName />
     <MtouchArch>ARMv7</MtouchArch>
-    <MtouchUseLlvm>true</MtouchUseLlvm>
-    <MtouchUseThumb>true</MtouchUseThumb>
+    <MtouchUseLlvm>True</MtouchUseLlvm>
+    <MtouchUseThumb>True</MtouchUseThumb>
     <CodesignProvision>E824985B-52EE-41A1-A19D-3929B9667B5C</CodesignProvision>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="monotouch" />
     <Reference Include="MonoTouch.Dialog-1" />
-    <Reference Include="TapkuLibrary">
-      <HintPath>..\..\binding\TapkuLibrary.dll</HintPath>
+    <Reference Include="Tapku">
+      <HintPath>..\..\binding\Tapku.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>