Merge pull request #731 from samj1912/dev-v

Change directory and config names to correspond to dev version

picard/__init__.py

@@ -20,7 +20,7 @@
 import re
 
 
-PICARD_APP_NAME = "Picard"
+PICARD_APP_NAME = "Picard Dev"
 PICARD_ORG_NAME = "MusicBrainz"
 PICARD_VERSION = (2, 0, 0, 'dev', 1)
 

picard/const/__init__.py

@@ -20,10 +20,13 @@
 import os
 import sys
 
+from picard import PICARD_APP_NAME
+
 # Install gettext "noop" function in case const.py gets imported directly.
 import builtins
 builtins.__dict__['N_'] = lambda a: a
 
+
 # Config directory
 if sys.platform == "win32":
     USER_DIR = os.environ.get("APPDATA", "~\\Application Data")
@@ -31,7 +34,7 @@ else:
     USER_DIR = os.environ.get("XDG_CONFIG_HOME", "~/.config")
 
 USER_DIR = os.path.join(
-    os.path.expanduser(USER_DIR), "MusicBrainz", "Picard"
+    os.path.expanduser(USER_DIR), "MusicBrainz", PICARD_APP_NAME
 )
 
 USER_PLUGIN_DIR = os.path.join(USER_DIR, "plugins")

setup.py

@@ -34,6 +34,10 @@ from distutils.dist import Distribution
 from distutils.spawn import find_executable
 from setuptools import setup, Command, Extension
 
+
+# Change to 'picard' when building for production
+PACKAGE_NAME = "picard_dev"
+
 ext_modules = [
     Extension('picard.util._astrcmp', sources=['picard/util/_astrcmp.c']),
 ]
@@ -263,8 +267,8 @@ class picard_build(build):
 
     def run(self):
         if 'bdist_nsis' not in sys.argv:  # somebody shoot me please
-            log.info('generating scripts/picard from scripts/picard.in')
-            generate_file('scripts/picard.in', 'scripts/picard', {'localedir': self.localedir, 'autoupdate': not self.disable_autoupdate})
+            log.info('generating scripts/%s from scripts/picard.in', PACKAGE_NAME)
+            generate_file('scripts/picard.in', 'scripts/' + PACKAGE_NAME, {'localedir': self.localedir, 'autoupdate': not self.disable_autoupdate})
         build.run(self)
 
 
@@ -640,7 +644,7 @@ def _picard_packages():
 
 
 args2 = {
-    'name': 'picard',
+    'name': PACKAGE_NAME,
     'version': __version__,
     'description': 'The next generation MusicBrainz tagger',
     'url': 'https://picard.musicbrainz.org/',
@@ -662,7 +666,7 @@ args2 = {
         'regen_pot_file': picard_regen_pot_file,
         'patch_version': picard_patch_version,
     },
-    'scripts': ['scripts/picard'],
+    'scripts': ['scripts/' + PACKAGE_NAME],
     'install_requires': ['PyQt5', 'mutagen'],
 }
 args.update(args2)