mirror of https://github.com/BOINC/boinc.git
fixed some distribution creation bugs
svn path=/trunk/boinc/; revision=1321
This commit is contained in:
Karl Chen
parent
fa9b342902
commit
40f117cdf5
29
Makefile.am
29
Makefile.am
|
|
@ -2,14 +2,21 @@
|
|||
|
||||
SUBDIRS = RSAEuro db lib api apps client sched
|
||||
|
||||
###########################################################################
|
||||
# The rest of the rules below deal with making .tar.gz, .tar.bz2, and .zip
|
||||
# files. There are two sets of distributions: full and client. full is built
|
||||
# by "make dist" and client is built by "make dist-client". The
|
||||
# NOT_IN_CLIENT_TARBALL variable contains sources that are not in the client
|
||||
# distribution.
|
||||
#
|
||||
|
||||
# Putting a directory name recursively copies the entire contents - the
|
||||
# dist-hook below gets rid of CVS directories.
|
||||
|
||||
EXTRA_DIST = \
|
||||
mac_build/boinc.pbproj/*.pbxproj mac_build/*.lproj/*.nib/*.* \
|
||||
mac_build/*.lproj/*.strings \
|
||||
win_build/*.* win_build/*/*.dsp win_build/*/*.rct \
|
||||
doc/*.* \
|
||||
html_ops/*.* \
|
||||
html_user/*.* \
|
||||
stripchart/* stripchart/samples/* \
|
||||
mac_build win_build \
|
||||
doc html_ops html_user \
|
||||
stripchart \
|
||||
test/*.xml test/*.php test/*wu test/*result test/*output \
|
||||
test/*input test/*.inc \
|
||||
INSTALL LICENSE
|
||||
|
|
@ -24,10 +31,9 @@ am__remove_distdir_client = \
|
|||
&& rm -fr $(distdir_client); }; }
|
||||
|
||||
distdir-client: distdir
|
||||
rm -fr $(distdir_client)
|
||||
mv $(distdir) $(distdir_client)
|
||||
cd $(distdir_client)
|
||||
rm -r $(NOT_IN_CLIENT_TARBALL)
|
||||
cd ..
|
||||
cd $(distdir_client) && rm -r $(NOT_IN_CLIENT_TARBALL) && cd ..
|
||||
|
||||
client-dist-gzip: distdir-client-client
|
||||
$(AMTAR) chof - $(distdir_client) | GZIP=$(GZIP_ENV) gzip -c >$(distdir_client).tar.gz
|
||||
|
|
@ -53,5 +59,8 @@ dist-client dist-client-all: distdir-client
|
|||
|
||||
dist-all: dist-client-all
|
||||
|
||||
dist-hook:
|
||||
rm -rf `find $(distdir) -name CVS`
|
||||
|
||||
.PHONY: distdir-client client-dist-gzip client-dist-gzip2 client-dist-zip \
|
||||
dist-client dist-client-all
|
||||
|
|
|
|||
34
Makefile.in
34
Makefile.in
|
|
@ -132,14 +132,21 @@ target_vendor = @target_vendor@
|
|||
|
||||
SUBDIRS = RSAEuro db lib api apps client sched
|
||||
|
||||
|
||||
###########################################################################
|
||||
# The rest of the rules below deal with making .tar.gz, .tar.bz2, and .zip
|
||||
# files. There are two sets of distributions: full and client. full is built
|
||||
# by "make dist" and client is built by "make dist-client". The
|
||||
# NOT_IN_CLIENT_TARBALL variable contains sources that are not in the client
|
||||
# distribution.
|
||||
#
|
||||
|
||||
# Putting a directory name recursively copies the entire contents - the
|
||||
# dist-hook below gets rid of CVS directories.
|
||||
EXTRA_DIST = \
|
||||
mac_build/boinc.pbproj/*.pbxproj mac_build/*.lproj/*.nib/*.* \
|
||||
mac_build/*.lproj/*.strings \
|
||||
win_build/*.* win_build/*/*.dsp win_build/*/*.rct \
|
||||
doc/*.* \
|
||||
html_ops/*.* \
|
||||
html_user/*.* \
|
||||
stripchart/* stripchart/samples/* \
|
||||
mac_build win_build \
|
||||
doc html_ops html_user \
|
||||
stripchart \
|
||||
test/*.xml test/*.php test/*wu test/*result test/*output \
|
||||
test/*input test/*.inc \
|
||||
INSTALL LICENSE
|
||||
|
|
@ -351,7 +358,7 @@ distcleancheck_listfiles = find . -type f -print
|
|||
distdir: $(DISTFILES)
|
||||
$(am__remove_distdir)
|
||||
mkdir $(distdir)
|
||||
$(mkinstalldirs) $(distdir)/doc $(distdir)/html_ops $(distdir)/html_user $(distdir)/mac_build/*.lproj $(distdir)/mac_build/*.lproj/*.nib $(distdir)/mac_build/boinc.pbproj $(distdir)/stripchart $(distdir)/stripchart/samples $(distdir)/test $(distdir)/win_build $(distdir)/win_build/*
|
||||
$(mkinstalldirs) $(distdir)/test
|
||||
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
|
||||
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
|
||||
list='$(DISTFILES)'; for file in $$list; do \
|
||||
|
|
@ -391,6 +398,9 @@ distdir: $(DISTFILES)
|
|||
|| exit 1; \
|
||||
fi; \
|
||||
done
|
||||
$(MAKE) $(AM_MAKEFLAGS) \
|
||||
top_distdir="$(top_distdir)" distdir="$(distdir)" \
|
||||
dist-hook
|
||||
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
|
||||
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
|
||||
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
|
||||
|
|
@ -568,10 +578,9 @@ uninstall-info: uninstall-info-recursive
|
|||
|
||||
|
||||
distdir-client: distdir
|
||||
rm -fr $(distdir_client)
|
||||
mv $(distdir) $(distdir_client)
|
||||
cd $(distdir_client)
|
||||
rm -r $(NOT_IN_CLIENT_TARBALL)
|
||||
cd ..
|
||||
cd $(distdir_client) && rm -r $(NOT_IN_CLIENT_TARBALL) && cd ..
|
||||
|
||||
client-dist-gzip: distdir-client-client
|
||||
$(AMTAR) chof - $(distdir_client) | GZIP=$(GZIP_ENV) gzip -c >$(distdir_client).tar.gz
|
||||
|
|
@ -597,6 +606,9 @@ dist-client dist-client-all: distdir-client
|
|||
|
||||
dist-all: dist-client-all
|
||||
|
||||
dist-hook:
|
||||
rm -rf `find $(distdir) -name CVS`
|
||||
|
||||
.PHONY: distdir-client client-dist-gzip client-dist-gzip2 client-dist-zip \
|
||||
dist-client dist-client-all
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
|
|
|
|||
|
|
@ -53,11 +53,12 @@ all-local: @CLIENT_BIN_FILENAME@
|
|||
rm -f @CLIENT_BIN_FILENAME@
|
||||
ln boinc_client @CLIENT_BIN_FILENAME@
|
||||
|
||||
## these source files need to be specified because no rule on unix uses them.
|
||||
EXTRA_DIST = \
|
||||
client/mac/*.h client/mac/*.cpp \
|
||||
client/win/*.h client/win/*.cpp client/win/*.rc \
|
||||
client/win/*.ico client/win/*.def client/win/res/*.* \
|
||||
client/translation/language.*
|
||||
mac/*.h mac/*.cpp \
|
||||
win/*.h win/*.cpp win/*.rc \
|
||||
win/*.ico win/*.def win/res/*.* \
|
||||
translation/language.*
|
||||
|
||||
clean-local:
|
||||
rm @CLIENT_BIN_FILENAME@
|
||||
|
|
|
|||
|
|
@ -204,10 +204,10 @@ speed_stats_SOURCES = speed_stats.C
|
|||
speed_stats_CFLAGS = -O6
|
||||
|
||||
EXTRA_DIST = \
|
||||
client/mac/*.h client/mac/*.cpp \
|
||||
client/win/*.h client/win/*.cpp client/win/*.rc \
|
||||
client/win/*.ico client/win/*.def client/win/res/*.* \
|
||||
client/translation/language.*
|
||||
mac/*.h mac/*.cpp \
|
||||
win/*.h win/*.cpp win/*.rc \
|
||||
win/*.ico win/*.def win/res/*.* \
|
||||
translation/language.*
|
||||
|
||||
subdir = client
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
|
|
@ -1168,7 +1168,7 @@ top_distdir = ..
|
|||
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
|
||||
|
||||
distdir: $(DISTFILES)
|
||||
$(mkinstalldirs) $(distdir)/.. $(distdir)/client/mac $(distdir)/client/translation $(distdir)/client/win $(distdir)/client/win/res
|
||||
$(mkinstalldirs) $(distdir)/.. $(distdir)/mac $(distdir)/translation $(distdir)/win $(distdir)/win/res
|
||||
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
|
||||
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
|
||||
list='$(DISTFILES)'; for file in $$list; do \
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
## $Id$
|
||||
|
||||
EXTRA_DIST = *.sql initdb
|
||||
EXTRA_DIST = *.sql init_db
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@ target_cpu = @target_cpu@
|
|||
target_os = @target_os@
|
||||
target_vendor = @target_vendor@
|
||||
|
||||
EXTRA_DIST = *.sql initdb
|
||||
EXTRA_DIST = *.sql init_db
|
||||
subdir = db
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
|
|
|
|||
Loading…
Reference in New Issue