Prepares 1.1.0

java-decompiler · May 23, 2015 · 43ba2af · 43ba2af
1 parent 587ed2d
commit 43ba2af
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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 → src/osx/resources/Info.plist b/src/osx/dist/JD-GUI.app/Contents/Info.plist → src/osx/resources/Info.plist
@@ -5,13 +5,13 @@
 		<key>CFBundleDevelopmentRegion</key>		<string>English</string>
 		<key>CFBundleExecutable</key>				<string>universalJavaApplicationStub.sh</string>
 		<key>CFBundleName</key>						<string>JD-GUI</string>
-		<key>CFBundleGetInfoString</key>			<string>JD-GUI version 1.0.0, Copyright 2008-2015 Emmanuel Dupuy</string>
+		<key>CFBundleGetInfoString</key>			<string>JD-GUI version ${VERSION}, Copyright 2008-2015 Emmanuel Dupuy</string>
 		<key>CFBundleIconFile</key>					<string>jd-gui.icns</string>
 		<key>CFBundleIdentifier</key>				<string>jd.jd-gui</string>
 		<key>CFBundleInfoDictionaryVersion</key>	<string>6.0</string>
 		<key>CFBundlePackageType</key>				<string>APPL</string>
-		<key>CFBundleLongVersionString</key>		<string>1.0.0, Copyright 2008-2015 Emmanuel Dupuy</string>
-		<key>CFBundleShortVersionString</key>		<string>1.0.0</string>
+		<key>CFBundleLongVersionString</key>		<string>${VERSION}, Copyright 2008-2015 Emmanuel Dupuy</string>
+		<key>CFBundleShortVersionString</key>		<string>${VERSION}</string>
 		<key>CSResourcesFileMapped</key>			<true/>
 		<key>LSRequiresCarbon</key>					<true/>
 		<key>NSHumanReadableCopyright</key>			<string>Copyright 2008-2015 Emmanuel Dupuy</string>
@@ -83,8 +83,8 @@
 		<dict>
 			<key>MainClass</key>					<string>jd.gui.OsxApp</string>
 			<key>JVMVersion</key>					<string>1.7+</string>
-			<key>ClassPath</key>					<string>$JAVAROOT/jd-gui-1.0.0.jar</string>
-			<key>WorkingDirectory</key>				<string>$JAVAROOT</string>
+			<key>ClassPath</key>					<string>\$JAVAROOT/jd-gui-${VERSION}.jar</string>
+			<key>WorkingDirectory</key> <string>\$JAVAROOT</string>
 			<key>Properties</key>
 			<dict>
 				<key>apple.laf.useScreenMenuBar</key>