Small fixes for v 0.3.2.1

This commit is contained in:
Manfred Karrer 2015-11-18 22:58:41 +01:00
parent 03b7503b11
commit f009434530
10 changed files with 22 additions and 126 deletions

View file

@ -44,7 +44,7 @@
<key>JVMAppClasspath</key>
<string></string>
<key>JVMMainJarName</key>
<string>2.jar</string>
<string>shaded.jar</string>
<key>JVMPreferencesID</key>
<string>bitsquare</string>
<key>JVMOptions</key>

View file

@ -1,58 +0,0 @@
<?xml version="1.0" ?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>LSMinimumSystemVersion</key>
<string>10.7.4</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleAllowMixedLocalizations</key>
<true/>
<key>CFBundleExecutable</key>
<string>Bitsquare</string>
<key>CFBundleIconFile</key>
<string>package/mac/Bitsquare.icns</string>
<key>CFBundleIdentifier</key>
<string>io.bitsquare.Bitsquare</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>Bitsquare</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1</string>
<!-- CFBundleSignature exists only for compatibility with Classic Mac OS apps and documents. Modern Mac OS X apps don't need to worry about assigning a Bundle Signature.-->
<key>CFBundleSignature</key>
<string>????</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.finance</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright (C) 2015</string>
<key>NSHighResolutionCapable</key>
<string>true</string>
<key>JVMRuntime</key>
<string>..</string>
<key>JVMMainClassName</key>
<string>io.bitsquare.app.core.BitsquareAppMain</string>
<key>JVMAppClasspath</key>
<string></string>
<key>JVMMainJarName</key>
<string>JAR_NAME_STRING_GOES_HERE</string>
<key>JVMPreferencesID</key>
<string>bitsquare</string>
<key>JVMOptions</key>
<array>
</array>
<key>JVMUserOptions</key>
<dict>
</dict>
</dict>
</plist>

View file

@ -5,28 +5,7 @@ mkdir -p gui/deploy
set -e
# Extract the version numbers.
majorVersion=$( sed -n 's/^.*final int MAJOR_VERSION = //p' common/src/main/java/io/bitsquare/app/Version.java )
minorVersion=$( sed -n 's/^.*final int MINOR_VERSION = //p' common/src/main/java/io/bitsquare/app/Version.java )
patchVersion=$( sed -n 's/^.*final int PATCH_VERSION = //p' common/src/main/java/io/bitsquare/app/Version.java )
# remove trailing;
majorVersion="${majorVersion:0:${#majorVersion}-1}"
minorVersion="${minorVersion:0:${#minorVersion}-1}"
patchVersion="${patchVersion:0:${#patchVersion}-1}"
fullVersion=$( sed -n 's/^.*final String VERSION = "//p' common/src/main/java/io/bitsquare/app/Version.java )
# remove trailing ";
fullVersion=$majorVersion.$minorVersion.$patchVersion
echo majorVersion = $majorVersion
echo minorVersion = $minorVersion
echo patchVersion = $patchVersion
echo fullVersion = $fullVersion
# Generate the plist from the template
sed "s|JAR_NAME_STRING_GOES_HERE|$patchVersion.jar|" package/mac/Info.template.plist >package/mac/Info.plist
fullVersion="0.3.2.1"
mvn clean package -DskipTests -Dmaven.javadoc.skip=true
cp gui/target/shaded.jar gui/deploy/Bitsquare.jar
@ -43,9 +22,12 @@ $JAVA_HOME/bin/javapackager \
-title Bitsquare \
-vendor Bitsquare \
-outdir gui/deploy \
-srcfiles gui/target/shaded.jar \
-srcfiles gui/deploy/Bitsquare.jar \
-appclass io.bitsquare.app.BitsquareAppMain \
-outfile Bitsquare \
-BjvmProperties=-Djava.net.preferIPv4Stack=true
cp gui/deploy/Bitsquare.jar /Users/mk/vm_shared_ubuntu/Bitsquare.jar
cp gui/deploy/Bitsquare.jar /Users/mk/vm_shared_windows/Bitsquare.jar
cd package/mac