Skip to content
Browse files

Flush.

  • Loading branch information...
1 parent 3edce27 commit c11fae926d829a608d9fd839d7e7afb7aa18e737 @jonpryor jonpryor committed Jan 26, 2012
View
19 GoogleMaps/bindings/Makefile
@@ -3,8 +3,7 @@ ANDROID_SDK_PATH := /opt/android/sdk
API_LEVELS := 8
BUILDDIR := bin
-RUNTIME := mono
-MCW_GEN := $(MONO_ANDROID_PATH)/lib/mandroid/mcw-gen.exe
+MCW_GEN := $(MONO_ANDROID_PATH)/bin/mcw-gen
platforms_dir := $(BUILDDIR)/platforms
@@ -22,21 +21,21 @@ SOURCES = \
src/Android.GoogleMaps/MyLocationOverlay.cs \
src/Android.GoogleMaps/TrackballGestureDetector.cs
-$(ASSEMBLIES): $(platforms_dir)/android-%/Mono.Android.GoogleMaps.dll: map.csv methodmap.csv Maps.fixup $(MCW_GEN)
+$(ASSEMBLIES): $(platforms_dir)/android-%/Mono.Android.GoogleMaps.dll: fieldmap.xml methodmap.xml Maps.fixup $(SOURCES) $(MCW_GEN)
-mkdir -p $(platforms_dir)/android-$*
-mkdir -p obj/platform-$*
- $(RUNTIME) $(MCW_GEN) \
- -sdk=$(ANDROID_SDK_PATH) \
+ $(MCW_GEN) \
+ -sdk-dir="$(ANDROID_SDK_PATH)" \
+ -sdk-platform=$* \
-jar=$(ANDROID_SDK_PATH)/add-ons/addon-google_apis-google_inc_-$*/libs/maps.jar \
-dll="$(platforms_dir)/android-$*/Mono.Android.GoogleMaps.dll" \
-fixup=Maps.fixup \
- -api-level=$* -outdir=obj/platform-$* \
+ -enumfields=fieldmap.xml -enummethods=methodmap.xml -global -v \
+ -o obj/platform-$* \
-javadoc=$(ANDROID_SDK_PATH)/add-ons/addon-google_apis-google_inc_-$*/docs/$(if $(findstr 15,$*),maps_apis,reference) \
- -fixup=metadata \
- -enumfields=map.csv -enummethods=methodmap.csv -global -v \
- -cscopt="-debug+ $(SOURCES)"
+ -cscopt -debug+ $(SOURCES:%=-cscopt "%")
-$(DOCS): $(platforms_dir)/android-%/Mono.Android.GoogleMaps.xml: $(platforms_dir)/android-%/Mono.Android.GoogleMaps.dll map.csv Maps.fixup
+$(DOCS): $(platforms_dir)/android-%/Mono.Android.GoogleMaps.xml: $(platforms_dir)/android-%/Mono.Android.GoogleMaps.dll fieldmap.xml Maps.fixup
$(RM) -R obj/platform-$*/docs
-mkdir -p obj/platform-$*/docs
-cp -R Documentation/en obj/platform-$*/docs
View
12 GoogleMaps/bindings/fieldmap.xml
@@ -0,0 +1,12 @@
+<enum-field-mappings>
+ <type enum-type="Android\GoogleMaps\MapDataSource" java-class="com/google/android/maps/MapActivity">
+ <member enum="China" java="MAP_DATA_SOURCE_CHINA" value="1" />
+ <member enum="Default" java="MAP_DATA_SOURCE_Default" value="0" />
+ </type>
+ <type enum-type="Android\GoogleMaps\ItemState" java-class="com/google/android/maps/OverlayItem">
+ <member enum="Focused" java="ITEM_STATE_FOCUSED_MASK" value="4" />
+ <member enum="Pressed" java="ITEM_STATE_PRESSED_MASK" value="1" />
+ <member enum="Selected" java="ITEM_STATE_SELECTED_MASK" value="2" />
+ </type>
+</enum-field-mappings>
+
View
5 GoogleMaps/bindings/map.csv
@@ -1,5 +0,0 @@
-0, Android\GoogleMaps\MapDataSource, China, com/google/android/maps/MapActivity.MAP_DATA_SOURCE_CHINA, 1
-0, Android\GoogleMaps\MapDataSource, Default, com/google/android/maps/MapActivity.MAP_DATA_SOURCE_DEFAULT, 0
-0, Android\GoogleMaps\ItemState, Focused, com/google/android/maps/OverlayItem.ITEM_STATE_FOCUSED_MASK, 4
-0, Android\GoogleMaps\ItemState, Pressed, com/google/android/maps/OverlayItem.ITEM_STATE_PRESSED_MASK, 1
-0, Android\GoogleMaps\ItemState, Selected, com/google/android/maps/OverlayItem.ITEM_STATE_SELECTED_MASK, 2
View
7 GoogleMaps/bindings/methodmap.csv
@@ -1,7 +0,0 @@
-0, com.google.android.maps, MapController, onKey, keyCode, Android.Views.Keycode
-0, com.google.android.maps, MapActivity, onGetMapDataSource, return, Com.Google.Android.Maps.MapDataSource
-0, com.google.android.maps, OverlayItem, getMarker, stateBitset, Com.Google.Android.Maps.ItemState
-0, com.google.android.maps, MyLocationOverlay, onStatusChanged, status, Android.Locations.Availability
-0, com.google.android.maps, MyLocationOverlay, onAccuracyChanged, sensor, Android.Hardware.SensorType
-0, com.google.android.maps, MyLocationOverlay, onAccuracyChanged, accuracy, Android.Hardware.SensorStatus
-0, com.google.android.maps, MyLocationOverlay, onSensorChanged, sensor, Android.Hardware.SensorType
View
9 GoogleMaps/bindings/methodmap.xml
@@ -0,0 +1,9 @@
+<enum-method-mappings>
+ <map package="com.google.android.maps" class="MapController" method="onKey" parameter="keyCode" enum="Android.Views.Keycode" />
+ <map package="com.google.android.maps" class="MapActivity" method="onGetMapDataSource" parameter="return" enum="Com.Google.Android.Maps.MapDataSource" />
+ <map package="com.google.android.maps" class="OverlayItem" method="getMarker" parameter="stateBitset" enum="Com.Google.Android.Maps.ItemState" />
+ <map package="com.google.android.maps" class="MyLocationOverlay" method="onStatusChanged" parameter="status" enum="Android.Locations.Availability" />
+ <map package="com.google.android.maps" class="MyLocationOverlay" method="onAccuracyChanged" parameter="sensor" enum="Android.Hardware.SensorType" />
+ <map package="com.google.android.maps" class="MyLocationOverlay" method="onAccuracyChanged" parameter="accuracy" enum="Android.Hardware.SensorStatus" />
+ <map package="com.google.android.maps" class="MyLocationOverlay" method="onSensorChanged" parameter="sensor" enum="Android.Hardware.SensorType" />
+</enum-method-mappings>

0 comments on commit c11fae9

Please sign in to comment.
Something went wrong with that request. Please try again.