REVERT ME / MAKE APPVEYOR BUILD INNO SETUP INSTALLER

diff --git a/appveyor.yml b/appveyor.yml
index 9076eaf243fbd2b9f7697f111a27ce8245ab6158..0db231f89e88ea892d9290831f469b051e8c9079 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -51,145 +51,16 @@ configuration: Debug
 # https://cmake.org/cmake/help/latest/manual/cmake-generators.7.html#visual-studio-generators
 environment:
   matrix:
-    # Visual Studio 2010 Win32
-    - GENERATOR: Visual Studio 10 2010
-      PLATFORM: Win32
-      EXPAT_DLL: libexpatd.dll
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-
-    # Visual Studio 2010 Win32 XML_UNICODE_WCHAR_T
-    - GENERATOR: Visual Studio 10 2010
-      PLATFORM: Win32
-      CMAKE_ARGS: -DEXPAT_CHAR_TYPE=wchar_t
-      EXPAT_DLL: libexpatwd.dll
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-
-    # Visual Studio 2010 x64
-    - GENERATOR: Visual Studio 10 2010 Win64
-      PLATFORM: x64
-      EXPAT_DLL: libexpatd.dll
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-
-    # Visual Studio 2010 x64 XML_UNICODE_WCHAR_T
-    - GENERATOR: Visual Studio 10 2010 Win64
-      PLATFORM: x64
-      CMAKE_ARGS: -DEXPAT_CHAR_TYPE=wchar_t
-      EXPAT_DLL: libexpatwd.dll
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-
-    # Visual Studio 2012 Win32
-    - GENERATOR: Visual Studio 11 2012
-      PLATFORM: Win32
-      EXPAT_DLL: libexpatd.dll
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-
-    # Visual Studio 2012 Win32 XML_UNICODE_WCHAR_T
-    - GENERATOR: Visual Studio 11 2012
-      PLATFORM: Win32
-      CMAKE_ARGS: -DEXPAT_CHAR_TYPE=wchar_t
-      EXPAT_DLL: libexpatwd.dll
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-
-    # Visual Studio 2012 x64
-    - GENERATOR: Visual Studio 11 2012 Win64
-      PLATFORM: x64
-      EXPAT_DLL: libexpatd.dll
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-
-    # Visual Studio 2012 x64 XML_UNICODE_WCHAR_T
-    - GENERATOR: Visual Studio 11 2012 Win64
-      PLATFORM: x64
-      CMAKE_ARGS: -DEXPAT_CHAR_TYPE=wchar_t
-      EXPAT_DLL: libexpatwd.dll
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-
-    # Visual Studio 2013 Win32
-    - GENERATOR: Visual Studio 12 2013
-      PLATFORM: Win32
-      EXPAT_DLL: libexpatd.dll
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-
-    # Visual Studio 2013 Win32 XML_UNICODE_WCHAR_T
-    - GENERATOR: Visual Studio 12 2013
-      PLATFORM: Win32
-      CMAKE_ARGS: -DEXPAT_CHAR_TYPE=wchar_t
-      EXPAT_DLL: libexpatwd.dll
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-
-    # Visual Studio 2013 x64
-    - GENERATOR: Visual Studio 12 2013 Win64
-      PLATFORM: x64
-      EXPAT_DLL: libexpatd.dll
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-
-    # Visual Studio 2013 x64 XML_UNICODE_WCHAR_T
-    - GENERATOR: Visual Studio 12 2013 Win64
-      PLATFORM: x64
-      CMAKE_ARGS: -DEXPAT_CHAR_TYPE=wchar_t
-      EXPAT_DLL: libexpatwd.dll
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-
-    # Visual Studio 2015 Win32
-    - GENERATOR: Visual Studio 14 2015
-      PLATFORM: Win32
-      EXPAT_DLL: libexpatd.dll
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-
-    # Visual Studio 2015 Win32 XML_UNICODE_WCHAR_T
-    - GENERATOR: Visual Studio 14 2015
-      PLATFORM: Win32
-      CMAKE_ARGS: -DEXPAT_CHAR_TYPE=wchar_t
-      EXPAT_DLL: libexpatwd.dll
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-
-    # Visual Studio 2015 x64
-    - GENERATOR: Visual Studio 14 2015 Win64
-      PLATFORM: x64
-      EXPAT_DLL: libexpatd.dll
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-
-    # Visual Studio 2015 x64 XML_UNICODE_WCHAR_T
-    - GENERATOR: Visual Studio 14 2015 Win64
-      PLATFORM: x64
-      CMAKE_ARGS: -DEXPAT_CHAR_TYPE=wchar_t
-      EXPAT_DLL: libexpatwd.dll
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-
-    # Visual Studio 2017 Win32
-    - GENERATOR: Visual Studio 15 2017
-      PLATFORM: Win32
-      EXPAT_DLL: libexpatd.dll
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-
-    # Visual Studio 2017 Win32 XML_UNICODE_WCHAR_T
-    - GENERATOR: Visual Studio 15 2017
-      PLATFORM: Win32
-      CMAKE_ARGS: -DEXPAT_CHAR_TYPE=wchar_t
-      EXPAT_DLL: libexpatwd.dll
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-
-    # Visual Studio 2017 x64
-    - GENERATOR: Visual Studio 15 2017 Win64
-      PLATFORM: x64
-      EXPAT_DLL: libexpatd.dll
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-
-    # Visual Studio 2017 x64 XML_UNICODE_WCHAR_T
-    - GENERATOR: Visual Studio 15 2017 Win64
-      PLATFORM: x64
-      CMAKE_ARGS: -DEXPAT_CHAR_TYPE=wchar_t
-      EXPAT_DLL: libexpatwd.dll
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
 
 before_build:
-  - echo Running cmake...
-  - cd c:\projects\libexpat
-  - cmake -G"%GENERATOR%" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DEXPAT_WARNINGS_AS_ERRORS=ON %CMAKE_ARGS% expat
+  - cd c:\projects\libexpat\expat
+  - set PATH=%PATH%;C:\Program Files (x86)\Inno Setup 5
 
-build:
-  parallel: true                  # enable MSBuild parallel builds
-  project: expat.sln              # path to Visual Studio solution or project
+build_script:
+  - echo "PATH=%PATH%"
+  - dir win32
+  - cmd /c win32\build_expat_iss.bat
 
-test_script:
-  - cp %CONFIGURATION%\\%EXPAT_DLL% tests\\%CONFIGURATION%\\
-  - ctest --build-config %CONFIGURATION% --output-on-failure --parallel 2
+artifacts:
+  - path: '**\expat-win32bin-*.exe'