Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. added erase and event samples to the distribution

Browse Source 
2. tar.bz2 now unpacks into wxTOOLKIT-VERSION and not wxTOOLKIT as well


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-06-21 17:51:42 +00:00
parent 027c19bedb
commit 16b0e4ac36
1 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
Makefile.in
View File

@@ -154,17 +154,18 @@ INTLDIR = $(WXDIR)/locale
# append a version suffix x.y.z to all file names # append a version suffix x.y.z to all file names
VER_SUFFIX=$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)$(EXTRA_VER) VER_SUFFIX=$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)$(EXTRA_VER)
WXARCHIVE = @DISTDIR@-$(VER_SUFFIX).tar.gz WXARCHIVE=@DISTDIR@-$(VER_SUFFIX).tar.gz
WXGLARCHIVE = @DISTDIR@-gl-$(VER_SUFFIX).tar.gz WXGLARCHIVE=@DISTDIR@-gl-$(VER_SUFFIX).tar.gz
WXSAMPLES = wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.gz WXSAMPLES=wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.gz
WXDEMOS = wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.gz WXDEMOS=wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.gz
WXARCHIVE_BZIP = @DISTDIR@-$(VER_SUFFIX).tar.bz2 WXARCHIVE_BZIP=@DISTDIR@-$(VER_SUFFIX).tar.bz2
WXGLARCHIVE_BZIP = @DISTDIR@-gl-$(VER_SUFFIX).tar.bz2 WXGLARCHIVE_BZIP=@DISTDIR@-gl-$(VER_SUFFIX).tar.bz2
WXSAMPLES_BZIP = wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.bz2 WXSAMPLES_BZIP=wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.bz2
WXDEMOS_BZIP = wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.bz2 WXDEMOS_BZIP=wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.bz2
DISTDIR = ./_dist_dir/@DISTDIR@ DISTDIRNAME=@DISTDIR@-$(VER_SUFFIX)
DISTDIR=./_dist_dir/$(DISTDIRNAME)
############################## Files ################################## ############################## Files ##################################
@@ -872,6 +873,16 @@ SAMPLES_DIST: ALL_GUI_DIST
cp $(SAMPDIR)/dynamic/*.cpp $(DISTDIR)/samples/dynamic cp $(SAMPDIR)/dynamic/*.cpp $(DISTDIR)/samples/dynamic
cp $(SAMPDIR)/dynamic/*.xpm $(DISTDIR)/samples/dynamic cp $(SAMPDIR)/dynamic/*.xpm $(DISTDIR)/samples/dynamic
mkdir $(DISTDIR)/samples/erase
cp $(SAMPDIR)/erase/Makefile.in $(DISTDIR)/samples/erase
cp $(SAMPDIR)/erase/makefile.unx $(DISTDIR)/samples/erase
cp $(SAMPDIR)/erase/*.cpp $(DISTDIR)/samples/erase
mkdir $(DISTDIR)/samples/event
cp $(SAMPDIR)/event/Makefile.in $(DISTDIR)/samples/event
cp $(SAMPDIR)/event/makefile.unx $(DISTDIR)/samples/event
cp $(SAMPDIR)/event/*.cpp $(DISTDIR)/samples/event
mkdir $(DISTDIR)/samples/exec mkdir $(DISTDIR)/samples/exec
cp $(SAMPDIR)/exec/Makefile.in $(DISTDIR)/samples/exec cp $(SAMPDIR)/exec/Makefile.in $(DISTDIR)/samples/exec
cp $(SAMPDIR)/exec/makefile.unx $(DISTDIR)/samples/exec cp $(SAMPDIR)/exec/makefile.unx $(DISTDIR)/samples/exec
@@ -1300,10 +1311,7 @@ distclean:
# the files twice # the files twice
dist-only: dist-only:
@echo "*** Creating wxWindows distribution in $(DISTDIR)..." @echo "*** Creating wxWindows distribution in $(DISTDIR)..."
@cd _dist_dir; \ @cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE);
mv @DISTDIR@ @DISTDIR@-$(VER_SUFFIX); \
tar ch @DISTDIR@-$(VER_SUFFIX) | gzip -f9 > ../$(WXARCHIVE); \
mv @DISTDIR@-$(VER_SUFFIX) @DISTDIR@
@if test "$(USE_GUI)" = 1; then \ @if test "$(USE_GUI)" = 1; then \
cd $(DISTDIR); \ cd $(DISTDIR); \
mv samples wxSamples-$(VER_SUFFIX); \ mv samples wxSamples-$(VER_SUFFIX); \
@@ -1317,12 +1325,9 @@ dist-only:
fi fi
dist: @GUIDIST@ dist: @GUIDIST@
cp $(WXDIR)/src/files.lst $(DISTDIR)/src/ cp $(WXDIR)/src/files.lst $(DISTDIR)/src
@echo "*** Creating wxWindows distribution in $(DISTDIR)..." @echo "*** Creating wxWindows distribution in $(DISTDIR)..."
@cd _dist_dir; \ @cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE);
mv @DISTDIR@ @DISTDIR@-$(VER_SUFFIX); \
tar ch @DISTDIR@-$(VER_SUFFIX) | gzip -f9 > ../$(WXARCHIVE); \
mv @DISTDIR@-$(VER_SUFFIX) @DISTDIR@
@if test "$(USE_GUI)" = 1; then \ @if test "$(USE_GUI)" = 1; then \
cd $(DISTDIR); \ cd $(DISTDIR); \
mv samples wxSamples-$(VER_SUFFIX); \ mv samples wxSamples-$(VER_SUFFIX); \
@@ -1337,7 +1342,7 @@ dist: @GUIDIST@
bzip-dist-only: bzip-dist-only:
@echo "*** Creating wxWindows distribution in $(DISTDIR)..." @echo "*** Creating wxWindows distribution in $(DISTDIR)..."
@cd _dist_dir; tar ch @DISTDIR@ | bzip2 -f9 > $(WXARCHIVE_BZIP); mv $(WXARCHIVE_BZIP) .. @cd _dist_dir && tar ch $(DISTDIRNAME) | bzip2 -f9 > ../$(WXARCHIVE_BZIP);
@if test "$(USE_GUI)" = 1; then \ @if test "$(USE_GUI)" = 1; then \
cd $(DISTDIR); \ cd $(DISTDIR); \
mv samples wxSamples-${VER_SUFFIX}; \ mv samples wxSamples-${VER_SUFFIX}; \
@@ -1349,10 +1354,11 @@ bzip-dist-only:
tar ch wxDemos-${VER_SUFFIX} | bzip2 -f9 > ../../$(WXDEMOS_BZIP); \ tar ch wxDemos-${VER_SUFFIX} | bzip2 -f9 > ../../$(WXDEMOS_BZIP); \
mv wxDemos-${VER_SUFFIX} demos; \ mv wxDemos-${VER_SUFFIX} demos; \
fi fi
bzip-dist: @GUIDIST@ bzip-dist: @GUIDIST@
cp $(WXDIR)/src/files.lst $(DISTDIR)/src/ cp $(WXDIR)/src/files.lst $(DISTDIR)/src/
@echo "*** Creating wxWindows distribution in $(DISTDIR)..." @echo "*** Creating wxWindows distribution in $(DISTDIR)..."
cd _dist_dir; tar ch @DISTDIR@ | bzip2 -f9 > $(WXARCHIVE_BZIP); mv $(WXARCHIVE_BZIP) .. @cd _dist_dir && tar ch $(DISTDIRNAME) | bzip2 -f9 > ../$(WXARCHIVE_BZIP)
@if test "$(USE_GUI)" = 1; then \ @if test "$(USE_GUI)" = 1; then \
cd $(DISTDIR); \ cd $(DISTDIR); \
mv samples wxSamples; \ mv samples wxSamples; \