Skip to content

Commit

Permalink
Updates from upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
Joel Håkansson committed Feb 21, 2018
2 parents 62879ff + a0875e5 commit e815a78
Show file tree
Hide file tree
Showing 8 changed files with 76 additions and 14 deletions.
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
language: java
os: osx
osx_image: xcode9.1
script: ./gradlew dmg
after_success: ./publish.sh
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
[![Build Status](https://travis-ci.org/brailleapps/dotify-studio-installer.svg?branch=master)](https://travis-ci.org/brailleapps/dotify-studio-installer)

# Dotify Studio Installer #
Provides an installer för Dotify Studio, a graphical user interface for embossing PEF-files.
Provides an installer för Dotify Studio, a graphical user interface for creating, managing and embossing PEF-files.

## Building ##
Build an installer on the target platform with the corresponding command.

| Platform | Command |
| :---------| :------------------------------- |
| Windows | `gradlew msi` |
| Windows (x64) | `gradlew msi` |
| Windows (x86) | `gradlew msi32` |
| Linux | `./gradlew rpm` |
| Linux | `./gradlew deb` |
| maOS | `./gradlew dmg` |
Expand Down
Binary file modified ant-build/resources/app-icon.ico
Binary file not shown.
1 change: 1 addition & 0 deletions ant-build/resources/longDesc_en.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Dotify Studio is an application for creating, managing and embossing PEf-files.
19 changes: 11 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "de.inetsoftware.setupbuilder" version "1.8.0"
id "de.inetsoftware.setupbuilder" version "3.4.3"
}

apply plugin: 'base'
Expand Down Expand Up @@ -112,11 +112,13 @@ configure( [msi, msi32] ) {
configure( [deb, rpm] ) {
doFirst {
setupBuilder {
desktopStarter {
executable = "bin/dotify-studio"
location = "ApplicationMenu"
categories = "Office"
}
defaultResourceLanguage 'en'
longDescription 'ant-build/resources/longDesc_en.txt'
desktopStarter {
executable = "bin/dotify-studio"
location = "ApplicationMenu"
categories = "Office"
}
}
}
}
Expand All @@ -129,6 +131,7 @@ rpm.dependsOn('unzip', 'copyPlugins')

deb {
maintainerEmail = '[email protected]'
section = 'text'
postinst = 'chmod +x /usr/share/dotify-studio/bin/dotify-studio'
}

Expand All @@ -138,5 +141,5 @@ rpm {


task wrapper(type: Wrapper, description: 'Refreshes the gradle wrapper') {
gradleVersion = '3.0'
}
gradleVersion = '3.5'
}
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
releaseName=Dotify Studio
version=0.5.0
version=0.6.0
releaseName=Dotify Studio
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Jun 28 19:30:48 CEST 2017
#Tue Nov 21 12:56:34 CET 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
51 changes: 51 additions & 0 deletions publish.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
#!/bin/bash
#version: 2017-11-18

repo=dotify-studio-installer
version=`grep 'version=' gradle.properties | grep -E -o '[0-9\.]+.+$'`
if [[ $version == *SNAPSHOT ]]; then
is_release=false
else
is_release=true
fi
if [ `git diff --name-only HEAD HEAD~ | grep gradle.properties -c` = 1 ]; then
prop_change="true"
else
prop_change="false"
fi

echo "Version: $version"
echo "Is release: $is_release"
echo "Properties changed: $prop_change"

if [ "$prop_change" = "false" ]; then
if [ "$is_release" = "true" ]; then
echo "No version change since last commit. Is this really a release?"
exit 1
fi
fi

if [ "$TRAVIS_REPO_SLUG" == "brailleapps/$repo" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ] && [ "$is_release" = true ]; then

echo -e "Publishing...\n"

mkdir -p $HOME/$repo/$version
cp -R build/distributions/* $HOME/$repo/$version

cd $HOME
git config --global user.email "[email protected]"
git config --global user.name "travis-ci"
git clone --quiet https://${GH_TOKEN}@github.com/brailleapps/brailleapps.github.io > /dev/null

cd brailleapps.github.io
git rm -rf ./$repo/$version

cp -Rf $HOME/$repo/. ./$repo

git add -f .
git commit -m "Lastest successful travis build of $repo ($TRAVIS_BUILD_NUMBER) auto-pushed to brailleapps.github.io"
git push -fq origin master > /dev/null

echo -e "Published artifacts to brailleapps.github.io.\n"

fi

0 comments on commit e815a78

Please sign in to comment.