Module: wine Branch: master Commit: dbb55ed91aded087a6c0320a2f4ae7980200b1e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/dbb55ed91aded087a6c0320a2f4ae79...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Sep 7 10:29:14 2022 +0200
makefiles: Add install-test target to install winetest.exe.
---
programs/winetest/Makefile.in | 2 +- tools/gitlab/build.yml | 18 +++++++++--------- tools/makedep.c | 14 +++++++++----- 3 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index c4d505e4545..f82ba5ec438 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -19,4 +19,4 @@ EXTRA_OBJS = build.res
EXTRA_TARGETS = build.nfo
-INSTALL_LIB = none +INSTALL_TEST = winetest.exe diff --git a/tools/gitlab/build.yml b/tools/gitlab/build.yml index 93a284a2d90..08e63db0ecd 100644 --- a/tools/gitlab/build.yml +++ b/tools/gitlab/build.yml @@ -14,8 +14,9 @@ - build32/config.cache - build64/config.cache before_script: - - export CCACHE_BASEDIR="$PWD" - - export CCACHE_DIR="$PWD/ccache" + - export BASEDIR="$PWD" + - export CCACHE_BASEDIR="$BASEDIR" + - export CCACHE_DIR="$BASEDIR/ccache" - export CCACHE_COMPILERCHECK=content - export PATH="/usr/lib/ccache:$PATH" - mkdir -p build32 build64 @@ -60,12 +61,11 @@ build-winetest: - winetest64.exe script: - cd build64 - - ../configure -C --enable-win64 --with-mingw - - make -s -j$(nproc) programs/winetest/winetest.exe + - ../configure -q -C --enable-win64 --with-mingw + - make -s -j$(nproc) install-test DESTDIR=$BASEDIR - cd ../build32 - - ../configure -C --with-mingw - - make -s -j$(nproc) programs/winetest/winetest.exe + - ../configure -q -C --with-mingw + - make -s -j$(nproc) install-test DESTDIR=$BASEDIR - cd .. - - mv build32/programs/winetest/winetest.exe winetest.exe - - mv build64/programs/winetest/winetest.exe winetest64.exe - - chmod 644 winetest.exe winetest64.exe + - mv usr/local/lib/wine/i386-windows/winetest.exe winetest.exe + - mv usr/local/lib/wine/x86_64-windows/winetest.exe winetest64.exe diff --git a/tools/makedep.c b/tools/makedep.c index a980e505e3a..69b4a4c660b 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -122,9 +122,9 @@ static const struct static struct list files[HASH_SIZE]; static struct list global_includes[HASH_SIZE];
-enum install_rules { INSTALL_LIB, INSTALL_DEV, NB_INSTALL_RULES }; -static const char *install_targets[NB_INSTALL_RULES] = { "install-lib", "install-dev" }; -static const char *install_variables[NB_INSTALL_RULES] = { "INSTALL_LIB", "INSTALL_DEV" }; +enum install_rules { INSTALL_LIB, INSTALL_DEV, INSTALL_TEST, NB_INSTALL_RULES }; +static const char *install_targets[NB_INSTALL_RULES] = { "install-lib", "install-dev", "install-test" }; +static const char *install_variables[NB_INSTALL_RULES] = { "INSTALL_LIB", "INSTALL_DEV", "INSTALL_TEST" };
/* variables common to all makefiles */ static struct strarray linguas; @@ -3624,10 +3624,14 @@ static void output_subdirs( struct makefile *make ) for (j = 0; j < NB_INSTALL_RULES; j++) { if (!install_deps[j].count) continue; - output( "install %s::", install_targets[j] ); + if (strcmp( install_targets[j], "install-test" )) + { + output( "install " ); + strarray_add_uniq( &make->phony_targets, "install" ); + } + output( "%s::", install_targets[j] ); output_filenames( install_deps[j] ); output( "\n" ); - strarray_add_uniq( &make->phony_targets, "install" ); strarray_add_uniq( &make->phony_targets, install_targets[j] ); } output_uninstall_rules( make );
-
Alexandre Julliard