From 1fcba0eefde944c296daa4ac5015bcd984909ad0 Mon Sep 17 00:00:00 2001 From: "Andrieu, Alban" Date: Tue, 10 Oct 2017 15:11:45 +0200 Subject: [PATCH] Cleaning --- tasks/build.yml | 14 +++++++------- tasks/cpp.yml | 36 +++++++++++------------------------- tasks/visualstudio-2008.yml | 1 - 3 files changed, 18 insertions(+), 33 deletions(-) diff --git a/tasks/build.yml b/tasks/build.yml index 21669d7..1fd9d8d 100644 --- a/tasks/build.yml +++ b/tasks/build.yml @@ -57,13 +57,13 @@ # version: '0.6.3.1' # state: present -- name: "download scons" - win_get_url: - url: "{{ scons.url_prefix }}/{{ scons.installer }}" - dest: "{{ ansible_user_dir }}\\{{ scons.installer }}" - force: no - tags: - - scons +#- name: "download scons" +# win_get_url: +# url: "{{ scons.url_prefix }}/{{ scons.installer }}" +# dest: "{{ ansible_user_dir }}\\{{ scons.installer }}" +# force: no +# tags: +# - scons #- name: "install scons" # win_command: "easy_install {{ ansible_user_dir }}\\{{ scons.installer }}" diff --git a/tasks/cpp.yml b/tasks/cpp.yml index b0b911b..35576d9 100644 --- a/tasks/cpp.yml +++ b/tasks/cpp.yml @@ -28,6 +28,12 @@ #choco install visualstudio2017-workload-nativecrossplat --package-parameters "--productId Microsoft.VisualStudio.Product.Enterprise --channelId VisualStudio.15.Release --includeOptional" +#- name: Install visualstudio2017community +# win_chocolatey: +# name: visualstudio2017community +# version: '15.2.26430.20170605' +# state: present + - name: Install microsoft-build-tools win_chocolatey: name: microsoft-build-tools @@ -55,34 +61,14 @@ #- name: "Enable .net" # win_shell: "Import-Module ServerManager; Add-WindowsFeature as-net-framework" -#- name: Install visualstudio2017community -# win_chocolatey: -# name: visualstudio2017community -# version: '15.2.26430.20170605' -# state: present - -#- name: "Install Visual Studio 2005" -# include: visualstudio-2005.yml -# tags: -# - vs -# - vs2005 -# #- name: "Install Visual Studio 2008" # include: visualstudio-2008.yml # tags: # - vs # - vs2008 - -- name: "Install Visual Studio 2012" - include: visualstudio-2012.yml - tags: - - vs - - vs2012 - -#- name: Install the vc thingy -# win_package: -# name="Microsoft Visual C thingy" -# path="http://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x64.exe" -# Product_Id="{CF2BEA3C-26EA-32F8-AA9B-331F7E34BA97}" -# Arguments="/install /passive /norestart" # +#- name: "Install Visual Studio 2012" +# include: visualstudio-2012.yml +# tags: +# - vs +# - vs2012 diff --git a/tasks/visualstudio-2008.yml b/tasks/visualstudio-2008.yml index 7ca1307..2894ca0 100644 --- a/tasks/visualstudio-2008.yml +++ b/tasks/visualstudio-2008.yml @@ -15,7 +15,6 @@ - name: "visual studio 2008 : unattended installation" win_command: "{{ visualstudio.2008.installer.path }}\\setup\\setup.exe /q /norestart" -# win_command: "{{ visualstudio.2008.installer.path }}\\setup\\setup.exe /unattendfile {{ ansible_user_dir }}\\{{ visualstudio.2008.installer.ini }}" - name: "visual studio 2008 : clean installation files" win_file: