This is the mail archive of the cygwin-apps-cvs mailing list for the cygwin-apps project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[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




https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=ee3cea662f228a31e9ec860cefa101bbd87986f2

commit ee3cea662f228a31e9ec860cefa101bbd87986f2
Author: Jon Turney <jon.turney@dronecode.org.uk>
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


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]