fix #3082 (use "dev build" in extension name)

This commit is contained in:
gorhill 2017-10-01 10:28:33 -04:00
parent e2cbc5c964
commit a19efa4ebe
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
3 changed files with 37 additions and 6 deletions

View File

@ -59,7 +59,7 @@ var noopFunc = function(){};
/******************************************************************************/
vAPI.app = {
name: manifest.name,
name: manifest.name.replace(' dev build', ''),
version: manifest.version
};

View File

@ -0,0 +1,32 @@
#!/usr/bin/env python3
import os
import json
import re
import sys
if len(sys.argv) == 1 or not sys.argv[1]:
raise SystemExit('Build dir missing.')
proj_dir = os.path.join(os.path.split(os.path.abspath(__file__))[0], '..')
manifest_in = {}
manifest_in_file = os.path.join(proj_dir, 'platform', 'chromium', 'manifest.json')
with open(manifest_in_file) as f1:
manifest_in = json.load(f1)
# Development build? If so, modify name accordingly.
match = re.search('^\d+\.\d+\.\d+\.\d+$', manifest_in['version'])
if match:
build_dir = os.path.abspath(sys.argv[1])
dev_build = ' dev build'
manifest_out = {}
manifest_out_file = os.path.join(build_dir, 'manifest.json')
with open(manifest_out_file) as f2:
manifest_out = json.load(f2)
manifest_out['name'] += dev_build
manifest_out['short_name'] += dev_build
manifest_out['browser_action']['default_title'] += dev_build
with open(manifest_out_file, 'w') as f2:
json.dump(manifest_out, f2, indent=2, separators=(',', ': '), sort_keys=True)
f2.write('\n')

View File

@ -5,11 +5,7 @@
echo "*** uBlock0.chromium: Creating web store package"
echo "*** uBlock0.chromium: Copying files"
if [ "$1" = experimental ]; then
DES=dist/build/experimental/uBlock0.chromium
else
DES=dist/build/uBlock0.chromium
fi
DES=dist/build/uBlock0.chromium
rm -rf $DES
mkdir -p $DES
@ -28,6 +24,9 @@ cp platform/chromium/*.html $DES/
cp platform/chromium/*.json $DES/
cp LICENSE.txt $DES/
echo "*** uBlock0.chromium: Generating meta..."
python tools/make-chromium-meta.py $DES/
if [ "$1" = all ]; then
echo "*** uBlock0.chromium: Creating package..."
pushd $(dirname $DES/) > /dev/null