setuptools: change resources path

.travis.yml

@@ -28,7 +28,7 @@ install:
 before_deploy:
 - pip3 install dmgbuild
 - mkdir dist_dmg
-- mv resources/macOS_readme.pdf resources/.macOS_readme.pdf
+- mv syncplay/resources/macOS_readme.pdf syncplay/resources/.macOS_readme.pdf
 - export VER="$(cat syncplay/__init__.py | awk '/version/ {gsub("\047", "", $3); print $NF}')"
 - dmgbuild -s appdmg.py "Syncplay" dist_dmg/Syncplay_${VER}.dmg
 - python3 bintray_version.py

GNUmakefile

@@ -35,18 +35,18 @@ endif
 	SHARE_PATH        = ${DESTDIR}${PREFIX}/share
 
 common:
-	-mkdir -p $(LIB_PATH)/syncplay/resources/lua/intf
+	-mkdir -p $(LIB_PATH)/syncplay/syncplay/resources/lua/intf
 	-mkdir -p $(APP_SHORTCUT_PATH)
 	-mkdir -p $(SHARE_PATH)/app-install/icons
 	-mkdir -p $(SHARE_PATH)/pixmaps/
 	cp -r syncplay $(LIB_PATH)/syncplay/
 	chmod 755 $(LIB_PATH)/syncplay/
-	cp -r resources/hicolor $(SHARE_PATH)/icons/
-	cp -r resources/*.png $(LIB_PATH)/syncplay/resources/
-	cp -r resources/*.lua $(LIB_PATH)/syncplay/resources/
-	cp -r resources/lua/intf/*.lua $(LIB_PATH)/syncplay/resources/lua/intf/
-	cp resources/hicolor/48x48/apps/syncplay.png $(SHARE_PATH)/app-install/icons/
-	cp resources/hicolor/48x48/apps/syncplay.png $(SHARE_PATH)/pixmaps/
+	cp -r syncplay/resources/hicolor $(SHARE_PATH)/icons/
+	cp -r syncplay/resources/*.png $(LIB_PATH)/syncplay/syncplay/resources/
+	cp -r syncplay/resources/*.lua $(LIB_PATH)/syncplay/syncplay/resources/
+	cp -r syncplay/resources/lua/intf/*.lua $(LIB_PATH)/syncplay/syncplay/resources/lua/intf/
+	cp syncplay/resources/hicolor/48x48/apps/syncplay.png $(SHARE_PATH)/app-install/icons/
+	cp syncplay/resources/hicolor/48x48/apps/syncplay.png $(SHARE_PATH)/pixmaps/
 
 u-common:
 	-rm -rf $(LIB_PATH)/syncplay
@@ -60,7 +60,7 @@ client:
 	sed -i -e '/# libpath/ a\import site\nsite.addsitedir\("${PREFIX}/lib/syncplay"\)' $(BIN_PATH)/syncplay
 	chmod 755 $(BIN_PATH)/syncplay
 	cp syncplayClient.py $(LIB_PATH)/syncplay/
-	cp resources/syncplay.desktop $(APP_SHORTCUT_PATH)/
+	cp syncplay/resources/syncplay.desktop $(APP_SHORTCUT_PATH)/
 
 ifeq ($(SINGLE_USER),false)
 	chmod 755 $(APP_SHORTCUT_PATH)/syncplay.desktop
@@ -79,7 +79,7 @@ server:
 	sed -i -e '/# libpath/ a\import site\nsite.addsitedir\("${PREFIX}/lib/syncplay"\)' $(BIN_PATH)/syncplay-server
 	chmod 755 $(BIN_PATH)/syncplay-server
 	cp syncplayServer.py $(LIB_PATH)/syncplay/
-	cp resources/syncplay-server.desktop $(APP_SHORTCUT_PATH)/
+	cp syncplay/resources/syncplay-server.desktop $(APP_SHORTCUT_PATH)/
 
 ifeq ($(SINGLE_USER),false)
 	chmod 755 $(APP_SHORTCUT_PATH)/syncplay-server.desktop

MANIFEST.in

@@ -1,6 +1,6 @@
 include LICENSE
-include resources/*.png
-include resources/*.mng
-include resources/*.lua
-include resources/*.rtf
-include resources/lua/intf/*.lua
+include syncplay/resources/*.png
+include syncplay/resources/*.mng
+include syncplay/resources/*.lua
+include syncplay/resources/*.rtf
+include syncplay/resources/lua/intf/*.lua

appdmg.py

@@ -31,7 +31,7 @@ size = defines.get('size', None)
 # Files to include
 files = [
     application,
-    'resources/.macOS_readme.pdf'
+    'syncplay/resources/.macOS_readme.pdf'
 ]
 
 # Symlinks to create
@@ -78,7 +78,7 @@ icon_locations = {
 #
 # Other color components may be expressed either in the range 0 to 1, or
 # as percentages (e.g. 60% is equivalent to 0.6).
-background = 'resources/macOS_dmg_bkg.tiff'
+background = 'syncplay/resources/macOS_dmg_bkg.tiff'
 
 show_status_bar = False
 show_tab_view = False

buildPy2app.py

@@ -11,11 +11,11 @@ import syncplay
 
 APP = ['syncplayClient.py']
 DATA_FILES = [
-    ('resources', glob('resources/*.png') + glob('resources/*.rtf') + glob('resources/*.lua')),
-    ('resources/lua/intf', glob('resources/lua/intf/*.lua'))
+    ('resources', glob('syncplay/resources/*.png') + glob('syncplay/resources/*.rtf') + glob('syncplay/resources/*.lua')),
+    ('resources/lua/intf', glob('syncplay/resources/lua/intf/*.lua'))
 ]
 OPTIONS = {
-    'iconfile': 'resources/icon.icns',
+    'iconfile': 'syncplay/resources/icon.icns',
     'extra_scripts': 'syncplayServer.py',
     'includes': {'PySide2.QtCore', 'PySide2.QtUiTools', 'PySide2.QtGui', 'PySide2.QtWidgets', 'certifi', 'cffi'},
     'excludes': {'PySide', 'PySide.QtCore', 'PySide.QtUiTools', 'PySide.QtGui'},

buildPy2exe.py

@@ -691,14 +691,14 @@ guiIcons = [
     'resources/world_add.png', 'resources/film_add.png', 'resources/delete.png', 'resources/spinner.mng'
 ]
 resources = [
-    "resources/icon.ico",
-    "resources/syncplay.png",
-    "resources/syncplayintf.lua",
-    "resources/license.rtf",
-    "resources/third-party-notices.rtf"
+    "syncplay/resources/icon.ico",
+    "syncplay/resources/syncplay.png",
+    "syncplay/resources/syncplayintf.lua",
+    "syncplay/resources/license.rtf",
+    "syncplay/resources/third-party-notices.rtf"
 ]
 resources.extend(guiIcons)
-intf_resources = ["resources/lua/intf/syncplay.lua"]
+intf_resources = ["syncplay/resources/lua/intf/syncplay.lua"]
 
 qt_plugins = ['platforms\\qwindows.dll', 'styles\\qwindowsvistastyle.dll']
 
@@ -714,7 +714,7 @@ info = dict(
     common_info,
     windows=[{
       "script": "syncplayClient.py",
-      "icon_resources": [(1, "resources\\icon.ico")],
+      "icon_resources": [(1, "syncplay\\resources\\icon.ico")],
       'dest_base': "Syncplay"},
     ],
     console=['syncplayServer.py'],

setup.py

@@ -11,7 +11,7 @@ with open("README.md", "r") as fh:
     long_description = fh.read()
 
 setuptools.setup(
-    name="syncplay-distutil-test-3",
+    name="syncplay-setuptools-test-3",
     version=syncplay_version,
     author="Syncplay",
     author_email="dev@syncplay.pl",

syncplay/utils.py

@@ -147,7 +147,7 @@ def isASCII(s):
 
 def findResourcePath(resourceName):
     if resourceName == "syncplay.lua":
-        resourcePath = os.path.join(findWorkingDir(),"resources", "lua", "intf", resourceName)
+        resourcePath = os.path.join(findWorkingDir(), "resources", "lua", "intf", resourceName)
     else:
         resourcePath = os.path.join(findWorkingDir(), "resources", resourceName)
     return resourcePath
@@ -156,7 +156,7 @@ def findResourcePath(resourceName):
 def findWorkingDir():
     frozen = getattr(sys, 'frozen', '')
     if not frozen:
-        path = os.path.dirname(os.path.dirname(__file__))
+        path = os.path.dirname(__file__)
     elif frozen in ('dll', 'console_exe', 'windows_exe', 'macosx_app'):
         path = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
     elif frozen:  # needed for PyInstaller