Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compatibility with patacrep 4.0 #149

Merged
merged 140 commits into from
Jun 10, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
140 commits
Select commit Hold shift + click to select a range
6f2ecc8
Started Qt creator project
LaTruelle Sep 29, 2014
447949c
Refactoring fot Qt creator
LaTruelle Oct 1, 2014
cc381c2
Update Doxyfile + ISSUES list
LaTruelle Oct 29, 2014
c6be9f0
Added PythonQt in compilation tools
LaTruelle Nov 18, 2014
086d509
PythonQt
LaTruelle Nov 18, 2014
4965b79
Revert c6be9f0..086d509
LaTruelle Nov 18, 2014
919bd7f
Plus links for libraries
LaTruelle Nov 18, 2014
7c0a434
Merge pull request #1 from patacrep/master
LaTruelle Nov 19, 2014
d7e84db
Merged form upstream
LaTruelle Nov 19, 2014
50e9ccd
PythonQt works
LaTruelle Nov 19, 2014
c40ae25
Patacrep Import works.
LaTruelle Nov 19, 2014
9a4b3b1
Refactoring PythonQt
LaTruelle Nov 27, 2014
fd06476
Imported builder + example
LaTruelle Nov 27, 2014
45dabdf
Added pythonqt libs, built on Fedora 20 with python 3.3 and Qt5.3
LaTruelle Dec 17, 2014
acd5d9c
Change in CMake
LaTruelle Feb 21, 2015
1987358
Updated Python Version
LaTruelle Mar 1, 2015
1b10586
For Python3 in Homebrew
LaTruelle Apr 2, 2015
aea25cc
Merge branch 'pythonqt' of github.com:LaTruelle/patagui into pythonqt
LaTruelle Apr 6, 2015
b22f8b1
Updated CMakeLists.txt + Added compiled PythonQt libs
LaTruelle Apr 6, 2015
8ed15d0
Replaced full libs with symlinks
LaTruelle Apr 6, 2015
a108e4d
Import all modules
LaTruelle Apr 18, 2015
6f91eec
Added script file for python
LaTruelle Apr 19, 2015
8b898c2
Cleanup
LaTruelle Apr 19, 2015
235b798
Updated Mac Libs
LaTruelle Apr 22, 2015
4132a6e
Changes to CMake for Mac
LaTruelle Apr 28, 2015
8177df7
Finished Making Functions in songbook.py
LaTruelle May 3, 2015
e1cb0e2
Removing QProcess for access to patacrep
LaTruelle May 9, 2015
6769c26
Modified Build Orders
LaTruelle May 9, 2015
6cb8d91
Final change for finishing touch on mac deployment
LaTruelle May 9, 2015
a6d65cd
Typos + Symlink dylib
LaTruelle May 9, 2015
c02799f
Call to songbook works in thread
LaTruelle May 11, 2015
2258191
JSON Qt template
LaTruelle May 27, 2015
9de7776
Switch to QJson classes
LaTruelle May 31, 2015
4870531
Suite modifications
LaTruelle Jun 4, 2015
cdb49f3
Improve integration
LaTruelle Jun 4, 2015
5928fa5
Output from Python in "Latex Logs"
LaTruelle Jun 6, 2015
98e40b7
Small edits here and there
LaTruelle Jun 7, 2015
392abd2
It seems the whole business works...
LaTruelle Jun 7, 2015
c0f5706
Remove old build commands
LaTruelle Jun 7, 2015
f819c82
The whole thing more or less works
LaTruelle Jun 7, 2015
a25c8d2
Simplified output by removing empty lines from python
LaTruelle Jun 7, 2015
05515db
It WORKS !!!
LaTruelle Jun 8, 2015
3501175
Add Windows compiled pythonqt
LaTruelle Jun 14, 2015
e14de02
Just for pushing
LaTruelle Jun 15, 2015
664816d
Really still very dirty
LaTruelle Jun 15, 2015
96ab88f
Reconnected Signal
LaTruelle Jun 20, 2015
ddd9fc2
Mechanism for process cancellation
LaTruelle Jun 20, 2015
84f7bd7
Safe start of process
LaTruelle Jun 21, 2015
73e8f1e
Multiprocessing support
LaTruelle Jun 22, 2015
7926289
Include 32bits PythonQt
LaTruelle Jul 1, 2015
ec2b731
Catch no datadir setup error
LaTruelle Jul 7, 2015
5e8d0eb
Found problematic preference reading and writing
LaTruelle Jul 9, 2015
d8f039f
Updated Doc
LaTruelle Jun 28, 2015
c13879f
Debugging Settings
LaTruelle Jul 10, 2015
58691db
Fixed hack for python3 on Mac OS
LaTruelle Jul 23, 2015
1249ecd
Not compiling but on the way
LaTruelle Jul 24, 2015
c55cdfa
Correcting a silly thing
LaTruelle Jul 24, 2015
acfe90f
Add setupDatadir dialog
LaTruelle Aug 9, 2015
a59775e
External Project Downloads and Builds
LaTruelle Aug 14, 2015
972649c
Adding proper paths
LaTruelle Aug 14, 2015
0266913
Typos in Mac specific CMakeLists
LaTruelle Aug 15, 2015
aafce3f
Builds properly on Mac OS X
LaTruelle Aug 18, 2015
930178a
Cleanup
LaTruelle Aug 19, 2015
87a0dfd
Cross Platform qmake
LaTruelle Aug 26, 2015
6f8021e
removed old pythonqt include and libs, included edited sources
LaTruelle Aug 26, 2015
666f8ed
Merge branch 'pythonqt-externalproject' into pythonqt
LaTruelle Aug 26, 2015
d353453
Cleanup
LaTruelle Aug 31, 2015
f2ce791
Meilleure vérification datadir.
LaTruelle Sep 4, 2015
e8fc2d4
Warns when no datadir is set up.
LaTruelle Sep 7, 2015
80461cb
Check for existence of songs directory.
LaTruelle Sep 14, 2015
3ad8b8c
OS X Hack No longer dependent on python version
LaTruelle Sep 14, 2015
bbf34b7
No longer saving and reading pointless datadirs
LaTruelle Sep 15, 2015
20a656e
Merge branch 'pythonqt' of github.com:LaTruelle/patagui into pythonqt
LaTruelle Sep 15, 2015
570d861
Started Mac OS X debugging
LaTruelle Sep 22, 2015
2693308
Remove various FIXMEs and TODOs
LaTruelle Sep 22, 2015
7f42171
Continue checking TODOs and FIXMEs
LaTruelle Sep 22, 2015
4bfbaa6
Patched source code instead of non-windows compatible patch
LaTruelle Sep 24, 2015
efaf3d9
Change something in find qmake-qt5 order.
LaTruelle Oct 4, 2015
627174e
Technical Change
LaTruelle Oct 4, 2015
06fd520
Removed QtScript + songbook-client->patagui switch
LaTruelle Oct 4, 2015
7318f6d
Oubli de la boulette
LaTruelle Oct 5, 2015
738f79f
Removed Debug output
LaTruelle Oct 10, 2015
d9297db
Final Songbook-Client -> Patagui switch
LaTruelle Oct 10, 2015
0f68f3d
Minor changes
LaTruelle Oct 12, 2015
d83acd1
Mac OS X // Qt bug corrected
LaTruelle Oct 16, 2015
abacf0e
test Python
LaTruelle Oct 20, 2015
7699767
Added Patacrep interface class
LaTruelle Oct 21, 2015
62d85bc
Started Filling in
LaTruelle Oct 23, 2015
e80105d
So far so good
LaTruelle Oct 23, 2015
7c33072
A few more classes
LaTruelle Oct 23, 2015
158d888
Including more minor classes
LaTruelle Oct 23, 2015
29e792a
A big one is done
LaTruelle Oct 23, 2015
0a69e28
Used clang-format
LaTruelle Oct 24, 2015
d184034
Clang-Style refactoring continues
LaTruelle Oct 25, 2015
223b9c9
Refactoring, yet another round
LaTruelle Oct 25, 2015
8c01cb9
CLabel --> Label
LaTruelle Oct 25, 2015
43f7245
Library -> Library
LaTruelle Oct 25, 2015
1375ce6
More functions and files refactored
LaTruelle Oct 25, 2015
57759f3
Final refactoring
LaTruelle Oct 25, 2015
eb2ffe9
Minor correction
LaTruelle Oct 25, 2015
bec0116
Merge pull request #4 from LaTruelle/refactoring
LaTruelle Oct 25, 2015
f983dd5
Started Filling up python interpreter
LaTruelle Oct 27, 2015
9059c5d
Removed useless const
LaTruelle Oct 27, 2015
bbd2267
clang update for older clang-format
LaTruelle Oct 27, 2015
118f43b
Reinstated songbook preference page
LaTruelle Oct 27, 2015
c89f8e4
Slight clang modif
LaTruelle Oct 27, 2015
c96e3f4
Full transfer from Makesongbookprocess to patacrep
LaTruelle Oct 27, 2015
db674b1
Update QtPropertyBrowser from the source
LaTruelle Oct 28, 2015
034ea30
Partial reinstatement of template mechanism
LaTruelle Oct 29, 2015
9dbc379
Switched to full patacrep, not working properly
LaTruelle Oct 29, 2015
2d3f45d
Building works
LaTruelle Oct 29, 2015
fc7647d
Reinstated threading. So far so good, at least on Linux.
LaTruelle Oct 30, 2015
5b4a145
moved back to threading module
LaTruelle Oct 31, 2015
6af8a43
Building log works better
LaTruelle Oct 31, 2015
cfaa6cb
A try with asyncio
LaTruelle Nov 1, 2015
bbe7b81
Corrected stupid bug
LaTruelle Nov 2, 2015
6a219d3
Switching back to threading module
LaTruelle Nov 2, 2015
b4ef56b
It's working, it's working !
LaTruelle Nov 2, 2015
9f2637b
Final cleanup
LaTruelle Nov 2, 2015
12917b8
Merge pull request #5 from LaTruelle/pythonqt-interface
LaTruelle Nov 2, 2015
1494b73
Implemented continuous integration on Appveyor
LaTruelle Nov 9, 2015
56f71e2
Lower load on appveyor
LaTruelle Nov 9, 2015
be4f336
Rolling back minor changes done in pythonqt that broke compilation on…
LaTruelle Nov 16, 2015
8825eaa
Added Travis Support
LaTruelle Dec 17, 2015
c55ae7b
Correction for wrong version of pythonqt used in merge
LaTruelle Dec 17, 2015
93bb6bf
Debugging Travis
LaTruelle Dec 17, 2015
4f8be39
test new PythonQt
LaTruelle Dec 17, 2015
4c6a0d3
Debug Appveyor now
LaTruelle Dec 17, 2015
2e0a8a5
Better
LaTruelle Dec 17, 2015
8e75471
Yaml-cpp builds
LaTruelle Dec 28, 2015
200e722
Full include of Yaml-cpp project
LaTruelle Dec 28, 2015
4febafa
Include Boost (required for YAML-CPP)
LaTruelle Dec 29, 2015
71a1c79
Static Boost
LaTruelle Dec 29, 2015
b29674f
CI changes
LaTruelle Dec 29, 2015
19ae766
Appveyor thing
LaTruelle Dec 29, 2015
0525124
Merge pull request #7 from LaTruelle/yaml-parser
LaTruelle Jan 25, 2016
cea8ce4
Corrected PythonQt for Windows
LaTruelle Jan 28, 2016
ab2d180
Hungarian Notation Leftover
LaTruelle Jan 31, 2016
2fdd155
Merge branch 'pythonqt'
LaTruelle Jun 10, 2016
d2fb7d8
Pull from master
LaTruelle Jun 10, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
clone_depth: 10
shallow_clone: true

environment:
BOOST_ROOT: C:\Libraries\boost_1_59_0
matrix:
- PLATFORM: x86
QT5: C:\Qt\5.5\msvc2013
PYTHON_PATH: C:\Python34
PYTHON_VERSION: 34
PYTHON_ARCH: 32
- PLATFORM: x86_amd64
QT5: C:\Qt\5.5\msvc2013_64
PYTHON_PATH: C:\Python34-x64
PYTHON_VERSION: 34
PYTHON_ARCH: 64

install:
- call "%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" %PLATFORM%

before_build:
- set PYTHON_LIB=%PYTHON_PATH%\libs
- set Path=%QT5%\bin;%Path%
- set Path=%PYTHON_PATH%;%PYTHON_PATH%\Scripts;%PYTHON_PATH%\libs;%Path%
- mkdir build

build_script:
- cmake -G "NMake Makefiles" -H. -Bbuild -DCMAKE_PREFIX_PATH=%QT5%
- cmake --build build

on_failure:
- cmd: type C:/projects/patagui/build/pythonqt/src/PythonQt-External-stamp/PythonQt-External-configure-*.log
35 changes: 35 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
---
Language: Cpp
BasedOnStyle: LLVM
AccessModifierOffset: -4
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortBlocksOnASingleLine: false
AllowShortFunctionsOnASingleLine: None
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: false
BreakBeforeBinaryOperators: false
BreakBeforeBraces: Linux
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: true
ColumnLimit: 80
CommentPragmas: '^ IWYU pragma:'
ConstructorInitializerAllOnOneLineOrOnePerLine: true
ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
Cpp11BracedListStyle: true
DerivePointerAlignment: false
DisableFormat: false
ExperimentalAutoDetectBinPacking: false
ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
IndentCaseLabels: false
IndentWidth: 4
IndentWrappedFunctionNames: false
KeepEmptyLinesAtTheStartOfBlocks: true
MaxEmptyLinesToKeep: 1
NamespaceIndentation: None
Standard: Cpp11
TabWidth: 4
UseTab: Never
...
7 changes: 3 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ src/config.h
build
buildpackage.sh
macos_specific/*priv*
songbook-client
Patagui
*.dmg
*.swp
*~
doc/html
doc/man
doc/latex
doc
CMakeLists.txt.user
49 changes: 49 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
sudo: required
dist: trusty

language: cpp

os:
- linux
- osx

env:
- CONFIG=Release

install:
- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
sudo apt-add-repository -y ppa:beineri/opt-qt551-trusty
&& sudo apt-add-repository -y ppa:george-edison55/cmake-3.x
&& sudo apt-get -qq update
&& sudo apt-get -qq install build-essential qt55tools qt55base cmake libboost-dev
&& QTDIR="/opt/qt55"
&& PATH="$QTDIR/bin:$PATH"
&& qt55-env.sh
;
else
brew update
&& brew unlink cmake
&& brew install cmake
&& brew unlink boost
&& brew install boost
&& brew install qt5
&& brew linkapps qt5
&& brew link --force qt5
&& brew install python3
&& chmod -R 755 /usr/local/opt/qt5/*
;
fi

script:
- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
cmake -DCMAKE_BUILD_TYPE=$CONFIG -DCMAKE_PREFIX_PATH=/opt/qt55/lib/cmake -DPYTHON_LIBRARY=/opt/python/3.5.0/lib/libpython3.5m.so -DPYTHON_INCLUDE_DIR=/opt/python/3.5.0/include/python3.5m .
;
else
cmake -DCMAKE_BUILD_TYPE=$CONFIG -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5/lib/cmake .
;
fi
&& make

after_failure:
- cat /home/travis/build/LaTruelle/patagui/yaml-cpp/src/Yaml-cpp-External-stamp/Yaml-cpp-External-configure-*.log
- cat /home/travis/build/LaTruelle/patagui/yaml-cpp/src/Yaml-cpp-External-stamp/Yaml-cpp-External-build-*.log
2 changes: 1 addition & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Copyright (C) 2009-2011, Romain Goffe <romain.goffe@gmail.com>
Copyright (C) 2009-2011, Alexandre Dupas <alexandre.dupas@gmail.com>
Copyright (C) 2009-2011, Matthias Bussonier <bussoniermatthias@gmail.com>
http://github.com/crep4ever/songbook-client
http://github.com/patacrep/patagui

License:

Expand Down
Loading