2
0

Move mpw-js out of the homepage.

This commit is contained in:
Maarten Billemont 2014-11-02 10:27:02 -05:00
parent acf9b4aec8
commit 1c72643aaa
16 changed files with 66 additions and 4 deletions

4
.gitmodules vendored
View File

@ -16,6 +16,6 @@
[submodule "External/jrswizzle"]
path = External/jrswizzle
url = git://github.com/jonmarimba/jrswizzle.git
[submodule "Site/2013-05/mpw-js/js/mpw-js"]
path = Site/2013-05/mpw-js/js/mpw-js
[submodule "Site/mpw-js/js/mpw-js"]
path = Site/mpw-js/js/mpw-js
url = https://github.com/Lyndir/mpw-js.git

62
Scripts/updatePlist Executable file
View File

@ -0,0 +1,62 @@
#!/usr/bin/env bash
cd "${BASH_SOURCE%/*}"
source bashlib
set -e
cd ..
export PATH+=:/usr/libexec
addPlistWithKey() {
local key=$1 type=$2 value=$3 plist=${4:-"$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH"}
PlistBuddy -c "Delete :'$key'" "$plist" 2>/dev/null || true
PlistBuddy -c "Add :'$key' '$type' '$value'" "$plist"
}
setPlistWithKey() {
local key=$1 value=$2 plist=${3:-"$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH"}
PlistBuddy -c "Set :'$key' '$value'" "$plist"
}
getPlistWithKey() {
local key=$1 plist=${2:-"$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH"}
PlistBuddy -c "Print :'$key'" "$plist"
}
setSettingWithTitle() {
local i title=$1 value=$2 plist=${3:-"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Settings.bundle/Root.plist"}
for (( i=0; 1; ++i )); do
PlistBuddy -c "Print :PreferenceSpecifiers:$i" "$plist" &>/dev/null || break
inf "Checking preference specifier $i"
[[ $(PlistBuddy -c "Print :PreferenceSpecifiers:$i:Title" "$plist" 2>/dev/null) = $title ]] || continue
inf "Correct title, setting value."
PlistBuddy -c "Set :PreferenceSpecifiers:$i:DefaultValue $value" "$plist"
break
done
}
description=$(git describe --always --dirty --long --match '*-release')
version=${description%-g*}
major=${version%%-*} minor=${version##*-}
printf -v version '%s.%02d' "$major" "$minor"
printf -v commit '%09d' "$((16#${description##*-g}))"
addPlistWithKey GITDescription string "$description"
setPlistWithKey CFBundleVersion "${version//.}$commit" # No separator between version and commit because I had already submitted a CFBundleVersion with a really high major. Cry.
setPlistWithKey CFBundleShortVersionString "$version"
setSettingWithTitle "Build" "$commit"
setSettingWithTitle "Version" "$version"
setSettingWithTitle "Copyright" "$(getPlistWithKey NSHumanReadableCopyright)"
if [[ $DEPLOYMENT_LOCATION = YES ]]; then
# This build is a release. Do some release checks.
passed=1
[[ $description != *-dirty ]] || \
{ passed=0; err 'ERROR: Cannot release a dirty version, first commit any changes.'; }
[[ $(PlistBuddy -c "Print :'API Key'" "$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Crashlytics.plist") ]] || \
{ passed=0; err 'ERROR: Cannot release: Crashlytics API key is missing.'; }
(( passed )) || \
{ ftl "Failed to pass release checks. Fix the above errors and re-try. Aborting."; exit 1; }
fi

View File

@ -84,7 +84,7 @@
Terminal (<a title="Mac, Linux, UNIX, Windows (command line interface)" href="masterpassword-cli.zip" onclick="_gaq.push(['_trackPageview', '/outbound/cli/java']);">Java<img class="popup" src="img/java-cli.png" /></a> /
<a title="Mac, Linux, UNIX, Windows (command line interface)" href="https://github.com/Lyndir/MasterPassword/tree/master/MasterPassword/C" onclick="_gaq.push(['_trackPageview', '/outbound/cli/c']);">Native C<img class="popup" src="img/c-cli.png" /></a>) |
<a title="Android" href="masterpassword-android.apk" onclick="_gaq.push(['_trackPageview', '/outbound/android']);">Android (Beta)<img class="popup" src="img/android.png" /></a> |
<a title="JavaScript" href="mpw-js" onclick="_gaq.push(['_trackPageview', '/outbound/js']);">Web (Beta)<img class="popup border" src="img/web.png" /></a>
<a title="JavaScript" href="https://js.masterpasswordapp.com/" onclick="_gaq.push(['_trackPageview', '/outbound/js']);">Web (Beta)<img class="popup border" src="img/web.png" /></a>
</h4>
</section>

@ -1 +0,0 @@
Subproject commit 08ada42cbb033b2c094cef0c015a20d8c7467bc1

View File

Before

Width:  |  Height:  |  Size: 423 B

After

Width:  |  Height:  |  Size: 423 B

1
Site/mpw-js/js/mpw-js Submodule

@ -0,0 +1 @@
Subproject commit 768cfad320668f480e2e44f7bf85c1f0de1b4059