From: Julian Smart Date: Wed, 15 Mar 2000 12:11:38 +0000 (+0000) Subject: Changes to ProjGen for new sample filenames X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/53adbc34a2e20614c9bb6cd1ef826d3e53544e35 Changes to ProjGen for new sample filenames git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/distrib/msw/makefile.rsp b/distrib/msw/makefile.rsp index d0f024afec..d51c9456e0 100644 --- a/distrib/msw/makefile.rsp +++ b/distrib/msw/makefile.rsp @@ -71,9 +71,11 @@ contrib/Makefile.in contrib/src/Makefile.in contrib/src/ogl/Makefile.in contrib/src/mmedia/Makefile.in +contrib/src/stc/Makefile.in contrib/samples/Makefile.in contrib/samples/ogl/Makefile.in contrib/samples/ogl/ogledit/Makefile.in contrib/samples/ogl/studio/Makefile.in contrib/samples/mmedia/Makefile.in +contrib/samples/stc/Makefile.in diff --git a/distrib/msw/mmedia.rsp b/distrib/msw/mmedia.rsp index 8ca494f1bc..8ab1632efa 100644 --- a/distrib/msw/mmedia.rsp +++ b/distrib/msw/mmedia.rsp @@ -25,7 +25,6 @@ contrib/src/mmedia/*.h contrib/src/mmedia/*.cpp contrib/src/mmedia/MMediaVC.dsp contrib/src/mmedia/MMediaVC.dsw -contrib/samples/mmedia/MMBoardVC.dsw contrib/samples/mmedia/*.h contrib/samples/mmedia/*.cpp contrib/samples/mmedia/makefile* diff --git a/distrib/msw/msw.rsp b/distrib/msw/msw.rsp index 976642cfa6..a4ee94bc95 100644 --- a/distrib/msw/msw.rsp +++ b/distrib/msw/msw.rsp @@ -61,6 +61,7 @@ src/msw/*.def src/msw/*.inc src/msw/winestub.c src/msw/gsocket.c +src/msw/gsockmsw.c src/msw/ole/*.cpp src/msw/*.prj diff --git a/distrib/msw/ogl.rsp b/distrib/msw/ogl.rsp index e9d11d0e62..626702ed4f 100644 --- a/distrib/msw/ogl.rsp +++ b/distrib/msw/ogl.rsp @@ -66,6 +66,7 @@ contrib/samples/ogl/studio/bitmaps/*.bmp contrib/samples/ogl/studio/bitmaps/*.gif contrib/samples/ogl/studio/bitmaps/*.xbm contrib/samples/ogl/studio/bitmaps/*.xpm +contrib/samples/ogl/studio/bitmaps/*.ico contrib/samples/ogl/studio/manual/*.tex contrib/samples/ogl/studio/manual/*.ini contrib/samples/ogl/studio/manual/*.gif @@ -75,20 +76,6 @@ contrib/samples/ogl/studio/manual/*.hlp contrib/samples/ogl/studio/manual/*.cnt contrib/samples/ogl/studio/manual/Makefile -contrib/docs/latex/ogl/*.txt -contrib/docs/latex/ogl/*.tex -contrib/docs/latex/ogl/*.ini -contrib/docs/latex/ogl/*.hpj -contrib/docs/latex/ogl/*.ps -contrib/docs/latex/ogl/*.eps -contrib/docs/latex/ogl/*.bmp -contrib/docs/latex/ogl/*.gif - -contrib/docs/html/ogl/*.* -contrib/docs/winhelp/ogl.hlp -contrib/docs/winhelp/ogl.cnt -contrib/docs/pdf/ogl.pdf - distrib/msw/ogl.rsp distrib/msw/zipogl.bat diff --git a/distrib/msw/stc.rsp b/distrib/msw/stc.rsp index 4e5049357b..442a116e07 100644 --- a/distrib/msw/stc.rsp +++ b/distrib/msw/stc.rsp @@ -24,7 +24,6 @@ contrib/src/stc/*.def contrib/src/stc/*.xbm contrib/src/stc/*.xpm contrib/src/stc/make*.* -contrib/src/stc/*.txt contrib/src/stc/*.ico contrib/src/stc/*.bmp contrib/src/stc/StcVC.dsp diff --git a/distrib/msw/wisebott.txt b/distrib/msw/wisebott.txt index b76d68454d..4080aa0e1a 100644 --- a/distrib/msw/wisebott.txt +++ b/distrib/msw/wisebott.txt @@ -36,7 +36,7 @@ item: Create Shortcut Working Directory=%MAINDIR% end item: Create Shortcut - Source=%MAINDIR%\docs\winhelp\ogl.hlp + Source=%MAINDIR%\contrib\docs\winhelp\ogl.hlp Destination=%GROUP%\Object Graphics Library Help.lnk Working Directory=%MAINDIR% end @@ -61,27 +61,16 @@ item: Create Shortcut Working Directory=%MAINDIR% end item: Create Shortcut - Source=%MAINDIR%\docs\release.txt - Destination=%GROUP%\Release Details.lnk - Working Directory=%MAINDIR% -end -item: Create Shortcut - Source=%MAINDIR%\docs\winhelp\wxtree.hlp - Destination=%GROUP%\wxTreeLayout Help.lnk + Source=%MAINDIR%\docs\changes.txt + Destination=%GROUP%\Change Log.lnk Working Directory=%MAINDIR% end item: Else Statement end item: Add ProgMan Icon Group=%GROUP% - Icon Name=wxTreeLayout Help - Command Line=%MAINDIR%\docs\winhelp\wxtree.hlp - Default Directory=%MAINDIR% -end -item: Add ProgMan Icon - Group=%GROUP% - Icon Name=Release Details - Command Line=%MAINDIR%\docs\release.txt + Icon Name=Change Log + Command Line=%MAINDIR%\docs\changes.txt Default Directory=%MAINDIR% end item: Add ProgMan Icon @@ -123,7 +112,7 @@ end item: Add ProgMan Icon Group=%GROUP% Icon Name=Object Graphics Library Help - Command Line=%MAINDIR%\docs\winhelp\ogl.hlp + Command Line=%MAINDIR%\contrib\docs\winhelp\ogl.hlp Default Directory=%MAINDIR% end item: Add ProgMan Icon diff --git a/distrib/msw/wisetop.txt b/distrib/msw/wisetop.txt index a125894350..d559db5e95 100644 --- a/distrib/msw/wisetop.txt +++ b/distrib/msw/wisetop.txt @@ -1,7 +1,7 @@ Document Type: WSE item: Global Version=5.0 - Title=wxWindows 2.1.13 Installation + Title=wxWindows 2.1.14 Installation Flags=00000100 Split=1420 Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 @@ -47,7 +47,7 @@ item: End Block end item: Set Variable Variable=APPTITLE - Value=wxWindows 2.1.13 + Value=wxWindows 2.1.14 end item: Set Variable Variable=GROUP diff --git a/distrib/msw/zipdist.bat b/distrib/msw/zipdist.bat index cf6a4ba92b..2995e5e420 100755 --- a/distrib/msw/zipdist.bat +++ b/distrib/msw/zipdist.bat @@ -64,6 +64,9 @@ zip32 -@ %dest\ogl3.zip < %src\distrib\msw\ogl.rsp rem MMedia zip32 -@ %dest\mmedia.zip < %src\distrib\msw\mmedia.rsp +rem STC (Scintilla widget) +zip32 -@ %dest\stc.zip < %src\distrib\msw\stc.rsp + rem GLCanvas: obsolete, now in main library rem zip32 -@ %dest\glcanvas.zip < %src\distrib\msw\glcanvas.rsp @@ -114,6 +117,7 @@ unzip32 -o ..\tex2rtf2.zip rem Now delete a few files that are unnecessary attrib -R * erase /Y BuildCVS.txt *.in *.spec *.guess *.sub mkinstalldirs modules install-sh *.sh descrip.mms +erase /Y configure samples\configure samples\*.in demos\configure demos\*.in contrib\configure contrib\*.in erase /Y setup.h.in setup.h_vms erase /SY Makefile.in rem erase /Y docs\pdf\ogl.pdf diff --git a/distrib/msw/zipstc.bat b/distrib/msw/zipstc.bat index e888906fd7..6110b39922 100755 --- a/distrib/msw/zipstc.bat +++ b/distrib/msw/zipstc.bat @@ -7,13 +7,13 @@ if "%src" == "" goto usage if "%dest" == "" goto usage echo About to archive an external STC distribution: echo From %src -echo To %dest\stc3.zip +echo To %dest\stc.zip echo CTRL-C if this is not correct. inkey /W4 `Press any key to continue...` %%input -erase %dest\stc3.zip +erase %dest\stc.zip cd %src -zip32 -@ %dest\stc3.zip < %src\distrib\msw\stc.rsp +zip32 -@ %dest\stc.zip < %src\distrib\msw\stc.rsp cd %dest diff --git a/docs/changes.txt b/docs/changes.txt index 20457ea5b9..75b98fdd27 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -4,6 +4,15 @@ wxWindows 2 Change Log 2.1.14 ------ +Documentation: + +- Added docs/tech for technical notes + +File hierarchy: + +- Started new contrib hierarchy that mirrors + the main lib structure; moved OGL and MMedia into it + wxBase: - wxDateTime replaces and extends old wxDate and wxTime classes (still @@ -50,7 +59,7 @@ all (GUI): - wxDragImage class added - samples/help improved to show standard and advanced HTML help controllers, as well as native help -- contrib hierarchy started, and OGL/Mmedia moved to it +- moved wxTreeLayout class to main lib wxMSW: diff --git a/utils/projgen/makeproj.cpp b/utils/projgen/makeproj.cpp index faf28b883d..ae37f967a4 100644 --- a/utils/projgen/makeproj.cpp +++ b/utils/projgen/makeproj.cpp @@ -228,7 +228,7 @@ void MyApp::GenerateSamples(const wxString& dir) GenerateSample("DynamicVC", "dynamic", dir + wxString("/samples/dynamic"), wxStringList("dynamic.cpp", 0)); GenerateSample("DrawingVC", "drawing", dir + wxString("/samples/drawing"), wxStringList("drawing.cpp", 0)); GenerateSample("ExecVC", "exec", dir + wxString("/samples/exec"), wxStringList("exec.cpp", 0)); - GenerateSample("GridVC", "test", dir + wxString("/samples/grid"), wxStringList("test.cpp", 0)); + GenerateSample("GridVC", "grid", dir + wxString("/samples/grid"), wxStringList("grid.cpp", 0)); GenerateSample("NewGridVC", "griddemo", dir + wxString("/samples/newgrid"), wxStringList("griddemo.cpp", 0)); GenerateSample("HelpVC", "demo", dir + wxString("/samples/help"), wxStringList("demo.cpp", 0)); @@ -268,16 +268,16 @@ void MyApp::GenerateSamples(const wxString& dir) GenerateSample("MemcheckVC", "memcheck", dir + wxString("/samples/memcheck"), wxStringList("memcheck.cpp", 0)); // Don't always generate this project since it has to be tweaked by hand. // GenerateSample("MfcVC", "mfctest", dir + wxString("/samples/mfc"), wxStringList("mfctest.cpp", "mfctest.h", 0)); - GenerateSample("MiniframVC", "test", dir + wxString("/samples/minifram"), wxStringList("test.cpp", "test.h", 0)); + GenerateSample("MiniframVC", "minifram", dir + wxString("/samples/minifram"), wxStringList("minifram.cpp", "minifram.h", 0)); GenerateSample("MinimalVC", "minimal", dir + wxString("/samples/minimal"), wxStringList("minimal.cpp", 0)); GenerateSample("NativdlgVC", "nativdlg", dir + wxString("/samples/nativdlg"), wxStringList("nativdlg.cpp", "nativdlg.h", "resource.h", 0)); GenerateSample("DialupVC", "nettest", dir + wxString("/samples/dialup"), wxStringList("nettest.cpp", 0)); - GenerateSample("NotebookVC", "test", dir + wxString("/samples/notebook"), wxStringList("test.cpp", "test.h", 0)); + GenerateSample("NotebookVC", "notebook", dir + wxString("/samples/notebook"), wxStringList("notebook.cpp", "notebook.h", 0)); GenerateSample("OleautoVC", "oleauto", dir + wxString("/samples/oleauto"), wxStringList("oleauto.cpp", 0)); GenerateSample("OwnerdrwVC", "ownerdrw", dir + wxString("/samples/ownerdrw"), wxStringList("ownerdrw.cpp", 0)); GenerateSample("PngVC", "pngdemo", dir + wxString("/samples/png"), wxStringList("pngdemo.cpp", "pngdemo.h", 0)); GenerateSample("PrintingVC", "printing", dir + wxString("/samples/printing"), wxStringList("printing.cpp", "printing.h", 0)); - GenerateSample("ProplistVC", "test", dir + wxString("/samples/proplist"), wxStringList("test.cpp", "test.h", 0)); + GenerateSample("ProplistVC", "proplist", dir + wxString("/samples/proplist"), wxStringList("proplist.cpp", "proplist.h", 0)); GenerateSample("PropsizeVC", "propsize", dir + wxString("/samples/propsize"), wxStringList("propsize.cpp", 0)); GenerateSample("RegtestVC", "regtest", dir + wxString("/samples/regtest"), wxStringList("regtest.cpp", 0)); GenerateSample("ResourceVC", "resource", dir + wxString("/samples/resource"), wxStringList("resource.cpp", "resource.h", 0)); @@ -286,12 +286,12 @@ void MyApp::GenerateSamples(const wxString& dir) GenerateSample("SashtestVC", "sashtest", dir + wxString("/samples/sashtest"), wxStringList("sashtest.cpp", "sashtest.h", 0)); GenerateSample("ScrollVC", "scroll", dir + wxString("/samples/scroll"), wxStringList("scroll.cpp", 0)); GenerateSample("ScrollsubVC", "scrollsub", dir + wxString("/samples/scrollsub"), wxStringList("scrollsub.cpp", 0)); - GenerateSample("SplitterVC", "test", dir + wxString("/samples/splitter"), wxStringList("test.cpp", 0)); + GenerateSample("SplitterVC", "splitter", dir + wxString("/samples/splitter"), wxStringList("splitter.cpp", 0)); GenerateSample("StatbarVC", "statbar", dir + wxString("/samples/statbar"), wxStringList("statbar.cpp", 0)); - GenerateSample("TabVC", "test", dir + wxString("/samples/tab"), wxStringList("test.cpp", "test.h", 0)); + GenerateSample("TabVC", "tab", dir + wxString("/samples/tab"), wxStringList("tab.cpp", "tab.h", 0)); GenerateSample("TaskbarVC", "tbtest", dir + wxString("/samples/taskbar"), wxStringList("tbtest.cpp", "tbtest.h", 0)); GenerateSample("TextVC", "text", dir + wxString("/samples/text"), wxStringList("text.cpp", 0)); - GenerateSample("ThreadVC", "test", dir + wxString("/samples/thread"), wxStringList("test.cpp", 0)); + GenerateSample("ThreadVC", "thread", dir + wxString("/samples/thread"), wxStringList("thread.cpp", 0)); GenerateSample("ToolbarVC", "toolbar", dir + wxString("/samples/toolbar"), wxStringList("toolbar.cpp", 0)); GenerateSample("TreectrlVC", "treetest", dir + wxString("/samples/treectrl"), wxStringList("treetest.cpp", "treetest.h", 0)); GenerateSample("TypetestVC", "typetest", dir + wxString("/samples/typetest"), wxStringList("typetest.cpp", "typetest.h", 0)); @@ -308,8 +308,8 @@ void MyApp::GenerateSamples(const wxString& dir) GenerateSample("ExecVC", "exec", dir + wxString("/samples/exec"), wxStringList("exec.cpp", 0)); GenerateSample("FontVC", "font", dir + wxString("/samples/font"), wxStringList("font.cpp", 0)); GenerateSample("MenuVC", "menu", dir + wxString("/samples/menu"), wxStringList("menu.cpp", 0)); - GenerateSample("TreelayVC", "test", dir + wxString("/samples/treelay"), wxStringList("test.cpp", "test.h", 0)); - GenerateSample("DragimagVC", "test", dir + wxString("/samples/dragimag"), wxStringList("test.cpp", "test.h", 0)); + GenerateSample("TreelayVC", "treelay", dir + wxString("/samples/treelay"), wxStringList("treelay.cpp", "treelay.h", 0)); + GenerateSample("DragimagVC", "dragimag", dir + wxString("/samples/dragimag"), wxStringList("dragimag.cpp", "dragimag.h", 0)); GenerateSample("PlotVC", "plot", dir + wxString("/samples/plot"), wxStringList("plot.cpp", 0)); //// Demos