X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=blobdiff_plain;f=Makefile.base;h=0d365b8448b1c4d7f4bda91c0aca3ff1b70307f8;hp=acc36d3aa9ed8a229426aadb357082d4fcfe7a03;hb=a1226ce080a0eb9038e855fc23608e273a02b6b7;hpb=53282decbc00dc2198c6eb3d4fe5a2356077b8a7 diff --git a/Makefile.base b/Makefile.base index acc36d3..0d365b8 100644 --- a/Makefile.base +++ b/Makefile.base @@ -5,6 +5,10 @@ # - 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 +# - 1.4.0: remove android stuff (not working anyway) +# - 1.5.0: include sources and readme/changelog in jar +# - 1.5.1: include binaries from libs/bin/ into the jar # Required parameters (the commented out ones are supposed to be per project): @@ -17,9 +21,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/ @@ -29,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)" @@ -47,10 +48,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 +.PHONY: all clean mrproper mrpropre build run jrun jar sjar resources test-resources install libs ifman man love bin: @mkdir -p bin @@ -80,8 +81,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 \ @@ -104,8 +103,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." @@ -142,19 +139,29 @@ libs: bin @[ ! -d libs ] || touch bin/libs $(NAME)-sources.jar: libs + @ls *.md >/dev/null || cp VERSION README.md @echo Making sources JAR file... @echo > bin/manifest - @[ "$(SJAR_FLAGS)" = "" ] || echo Creating $(NAME)-sources.jar... - @[ "$(SJAR_FLAGS)" = "" ] || $(JAR) cfm $(NAME)-sources.jar bin/manifest $(SJAR_FLAGS) - @[ "$(SJAR_FLAGS)" = "" ] || [ ! -e VERSION ] || echo Copying to "$(NAME)-`cat VERSION`-sources.jar"... - @[ "$(SJAR_FLAGS)" = "" ] || [ ! -e VERSION ] || cp $(NAME)-sources.jar "$(NAME)-`cat VERSION`-sources.jar" + @[ "$(SJAR_FLAGS)" != "" ] || echo No sources JAR file defined, skipping + @[ "$(SJAR_FLAGS)" = "" ] || echo Creating $(NAME)-sources.jar... + @[ "$(SJAR_FLAGS)" = "" ] || $(JAR) cfm $(NAME)-sources.jar bin/manifest -C ./ *.md $(SJAR_FLAGS) + @[ "$(SJAR_FLAGS)" = "" ] || [ ! -e VERSION ] || echo Copying to "$(NAME)-`cat VERSION`-sources.jar"... + @[ "$(SJAR_FLAGS)" = "" ] || [ ! -e VERSION ] || cp $(NAME)-sources.jar "$(NAME)-`cat VERSION`-sources.jar" $(NAME).jar: resources @[ -e bin/$(MAIN).class ] || echo You need to build the sources @[ -e bin/$(MAIN).class ] + @ls *.md >/dev/null || cp VERSION README.md + @echo "Copying documentation into bin/..." + @cp -r *.md bin/ || cp VERSION bin/no-documentation.md + @[ ! -d libs/bin/ ] || echo "Copying additional binaries from libs/bin/ into bin/..." + @[ ! -d libs/bin/ ] || cp -r libs/bin/* bin/ + @echo "Copying sources into bin/..." + @cp -r src/* bin/ + @echo "Making jar..." @echo "Main-Class: `echo "$(MAIN)" | sed 's:/:.:g'`" > bin/manifest @echo >> bin/manifest - $(JAR) cfm $(NAME).jar bin/manifest $(JAR_FLAGS) + $(JAR) cfm $(NAME).jar bin/manifest -C ./ *.md $(JAR_FLAGS) @[ ! -e VERSION ] || echo Copying to "$(NAME)-`cat VERSION`.jar"... @[ ! -e VERSION ] || cp $(NAME).jar "$(NAME)-`cat VERSION`.jar" @@ -185,53 +192,52 @@ install: echo "#!/bin/sh" > "$(PREFIX)/bin/$(NAME)" echo "$(RJAR) $(RJAR_FLAGS) \"$(PREFIX)/lib/$(NAME).jar\" \"\$$@\"" >> "$(PREFIX)/bin/$(NAME)" chmod a+rx "$(PREFIX)/bin/$(NAME)" - -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; \ - ) - -apk: libs ${NAME}.apk - @echo Building APK files... - -${NAME}.apk: ${NAME}-debug.apk - -${NAME}-debug.apk: android - @echo Starting gradlew assemble... - @( \ - 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";\ + if [ -e "man/man1/$(NAME).1" ]; then \ + cp -r man/ "$(PREFIX)"/share/; \ + fi + +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; \ - cd ../../../ ; \ - cat build.gradle.base \ - | sed 's:\(applicationId "\)":\1${ID_FOR_ANDROID}":' \ - | sed "s:\s*exclude '':$$excl:g" \ - > build.gradle; \ - cd ../ ; \ - 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"; \ - ); \ - ) + fi;