X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=Makefile.base;h=586c38e377fa9b0016081361d1c3d336b57ab5f2;hp=9f6e09f33b8fead2843f0cc9d8a28600831d7ec8;hb=refs%2Fheads%2Fupstream.niki;hpb=9b05b757e2e817cd4ecd561032a66f63c158398d

diff --git a/Makefile.base b/Makefile.base
index 9f6e09f..586c38e 100644
--- a/Makefile.base
+++ b/Makefile.base
@@ -2,10 +2,12 @@
 # 
 # Version:
 # - 1.0.0: add a version comment
-# - 1.1.0: add help, sjar
-# - 1.2.0: add apk
+# - 1.1.0: add 'help', 'sjar'
+# - 1.2.0: add 'apk'
+# - 1.2.1: improve 'apk' and add 'android'
+# - 1.3.0: add 'man' for man(ual) pages
 
-# Required parameters (the commented out ones are supposed to change per project):
+# Required parameters (the commented out ones are supposed to be per project):
 
 #MAIN = path to main java source to compile
 #MORE = path to supplementary needed resources not linked from MAIN
@@ -13,10 +15,12 @@
 #PREFIX = usually /usr/local (where to install the program)
 #TEST = path to main test source to compile
 #JAR_FLAGS += a list of things to pack, each usually prefixed with "-C bin/"
-#SJAR_FLAGS += a list of things to pack, each usually prefixed with "-C src/", for *-sources.jar files
+#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 = paths to remove for APK generation
+#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/
@@ -26,12 +30,12 @@ JAR = jar
 RJAR = java
 RJAR_FLAGS += -jar
 
-all: build jar
+all: build jar man
 
 help:
 	@echo "Usual options:"
 	@echo "=============="
-	@echo "	make		: to build the jar file"
+	@echo "	make		: to build the jar file and man pages IF possible"
 	@echo "	make help	: to get this help screen"
 	@echo "	make libs	: to update the libraries into src/"
 	@echo "	make build	: to update the binaries (not the jar)"
@@ -44,9 +48,12 @@ 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 
+.PHONY: all clean mrproper mrpropre build run jrun jar sjar resources test-resources install libs love apk android ifman man
 
 bin:
 	@mkdir -p bin
@@ -76,7 +83,8 @@ test: test-resources
 
 clean:
 	rm -rf bin/
-	rm -rf android/.gradle android/build android/app/build android/app/src android/app/build.gradle
+	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 \
@@ -180,31 +188,51 @@ install:
 	echo "#!/bin/sh" > "$(PREFIX)/bin/$(NAME)"
 	echo "$(RJAR) $(RJAR_FLAGS) \"$(PREFIX)/lib/$(NAME).jar\" \"\$$@\"" >> "$(PREFIX)/bin/$(NAME)"
 	chmod a+rx "$(PREFIX)/bin/$(NAME)"
+	if [ -e "man/man1/$(NAME).1" ]; then \
+		cp -r man/ "$(PREFIX)"/share/; \
+	fi
 
-apk: libs ${NAME}.apk
-	@echo Building APK files...
-
-${NAME}.apk: ${NAME}-debug.apk
+android: android/app/src
 
-${NAME}-debug.apk:
+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/java
-	cp src/AndroidManifest.xml android/app/src/main
-	cp -r res android/app/src/main
-	cp -r src/* android/app/src/main/java/
-	@echo Starting gradlew assemble...
+	@mkdir -p android/app/src/main
+	@echo Linking sources...
 	@( \
-		cd android/app; \
-		cat build.gradle.base | sed 's:applicationId "":applicationId "${ID_FOR_ANDROID}":' > build.gradle; \
-		cd src/main/java; \
+		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 Removing uneeded sources...; \
-			rm -rf ${RM_FOR_ANDROID}; \
+			echo Ignoring uneeded sources...; \
+			for file in ${RM_FOR_ANDROID}; do \
+				excl="$${excl}exclude '**/$${file}'\\n";\
+			done; \
 		fi; \
-		cd ../../../../; \
+		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; \
@@ -216,3 +244,48 @@ ${NAME}-debug.apk:
 		); \
 	)
 
+ifman:
+	@if pandoc -v >/dev/null 2>&1; then \
+		make man; \
+	else \
+		echo "man pages not generated: "'`'"pandoc' required"; \
+	fi
+
+man: 
+	@echo Checking for possible manual pages...
+	@if [ -e README.md ]; then \
+		echo Sources found for man pages; \
+		if pandoc -v >/dev/null 2>&1; then \
+			ls README*.md 2>/dev/null \
+					| grep 'README\(-..\|\)\.md' \
+					| while read man; do \
+				echo "	Processing page $$lang..."; \
+				lang="`echo "$$man" \
+					| sed 's:README\.md:en:' \
+					| sed 's:README-\(.*\)\.md:\1:'`"; \
+				mkdir -p man/"$$lang"/man1; \
+				( \
+					echo ".TH \"${NAME}\" 1 `\
+						date +%Y-%m-%d\
+						` \"version `cat VERSION`\""; \
+					echo; \
+					UNAME="`echo "${NAME}" \
+						| sed 's:\(.*\):\U\1:g'`"; \
+					( \
+						cat "$$man" | head -n1 \
+	| sed 's:.*(README\(-fr\|\)\.md).*::g'; \
+						cat "$$man" | tail -n+2; \
+					) | sed 's:^#\(#.*\):\1:g' \
+	| sed 's:^\(#.*\):\U\1:g;s:# *'"$$UNAME"':# NAME\n'"${NAME}"' \\- :g' \
+	| sed 's:--:——:g' \
+	| pandoc -f markdown -t man | sed 's:——:--:g' ; \
+				) > man/"$$lang"/man1/"${NAME}.1"; \
+			done; \
+			mkdir -p "man/man1"; \
+			cp man/en/man1/"${NAME}".1 man/man1/; \
+		else \
+			echo "man pages generation: pandoc required" >&2; \
+			false; \
+		fi; \
+	fi;
+