From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 2047 invoked by alias); 17 May 2017 18:38:40 -0000 Mailing-List: contact cygwin-apps-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cygwin-apps-cvs-owner@sourceware.org Received: (qmail 1334 invoked by uid 9795); 17 May 2017 18:38:40 -0000 Date: Wed, 17 May 2017 18:38:00 -0000 Message-ID: <20170517183840.1267.qmail@sourceware.org> From: jturney@sourceware.org To: cygwin-apps-cvs@sourceware.org Subject: [setup - the official Cygwin setup program used to install Cygwin and keep it up to date] branch ntlm-proxy-debugging, updated. release_2.878-8-gee3cea6 X-Git-Refname: refs/heads/ntlm-proxy-debugging X-Git-Reftype: branch X-Git-Oldrev: ee9140f581bd56fd340e0300b49f4ed6c38cfe35 X-Git-Newrev: ee3cea662f228a31e9ec860cefa101bbd87986f2 X-SW-Source: 2017-q2/txt/msg00030.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=ee3cea662f228a31e9ec860cefa101bbd87986f2 commit ee3cea662f228a31e9ec860cefa101bbd87986f2 Author: Jon Turney Date: Tue May 2 15:54:09 2017 +0100 Add Makefile rule to rename build products to form used when uploading Diff: --- Makefile.am | 5 +++++ configure.ac | 3 +++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/Makefile.am b/Makefile.am index a947a78..7d5e1e3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -273,6 +273,7 @@ inilint_SOURCES = \ GITVER := $(shell cd $(srcdir) && git describe --match release_\* --abbrev=6 --dirty || "N/A") VER := $(subst release_,,$(GITVER)) +ARCH := @ARCH@ setup_version.c : Makefile @echo "Setup version: " $(VER) @@ -307,3 +308,7 @@ upx: strip else \ echo "UPX doesn't seem to be installed, cannot compress setup$(EXEEXT)." ;\ fi + +release: upx + cp setup.dbg setup-${VER}.${ARCH}.dbg + cp setup${EXEEXT} setup-${VER}.${ARCH}${EXEEXT} diff --git a/configure.ac b/configure.ac index 42ad3e2..ab548c0 100644 --- a/configure.ac +++ b/configure.ac @@ -74,15 +74,18 @@ dnl add portability sources to inilint case "$host" in i?86-*-mingw32) SETUP="setup" + ARCH="x86" ;; x86_64-*-mingw32) SETUP="setup" + ARCH="x86_64" ;; *) AC_MSG_ERROR([Cygwin Setup can only be built for Win32 or Win64 hosts]) ;; esac AC_SUBST(SETUP) +AC_SUBST(ARCH) AC_CONFIG_FILES([Makefile tests/Makefile]) AC_OUTPUT