drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct some binary distribution packaging defects.

This commit is contained in:
Keith Marshall 2008-10-28 23:55:39 +00:00
parent 871d7a45e7
commit 2004f7603f
2 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
winsup/mingw/ChangeLog
View File

@ -1,3 +1,13 @@
2008-10-28 Keith Marshall <keithmarshall@users.sourceforge.net>
Correct some binary distribution packaging defects.
* Makefile.in (bindist): Remove `make' conditionals; segregate into...
(bindist-common, bindist-mingwrt, bindist-mingw-runtime): ...these new
intermediate goals; they make packages of files, as specified by...
(BINDIST_FILES, DEVDIST_FILES, DLLDIST_FILES): ...these new macros.
(dist_prefix) [target_alias !~ cygwin]: Leave it undefined.
2008-10-18 Keith Marshall <keithmarshall@users.sourceforge.net> 2008-10-18 Keith Marshall <keithmarshall@users.sourceforge.net>
Fix MinGW-Bug [2136252]: (Reported by Roumen Petrov). Fix MinGW-Bug [2136252]: (Reported by Roumen Petrov).

45
winsup/mingw/Makefile.in
View File

@ -367,12 +367,7 @@ endif
ifneq (,$(findstring cygwin, $(target_alias))) ifneq (,$(findstring cygwin, $(target_alias)))
TARFLAGS = j TARFLAGS = j
TARFILEEXT = .tar.bz2 TARFILEEXT = .tar.bz2
endif dist_prefix = $(conf_prefix)
ifneq (,$(findstring mingw, $(target_alias)))
dist_prefix =
else
dist_prefix = $(conf_prefix)
endif endif
dist: srcdist bindist dist: srcdist bindist
@ -404,27 +399,41 @@ srcdist:
rm -f $(distdir)-src.tar.gz rm -f $(distdir)-src.tar.gz
$(TAR) $(TARFLAGS)cf $(distdir)-src$(TARFILEEXT) $(distdir) $(TAR) $(TARFLAGS)cf $(distdir)-src$(TARFILEEXT) $(distdir)
# Binary package structure is determined according to the
# preferred package name assigned at configure time...
#
bindist: bindist-$(PACKAGE)
ifneq (,$(findstring cygwin, $(target_alias))) # The directory structure is common to both package styles...
bindist: #
bindist-common:
rm -rf $(distdir) rm -rf $(distdir)
mkdir $(distdir) mkdir $(distdir)
chmod 755 $(distdir) chmod 755 $(distdir)
$(MAKE) install prefix=$(shell pwd)/$(distdir)$(dist_prefix) $(MAKE) install prefix=$(shell pwd)/$(distdir)$(dist_prefix)
rm -f $(distdir).tar.gz rm -f $(distdir).tar.gz
# Current MinGW distributions prefer separate `dev' and `dll' bundles,
# and use the abbreviated `mingwrt' form for the package name...
#
DEVDIST_FILES = * --exclude=bin
DLLDIST_FILES = bin/*.dll doc/*
#
bindist-mingwrt: bindist-common
cd $(distdir); \ cd $(distdir); \
$(TAR) $(TARFLAGS)cf ../$(distdir)$(TARFILEEXT) * $(TAR) $(TARFLAGS)cf ../$(distdir)-dev$(TARFILEEXT) $(DEVDIST_FILES); \
else $(TAR) $(TARFLAGS)cf ../$(distdir)-dll$(TARFILEEXT) $(DLLDIST_FILES)
bindist:
rm -rf $(distdir) rm -rf $(distdir)
mkdir $(distdir)
chmod 755 $(distdir) # However, Cygwin maintainers continue to prefer a composite package,
$(MAKE) install prefix=$(shell pwd)/$(distdir)$(dist_prefix) # retaining the older `mingw-runtime' naming convention...
rm -f $(distdir).tar.gz #
BINDIST_FILES = *
#
bindist-mingw-runtime: bindist-common
cd $(distdir); \ cd $(distdir); \
$(TAR) $(TARFLAGS)cf ../$(distdir)-dev$(TARFILEEXT) * --exclude=bin; \ $(TAR) $(TARFLAGS)cf ../$(distdir)$(TARFILEEXT) $(BINDIST_FILES)
$(TAR) $(TARFLAGS)cf ../$(distdir)-dll$(TARFILEEXT) bin/*.dll rm -rf $(distdir)
endif
snapshot: snapshot:
make dist SNAPDATE=$(shell date '+%Y%m%d') make dist SNAPDATE=$(shell date '+%Y%m%d')