From ca56b08719da8384bc05c7fa2652b4c5e60949bd Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Wed, 16 Nov 2022 14:30:01 +0100 Subject: [PATCH] [ci,nightly] Enable deprecated command line --- ci/cmake-preloads/config-android.txt | 1 + ci/cmake-preloads/config-debian-squeeze.txt | 1 + ci/cmake-preloads/config-linux-all.txt | 1 + ci/cmake-preloads/config-macosx.txt | 1 + ci/cmake-preloads/config-ubuntu-1204.txt | 1 + ci/cmake-preloads/config-windows.txt | 1 + packaging/deb/freerdp-nightly/rules | 1 + packaging/flatpak/com.freerdp.FreeRDP.json | 1 + packaging/rpm/freerdp-nightly.spec | 1 + 9 files changed, 9 insertions(+) diff --git a/ci/cmake-preloads/config-android.txt b/ci/cmake-preloads/config-android.txt index bcb3446df..695c6ea03 100644 --- a/ci/cmake-preloads/config-android.txt +++ b/ci/cmake-preloads/config-android.txt @@ -5,3 +5,4 @@ set(FREERDP_EXTERNAL_SSL_PATH $ENV{ANDROID_SSL_PATH} CACHE PATH "android ssl") # ANDROID_NDK and ANDROID_SDK must be set as environment variable #set(ANDROID_NDK $ENV{ANDROID_SDK} CACHE PATH "Android NDK") #set(ANDROID_SDK "${ANDROID_NDK}" CACHE PATH "android SDK") +set (WITH_FREERDP_DEPRECATED_COMMANDLINE ON CACHE BOOL "Enable deprecated command line options") diff --git a/ci/cmake-preloads/config-debian-squeeze.txt b/ci/cmake-preloads/config-debian-squeeze.txt index c7319cf9a..6d67c8166 100644 --- a/ci/cmake-preloads/config-debian-squeeze.txt +++ b/ci/cmake-preloads/config-debian-squeeze.txt @@ -9,3 +9,4 @@ set (WITH_XV OFF CACHE BOOL "xvideo support") set (BUILD_TESTING ON CACHE BOOL "build testing") set (WITH_XSHM OFF CACHE BOOL "build with xshm support") set (WITH_SANITIZE_ADDRESS ON) +set(WITH_FREERDP_DEPRECATED_COMMANDLINE ON CACHE BOOL "Enable deprecated command line options") diff --git a/ci/cmake-preloads/config-linux-all.txt b/ci/cmake-preloads/config-linux-all.txt index b8c0d45af..ba6408604 100644 --- a/ci/cmake-preloads/config-linux-all.txt +++ b/ci/cmake-preloads/config-linux-all.txt @@ -54,3 +54,4 @@ set (WITH_SWSCALE OFF CACHE BOOL "compile ffmpeg support") set (WITH_DSP_FFMPEG ON CACHE BOOL "compile ffmpeg support") set (WITH_PROXY ON CACHE BOOL "compile proxy") set (WITH_PROXY_MODULES ON CACHE BOOL "compile proxy modules") +set (WITH_FREERDP_DEPRECATED_COMMANDLINE ON CACHE BOOL "Enable deprecated command line options") diff --git a/ci/cmake-preloads/config-macosx.txt b/ci/cmake-preloads/config-macosx.txt index a004dd9a0..7a0c64df7 100644 --- a/ci/cmake-preloads/config-macosx.txt +++ b/ci/cmake-preloads/config-macosx.txt @@ -6,3 +6,4 @@ set (CHANNEL_URBDRC OFF CACHE BOOL "USB redirection") set (WITH_X11 ON CACHE BOOL "Enable X11") set (BUILD_TESTING ON CACHE BOOL "build testing") set (WITH_SANITIZE_ADDRESS ON) +set (WITH_FREERDP_DEPRECATED_COMMANDLINE ON CACHE BOOL "Enable deprecated command line options") diff --git a/ci/cmake-preloads/config-ubuntu-1204.txt b/ci/cmake-preloads/config-ubuntu-1204.txt index c7319cf9a..822f62121 100644 --- a/ci/cmake-preloads/config-ubuntu-1204.txt +++ b/ci/cmake-preloads/config-ubuntu-1204.txt @@ -9,3 +9,4 @@ set (WITH_XV OFF CACHE BOOL "xvideo support") set (BUILD_TESTING ON CACHE BOOL "build testing") set (WITH_XSHM OFF CACHE BOOL "build with xshm support") set (WITH_SANITIZE_ADDRESS ON) +set (WITH_FREERDP_DEPRECATED_COMMANDLINE ON CACHE BOOL "Enable deprecated command line options") diff --git a/ci/cmake-preloads/config-windows.txt b/ci/cmake-preloads/config-windows.txt index 8c6027cd6..e8b118597 100644 --- a/ci/cmake-preloads/config-windows.txt +++ b/ci/cmake-preloads/config-windows.txt @@ -5,3 +5,4 @@ set (WITH_PROXY_MODULES "OFF" CACHE BOOL "Do not build proxy modules") set (CHANNEL_URBDRC OFF CACHE BOOL "USB redirection") set (BUILD_TESTING ON CACHE BOOL "build testing") set (WITH_SANITIZE_ADDRESS ON) +set (WITH_FREERDP_DEPRECATED_COMMANDLINE ON CACHE BOOL "Enable deprecated command line options") diff --git a/packaging/deb/freerdp-nightly/rules b/packaging/deb/freerdp-nightly/rules index 000c82511..b44db2923 100755 --- a/packaging/deb/freerdp-nightly/rules +++ b/packaging/deb/freerdp-nightly/rules @@ -16,6 +16,7 @@ DEB_CMAKE_EXTRA_FLAGS := -DCMAKE_SKIP_RPATH=FALSE \ -DWITH_DSP_FFMPEG=ON \ -DCHANNEL_URBDRC=ON \ -DCHANNEL_URBDRC_CLIENT=ON \ + -DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON \ -DWITH_SERVER=ON \ -DWITH_WAYLAND=ON \ -DWITH_CAIRO=ON \ diff --git a/packaging/flatpak/com.freerdp.FreeRDP.json b/packaging/flatpak/com.freerdp.FreeRDP.json index 38c5f17e0..6e2bc83e5 100644 --- a/packaging/flatpak/com.freerdp.FreeRDP.json +++ b/packaging/flatpak/com.freerdp.FreeRDP.json @@ -124,6 +124,7 @@ "-DCMAKE_VERBOSE_MAKEFILE=ON", "-DCMAKE_BUILD_TYPE:STRING=Release", "-DCMAKE_INSTALL_LIBDIR:PATH=lib", + "-DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON", "-DCHANNEL_TSMF:BOOL=OFF", "-DCHANNEL_URBDRC:BOOL=ON", "-DBUILD_TESTING:BOOL=OFF", diff --git a/packaging/rpm/freerdp-nightly.spec b/packaging/rpm/freerdp-nightly.spec index 385804229..f3945a68d 100644 --- a/packaging/rpm/freerdp-nightly.spec +++ b/packaging/rpm/freerdp-nightly.spec @@ -110,6 +110,7 @@ cp %{_topdir}/SOURCES/source_version freerdp-nightly-%{version}/.source_version %cmake -DCMAKE_SKIP_RPATH=FALSE \ -DCMAKE_SKIP_INSTALL_RPATH=FALSE \ + -DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON \ -DWITH_PULSE=ON \ -DWITH_CHANNELS=ON \ -DWITH_CUPS=ON \