Skip to content

Commit

Permalink
bump version v0.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
kokimame committed Feb 25, 2018
1 parent 8446153 commit 4ceab1a
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 25 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ install:
cd ${PREFIX}/share/joytan && (\
mv joytan.xpm ${PREFIX}/share/pixmaps;\
mv joytan.desktop ${PREFIX}/share/applications/)
@echo "Installing may take a minute."
@echo "Installing Joytan: This may take a minute."
xdg-mime install joytan.xml --novendor
xdg-mime default joytan.desktop applications/x-joytan
@echo
@echo "Install complete. Type 'joytan' to run."

uninstall:
@echo "Uninstalling may take a minute."
@echo "Uninstalling Joytan: This may take a minute."
-xdg-mime uninstall ${PREFIX}/share/joytan/joytan.xml
rm -rf ${PREFIX}/share/joytan
rm -rf ${PREFIX}/bin/joytan
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
[![Twitter](https://img.shields.io/twitter/follow/JoytanApp.svg?style=social&label=Follow)](https://twitter.com/intent/follow?screen_name=JoytanApp)

Website: https://kokimame.github.io/joytan/
**Website**: https://kokimame.github.io/joytan/


#### Convert CSV files to your original audio/textbooks with Joytan.
Expand Down
6 changes: 3 additions & 3 deletions devscript/build_nsis.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
# show up in a few places.
# All the other settings can be tweaked by editing the !defines at the top of this script
!define APPNAME "Joytan"
!define COMPANYNAME "Koki Mametani"
!define DESCRIPTION "Create Audio/Textbooks for your study"
!define COMPANYNAME "Kohki Mametani"
!define DESCRIPTION "Free Creative Audio/Textbook Maker"
# These three must be integers
!define VERSIONMAJOR 0
!define VERSIONMINOR 0
!define VERSIONMINOR 1
!define VERSIONBUILD 0
# These will be displayed by the "Click here for support information" link in "Add/Remove Programs"
# It is possible to use "mailto:" links in here to open the email client
Expand Down
5 changes: 4 additions & 1 deletion devscript/bundle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ fi

cd ..
# Setting input folder and output folder
version=0.0.0
version=0.1.0
inbase=joytan
outbase=~/Desktop/$(date +"%m-%d_%H-%M-%S")_Joytan

Expand Down Expand Up @@ -65,6 +65,9 @@ rm -rf ${outbase}/build ${outbase}/joytan.spec
if [[ "$OSTYPE" == "linux-gnu" ]]; then
cp ${inbase}/joytan.desktop ${inbase}/joytan.xml \
${inbase}/joytan.xpm ${inbase}/Makefile ${outbase}
cp /usr/bin/ffmpeg ${outbase}/bin/
cp /usr/bin/lame ${outbase}/bin/
cp ${inbase}/design/default_textbook.html ${outbase}/bin/
cd ${outbase}
tar -cvjSf joytan-${version}-amd64.tar.bz2 *
fi
Expand Down
12 changes: 6 additions & 6 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -123,15 +123,15 @@ <h2>Any Questions?</h2>
<aside id="sidebar">
<h2>Downloads</h2>
<p>
<a href="https://drive.google.com/uc?export=download&id=1QhkcsuzZYVpWrNne8sh6qGUK0wh1JwVX"
<a href="https://github.com/kokimame/joytan/releases/download/v0.1.0/Joytan-installer.exe"
title="Download Windows installer (.exe)"
class="button"><span>Windows (beta)</span></a>
<a href="https://drive.google.com/uc?export=download&id=1KqcJqL4Xf_Zt105iIfrHJO1irNPcaK1U"
class="button"><span>Windows v0.1.0 (.exe)</span></a>
<a href="https://github.com/kokimame/joytan/releases/download/v0.1.0/joytan-0.1.0.dmg"
title="Download Joytan for Mac (.dmg)"
class="button"><span>Mac (beta)</span></a>
<a href="https://drive.google.com/uc?export=download&id=1Uvgy4mIQ8xOYGXnD2jblojRUNXoAh7sd"
class="button"><span>Mac v0.1.0 (.dmg)</span></a>
<a href="https://github.com/kokimame/joytan/releases/download/v0.1.0/joytan-0.1.0-amd64.tar.bz2"
title="Download Joytan for Linux (.tar.gz)"
class="button"><span>Linux (beta)</span></a>
class="button"><span>Linux v0.1.0 (.tar.bz2)</span></a>
</p>

<!--
Expand Down
20 changes: 9 additions & 11 deletions docs/install.html
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,13 @@ <h2>Linux</h2>
</p>

<p>
2. Then from Terminal, the following commands install dependencies and Joytan.
2. Then from Terminal, the following commands extract the package and install Joytan.
(Example on Ubuntu)
</p>

<pre>
$ tar xjf Downloads/joytan-0.0.0-amd64.tar.bz2
$ cd joytan-0.0.0
$ sudo apt-get install ffmpeg
$ sudo apt-get install lame
$ tar xjf Downloads/joytan-{your_version}-amd64.tar.bz2
$ cd joytan-{your_version}-amd64
$ make
$ sudo make install
</pre>
Expand All @@ -115,15 +113,15 @@ <h2>Any Questions?</h2>
<aside id="sidebar">
<h2>Downloads</h2>
<p>
<a href="https://drive.google.com/uc?export=download&id=1QhkcsuzZYVpWrNne8sh6qGUK0wh1JwVX"
<a href="https://github.com/kokimame/joytan/releases/download/v0.1.0/Joytan-installer.exe"
title="Download Windows installer (.exe)"
class="button"><span>Windows (beta)</span></a>
<a href="https://drive.google.com/uc?export=download&id=1KqcJqL4Xf_Zt105iIfrHJO1irNPcaK1U"
class="button"><span>Windows v0.1.0 (.exe)</span></a>
<a href="https://github.com/kokimame/joytan/releases/download/v0.1.0/joytan-0.1.0.dmg"
title="Download Joytan for Mac (.dmg)"
class="button"><span>Mac (beta)</span></a>
<a href="https://drive.google.com/uc?export=download&id=1Uvgy4mIQ8xOYGXnD2jblojRUNXoAh7sd"
class="button"><span>Mac v0.1.0 (.dmg)</span></a>
<a href="https://github.com/kokimame/joytan/releases/download/v0.1.0/joytan-0.1.0-amd64.tar.bz2"
title="Download Joytan for Linux (.tar.gz)"
class="button"><span>Linux (beta)</span></a>
class="button"><span>Linux v0.1.0 (.tar.bz2)</span></a>
</p>

<h2>Support</h2>
Expand Down
2 changes: 1 addition & 1 deletion gui/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
raise Exception("Joytan requires a UTF-8 locale.")

# build scripts grep this line, so keep this format
app_version = "0.0.0"
app_version = "0.1.0"
# Main window set in runtime
mw = None
logger = None
Expand Down

0 comments on commit 4ceab1a

Please sign in to comment.