update Makefile.base: remove android support

diff --git a/Makefile.base b/Makefile.base
index 586c38e377fa9b0016081361d1c3d336b57ab5f2..92e8e8e3497f3045c90f967a517cd10b3b625987 100644 (file)
--- a/Makefile.base
+++ b/Makefile.base
@@ -6,6 +6,7 @@
 # - 1.2.0: add 'apk'
 # - 1.2.1: improve 'apk' and add 'android'
 # - 1.3.0: add 'man' for man(ual) pages
+# - 1.4.0: remove android stuff (not working anyway)
 
 # Required parameters (the commented out ones are supposed to be per project):
 
@@ -18,9 +19,6 @@
 #SJAR_FLAGS += a list of things to pack, each usually prefixed with "-C src/",
 #              for *-sources.jar files
 #TEST_PARAMS = any parameter to pass to the test runnable when "test-run"
-#ID_FOR_ANDROID = id of activity to launch for Android
-#RM_FOR_ANDROID = packages (if it ends with /) or classes to ignore for APK 
-#              generation
 
 JAVAC = javac
 JAVAC_FLAGS += -encoding UTF-8 -d ./bin/ -cp ./src/
@@ -48,12 +46,10 @@ help:
        @echo " make run-test   : to run the test program from the binaries"
        @echo " make jrun       : to run the program from the jar file"
        @echo " make install    : to install the application into $$PREFIX"
-       @echo " make android    : to prepare the sources in android/ for Studio"
-       @echo " make apk        : to compile the APK file"
        @echo " make ifman      : to make the manual pages (if pandoc is found)"
        @echo " make man        : to make the manual pages (requires pandoc)"
 
-.PHONY: all clean mrproper mrpropre build run jrun jar sjar resources test-resources install libs love apk android ifman man
+.PHONY: all clean mrproper mrpropre build run jrun jar sjar resources test-resources install libs ifman man love
 
 bin:
        @mkdir -p bin
@@ -83,8 +79,6 @@ test: test-resources
 
 clean:
        rm -rf bin/
-       rm -rf android/.gradle android/build android/app/build android/app/build.gradle
-       [ ! -L android/app/src/main/java ] || rm -rf android/app/src
        @echo Removing sources taken from libs...
        @for lib in libs/*-sources.jar libs/*-sources.patch.jar; do \
                if [ "$$lib" != 'libs/*-sources.jar' -a "$$lib" != 'libs/*-sources.patch.jar' ]; then \
@@ -107,8 +101,6 @@ mrpropre: clean
        rm -f $(NAME)-debug.apk
        [ ! -e VERSION ] || rm -f "$(NAME)-`cat VERSION`.jar"
        [ ! -e VERSION ] || rm -f "$(NAME)-`cat VERSION`-sources.jar"
-       [ ! -e VERSION ] || rm -f "$(NAME)-`cat VERSION`.apk"
-       [ ! -e VERSION ] || rm -f "$(NAME)-`cat VERSION`-debug.apk"
 
 love:
        @echo " ...not war."
@@ -192,58 +184,6 @@ install:
                cp -r man/ "$(PREFIX)"/share/; \
        fi
 
-android: android/app/src
-
-android/app/src:
-       @[ -d android ] || echo No android/ directory found
-       @[ -d android ]
-       @[ -e android/local.properties ] || echo 'You need to create android/local.properties and add "sdk.dir=PATH_TO_SDK"'
-       @[ -e android/local.properties ]
-       @mkdir -p android/app/src/main
-       @echo Linking sources...
-       @( \
-               cd android/app/src/main; \
-               ln -s ../../../../src/AndroidManifest.xml .; \
-               ln -s ../../../../res .; \
-               ln -s ../../../../src ./java; \
-       )
-       @echo Fixing configuration...
-       @( \
-               cd android/app/src/main/java; \
-               excl="\\n";\
-               if [ "${RM_FOR_ANDROID}" != "" ]; then \
-                       echo Ignoring uneeded sources...; \
-                       for file in ${RM_FOR_ANDROID}; do \
-                               excl="$${excl}exclude '**/$${file}'\\n";\
-                       done; \
-               fi; \
-               cd ../../../ ; \
-               cat build.gradle.base \
-                       | sed 's:\(applicationId "\)":\1${ID_FOR_ANDROID}":' \
-                       | sed "s:\s*exclude '':$$excl:g" \
-               > build.gradle; \
-       )
-
-apk: libs ${NAME}.apk
-       @echo Building APK files...
-
-${NAME}.apk: ${NAME}-debug.apk
-
-${NAME}-debug.apk: android
-       @echo Starting gradlew assemble...
-       @( \
-               cd android/; \
-               bash gradlew assemble && ( \
-                       cd ..; \
-                       cp android/app/build/outputs/apk/release/app-release-unsigned.apk ${NAME}.apk; \
-                       cp android/app/build/outputs/apk/debug/app-debug.apk ${NAME}-debug.apk; \
-                       [ ! -e VERSION ] || echo Copying to "$(NAME)-`cat VERSION`.apk"...; \
-                       [ ! -e VERSION ] || cp $(NAME).apk "$(NAME)-`cat VERSION`.apk"; \
-                       [ ! -e VERSION ] || echo Copying to "$(NAME)-`cat VERSION`-debug.apk"...; \
-                       [ ! -e VERSION ] || cp $(NAME).apk "$(NAME)-`cat VERSION`-debug.apk"; \
-               ); \
-       )
-
 ifman:
        @if pandoc -v >/dev/null 2>&1; then \
                make man; \

diff --git a/configure.sh b/configure.sh
index 6179aae888887bf44e0be8ddbffbac9d7201bbaf..c73fc62dc6131d06e38c5a04a599bc530a6d834d 100755 (executable)
--- a/configure.sh
+++ b/configure.sh
@@ -5,9 +5,7 @@ PREFIX=/usr/local
 PROGS="java javac jar"
 
 UI=be/nikiroo/utils/ui/test/TestUI
-JUI="-C bin/ be/nikiroo/utils/ui"
 ANDOIRD=
-JANDROID=
 
 valid=true
 while [ "$*" != "" ]; do
@@ -29,14 +27,12 @@ while [ "$*" != "" ]; do
                [ "$val" = no -o "$val" = false ] && UI= && JUI=
                if [ "$val" = yes -o "$val" = true ]; then
                        UI=be/nikiroo/utils/ui/test/TestUI
-                       JUI="-C bin/ be/nikiroo/utils/ui"
                fi
        ;;
        --android) #=yes        Enable Android UI support
                [ "$val" = no -o "$val" = false ] && ANDROID= && JANDROID=
                if [ "$val" = yes -o "$val" = true ]; then
                        ANDROID=be/nikiroo/utils/android/test/TestAndroid
-                       JANDROID="-C bin/ be/nikiroo/utils/android"
                fi
        ;;
        *)
@@ -77,8 +73,8 @@ echo "TEST = be/nikiroo/utils/test_code/Test" >> Makefile
 echo "TEST_PARAMS = $cols $ok $ko" >> Makefile
 echo "NAME = nikiroo-utils" >> Makefile
 echo "PREFIX = $PREFIX" >> Makefile
-echo "JAR_FLAGS += -C bin/ be $JUI $JANDROID -C bin/ VERSION" >> Makefile
-echo "SJAR_FLAGS += -C src/ org -C src/ be" >> Makefile
+echo "JAR_FLAGS += -C bin/ be -C bin/ org -C bin/ VERSION" >> Makefile
+echo "SJAR_FLAGS += -C src/ org -C src/ be -C libs/ licenses" >> Makefile
 
 cat Makefile.base >> Makefile