Started "make dist"

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3367 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/BuildCVS.txt b/BuildCVS.txt
index e16d24e6ffe0471d44cc68704f91844b28ba13b5..81ffa9a83ebd663b8f4ff2dbba8b50db9a6f3b94 100644 (file)
--- a/BuildCVS.txt
+++ b/BuildCVS.txt
@@ -52,8 +52,7 @@ II) Unix ports
 Building wxGTK or wxMotif completely without configure
 won't ever work, but there is now a new makefile system
 that works without libtool and automake, using only
-configure to create what is needed. So far, only shared
-libraries can be build with this system.
+configure to create what is needed. 
 
 Set WXWIN environment variable to the base directory such
 as ~/wxWindows (this is actually not really needed).
@@ -69,6 +68,11 @@ or type: ../configure --with-gtk
 -> type: ldconfig
 -> type: exit
 
+Call configure with --disable-shared to create a static
+library. Calling "make uninstall" will remove the installed
+library and "make dist" will create a distribution (not
+yet complete).
+
 III) Windows using configure
 ----------------------------------------
 

diff --git a/Makefile.in b/Makefile.in
index 7bd3fa7deaa3067fa7bfac3737634156a19df389..53ae68c8f93af130bfa50862f23f35528b268de4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
 
 #
-# This file was automatically generated by tmake at 09:43, 1999/08/13
+# This file was automatically generated by tmake at 11:22, 1999/08/13
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
 
 #
@@ -102,6 +102,11 @@ INCDIR  = $(WXDIR)/include
 
 DOCDIR = $(WXDIR)/docs
 
+########################## Archive name ###############################
+
+WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
+DISTDIR = ./_dist_dir/wx$(TOOLKIT)
+
 ############################## Files ##################################
 
 WX_HEADERS = \
@@ -401,6 +406,96 @@ MOTIF_HEADERS = \
                motif/toolbar.h \
                motif/window.h
 
+MSW_HEADERS = \
+               msw/accel.h \
+               msw/app.h \
+               msw/bitmap.h \
+               msw/bmpbuttn.h \
+               msw/brush.h \
+               msw/button.h \
+               msw/caret.h \
+               msw/checkbox.h \
+               msw/checklst.h \
+               msw/choice.h \
+               msw/clipbrd.h \
+               msw/colordlg.h \
+               msw/colour.h \
+               msw/combobox.h \
+               msw/control.h \
+               msw/curico.h \
+               msw/curicop.h \
+               msw/cursor.h \
+               msw/dc.h \
+               msw/dcclient.h \
+               msw/dcmemory.h \
+               msw/dcprint.h \
+               msw/dcscreen.h \
+               msw/dde.h \
+               msw/dialog.h \
+               msw/dib.h \
+               msw/dibutils.h \
+               msw/dirdlg.h \
+               msw/dragimag.h \
+               msw/filedlg.h \
+               msw/font.h \
+               msw/fontdlg.h \
+               msw/frame.h \
+               msw/gauge.h \
+               msw/gauge95.h \
+               msw/gaugemsw.h \
+               msw/gdiobj.h \
+               msw/helpwin.h \
+               msw/icon.h \
+               msw/imaglist.h \
+               msw/iniconf.h \
+               msw/joystick.h \
+               msw/listbox.h \
+               msw/listctrl.h \
+               msw/mdi.h \
+               msw/menu.h \
+               msw/menuitem.h \
+               msw/metafile.h \
+               msw/minifram.h \
+               msw/msgdlg.h \
+               msw/msvcrt.h \
+               msw/notebook.h \
+               msw/palette.h \
+               msw/pen.h \
+               msw/pnghand.h \
+               msw/pngread.h \
+               msw/printdlg.h \
+               msw/printwin.h \
+               msw/private.h \
+               msw/radiobox.h \
+               msw/radiobut.h \
+               msw/regconf.h \
+               msw/region.h \
+               msw/registry.h \
+               msw/scrolbar.h \
+               msw/settings.h \
+               msw/setup0.h \
+               msw/slider.h \
+               msw/slider95.h \
+               msw/slidrmsw.h \
+               msw/spinbutt.h \
+               msw/statbmp.h \
+               msw/statbox.h \
+               msw/statbr95.h \
+               msw/statline.h \
+               msw/stattext.h \
+               msw/tabctrl.h \
+               msw/taskbar.h \
+               msw/tbar95.h \
+               msw/tbarmsw.h \
+               msw/textctrl.h \
+               msw/timer.h \
+               msw/tooltip.h \
+               msw/treectrl.h \
+               msw/wave.h \
+               msw/window.h \
+               msw/winundef.h \
+               msw/xpmhand.h
+
 UNIX_HEADERS = \
                unix/execute.h
 
@@ -1227,6 +1322,57 @@ uninstall:
        @if test -d $(includedir)/wx/protocol; then rmdir $(includedir)/wx/protocol; fi
        @if test -d $(includedir)/wx; then rmdir $(includedir)/wx; fi
 
+predist:
+       mkdir _dist_dir
+       mkdir $(DISTDIR)
+       cp $(WXDIR)/wx$(TOOLKIT).spec $(DISTDIR)
+       cp $(WXDIR)/configure $(DISTDIR)
+       cp $(WXDIR)/config.sub $(DISTDIR)
+       cp $(WXDIR)/config.guess $(DISTDIR)
+       cp $(WXDIR)/install-sh $(DISTDIR)
+       cp $(WXDIR)/mkinstalldirs $(DISTDIR)
+       cp $(WXDIR)/wx-config.in $(DISTDIR)
+       cp $(WXDIR)/setup.h.in $(DISTDIR)
+       cp $(WXDIR)/Makefile.in $(DISTDIR)
+       cp $(DOCDIR)/lgpl.txt $(DISTDIR)/COPYING.LIB
+       cp $(DOCDIR)/licence.txt $(DISTDIR)/LICENCE.txt
+       cp $(DOCDIR)/symbols.txt $(DISTDIR)/SYMBOLS.txt
+       cp $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt
+       cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES.txt
+       cp $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README.txt
+       cp $(DOCDIR)/$(TOOLKITDIR)/todo.txt $(DISTDIR)/TODO.txt
+       mkdir $(DISTDIR)/include
+       mkdir $(DISTDIR)/include/wx
+       mkdir $(DISTDIR)/include/wx/$(TOOLKITDIR)
+       mkdir $(DISTDIR)/include/wx/generic
+       mkdir $(DISTDIR)/include/wx/html
+       mkdir $(DISTDIR)/include/wx/unix
+       mkdir $(DISTDIR)/include/wx/protocol
+       cp $(INCDIR)/wx/*.h $(DISTDIR)/include/wx 
+       cp $(INCDIR)/wx/*.cpp $(DISTDIR)/include/wx
+       cp $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic
+       cp $(INCDIR)/wx/generic/*.xpm $(DISTDIR)/include/wx/generic
+       cp $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html
+       cp $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix
+       cp $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol
+
+GTK_DIST:
+       cp $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk
+
+MOTIF_DIST:
+       cp $(INCDIR)/wx/motif/*.h $(DISTDIR)/include/wx/motif
+
+MSW_DIST:
+       cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
+       cp $(INCDIR)/wx/msw/*.cur $(DISTDIR)/include/wx/msw
+       cp $(INCDIR)/wx/msw/*.ico $(DISTDIR)/include/wx/msw
+       cp $(INCDIR)/wx/msw/*.bmp $(DISTDIR)/include/wx/msw
+       cp $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw
+
+dist: predist @GUIDIST@
+       cd _dist_dir; tar ch wx$(TOOLKIT) | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) ..
+       rm -f -r _dist_dir
+
 clean:
        rm -f ./src/msw/*.o
        rm -f ./src/gtk/*.o

diff --git a/configure.in b/configure.in
index 2bc4a2eb6d251dfbbf7f12a4607f6150aa9c3573..6fc5851295d5aaee99f29f1db4a333dad5d590a2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1399,10 +1399,11 @@ if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
     TOOLKIT=MSW
     
     GUIOBJS=MSW_GUIOBJS
-    GUIHEADERS=
+    GUIHEADERS=MSW_HEADERS
     COMMONOBJS=MSW_COMMONOBJS
     GENERICOBJS=MSW_GENERICOBJS
     UNIXOBJS=
+    GUIDIST=MSW_DIST
 fi
 
 if test "$wxUSE_GTK" = 1; then
@@ -1422,6 +1423,7 @@ if test "$wxUSE_GTK" = 1; then
     COMMONOBJS=GTK_COMMONOBJS
     GENERICOBJS=GTK_GENERICOBJS
     UNIXOBJS=UNIXOBJS
+    GUIDIST=GTK_DIST
 fi
 
 if test "$wxUSE_WINE" = 1; then
@@ -1465,10 +1467,11 @@ if test "$wxUSE_WINE" = 1; then
     TOOLKIT=MSW
     
     GUIOBJS=MSW_GUIOBJS
-    GUIHEADERS=
+    GUIHEADERS=MSW_HEADERS
     COMMONOBJS=MSW_COMMONOBJS
     GENERICOBJS=MSW_GENERICOBJS
     UNIXOBJS=UNIXOBJS
+    GUIDIST=MSW_DIST
 fi
 
 if test "$wxUSE_MOTIF" = 1; then
@@ -1540,6 +1543,7 @@ if test "$wxUSE_MOTIF" = 1; then
     COMMONOBJS=MOTIF_COMMONOBJS
     GENERICOBJS=MOTIF_GENERICOBJS
     UNIXOBJS=UNIXOBJS
+    GUIDIST=MOTIF_DIST
 fi
 
 dnl the name of the directory where the files for this toolkit live
@@ -2661,6 +2665,7 @@ AC_SUBST(GUIHEADERS)
 AC_SUBST(COMMONOBJS)
 AC_SUBST(GENERICOBJS)
 AC_SUBST(UNIXOBJS)
+AC_SUBST(GUIDIST)
 
 dnl additional subdirectories where we will build
 AC_SUBST(SRC_SUBDIRS)

diff --git a/distrib/msw/tmake/filelist.t b/distrib/msw/tmake/filelist.t
index 6b4dc4fd9cb1dc57ccf3d642eedefdb477352358..e2536e11086c2f4f8039be1de4d74308429a57c2 100644 (file)
--- a/distrib/msw/tmake/filelist.t
+++ b/distrib/msw/tmake/filelist.t
@@ -55,6 +55,8 @@
             $wxHTMLINCLUDE{$fields[0]} = $fields[2];
         } elsif ( $fields[1] eq "F" ) {
             $wxMOTIFINCLUDE{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "B" ) {
+            $wxMSWINCLUDE{$fields[0]} = $fields[2];
         } elsif ( $fields[1] eq "K" ) {
             $wxGTKINCLUDE{$fields[0]} = $fields[2];
         } elsif ( $fields[1] eq "S" ) {

diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index 6dbb2ff1c229218d4fde868dd923b657bd65f10f..2d1360424be56a40abaecbd9a7c5e2a5aee63985 100644 (file)
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -17,6 +17,7 @@
 #  W   /include/wx
 #  K   /include/wx/gtk        K for gtK
 #  F    /include/wx/motif      F for motiF
+#  B    /include/wx/msw        B for Bill Gates
 #  N    /include/wx/generic    N for geNeric
 #  L    /include/wx/html       L for htmL
 #  P    /include/wx/protocol
@@ -683,6 +684,120 @@ timer.h   F
 toolbar.h      F
 window.h       F
 
+accel.h        B
+app.h  B
+bitmap.h       B
+bmpbuttn.h     B
+brush.h        B
+button.h       B
+caret.h        B
+checkbox.h     B
+checklst.h     B
+choice.h       B
+clipbrd.h      B
+colordlg.h     B
+colour.h       B
+combobox.h     B
+control.h      B
+curico.h       B
+curicop.h      B
+cursor.h       B
+dc.h   B
+dcclient.h     B
+dcmemory.h     B
+dcprint.h      B
+dcscreen.h     B
+dde.h  B
+dialog.h       B
+dib.h  B
+dibutils.h     B
+dirdlg.h       B
+dragimag.h     B
+filedlg.h      B
+font.h B
+fontdlg.h      B
+frame.h        B
+gauge.h        B
+gauge95.h      B
+gaugemsw.h     B
+gdiobj.h       B
+helpwin.h      B
+icon.h B
+imaglist.h     B
+iniconf.h      B
+joystick.h     B
+listbox.h      B
+listctrl.h     B
+mdi.h  B
+menu.h B
+menuitem.h     B
+metafile.h     B
+minifram.h     B
+msgdlg.h       B
+msvcrt.h       B
+notebook.h     B
+palette.h      B
+pen.h  B
+pnghand.h      B
+pngread.h      B
+printdlg.h     B
+printwin.h     B
+private.h      B
+radiobox.h     B
+radiobut.h     B
+regconf.h      B
+region.h       B
+registry.h     B
+scrolbar.h     B
+settings.h     B
+setup0.h       B
+slider.h       B
+slider95.h     B
+slidrmsw.h     B
+spinbutt.h     B
+statbmp.h      B
+statbox.h      B
+statbr95.h     B
+statline.h     B
+stattext.h     B
+tabctrl.h      B
+taskbar.h      B
+tbar95.h       B
+tbarmsw.h      B
+textctrl.h     B
+timer.h        B
+tooltip.h      B
+treectrl.h     B
+wave.h B
+window.h       B
+winundef.h     B
+xpmhand.h      B
+# blank.cur    B
+# bullseye.cur B
+# child.ico    B
+# clock.cur    B
+# error.ico    B
+# hand.cur     B
+# heart.cur    B
+# info.ico     B
+# magnif1.cur  B
+# mdi.ico      B
+# noentry.cur  B
+# pbrush.cur   B
+# pencil.cur   B
+# pntleft.cur  B
+# pntright.cur B
+# query.cur    B
+# question.ico B
+# roller.cur   B
+# size.cur     B
+# std.ico      B
+# tip.ico      B
+# warning.ico  B
+# watch1.cur   B
+# disable.bmp  B
+# wx.rc        B
+
 execute.h      S
 
 file.h P

diff --git a/distrib/msw/tmake/unx.t b/distrib/msw/tmake/unx.t
index f5a7df684a07ed0ef5776a6b6634a7be4639a8d5..44b8c227b4cebf3e9180d385b6a132a8218ca426 100644 (file)
--- a/distrib/msw/tmake/unx.t
+++ b/distrib/msw/tmake/unx.t
@@ -119,6 +119,10 @@
         $project{"WXGTK_HEADERS"} .= "gtk/" . $file . " "
     }
     
+    foreach $file (sort keys %wxMSWINCLUDE) {
+        $project{"WXMSW_HEADERS"} .= "msw/" . $file . " "
+    }
+    
     foreach $file (sort keys %wxHTMLINCLUDE) {
         $project{"WXHTML_HEADERS"} .= "html/" . $file . " "
     }
@@ -234,6 +238,11 @@ INCDIR  = $(WXDIR)/include
 
 DOCDIR = $(WXDIR)/docs
 
+########################## Archive name ###############################
+
+WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
+DISTDIR = ./_dist_dir/wx$(TOOLKIT)
+
 ############################## Files ##################################
 
 WX_HEADERS = \
@@ -245,6 +254,9 @@ GTK_HEADERS = \
 MOTIF_HEADERS = \
                #$ ExpandList("WXMOTIF_HEADERS");
 
+MSW_HEADERS = \
+               #$ ExpandList("WXMSW_HEADERS");
+
 UNIX_HEADERS = \
                #$ ExpandList("WXUNIX_HEADERS");
 
@@ -520,6 +532,57 @@ uninstall:
        @if test -d $(includedir)/wx/protocol; then rmdir $(includedir)/wx/protocol; fi
        @if test -d $(includedir)/wx; then rmdir $(includedir)/wx; fi
 
+predist:
+       mkdir _dist_dir
+       mkdir $(DISTDIR)
+       cp $(WXDIR)/wx$(TOOLKIT).spec $(DISTDIR)
+       cp $(WXDIR)/configure $(DISTDIR)
+       cp $(WXDIR)/config.sub $(DISTDIR)
+       cp $(WXDIR)/config.guess $(DISTDIR)
+       cp $(WXDIR)/install-sh $(DISTDIR)
+       cp $(WXDIR)/mkinstalldirs $(DISTDIR)
+       cp $(WXDIR)/wx-config.in $(DISTDIR)
+       cp $(WXDIR)/setup.h.in $(DISTDIR)
+       cp $(WXDIR)/Makefile.in $(DISTDIR)
+       cp $(DOCDIR)/lgpl.txt $(DISTDIR)/COPYING.LIB
+       cp $(DOCDIR)/licence.txt $(DISTDIR)/LICENCE.txt
+       cp $(DOCDIR)/symbols.txt $(DISTDIR)/SYMBOLS.txt
+       cp $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt
+       cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES.txt
+       cp $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README.txt
+       cp $(DOCDIR)/$(TOOLKITDIR)/todo.txt $(DISTDIR)/TODO.txt
+       mkdir $(DISTDIR)/include
+       mkdir $(DISTDIR)/include/wx
+       mkdir $(DISTDIR)/include/wx/$(TOOLKITDIR)
+       mkdir $(DISTDIR)/include/wx/generic
+       mkdir $(DISTDIR)/include/wx/html
+       mkdir $(DISTDIR)/include/wx/unix
+       mkdir $(DISTDIR)/include/wx/protocol
+       cp $(INCDIR)/wx/*.h $(DISTDIR)/include/wx 
+       cp $(INCDIR)/wx/*.cpp $(DISTDIR)/include/wx
+       cp $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic
+       cp $(INCDIR)/wx/generic/*.xpm $(DISTDIR)/include/wx/generic
+       cp $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html
+       cp $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix
+       cp $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol
+
+GTK_DIST:
+       cp $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk
+
+MOTIF_DIST:
+       cp $(INCDIR)/wx/motif/*.h $(DISTDIR)/include/wx/motif
+
+MSW_DIST:
+       cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
+       cp $(INCDIR)/wx/msw/*.cur $(DISTDIR)/include/wx/msw
+       cp $(INCDIR)/wx/msw/*.ico $(DISTDIR)/include/wx/msw
+       cp $(INCDIR)/wx/msw/*.bmp $(DISTDIR)/include/wx/msw
+       cp $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw
+
+dist: predist @GUIDIST@
+       cd _dist_dir; tar ch wx$(TOOLKIT) | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) ..
+       rm -f -r _dist_dir
+
 clean:
        rm -f ./src/msw/*.o
        rm -f ./src/gtk/*.o

diff --git a/src/make.env.in b/src/make.env.in
index a0ee460ddc230345c2f10717cc02d7134045dd35..3c5921b7840f1d3f6a7048c26b214109730e2cf1 100644 (file)
--- a/src/make.env.in
+++ b/src/make.env.in
@@ -15,6 +15,7 @@ EXTRALIBS = @EXTRA_LIBS@
 LDLIBS = ${top_builddir}/lib/@WX_TARGET_LIBRARY@  $(EXTRA_LIBS)
 
 TOOLKIT = @TOOLKIT@
+TOOLKITDIR = @TOOLKIT_DIR@
 
 WXLIB = @WX_LIBRARY_NAME_STATIC@
 WXSHLIB = @WX_LIBRARY_NAME_SHARED@