Update of local copy of Windows pthreads library to MinGW-w64 winpthreads.

[orte.git] / Makefile.git

diff --git a/Makefile.git b/Makefile.git
index 3d0097e43fe830acb99268143e1716cb364030ad..f4f69d73354fe22143d12aecb7779d1c3ff5ea1d 100644 (file)
--- a/Makefile.git
+++ b/Makefile.git
@@ -14,30 +14,45 @@ all:
 
 VER=$(shell git describe --match='v[0-9]*' | sed -e 's/^v\(.*\)/\1/')
 
+CONFIGURE_FLAGS = --enable-orte-idl
+
 configure: git
 
 check: configure
-       $(MAKE) -f Makefile.git check-windows check-autotools check-java
-
-check-windows:
-       mkdir -p _check-win
-       cd _check-win && ../configure --host=i586-mingw32msvc CC=i586-mingw32msvc-gcc || \
-                        ../configure --host=i686-w64-mingw32 CC=i686-w64-mingw32-gcc
-       cd _check-win && $(MAKE)
-
-check-autotools:
-       mkdir -p _check-autotools
-       cd _check-autotools && ../configure
-       cd _check-autotools && $(MAKE)
-
-check-java: JAVAC=$(shell readlink -f $(which javac))
-check-java: JAVA_HOME=$(JAVAC:%/bin/javac=%)
-check-java:
-       mkdir -p _check-java
-       cd _check-java && ../configure --with-java=$(JAVA_HOME)
-       cd _check-java && $(MAKE)
+       $(MAKE) check-windows check-autotools check-java check-android
+
+check-%:
+       rm -rf _$@
+       mkdir -p _$@
+       $(MAKE) -C _$@ -f ../Makefile.git $@.real
+
+check-windows.real:
+# We don't have libIDL for mingw, so we check without --enable-orte-idl
+       ../configure --prefix=/ --host=i586-mingw32msvc CC=i586-mingw32msvc-gcc || \
+       ../configure --prefix=/ --host=i686-w64-mingw32 CC=i686-w64-mingw32-gcc
+       make
+       make install DESTDIR=$(CURDIR)/_install
+       test -f _install/bin/liborte-*.dll
+
+
+check-autotools.real:
+       ../configure $(CONFIGURE_FLAGS)
+       make
+
+check-java.real: JAVAC=$(shell readlink -f $(which javac))
+check-java.real: JAVA_HOME=$(JAVAC:%/bin/javac=%)
+check-java.real:
+       ../configure --with-java=$(JAVA_HOME)
+       $(MAKE)
        false # Java is not compiled - either fix it or update README
 
+check-android:
+       android update project -p orte/libaorte
+       android update project -p orte/contrib/Robot_Demo
+       cd orte/libaorte && ndk-build
+       cd orte/contrib/Robot_Demo && ant debug
+       test -f orte/contrib/Robot_Demo/bin/RoboDruid-debug.apk
+
 dist:
        $(MAKE) VER=$(VER) dist-tarball dist-check
        @echo "Tarball stored as orte-$(VER).tar.gz"
@@ -65,7 +80,7 @@ dist-check: orte-$(VER).tar.gz
        tar xf $<
 # Check that we can compile the content of the tarball
        mkdir orte-$(VER)/_build
-       cd orte-$(VER)/_build && ../configure && make V=0
+       cd orte-$(VER)/_build && ../configure $(CONFIGURE_FLAGS) && make V=0
        mkdir orte-$(VER)/_win
-       cd orte-$(VER)/_win && ../configure --host=i686-w64-mingw32 CC=i686-w64-mingw32-gcc && make V=0
+       cd orte-$(VER)/_win && ../configure --host=i686-w64-mingw32 CC=i686-w64-mingw32-gcc $(CONFIGURE_FLAGS) && make V=0
        rm -rf orte-$(VER)