1.2.1dev: merge [15385,15387,15389] from 1.0-stable (Makefile and AppVeyor)

r15389 was actually undone, as using `$(PYTHON)` instead of `python`
is what we do since 1.2...


git-svn-id: http://trac.edgewall.org/intertrac/log:/branches/1.2-stable@15390 af82e41b-90c4-0310-8c96-b1721e28e2e2

Author: cboos

.appveyor.yml

@@ -50,3 +50,5 @@ test_script:
     . .\contrib\appveyor.ps1
 
     Trac-Tests
+artifacts:
+- path: 'dist\*'

Makefile

@@ -40,6 +40,7 @@ define HELP
   help-release        tasks and configuration for preparing a Trac release
   help-misc           several other tasks
 
+  help-all            all the tasks at a glance...
 endef
 # `
 export HELP
@@ -59,7 +60,7 @@ export HELP_CFG
 #
 # ----------------------------------------------------------------------------
 
-.PHONY: all help status clean clean-bytecode clean-mo
+.PHONY: all help help-all status clean clean-bytecode clean-mo
 
 %.py : status
 	$(PYTHON) setup.py -q test -s $(subst /,.,$(@:.py=)).test_suite $(testopts)
@@ -74,6 +75,13 @@ endif
 help: Makefile.cfg
 	@echo "$$HELP"
 
+help_variables = $(filter HELP_%,$(.VARIABLES))
+help_targets = $(filter-out help-CFG,$(help_variables:HELP_%=help-%))
+
+.SECONDEXPANSION:
+help-all: $$(sort $$(help_targets))
+
+
 help-%: Makefile.cfg
 	@echo "$${HELP_$*}"
 

contrib/appveyor.ps1

@@ -59,7 +59,8 @@ $pipCommonPackages = @(
     'configobj',
     'docutils',
     'pygments',
-    'pytz'
+    'pytz',
+    'wheel'
 )
 
 $fcrypt    = "$deps\fcrypt-1.3.1.tar.gz"
@@ -153,6 +154,7 @@ if (-not $env:APPVEYOR) {
     function Add-AppveyorMessage() { Debug-Caller @args }
     function Add-AppveyorTest() { Debug-Caller @args }
     function Update-AppveyorTest() { Debug-Caller @args }
+    function Push-AppveyorArtifact() { Debug-Caller @args }
 }
 
 
@@ -267,7 +269,7 @@ function Trac-Install {
           -Category Information
     }
 
-    & pip list
+    & pip list --format=columns
 
     # Prepare local Makefile.cfg
 
@@ -405,7 +407,7 @@ function Trac-Tests {
           -Duration $msecs
     }
 
-    $exit = 0
+    $exit = $fexit = 0
 
     #
     # Running unit-tests
@@ -419,7 +421,16 @@ function Trac-Tests {
     #
 
     Make-Test -Goal functional-test -Name "Functional tests for $config" `
-      -Code ([ref]$exit)
+      -Code ([ref]$fexit)
+
+    if (-not $fexit -eq 0) {
+        Write-Host "Saving functional logs in testenv.zip"
+        & 7z.exe a testenv.zip testenv
+
+        Push-AppveyorArtifact testenv.zip
+
+        $exit = $fexit
+    }
 
     if (-not $exit -eq 0) {
         Write-Host "Exiting with code $exit"
@@ -429,4 +440,10 @@ function Trac-Tests {
     if (-not $skipTests) {
         Write-Host "All tests passed."
     }
+
+    #
+    # Prepare release artifacts
+    #
+
+    & make.exe release-src wininst
 }