Updates to the appveyor. Only build docs if building trunk.

scripts/appveyor-webhook.py

@@ -42,7 +42,7 @@ webhook_element = \
     {
         'commit': {
             'author': {
-                'email': 'open@contributer',
+                'email': 'contributer@openlp',
                 'name': 'OpenLP Contributor'
             },
             'id': None,
@@ -92,6 +92,10 @@ def get_yml(branch):
     yml_text = f.read()
     f.close()
     yml_text = yml_text.replace('BRANCHNAME', branch)
+    if 'openlp-core/openlp/trunk' in branch:
+        yml_text = yml_text.replace('BUILD_DOCS', '$TRUE')
+    else:
+        yml_text = yml_text.replace('BUILD_DOCS', '$FALSE')
     return yml_text
 
 
@@ -115,8 +119,6 @@ def get_appveyor_build_url(branch):
     """
     Get the url of the build.
     """
-    # Wait 10 seconds to make sure the hook has been triggered
-    time.sleep(10)
     responce = urllib.request.urlopen(appveyor_api_url)
     json_str = responce.read().decode('utf-8')
     build_json = json.loads(json_str)
@@ -130,4 +132,6 @@ else:
     webhook_url = sys.argv[1]
     branch = sys.argv[2]
     hook(webhook_url, get_yml(branch))
+    # Wait 5 seconds to make sure the hook has been triggered
+    time.sleep(5)
     get_appveyor_build_url(branch)

scripts/appveyor.yml

@@ -44,10 +44,8 @@ test_script:
 after_test:
   # This is where we create a package using PyInstaller
   # First get PyInstaller
-  #- curl -L -O https://github.com/pyinstaller/pyinstaller/archive/develop.zip
   - curl -L -O https://github.com/pyinstaller/pyinstaller/releases/download/v3.2/PyInstaller-3.2.zip
   - 7z x PyInstaller-3.2.zip
-  #- mv pyinstaller-develop PyInstaller-3.2
   # Install PyInstaller dependencies
   - "%PYTHON%\\python.exe -m pip install future pefile"
   # Download and install Inno Setup - used for packaging
@@ -64,28 +62,38 @@ after_test:
   # - curl -L -O http://downloads.sourceforge.net/project/portableapps/NSIS%20Portable/NSISPortable_3.0_English.paf.exe
   # - NSISPortable_3.0_English.paf.exe /S
   # Get the packaging code
-  #- bzr checkout --lightweight lp:openlp/packaging packaging
-  - bzr checkout --lightweight lp:~raoul-snyman/openlp/pyinstaller-change packaging
-  #- curl -L http://bazaar.launchpad.net/~openlp-core/openlp/packaging/tarball -o packaging.tar.gz
-  #- 7z e packaging.tar.gz
-  #- 7z x packaging.tar
-  #- mv ~openlp-core/openlp/packaging packaging
+  - curl -L http://bazaar.launchpad.net/~openlp-core/openlp/packaging/tarball -o packaging.tar.gz
+  - 7z e packaging.tar.gz
+  - 7z x packaging.tar
+  - mv ~openlp-core/openlp/packaging packaging
   # If this is trunk we should also build the manual
   # Download and install HTML Help Workshop
   #- curl -L "http://go.microsoft.com/fwlink/p/?linkid=14188" -o htmlhelp.exe
   #- htmlhelp.exe /Q
   # Install sphinx
-  - "%PYTHON%\\python.exe -m pip install sphinx"
+  - ps: >-
+      If (BUILD_DOCS) {
+        &"$env:PYTHON\python.exe" -m pip install sphinx
+        Invoke-WebRequest -Uri "http://bazaar.launchpad.net/~openlp-core/openlp/documentation/tarball" -OutFile documentation.tar.gz
+        7z e documentation.tar.gz
+        7z x documentation.tar
+        mv ~openlp-core/openlp/documentation documentation
+        cd packaging
+        &"$env:PYTHON\python.exe" builders/windows-builder.py --skip-update --skip-translations -c windows/config-appveyor.ini -b ../openlp-branch -d ../documentation --portable
+      } else {
+        cd packaging
+        &"$env:PYTHON\python.exe" builders/windows-builder.py --skip-update --skip-translations -c windows/config-appveyor.ini -b ../openlp-branch --portable
+      }
   # Get the documentation code
   #- bzr checkout --lightweight lp:openlp/documentation documentation
-  - curl -L http://bazaar.launchpad.net/~openlp-core/openlp/documentation/tarball -o documentation.tar.gz
-  - 7z e documentation.tar.gz
-  - 7z x documentation.tar
-  - mv ~openlp-core/openlp/documentation documentation
+  #- curl -L http://bazaar.launchpad.net/~openlp-core/openlp/documentation/tarball -o documentation.tar.gz
+  #- 7z e documentation.tar.gz
+  #- 7z x documentation.tar
+  #- mv ~openlp-core/openlp/documentation documentation
   # Build the bundle
-  - cd packaging
+  #- cd packaging
   #- "%PYTHON%\\python.exe windows/windows-builder.py -v -u -t -c windows/config-appveyor.ini -b ../openlp-branch -d ../documentation"
-  - "%PYTHON%\\python.exe builders/windows-builder.py -v --skip-update --skip-translations -c windows/config-appveyor.ini -b ../openlp-branch -d ../documentation --portable"
+  #- "%PYTHON%\\python.exe builders/windows-builder.py --skip-update --skip-translations -c windows/config-appveyor.ini -b ../openlp-branch -d ../documentation --portable"
 
 artifacts:
   - path: openlp-branch\dist\*.exe