From: Niki Roo Date: Sun, 12 Feb 2017 15:42:18 +0000 (+0100) Subject: Version 0.9.0 + update nikiroo-utils X-Git-Tag: fanfix-0.9.1~2 X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=dd56a89364e9fe198bec79d2da612b84bf983f31;p=fanfix.git Version 0.9.0 + update nikiroo-utils Introduced a VERSION file in configure/make --- diff --git a/Makefile.base b/Makefile.base index 86050e6..9396588 100644 --- a/Makefile.base +++ b/Makefile.base @@ -6,6 +6,7 @@ #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 JAVAC = javac JAVAC_FLAGS += -encoding UTF-8 -d ./bin/ -cp ./src/ -Xdiags:verbose @@ -76,6 +77,9 @@ mrproper: mrpropre mrpropre: clean rm -f $(NAME).jar + rm -f $(NAME)-sources.jar + [ ! -e VERSION ] || rm -f "$(NAME)-`cat VERSION`.jar" + [ ! -e VERSION ] || rm -f "$(NAME)-`cat VERSION`-sources.jar" love: @echo " ...not war." @@ -102,10 +106,15 @@ $(NAME).jar: resources @[ -e bin/$(MAIN).class ] || echo You need to build the sources @[ -e bin/$(MAIN).class ] @echo Making 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" @echo "Main-Class: `echo "$(MAIN)" | sed 's:/:.:g'`" > bin/manifest @echo >> bin/manifest $(JAR) cfm $(NAME).jar bin/manifest $(JAR_FLAGS) - @[ ! -e VERSION ] || echo Copying to "$(NAME)-`cat VERSION`.jar" + @[ ! -e VERSION ] || echo Copying to "$(NAME)-`cat VERSION`.jar"... @[ ! -e VERSION ] || cp $(NAME).jar "$(NAME)-`cat VERSION`.jar" run: diff --git a/README.md b/README.md index cc25a7b..37865b7 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,6 @@ Note that calling ```make libs``` will export the libraries into the src/ direct Currently missing, but either in progress or planned: - A GUI (work in progress) -- A binary JAR release (and thus, version 1) - Some readers other than CLI (TUI, GUI) - Check if it can work on Android - French translation diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..ac39a10 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +0.9.0 diff --git a/configure.sh b/configure.sh index 76697d9..2954620 100755 --- a/configure.sh +++ b/configure.sh @@ -36,7 +36,8 @@ done echo "MAIN = be/nikiroo/fanfix/Main" > Makefile echo "NAME = fanfix" >> Makefile echo "PREFIX = $PREFIX" >> Makefile -echo "JAR_FLAGS += -C bin/ org -C bin/ be -C ./ src" >> Makefile +echo "JAR_FLAGS += -C bin/ org -C bin/ be -C ./ VERSION" >> Makefile +#echo "SJAR_FLAGS += -C src/ org -C src/ be -C ./ LICENSE -C ./ README.md -C ./ VERSION" >> Makefile cat Makefile.base >> Makefile diff --git a/libs/nikiroo-utils-0.9.2-sources.jar b/libs/nikiroo-utils-0.9.2-sources.jar deleted file mode 100644 index 82863ab..0000000 Binary files a/libs/nikiroo-utils-0.9.2-sources.jar and /dev/null differ diff --git a/libs/nikiroo-utils-0.9.3-sources.jar b/libs/nikiroo-utils-0.9.3-sources.jar new file mode 100644 index 0000000..668e2b8 Binary files /dev/null and b/libs/nikiroo-utils-0.9.3-sources.jar differ diff --git a/src/be/nikiroo/fanfix/reader/BasicReader.java b/src/be/nikiroo/fanfix/reader/BasicReader.java index 13e1599..3403f87 100644 --- a/src/be/nikiroo/fanfix/reader/BasicReader.java +++ b/src/be/nikiroo/fanfix/reader/BasicReader.java @@ -11,9 +11,9 @@ import be.nikiroo.fanfix.supported.BasicSupport; import be.nikiroo.fanfix.supported.BasicSupport.SupportType; /** - * Command line {@link Story} reader. + * The class that handles the different {@link Story} readers you can use. *

- * Will output stories to the console. + * All the readers should be accessed via {@link BasicReader#getReader()}. * * @author niki */ @@ -159,8 +159,8 @@ public abstract class BasicReader { public static BasicReader getReader() { if (defaultType != null) { switch (defaultType) { - //case LOCAL: - //return new LocalReader().setType(ReaderType.LOCAL); + // case LOCAL: + // return new LocalReader().setType(ReaderType.LOCAL); case CLI: return new CliReader().setType(ReaderType.CLI); }