From 33f70b2f6a2b1b2f47d9bf272013ff8bcf33ae63 Mon Sep 17 00:00:00 2001
From: Kandrashin Denis <mail@lintest.ru>
Date: Wed, 9 Dec 2020 09:40:59 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20AppVeyor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 appveyor.yml | 35 ++++++++++-------------------------
 manifest.ps1 | 14 --------------
 2 files changed, 10 insertions(+), 39 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 3b50b90..32df035 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 0.1.0.{build}
+version: 2.44.2.{build}
 configuration: Release
 platform: x64
 
@@ -34,44 +34,29 @@ install:
   - git submodule update --init
   - cd ..
 
-  - sh: sudo dpkg --add-architecture i386
-  - sh: sudo apt -qq update
-  - sh: sudo apt -qq -y install
-      uuid-dev uuid-dev:i386
-      libxrandr-dev libxrandr-dev:i386
-      libpng-dev libpng-dev:i386
-      gcc-multilib g++-multilib
-      bison flex
-
 init:
-  - cmd: cmake --version
-  - cmd: msbuild /version
-  - cmd: echo.
+  - cmake --version
+  - msbuild /version
+  - echo.
 
 build_script:
-  - sh: echo "#define VERSION_FULL " ${APPVEYOR_BUILD_VERSION} > "version.h"
-  - cmd: Powershell.exe -File manifest.ps1 -Project GraphViz1c -Version %APPVEYOR_BUILD_VERSION%
+  - Powershell.exe -File manifest.ps1 -Project GraphViz1c -Version %APPVEYOR_BUILD_VERSION%
 
   - mkdir build32
   - cd build32
-  - sh: cmake -D CMAKE_BUILD_TYPE:STRING=Release -D TARGET_PLATFORM_32:BOOL=ON --build ..
-  - cmd: cmake .. -A Win32 -DMySuffix2=32 -DVERSION="2.44.2" -DDATE="2020-12-07"
+  - cmake .. -A Win32 -DMySuffix2=32 -DVERSION="%APPVEYOR_BUILD_VERSION%" -DDATE="2020-12-07"
   - cmake --build . --config Release --target GraphViz1c
   - cd ..
 
   - mkdir build64
   - cd build64
-  - sh: cmake -D CMAKE_BUILD_TYPE:STRING=Release -D TARGET_PLATFORM_32:BOOL=OFF --build ..
-  - cmd: cmake .. -A x64 -DMySuffix2=64 -DVERSION="2.44.2" -DDATE="2020-12-07"
+  - cmake .. -A x64 -DMySuffix2=64 -DVERSION="%APPVEYOR_BUILD_VERSION%" -DDATE="2020-12-07"
   - cmake --build . --config Release --target GraphViz1c
   - cd ..
 
-  - sh: cp bin32/libGraphViz1cLin32.so .
-  - sh: cp bin64/libGraphViz1cLin64.so .
-  - sh: 7z a GraphViz1c.zip liblibGraphViz1c??.so
-  - cmd: copy .\bin32\Release\libGraphViz1cWin32.dll .
-  - cmd: copy .\bin64\Release\libGraphViz1cWin64.dll .
-  - cmd: Powershell.exe -File appveyor.ps1
+  - copy .\bin32\Release\libGraphViz1cWin32.dll .
+  - copy .\bin64\Release\libGraphViz1cWin64.dll .
+  - Powershell.exe -File appveyor.ps1
 
 for:
   - matrix:
diff --git a/manifest.ps1 b/manifest.ps1
index 18d8268..0bca91a 100644
--- a/manifest.ps1
+++ b/manifest.ps1
@@ -35,20 +35,6 @@ $writer.WriteAttributeString('arch', 'x86_64')
 $writer.WriteAttributeString('path', "${project}Win64${postfix}.dll")
 $writer.WriteEndElement();
 
-$writer.WriteStartElement('component')
-$writer.WriteAttributeString('type', 'native')
-$writer.WriteAttributeString('os', 'Linux')
-$writer.WriteAttributeString('arch', 'i386')
-$writer.WriteAttributeString('path', "${project}Lin32${postfix}.so")
-$writer.WriteEndElement();
-
-$writer.WriteStartElement('component')
-$writer.WriteAttributeString('type', 'native')
-$writer.WriteAttributeString('os', 'Linux')
-$writer.WriteAttributeString('arch', 'x86_64')
-$writer.WriteAttributeString('path', "${project}Lin64${postfix}.so")
-$writer.WriteEndElement();
-
 $writer.WriteEndElement();
 $writer.WriteEndDocument()
 $writer.Flush()