diff --git a/README.md b/README.md
index 26ad04e3..124ec30b 100644
--- a/README.md
+++ b/README.md
@@ -19,13 +19,13 @@ for instant access to methods and fields.
```
generate _"build/libs/jd-gui-x.y.z.jar"_
```
-> gradle build installOsxDist
+> gradle installOsxDist
```
generate _"build/install/jd-gui-osx/JD-GUI.app"_
```
> iexplore http://sourceforge.net/projects/launch4j/files/launch4j-3/3.7/launch4j-3.7-win32.zip/download
> unzip launch4j-3.7-win32.zip
-> gradle -DLAUNCH4J_HOME=.../path/to/launch4j-3.7-win32 launch4j installWindowsDist
+> gradle -DLAUNCH4J_HOME=.../path/to/launch4j-3.7-win32 installWindowsDist
```
generate _"build/install/jd-gui-windows/jd-gui.exe"_
diff --git a/app/src/main/groovy/jd/gui/view/MainDescription.groovy b/app/src/main/groovy/jd/gui/view/MainDescription.groovy
index ddf2eaf5..97f70733 100644
--- a/app/src/main/groovy/jd/gui/view/MainDescription.groovy
+++ b/app/src/main/groovy/jd/gui/view/MainDescription.groovy
@@ -263,7 +263,7 @@ dialog(
hbox {
panel(layout:new GridLayout(2,2), opaque:false, border:emptyBorder([5,10,5,50])) {
label(text: 'JD-GUI')
- label(text: 'version 1.0.0')
+ label(text: 'version 1.1.0')
label(text: 'JD-Core')
label(text: 'version 0.7.1')
}
diff --git a/build.gradle b/build.gradle
index 911c181b..a2641c2d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'distribution'
// Common configuration //
allprojects {
- version='1.0.0'
+ version='1.1.0'
apply plugin: 'eclipse'
apply plugin: 'idea'
@@ -107,12 +107,23 @@ task launch4j(type: Exec, dependsOn: [':jar', ':launch4jConfig']) {
}
// Distributions for OSX and Windows //
+task installOsxDistConfig(type: Copy) {
+ from 'src/osx/resources/Info.plist'
+ into 'build/distributions/osx'
+ expand(
+ VERSION: project.version
+ )
+}
+
distributions {
osx {
contents {
- into('JD-GUI.app/Contents/Resources/Java') {
- from jar.archivePath
- }
+ into('JD-GUI.app/Contents') {
+ from 'build/distributions/osx'
+ }
+ into('JD-GUI.app/Contents/Resources/Java') {
+ from jar.archivePath
+ }
from 'LICENSE', 'NOTICE', 'README.md'
}
}
@@ -123,3 +134,6 @@ distributions {
}
}
}
+installOsxDist.dependsOn build
+installOsxDist.dependsOn installOsxDistConfig
+installWindowsDist.dependsOn launch4j
diff --git a/src/osx/dist/JD-GUI.app/Contents/Info.plist b/src/osx/resources/Info.plist
similarity index 88%
rename from src/osx/dist/JD-GUI.app/Contents/Info.plist
rename to src/osx/resources/Info.plist
index e4c03e01..e5b56b94 100644
--- a/src/osx/dist/JD-GUI.app/Contents/Info.plist
+++ b/src/osx/resources/Info.plist
@@ -5,13 +5,13 @@
CFBundleDevelopmentRegion English
CFBundleExecutable universalJavaApplicationStub.sh
CFBundleName JD-GUI
- CFBundleGetInfoString JD-GUI version 1.0.0, Copyright 2008-2015 Emmanuel Dupuy
+ CFBundleGetInfoString JD-GUI version ${VERSION}, Copyright 2008-2015 Emmanuel Dupuy
CFBundleIconFile jd-gui.icns
CFBundleIdentifier jd.jd-gui
CFBundleInfoDictionaryVersion 6.0
CFBundlePackageType APPL
- CFBundleLongVersionString 1.0.0, Copyright 2008-2015 Emmanuel Dupuy
- CFBundleShortVersionString 1.0.0
+ CFBundleLongVersionString ${VERSION}, Copyright 2008-2015 Emmanuel Dupuy
+ CFBundleShortVersionString ${VERSION}
CSResourcesFileMapped
LSRequiresCarbon
NSHumanReadableCopyright Copyright 2008-2015 Emmanuel Dupuy
@@ -83,8 +83,8 @@
MainClass jd.gui.OsxApp
JVMVersion 1.7+
- ClassPath $JAVAROOT/jd-gui-1.0.0.jar
- WorkingDirectory $JAVAROOT
+ ClassPath \$JAVAROOT/jd-gui-${VERSION}.jar
+ WorkingDirectory \$JAVAROOT
Properties
apple.laf.useScreenMenuBar