From 4374c77bc5c425762fe8ef8026fc3160468dfcf9 Mon Sep 17 00:00:00 2001 From: Pauli Jokela Date: Tue, 7 May 2019 20:25:57 +0300 Subject: [PATCH 1/5] Adding cross-platform binary compilation support, as well as Travis CI tests. - Added initial .travis.yml for all three platforms - Applied a simple fix to ProperTree.command for pyinstaller failing to load/bundle all dependencies --- .travis.yml | 26 ++++++++++++++++++++++++++ ProperTree.command | 1 + 2 files changed, 27 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..babd103e --- /dev/null +++ b/.travis.yml @@ -0,0 +1,26 @@ +# https://docs.travis-ci.com/user/languages/python/ +language: python +matrix: + include: + - name: "Python 3.7 on Linux" + python: 3.7 + dist: xenial + - name: "Python 3.7 on macOS" + os: osx + osx_image: xcode10.2 + language: shell + - name: "Python 3.7 on Windows" + os: windows + language: shell + before_install: choco install python + env: PATH=/c/Python37:/c/Python37/Scripts:$PATH +install: + - pip3 install pyinstaller +script: + - pyinstaller \ + --clean \ + --windowed \ + --onedir \ + --onefile \ + --add-data Scripts:Scripts \ + ProperTree.command diff --git a/ProperTree.command b/ProperTree.command index f093308d..4abe3a7f 100755 --- a/ProperTree.command +++ b/ProperTree.command @@ -1,5 +1,6 @@ #!/usr/bin/env python import sys, os, binascii, base64 +import queue, json, ctypes # Fix for pyinstaller failing to bundle dependencies try: import Tkinter as tk import ttk From d3b92f1cd1250cbfb5ce1731268278e0407ad0f1 Mon Sep 17 00:00:00 2001 From: Pauli Jokela Date: Tue, 7 May 2019 20:30:34 +0300 Subject: [PATCH 2/5] Fixing .travis.yml --- .travis.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index babd103e..76a21e74 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,11 +16,4 @@ matrix: env: PATH=/c/Python37:/c/Python37/Scripts:$PATH install: - pip3 install pyinstaller -script: - - pyinstaller \ - --clean \ - --windowed \ - --onedir \ - --onefile \ - --add-data Scripts:Scripts \ - ProperTree.command +script: pyinstaller --clean --windowed --onedir --onefile --add-data Scripts:Scripts ProperTree.command From be845b24fccbe49c851e3c0d5cee2bb0455bb613 Mon Sep 17 00:00:00 2001 From: Pauli Jokela Date: Tue, 7 May 2019 20:33:35 +0300 Subject: [PATCH 3/5] Added Travis CI status badge to README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f7d41808..d7bfd36d 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ +[![Build Status](https://travis-ci.org/CorpNewt/ProperTree.svg?branch=master)](https://travis-ci.org/CorpNewt/ProperTree) # ProperTree Cross platform GUI plist editor written in python. From 301476cd26e6150d663053324744fb17ee582674 Mon Sep 17 00:00:00 2001 From: Pauli Jokela Date: Tue, 7 May 2019 20:37:17 +0300 Subject: [PATCH 4/5] Fixing .travis.yml --- .travis.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 76a21e74..2ef9c845 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,15 +5,18 @@ matrix: - name: "Python 3.7 on Linux" python: 3.7 dist: xenial + install: pip3 install pyinstaller + script: pyinstaller --clean --windowed --onedir --onefile --add-data "Scripts:Scripts" ProperTree.command - name: "Python 3.7 on macOS" os: osx osx_image: xcode10.2 language: shell + install: pip3 install pyinstaller + script: pyinstaller --clean --windowed --onedir --onefile --add-data "Scripts:Scripts" ProperTree.command - name: "Python 3.7 on Windows" os: windows language: shell before_install: choco install python env: PATH=/c/Python37:/c/Python37/Scripts:$PATH -install: - - pip3 install pyinstaller -script: pyinstaller --clean --windowed --onedir --onefile --add-data Scripts:Scripts ProperTree.command + install: pip3 install pyinstaller + script: pyinstaller --clean --windowed --onedir --onefile --add-data "Scripts;Scripts" ProperTree.command From 644d00ce8970dd1487aa0389ee59b4212f064314 Mon Sep 17 00:00:00 2001 From: Pauli Jokela Date: Tue, 7 May 2019 20:38:13 +0300 Subject: [PATCH 5/5] Fixing corpnewt capitalization in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d7bfd36d..a22a9408 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -[![Build Status](https://travis-ci.org/CorpNewt/ProperTree.svg?branch=master)](https://travis-ci.org/CorpNewt/ProperTree) +[![Build Status](https://travis-ci.org/corpnewt/ProperTree.svg?branch=master)](https://travis-ci.org/corpnewt/ProperTree) # ProperTree Cross platform GUI plist editor written in python.