From 513d6d48f162fd3585aa8ae60bfced30c9a59fd3 Mon Sep 17 00:00:00 2001
From: alby128 <alby128@gmail.com>
Date: Sat, 7 Oct 2017 22:02:59 +0200
Subject: [PATCH] Changed deployment target to Bintray

---
 .appveyor.yml  | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++
 .gitignore     |  2 +-
 .travis.yml    | 18 +++++++----------
 bintray.json   | 19 ++++++++++++++++++
 buildPy2exe.py |  4 ++--
 5 files changed, 83 insertions(+), 14 deletions(-)
 create mode 100644 .appveyor.yml
 create mode 100644 bintray.json

diff --git a/.appveyor.yml b/.appveyor.yml
new file mode 100644
index 0000000..bcbce7d
--- /dev/null
+++ b/.appveyor.yml
@@ -0,0 +1,54 @@
+environment:
+  MINICONDA: "C:\\Miniconda"
+  clone_folder: c:\projects\syncplay
+
+image:
+  - Visual Studio 2013
+
+platform: x86
+
+configuration: Release
+
+init:
+  - set PATH=C:\Miniconda;C:\Miniconda\Scripts;%PATH%
+  - cmd: conda create -n syncplay -y  
+  - cmd: activate syncplay
+  - cmd: conda install python pywin32 pyside -y
+  - cmd: pip install twisted py2exe_py2 zope.interface
+  - cmd: type nul > C:\Miniconda\envs\syncplay\lib\site-packages\zope\__init__.py
+  - cmd: pip freeze
+  - cmd: conda list
+  
+install:
+  - cmd: cd c:\projects\syncplay
+  - cmd: python buildPy2exe.py
+  - cmd: del C:\projects\syncplay\syncplay_v1.5.0\lib\DNSAPI.dll
+  - cmd: del C:\projects\syncplay\syncplay_v1.5.0\lib\MPR.dll
+  - cmd: mkdir C:\projects\syncplay\syncplay_v1.5.0\platforms
+  #- cmd: copy C:\Miniconda\envs\syncplay\library\plugins\platforms\qwindows.dll C:\projects\syncplay\syncplay_v1.5.0\platforms\
+
+# Not a project with an msbuild file, build done at install.
+build: off 
+
+artifacts:
+  path: 'syncplay_v1.5.0'
+  type: zip
+  name: Syncplay_win
+
+# Push artefact to S3 bucket and list all
+before_deploy:
+  - cmd: dir
+  #- cmd: python -c "from PySide2 import QtCore; print QtCore.QLibraryInfo.location(QtCore.QLibraryInfo.PluginsPath)"
+
+# Deploy build to BinTray
+deploy:
+  provider: BinTray
+  username: alby128
+  api_key:
+    secure: lAocj5KA9Z9x4BefQBIgNlQJbeW4qPBfCgYVBHMyOP3NgyhnMLmvR57ZCqtCKBlQ
+  subject: alby128
+  repo: Syncplay
+  package: Syncplay
+  version: "1.5.0_test"
+  publish: true
+  override: true
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index bb89611..8309fad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,5 +10,5 @@ venv
 syncplay_setup.nsi
 dist.7z
 .*
-
 !.travis.yml
+!.appveyor.yml
diff --git a/.travis.yml b/.travis.yml
index 88de432..62214eb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,16 +25,12 @@ before_deploy:
 - pip install dmgbuild
 - mkdir dist_dmg
 - mv resources/macos_vlc_install.command resources/.macos_vlc_install.command
-- dmgbuild -s appdmg.py "Syncplay" dist_dmg/Syncplay.dmg
+- dmgbuild -s appdmg.py "Syncplay" dist_dmg/Syncplay_macOS.dmg
 
 deploy:
-  provider: s3
-  access_key_id: AKIAJS554GLAZJ5L6TUA
-  secret_access_key:
-    secure: "iDuHZ6lgASU1O/9UKncgKfJZ96PpLzdKKvASDKCDPWBXXI5LyjGIIZJxbdjcE+WVoHYCCrN9Xn2XvhEjapqBzD2uKMH4QvN5mOG62FaPPOIPr+CCZxuEQuUQ8LUSIwQO3huu0K4eLn6q5b/ihmiWkTAssZFx1pccv15CJiwVPDwunULC2P55d/GxRohN2HcHDHGbHwlXasgvOx68xxbDEO4Ox7KRwcSIHnmx6vInQtzpqdnme8t1kmGG2vp6juyh39vCN0RzoJ5aH17qht/0nNvkbxnPcUg7jsDayOuWiwMgp4s+EYdyCh33IM3LQugxPqa3za5yjYQqC92SoaQg8FnsoU1sf7FHMCmb4mv8ZwgTD78+Ood/7lKHaOVGnxkoBtdrtXXf2tU/WyAGXTw4zc6eA+MIXC6FmNQFJaRUvGZPF+u+awHNJGAlmIhFOASBW4Ua6qahNzcasRE8e3cuzYuVzK4R24TRWqjYCadHd6SNh2FKVGYEKK1FcADUxn5GzldcovG3wsHRK6ONCS57s5xBlajVfEB4b78EqYkRgQQTAnCvNcUAbfsJOYywtSj/4keaGQeRydoY9qMl6MPpVXqn+r9bbglLBIOPzUr2EWXj/O6gq7bd9eSwCa1PvGplboDahkfWmVZKJ6rZpuvUfoQcKmuJiIpgowCczP9NNco="
-  bucket: syncplay
-  skip_cleanup: true
-  region: eu-central-1
-  local_dir: dist_dmg
-  on:
-    branch: macOS_app
\ No newline at end of file
+  on: macOS_app
+  provider: bintray
+  file: "bintray.json"
+  user: alby128
+  key:
+    secure: "N4XK9IxGEj+5aMskTEvUWwXSMXtHDFcjiLvnPRzVT3OOTSAA2AYjlH975MGiGEanap5gq5ftIo+M2TVNfiqflE9GSlFir+KfzabheoONZVegAq2sG6rDq9YElGJ8JefEb2O8vZykeyvow6TBxcsFdbV44RbGmf4obLALXKgK1cXG8MCKj8VOxVZpgaXFnNCxVlN1AlORx6MQ4ukaZMuO7fDnHjAgnkGlZOBq7/kMJfYGdZvLkKoe6qEoZHJQxVTcA3pkIwRQci5kx/AAxCuKcXYLpoHot5dytIumk0iwfzDqN4uUX5qOG8o2FrWy+7z/Yt7W97lA5c6hVltsoX5dqp0WB14EKgYq+wQwSNcI6tInjogDo4JnGSu1Tpmsy+Fc3Y5Z1cD29hWimxcC8h/wlm9C2hOjfEsdLOfkghevMjRdAW2RIIA8/KmR1Xi2EX78Q75wrPHvo4/4x0Cw0ZviN2wC9LY3GU8tmGjjC0P+WsF4M1Y9by2H2xLHuYPB7h7OnlD67d8pPQVq84Yl2jq9kT2PoYjlNwqWz1r/PsLBCGlXQtlTc7FQKXUAREFwBJY+b5mk2xMsiZZsNrtIfRQ2roDbHws+M0mAQPo1eqeDKLPH8fkDf/ZhWzE+swLadoGxuwKSux53ySAp7CQeObJYWJ3eHfO0cI21DZmd9uyjayA="
\ No newline at end of file
diff --git a/bintray.json b/bintray.json
new file mode 100644
index 0000000..9dd447f
--- /dev/null
+++ b/bintray.json
@@ -0,0 +1,19 @@
+{
+    "package": {
+        "name": "Syncplay",
+        "repo": "Syncplay",
+        "subject": "alby128"
+    },
+
+    "version": {
+        "name": "1.5.0_test"
+    },
+
+    "files":
+        [
+        {"includePattern": "dist_dmg/(.*)", "uploadPattern": "$1", 
+           "matrixParams": {
+           "override": 1 }}
+	    ],
+    "publish": true
+}
\ No newline at end of file
diff --git a/buildPy2exe.py b/buildPy2exe.py
index 4d5f242..f4ee45f 100644
--- a/buildPy2exe.py
+++ b/buildPy2exe.py
@@ -33,7 +33,7 @@ if missingStrings is not None and missingStrings is not "":
 
 p = "C:\\Program Files (x86)\\NSIS\\makensis.exe" #TODO: how to move that into proper place, huh
 NSIS_COMPILE = p if os.path.isfile(p) else "makensis.exe"
-OUT_DIR = "syncplay v{}".format(syncplay.version)
+OUT_DIR = "syncplay_v{}".format(syncplay.version)
 SETUP_SCRIPT_PATH = "syncplay_setup.nsi"
 NSIS_SCRIPT_TEMPLATE = r"""
   !include LogicLib.nsh
@@ -698,5 +698,5 @@ info = dict(
     cmdclass = {"py2exe": build_installer},               
 )
 
-sys.argv.extend(['py2exe', '-p win32com ', '-i twisted.web.resource'])
+sys.argv.extend(['py2exe', '-p win32com ', '-i twisted.web.resource', '-p PySide.QtGui'])
 setup(**info)