From 261a2308e2b80904d1cff050a24cee6b4bf0c509 Mon Sep 17 00:00:00 2001
From: Andras Timar <andras.timar@collabora.com>
Date: Wed, 5 May 2021 17:05:09 +0200
Subject: [cp] Update Windows build configs

Change-Id: I5cdad8146639817092c02911a0a6cf6413688ff7
---
 distro-configs/CPWin32-MPL.conf | 28 ----------------------------
 distro-configs/CPWin32.conf     |  1 +
 distro-configs/CPWin64.conf     | 25 +++++++++++++++++++++++++
 3 files changed, 26 insertions(+), 28 deletions(-)
 delete mode 100644 distro-configs/CPWin32-MPL.conf
 create mode 100644 distro-configs/CPWin64.conf

(limited to 'distro-configs')

diff --git a/distro-configs/CPWin32-MPL.conf b/distro-configs/CPWin32-MPL.conf
deleted file mode 100644
index 966d39df2d45..000000000000
--- a/distro-configs/CPWin32-MPL.conf
+++ /dev/null
@@ -1,28 +0,0 @@
---enable-mpl-subset
---with-vendor=Collabora
---disable-community-flavor
---with-branding=icon-themes/galaxy/brand_cp
---with-theme=colibre
---without-help
---with-myspell-dicts
---without-junit
---without-helppack-integration
---enable-extension-integration
---disable-online-update
---disable-odk
---disable-ext-wiki-publisher
---disable-report-builder
---disable-ext-nlpsolver
---disable-ext-numbertext
---disable-ext-ct2n
---disable-postgresql-sdbc
---disable-lotuswordpro
---disable-lpsolve
---with-webdav=serf
---enable-release-build
---with-package-format=msi
---enable-mergelibs
---with-lang=ar as ast bg bn-IN br ca ca-valencia cy cs da de el en-US en-GB es et eu fi fr ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn oc or pa-IN pl pt pt-BR ro ru sk sl sr sr-Latn sv ta te tr uk vi zh-CN zh-TW
---enable-windows-build-signing
---without-java
---disable-pdfimport
diff --git a/distro-configs/CPWin32.conf b/distro-configs/CPWin32.conf
index 02f94f92b5e7..3250815ed4bb 100644
--- a/distro-configs/CPWin32.conf
+++ b/distro-configs/CPWin32.conf
@@ -1,3 +1,4 @@
+--host=i686-pc-cygwin
 --with-vendor=Collabora
 --disable-community-flavor
 --with-branding=icon-themes/galaxy/brand_cp
diff --git a/distro-configs/CPWin64.conf b/distro-configs/CPWin64.conf
new file mode 100644
index 000000000000..2fff7ab85891
--- /dev/null
+++ b/distro-configs/CPWin64.conf
@@ -0,0 +1,25 @@
+--host=x86_64-pc-cygwin
+--with-vendor=Collabora
+--disable-community-flavor
+--with-branding=icon-themes/galaxy/brand_cp
+--without-junit
+--without-helppack-integration
+--enable-extension-integration
+--disable-online-update
+--disable-odk
+--enable-scripting-beanshell
+--enable-scripting-javascript
+--enable-ext-wiki-publisher
+--enable-report-builder
+--enable-ext-nlpsolver
+--enable-ext-numbertext
+--enable-ext-ct2n
+--enable-release-build
+--with-help
+--with-myspell-dicts
+--with-package-format=msi
+--enable-mergelibs
+--with-lang=ar as ast bg bn-IN br ca ca-valencia cy cs da de el en-US en-GB es et eu fi fr ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn oc or pa-IN pl pt pt-BR ro ru sk sl sr sr-Latn sv ta te tr uk vi zh-CN zh-TW
+--enable-windows-build-signing
+--enable-symbols
+--enable-breakpad
-- 
cgit