jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Android makefiles rewrite to use common code

Browse source
This commit is contained in:
William S Fulton 2013-04-17 18:50:38 +01:00
commit 1d77a1b981
4 changed files with 78 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

46
Examples/Makefile.in
View file

@ -598,12 +598,56 @@ java_clean:
##### ANDROID ###### ##### ANDROID ######
################################################################## ##################################################################
ANDROID = android
ANDROID_NDK_BUILD = ndk-build
ANDROID_ADB = adb
ANT = ant
TARGETID = 1
# ----------------------------------------------------------------
# Build an Android dynamically loadable module (C)
# ----------------------------------------------------------------
android: $(SRCS)
$(ANDROID) update project --target $(TARGETID) --name $(PROJECTNAME) --path .
$(SWIG) -java $(SWIGOPT) -o $(INTERFACEDIR)$(TARGET)_wrap.c $(INTERFACEPATH)
$(ANDROID_NDK_BUILD)
$(ANT) debug
# ----------------------------------------------------------------
# Build an Android dynamically loadable module (C++)
# ----------------------------------------------------------------
android_cpp: $(SRCS)
$(ANDROID) update project --target $(TARGETID) --name $(PROJECTNAME) --path .
$(SWIG) -java -c++ $(SWIGOPT) -o $(INTERFACEDIR)$(TARGET)_wrap.cpp $(INTERFACEPATH)
$(ANDROID_NDK_BUILD)
$(ANT) debug
# ----------------------------------------------------------------
# Android install
# ----------------------------------------------------------------
android_install:
-$(ANDROID_ADB) uninstall $(PACKAGENAME)
$(ANDROID_ADB) install $(INSTALLOPTIONS) bin/$(PROJECTNAME)-debug.apk
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# Version display # Version display
# ----------------------------------------------------------------- # -----------------------------------------------------------------
android_version: android_version:
adb version $(ANDROID_ADB) version
# -----------------------------------------------------------------
# Cleaning the Android examples
# -----------------------------------------------------------------
android_clean:
ant -q -logfile /dev/null clean
rm -f $(INTERFACEDIR)$(TARGET)_wrap.*
rm -f `find $(PACKAGEDIR) -name \*.java | grep -v $(PROJECTNAME).java`
rm -rf obj
################################################################## ##################################################################
##### MODULA3 ###### ##### MODULA3 ######

22
Examples/android/class/Makefile
View file

@ -2,6 +2,7 @@ TOP = ../..
SWIG = $(TOP)/../preinst-swig SWIG = $(TOP)/../preinst-swig
TARGET = example TARGET = example
INTERFACE = example.i INTERFACE = example.i
INTERFACEDIR = jni/
PACKAGEDIR = src/org/swig PACKAGEDIR = src/org/swig
PACKAGENAME= org.swig.classexample PACKAGENAME= org.swig.classexample
SWIGOPT = -package $(PACKAGENAME) -outdir $(PACKAGEDIR)/classexample SWIGOPT = -package $(PACKAGENAME) -outdir $(PACKAGEDIR)/classexample
@ -9,18 +10,17 @@ PROJECTNAME= SwigClass
TARGETID = 1 TARGETID = 1
#INSTALLOPTIONS = -s # To install on SD Card #INSTALLOPTIONS = -s # To install on SD Card
check: check: build
android update project --target $(TARGETID) --name $(PROJECTNAME) --path .
$(SWIG) -c++ -java $(SWIGOPT) -o jni/$(TARGET)_wrap.cpp jni/$(INTERFACE) build:
ndk-build $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \
ant debug TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' \
PROJECTNAME='$(PROJECTNAME)' TARGETID='$(TARGETID)' android_cpp
install: install:
-adb uninstall $(PACKAGENAME) $(MAKE) -f $(TOP)/Makefile INSTALLOPTIONS='$(INSTALLOPTIONS)' PROJECTNAME='$(PROJECTNAME)' \
adb install $(INSTALLOPTIONS) bin/$(PROJECTNAME)-debug.apk PACKAGEDIR='$(PACKAGEDIR)' PACKAGENAME='$(PACKAGENAME)' android_install
clean: clean:
ant clean $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' PROJECTNAME='$(PROJECTNAME)' \
rm -f jni/$(TARGET)_wrap.cpp PACKAGEDIR='$(PACKAGEDIR)' INTERFACEDIR='$(INTERFACEDIR)' android_clean
rm -f `find $(PACKAGEDIR) -name \*.java | grep -v $(PROJECTNAME).java`
rm -rf obj

22
Examples/android/extend/Makefile
View file

@ -2,6 +2,7 @@ TOP = ../..
SWIG = $(TOP)/../preinst-swig SWIG = $(TOP)/../preinst-swig
TARGET = example TARGET = example
INTERFACE = example.i INTERFACE = example.i
INTERFACEDIR = jni/
PACKAGEDIR = src/org/swig PACKAGEDIR = src/org/swig
PACKAGENAME= org.swig.extendexample PACKAGENAME= org.swig.extendexample
SWIGOPT = -package $(PACKAGENAME) -outdir $(PACKAGEDIR)/extendexample SWIGOPT = -package $(PACKAGENAME) -outdir $(PACKAGEDIR)/extendexample
@ -9,18 +10,17 @@ PROJECTNAME= SwigExtend
TARGETID = 1 TARGETID = 1
#INSTALLOPTIONS = -s # To install on SD Card #INSTALLOPTIONS = -s # To install on SD Card
check: check: build
android update project --target $(TARGETID) --name $(PROJECTNAME) --path .
$(SWIG) -c++ -java $(SWIGOPT) -o jni/$(TARGET)_wrap.cpp jni/$(INTERFACE) build:
ndk-build $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \
ant debug TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' \
PROJECTNAME='$(PROJECTNAME)' TARGETID='$(TARGETID)' android_cpp
install: install:
-adb uninstall $(PACKAGENAME) $(MAKE) -f $(TOP)/Makefile INSTALLOPTIONS='$(INSTALLOPTIONS)' PROJECTNAME='$(PROJECTNAME)' \
adb install $(INSTALLOPTIONS) bin/$(PROJECTNAME)-debug.apk PACKAGEDIR='$(PACKAGEDIR)' PACKAGENAME='$(PACKAGENAME)' android_install
clean: clean:
ant clean $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' PROJECTNAME='$(PROJECTNAME)' \
rm -f jni/$(TARGET)_wrap.h jni/$(TARGET)_wrap.cpp PACKAGEDIR='$(PACKAGEDIR)' INTERFACEDIR='$(INTERFACEDIR)' android_clean
rm -f `find $(PACKAGEDIR) -name \*.java | grep -v $(PROJECTNAME).java`
rm -rf obj

22
Examples/android/simple/Makefile
View file

@ -2,6 +2,7 @@ TOP = ../..
SWIG = $(TOP)/../preinst-swig SWIG = $(TOP)/../preinst-swig
TARGET = example TARGET = example
INTERFACE = example.i INTERFACE = example.i
INTERFACEDIR = jni/
PACKAGEDIR = src/org/swig PACKAGEDIR = src/org/swig
PACKAGENAME= org.swig.simple PACKAGENAME= org.swig.simple
SWIGOPT = -package $(PACKAGENAME) -outdir $(PACKAGEDIR)/simple SWIGOPT = -package $(PACKAGENAME) -outdir $(PACKAGEDIR)/simple
@ -9,18 +10,17 @@ PROJECTNAME= SwigSimple
TARGETID = 1 TARGETID = 1
#INSTALLOPTIONS = -s # To install on SD Card #INSTALLOPTIONS = -s # To install on SD Card
check: check: build
android update project --target $(TARGETID) --name $(PROJECTNAME) --path .
$(SWIG) -java $(SWIGOPT) -o jni/$(TARGET)_wrap.c jni/$(INTERFACE) build:
ndk-build $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \
ant debug TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' \
PROJECTNAME='$(PROJECTNAME)' TARGETID='$(TARGETID)' android
install: install:
-adb uninstall $(PACKAGENAME) $(MAKE) -f $(TOP)/Makefile INSTALLOPTIONS='$(INSTALLOPTIONS)' PROJECTNAME='$(PROJECTNAME)' \
adb install $(INSTALLOPTIONS) bin/$(PROJECTNAME)-debug.apk PACKAGEDIR='$(PACKAGEDIR)' PACKAGENAME='$(PACKAGENAME)' android_install
clean: clean:
ant clean $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' PROJECTNAME='$(PROJECTNAME)' \
rm -f jni/$(TARGET)_wrap.c PACKAGEDIR='$(PACKAGEDIR)' INTERFACEDIR='$(INTERFACEDIR)' android_clean
rm -f `find $(PACKAGEDIR) -name \*.java | grep -v $(PROJECTNAME).java`
rm -rf obj