Thread: pgAdmin III commit: Database Designer (milestone 1 of GSoC 2011)
Database Designer (milestone 1 of GSoC 2011) This patch adds the database designer. This new tool helps users to create their databases' schema. Lots of things still need to be implemented, but the raw features are in. Branch ------ master Details ------- http://git.postgresql.org/gitweb?p=pgadmin3.git;a=commitdiff;h=a8c26ad9f988e1948ffd8d6d3032560ceb437aaa Author: Luis Ochoa <ziul1979@gmail.com> Modified Files -------------- pgadmin/Makefile.am | 1 + pgadmin/dd/dditems/figures/ddColumnFigure.cpp | 458 +++++ pgadmin/dd/dditems/figures/ddColumnKindIcon.cpp | 418 +++++ pgadmin/dd/dditems/figures/ddColumnOptionIcon.cpp | 127 ++ .../dd/dditems/figures/ddRelationshipFigure.cpp | 822 +++++++++ pgadmin/dd/dditems/figures/ddRelationshipItem.cpp | 112 ++ .../dd/dditems/figures/ddRelationshipTerminal.cpp | 154 ++ pgadmin/dd/dditems/figures/ddTableFigure.cpp | 1030 +++++++++++ .../dd/dditems/figures/ddTextTableItemFigure.cpp | 529 ++++++ pgadmin/dd/dditems/figures/module.mk | 23 + .../dd/dditems/handles/ddAddColButtonHandle.cpp | 78 + pgadmin/dd/dditems/handles/ddAddFkButtonHandle.cpp | 71 + .../dditems/handles/ddMinMaxTableButtonHandle.cpp | 68 + .../dditems/handles/ddRemoveTableButtonHandle.cpp | 75 + pgadmin/dd/dditems/handles/ddScrollBarHandle.cpp | 127 ++ .../dd/dditems/handles/ddSouthTableSizeHandle.cpp | 92 + pgadmin/dd/dditems/handles/module.mk | 21 + pgadmin/dd/dditems/locators/ddAddColLocator.cpp | 41 + pgadmin/dd/dditems/locators/ddAddFkLocator.cpp | 41 + .../dd/dditems/locators/ddMinMaxTableLocator.cpp | 44 + .../dd/dditems/locators/ddRemoveTableLocator.cpp | 44 + .../dditems/locators/ddScrollBarTableLocator.cpp | 45 + .../dd/dditems/locators/ddTableBottomLocator.cpp | 45 + pgadmin/dd/dditems/locators/module.mk | 21 + pgadmin/dd/dditems/module.mk | 19 + pgadmin/dd/dditems/tools/ddColumnFigureTool.cpp | 130 ++ pgadmin/dd/dditems/tools/ddColumnTextTool.cpp | 84 + pgadmin/dd/dditems/tools/module.mk | 17 + .../dditems/utilities/ddPrecisionScaleDialog.cpp | 204 +++ .../dd/dditems/utilities/ddSelectKindFksDialog.cpp | 299 ++++ pgadmin/dd/dditems/utilities/ddTableNameDialog.cpp | 229 +++ pgadmin/dd/dditems/utilities/module.mk | 17 + pgadmin/dd/ddmodel/ddDatabaseDesign.cpp | 197 +++ pgadmin/dd/ddmodel/ddDrawingEditor.cpp | 78 + pgadmin/dd/ddmodel/ddDrawingView.cpp | 131 ++ pgadmin/dd/ddmodel/ddTextEditor.cpp | 64 + pgadmin/dd/ddmodel/module.mk | 19 + pgadmin/dd/module.mk | 18 + pgadmin/dd/wxhotdraw/connectors/module.mk | 19 + .../wxhotdraw/connectors/wxhdChopBoxConnector.cpp | 81 + pgadmin/dd/wxhotdraw/connectors/wxhdIConnector.cpp | 66 + .../wxhotdraw/connectors/wxhdLocatorConnector.cpp | 60 + .../connectors/wxhdStickyRectangleConnector.cpp | 72 + .../wxhotdraw/figures/defaultAttributes/module.mk | 19 + .../defaultAttributes/wxhdFillAttribute.cpp | 45 + .../defaultAttributes/wxhdFontAttribute.cpp | 43 + .../defaultAttributes/wxhdFontColorAttribute.cpp | 38 + .../defaultAttributes/wxhdLineAttribute.cpp | 43 + pgadmin/dd/wxhotdraw/figures/module.mk | 30 + .../dd/wxhotdraw/figures/wxhdAbstractFigure.cpp | 134 ++ .../wxhotdraw/figures/wxhdAbstractMenuFigure.cpp | 59 + pgadmin/dd/wxhotdraw/figures/wxhdAttribute.cpp | 34 + .../dd/wxhotdraw/figures/wxhdAttributeFigure.cpp | 95 + pgadmin/dd/wxhotdraw/figures/wxhdBitmapFigure.cpp | 61 + .../dd/wxhotdraw/figures/wxhdCompositeFigure.cpp | 229 +++ .../dd/wxhotdraw/figures/wxhdIConnectionFigure.cpp | 23 + pgadmin/dd/wxhotdraw/figures/wxhdIFigure.cpp | 171 ++ .../dd/wxhotdraw/figures/wxhdLineConnection.cpp | 270 +++ pgadmin/dd/wxhotdraw/figures/wxhdLineTerminal.cpp | 59 + .../dd/wxhotdraw/figures/wxhdPolyLineFigure.cpp | 355 ++++ .../dd/wxhotdraw/figures/wxhdRectangleFigure.cpp | 52 + .../dd/wxhotdraw/figures/wxhdSimpleTextFigure.cpp | 138 ++ pgadmin/dd/wxhotdraw/handles/module.mk | 23 + pgadmin/dd/wxhotdraw/handles/wxhdButtonHandle.cpp | 72 + .../handles/wxhdChangeConnectionEndHandle.cpp | 65 + .../handles/wxhdChangeConnectionHandle.cpp | 111 ++ .../handles/wxhdChangeConnectionStartHandle.cpp | 65 + pgadmin/dd/wxhotdraw/handles/wxhdIHandle.cpp | 47 + .../wxhotdraw/handles/wxhdLineConnectionHandle.cpp | 45 + pgadmin/dd/wxhotdraw/handles/wxhdLocatorHandle.cpp | 53 + .../dd/wxhotdraw/handles/wxhdPolyLineHandle.cpp | 77 + pgadmin/dd/wxhotdraw/locators/module.mk | 17 + pgadmin/dd/wxhotdraw/locators/wxhdILocator.cpp | 27 + .../dd/wxhotdraw/locators/wxhdPolyLineLocator.cpp | 49 + pgadmin/dd/wxhotdraw/main/module.mk | 18 + pgadmin/dd/wxhotdraw/main/wxhdDrawing.cpp | 142 ++ pgadmin/dd/wxhotdraw/main/wxhdDrawingEditor.cpp | 87 + pgadmin/dd/wxhotdraw/main/wxhdDrawingView.cpp | 541 ++++++ pgadmin/dd/wxhotdraw/module.mk | 21 + pgadmin/dd/wxhotdraw/tools/module.mk | 30 + pgadmin/dd/wxhotdraw/tools/wxhdAbstractTool.cpp | 66 + pgadmin/dd/wxhotdraw/tools/wxhdCanvasMenuTool.cpp | 83 + .../dd/wxhotdraw/tools/wxhdCompositeFigureTool.cpp | 121 ++ .../wxhotdraw/tools/wxhdConnectionCreationTool.cpp | 137 ++ pgadmin/dd/wxhotdraw/tools/wxhdCreationTool.cpp | 70 + .../dd/wxhotdraw/tools/wxhdDragCreationTool.cpp | 35 + pgadmin/dd/wxhotdraw/tools/wxhdDragTrackerTool.cpp | 101 ++ pgadmin/dd/wxhotdraw/tools/wxhdFigureTool.cpp | 101 ++ .../dd/wxhotdraw/tools/wxhdHandleTrackerTool.cpp | 46 + pgadmin/dd/wxhotdraw/tools/wxhdITool.cpp | 94 + pgadmin/dd/wxhotdraw/tools/wxhdMenuTool.cpp | 75 + .../dd/wxhotdraw/tools/wxhdPolyLineFigureTool.cpp | 53 + pgadmin/dd/wxhotdraw/tools/wxhdSelectAreaTool.cpp | 124 ++ pgadmin/dd/wxhotdraw/tools/wxhdSelectionTool.cpp | 160 ++ pgadmin/dd/wxhotdraw/tools/wxhdSimpleTextTool.cpp | 140 ++ pgadmin/dd/wxhotdraw/utilities/module.mk | 22 + .../dd/wxhotdraw/utilities/wxhdArrayCollection.cpp | 221 +++ pgadmin/dd/wxhotdraw/utilities/wxhdCollection.cpp | 111 ++ pgadmin/dd/wxhotdraw/utilities/wxhdGeometry.cpp | 180 ++ pgadmin/dd/wxhotdraw/utilities/wxhdKeyEvent.cpp | 36 + pgadmin/dd/wxhotdraw/utilities/wxhdMouseEvent.cpp | 99 ++ pgadmin/dd/wxhotdraw/utilities/wxhdPoint.cpp | 38 + pgadmin/dd/wxhotdraw/utilities/wxhdRect.cpp | 83 + pgadmin/dlg/dlgForeignDataWrapper.cpp | 2 +- pgadmin/dlg/dlgForeignServer.cpp | 2 +- pgadmin/dlg/dlgUserMapping.cpp | 2 +- pgadmin/frm/frmDatabaseDesigner.cpp | 298 ++++ pgadmin/frm/frmMain.cpp | 3 + pgadmin/frm/module.mk | 1 + pgadmin/include/ctl/xh_ctlcolourpicker.h | 2 +- .../include/dd/dditems/figures/ddColumnFigure.h | 91 + .../include/dd/dditems/figures/ddColumnKindIcon.h | 70 + .../dd/dditems/figures/ddColumnOptionIcon.h | 54 + .../dd/dditems/figures/ddRelationshipFigure.h | 105 ++ .../dd/dditems/figures/ddRelationshipItem.h | 46 + .../dd/dditems/figures/ddRelationshipTerminal.h | 34 + pgadmin/include/dd/dditems/figures/ddTableFigure.h | 121 ++ .../dd/dditems/figures/ddTextTableItemFigure.h | 84 + pgadmin/include/dd/dditems/figures/module.mk | 22 + .../dd/dditems/handles/ddAddColButtonHandle.h | 33 + .../dd/dditems/handles/ddAddFkButtonHandle.h | 33 + .../dd/dditems/handles/ddMinMaxTableButtonHandle.h | 35 + .../dd/dditems/handles/ddRemoveTableButtonHandle.h | 33 + .../include/dd/dditems/handles/ddScrollBarHandle.h | 46 + .../dd/dditems/handles/ddSouthTableSizeHandle.h | 36 + pgadmin/include/dd/dditems/handles/module.mk | 21 + .../include/dd/dditems/locators/ddAddColLocator.h | 30 + .../include/dd/dditems/locators/ddAddFkLocator.h | 30 + .../dd/dditems/locators/ddMinMaxTableLocator.h | 30 + .../dd/dditems/locators/ddRemoveTableLocator.h | 30 + .../dd/dditems/locators/ddScrollBarTableLocator.h | 31 + .../dd/dditems/locators/ddTableBottomLocator.h | 31 + pgadmin/include/dd/dditems/locators/module.mk | 21 + pgadmin/include/dd/dditems/module.mk | 19 + .../include/dd/dditems/tools/ddColumnFigureTool.h | 34 + .../include/dd/dditems/tools/ddColumnTextTool.h | 33 + pgadmin/include/dd/dditems/tools/module.mk | 17 + pgadmin/include/dd/dditems/utilities/ddDataType.h | 61 + .../dd/dditems/utilities/ddPrecisionScaleDialog.h | 91 + .../dd/dditems/utilities/ddSelectKindFksDialog.h | 98 + .../dd/dditems/utilities/ddTableNameDialog.h | 102 ++ pgadmin/include/dd/dditems/utilities/module.mk | 19 + pgadmin/include/dd/ddmodel/ddDatabaseDesign.h | 44 + pgadmin/include/dd/ddmodel/ddDrawingEditor.h | 36 + pgadmin/include/dd/ddmodel/ddDrawingView.h | 25 + pgadmin/include/dd/ddmodel/ddTextEditor.h | 35 + pgadmin/include/dd/ddmodel/module.mk | 19 + pgadmin/include/dd/module.mk | 18 + pgadmin/include/dd/wxhotdraw/connectors/module.mk | 19 + .../dd/wxhotdraw/connectors/wxhdChopBoxConnector.h | 33 + .../dd/wxhotdraw/connectors/wxhdIConnector.h | 41 + .../dd/wxhotdraw/connectors/wxhdLocatorConnector.h | 40 + .../connectors/wxhdStickyRectangleConnector.h | 42 + .../wxhotdraw/figures/defaultAttributes/module.mk | 19 + .../figures/defaultAttributes/wxhdFillAttribute.h | 27 + .../figures/defaultAttributes/wxhdFontAttribute.h | 27 + .../defaultAttributes/wxhdFontColorAttribute.h | 29 + .../figures/defaultAttributes/wxhdLineAttribute.h | 27 + pgadmin/include/dd/wxhotdraw/figures/module.mk | 30 + .../dd/wxhotdraw/figures/wxhdAbstractFigure.h | 50 + .../dd/wxhotdraw/figures/wxhdAbstractMenuFigure.h | 37 + .../include/dd/wxhotdraw/figures/wxhdAttribute.h | 23 + .../dd/wxhotdraw/figures/wxhdAttributeFigure.h | 55 + .../dd/wxhotdraw/figures/wxhdBitmapFigure.h | 34 + .../dd/wxhotdraw/figures/wxhdCompositeFigure.h | 42 + .../dd/wxhotdraw/figures/wxhdIConnectionFigure.h | 55 + pgadmin/include/dd/wxhotdraw/figures/wxhdIFigure.h | 63 + .../dd/wxhotdraw/figures/wxhdLineConnection.h | 62 + .../dd/wxhotdraw/figures/wxhdLineTerminal.h | 31 + .../dd/wxhotdraw/figures/wxhdPolyLineFigure.h | 67 + .../dd/wxhotdraw/figures/wxhdRectangleFigure.h | 35 + .../dd/wxhotdraw/figures/wxhdSimpleTextFigure.h | 50 + pgadmin/include/dd/wxhotdraw/handles/module.mk | 23 + .../dd/wxhotdraw/handles/wxhdButtonHandle.h | 41 + .../handles/wxhdChangeConnectionEndHandle.h | 30 + .../wxhotdraw/handles/wxhdChangeConnectionHandle.h | 44 + .../handles/wxhdChangeConnectionStartHandle.h | 30 + pgadmin/include/dd/wxhotdraw/handles/wxhdIHandle.h | 48 + .../wxhotdraw/handles/wxhdLineConnectionHandle.h | 25 + .../dd/wxhotdraw/handles/wxhdLocatorHandle.h | 39 + .../dd/wxhotdraw/handles/wxhdPolyLineHandle.h | 40 + pgadmin/include/dd/wxhotdraw/locators/module.mk | 17 + .../include/dd/wxhotdraw/locators/wxhdILocator.h | 32 + .../dd/wxhotdraw/locators/wxhdPolyLineLocator.h | 31 + pgadmin/include/dd/wxhotdraw/main/module.mk | 19 + pgadmin/include/dd/wxhotdraw/main/wxhdDrawing.h | 42 + .../include/dd/wxhotdraw/main/wxhdDrawingEditor.h | 38 + .../include/dd/wxhotdraw/main/wxhdDrawingView.h | 114 ++ pgadmin/include/dd/wxhotdraw/main/wxhdObject.h | 19 + pgadmin/include/dd/wxhotdraw/module.mk | 21 + pgadmin/include/dd/wxhotdraw/tools/module.mk | 30 + .../include/dd/wxhotdraw/tools/wxhdAbstractTool.h | 42 + .../dd/wxhotdraw/tools/wxhdCanvasMenuTool.h | 35 + .../dd/wxhotdraw/tools/wxhdCompositeFigureTool.h | 34 + .../wxhotdraw/tools/wxhdConnectionCreationTool.h | 38 + .../include/dd/wxhotdraw/tools/wxhdCreationTool.h | 36 + .../dd/wxhotdraw/tools/wxhdDragCreationTool.h | 26 + .../dd/wxhotdraw/tools/wxhdDragTrackerTool.h | 43 + .../include/dd/wxhotdraw/tools/wxhdFigureTool.h | 38 + .../dd/wxhotdraw/tools/wxhdHandleTrackerTool.h | 40 + pgadmin/include/dd/wxhotdraw/tools/wxhdITool.h | 42 + pgadmin/include/dd/wxhotdraw/tools/wxhdMenuTool.h | 36 + .../dd/wxhotdraw/tools/wxhdPolyLineFigureTool.h | 27 + .../dd/wxhotdraw/tools/wxhdSelectAreaTool.h | 38 + .../include/dd/wxhotdraw/tools/wxhdSelectionTool.h | 37 + .../dd/wxhotdraw/tools/wxhdSimpleTextTool.h | 43 + pgadmin/include/dd/wxhotdraw/utilities/module.mk | 23 + .../dd/wxhotdraw/utilities/wxhdArrayCollection.h | 74 + .../dd/wxhotdraw/utilities/wxhdCollection.h | 43 + .../dd/wxhotdraw/utilities/wxhdCollectionBase.h | 54 + .../include/dd/wxhotdraw/utilities/wxhdGeometry.h | 37 + .../include/dd/wxhotdraw/utilities/wxhdKeyEvent.h | 30 + .../dd/wxhotdraw/utilities/wxhdMouseEvent.h | 43 + pgadmin/include/dd/wxhotdraw/utilities/wxhdPoint.h | 23 + pgadmin/include/dd/wxhotdraw/utilities/wxhdRect.h | 34 + pgadmin/include/dlg/dlgForeignDataWrapper.h | 2 +- pgadmin/include/dlg/dlgForeignServer.h | 2 +- pgadmin/include/dlg/dlgUserMapping.h | 2 +- pgadmin/include/frm/frmDatabaseDesigner.h | 67 + pgadmin/include/frm/menu.h | 4 + pgadmin/include/images/ddAddColumn.png | Bin 0 -> 165 bytes pgadmin/include/images/ddAddColumnCursor.png | Bin 0 -> 612 bytes pgadmin/include/images/ddAddForeignKey.png | Bin 0 -> 173 bytes pgadmin/include/images/ddDeleteTableCursor.png | Bin 0 -> 937 bytes pgadmin/include/images/ddDown.png | Bin 0 -> 291 bytes pgadmin/include/images/ddMaximizeTable.png | Bin 0 -> 162 bytes pgadmin/include/images/ddMinMaxCursor.png | Bin 0 -> 1569 bytes pgadmin/include/images/ddMinimizeTable.png | Bin 0 -> 159 bytes pgadmin/include/images/ddRelationshipCursor.png | Bin 0 -> 611 bytes pgadmin/include/images/ddRemoveColumn.png | Bin 0 -> 151 bytes pgadmin/include/images/ddRemoveColumnCursor.png | Bin 0 -> 751 bytes pgadmin/include/images/ddRemoveTable.png | Bin 0 -> 178 bytes pgadmin/include/images/ddRemoveTable2.png | Bin 0 -> 759 bytes pgadmin/include/images/ddUp.png | Bin 0 -> 278 bytes pgadmin/include/images/ddcancel.png | Bin 0 -> 485 bytes pgadmin/include/images/ddforeignkey.png | Bin 0 -> 329 bytes pgadmin/include/images/ddforeignkeyfromuk.png | Bin 0 -> 355 bytes pgadmin/include/images/ddforeignkeyuniquekey.png | Bin 0 -> 361 bytes .../include/images/ddforeignkeyuniquekeyfromuk.png | Bin 0 -> 377 bytes pgadmin/include/images/ddmodel-32.png | Bin 0 -> 640 bytes pgadmin/include/images/ddnotnull.png | Bin 0 -> 176 bytes pgadmin/include/images/ddnull.png | Bin 0 -> 169 bytes pgadmin/include/images/ddprimaryforeignkey.png | Bin 0 -> 367 bytes .../include/images/ddprimaryforeignkeyfromuk.png | Bin 0 -> 386 bytes pgadmin/include/images/ddprimarykey.png | Bin 0 -> 344 bytes pgadmin/include/images/ddprimarykeyuniquekey.png | Bin 0 -> 361 bytes pgadmin/include/images/ddunique.png | Bin 0 -> 241 bytes pgadmin/include/images/module.mk | 14 + pgadmin/include/ogl/module.mk | 2 +- pgadmin/include/schema/pgForeignDataWrapper.h | 2 +- pgadmin/include/schema/pgForeignServer.h | 2 +- pgadmin/include/schema/pgUserMapping.h | 2 +- pgadmin/include/utils/registry.h | 2 +- pgadmin/ogl/module.mk | 2 +- pgadmin/pgAdmin3.cpp | 94 +- pgadmin/pgAdmin3.vcproj | 1850 ++++++++++++++++---- pgadmin/schema/pgForeignDataWrapper.cpp | 2 +- pgadmin/schema/pgForeignServer.cpp | 2 +- pgadmin/schema/pgUserMapping.cpp | 2 +- 259 files changed, 18089 insertions(+), 404 deletions(-)
Did this patch randomly update a couple of copyright years to 2011, or were those files that were somehow forgotten in a previous run? EIther way it looked unrelated so I figured I'd ask :-) (e.g .pgForeignServer.cpp and pgUserMapping.cpp) There also seem to be some unrealated changes in the visual studio project? Changing the default from debug win32 to release x64, was that intentional? (at least I think it did that - unfortunately VS appears to have reordered the file pretty bad so the diff is hard to read) Other than that - yay! Now I just have to pull this down and test it... //Magnus On Mon, Jun 27, 2011 at 09:07, Guillaume Lelarge <guillaume@lelarge.info> wrote: > Database Designer (milestone 1 of GSoC 2011) > > This patch adds the database designer. This new tool helps users to create > their databases' schema. Lots of things still need to be implemented, but the > raw features are in. > > Branch > ------ > master > > Details > ------- > http://git.postgresql.org/gitweb?p=pgadmin3.git;a=commitdiff;h=a8c26ad9f988e1948ffd8d6d3032560ceb437aaa > Author: Luis Ochoa <ziul1979@gmail.com> > > Modified Files > -------------- > pgadmin/Makefile.am | 1 + > pgadmin/dd/dditems/figures/ddColumnFigure.cpp | 458 +++++ > pgadmin/dd/dditems/figures/ddColumnKindIcon.cpp | 418 +++++ > pgadmin/dd/dditems/figures/ddColumnOptionIcon.cpp | 127 ++ > .../dd/dditems/figures/ddRelationshipFigure.cpp | 822 +++++++++ > pgadmin/dd/dditems/figures/ddRelationshipItem.cpp | 112 ++ > .../dd/dditems/figures/ddRelationshipTerminal.cpp | 154 ++ > pgadmin/dd/dditems/figures/ddTableFigure.cpp | 1030 +++++++++++ > .../dd/dditems/figures/ddTextTableItemFigure.cpp | 529 ++++++ > pgadmin/dd/dditems/figures/module.mk | 23 + > .../dd/dditems/handles/ddAddColButtonHandle.cpp | 78 + > pgadmin/dd/dditems/handles/ddAddFkButtonHandle.cpp | 71 + > .../dditems/handles/ddMinMaxTableButtonHandle.cpp | 68 + > .../dditems/handles/ddRemoveTableButtonHandle.cpp | 75 + > pgadmin/dd/dditems/handles/ddScrollBarHandle.cpp | 127 ++ > .../dd/dditems/handles/ddSouthTableSizeHandle.cpp | 92 + > pgadmin/dd/dditems/handles/module.mk | 21 + > pgadmin/dd/dditems/locators/ddAddColLocator.cpp | 41 + > pgadmin/dd/dditems/locators/ddAddFkLocator.cpp | 41 + > .../dd/dditems/locators/ddMinMaxTableLocator.cpp | 44 + > .../dd/dditems/locators/ddRemoveTableLocator.cpp | 44 + > .../dditems/locators/ddScrollBarTableLocator.cpp | 45 + > .../dd/dditems/locators/ddTableBottomLocator.cpp | 45 + > pgadmin/dd/dditems/locators/module.mk | 21 + > pgadmin/dd/dditems/module.mk | 19 + > pgadmin/dd/dditems/tools/ddColumnFigureTool.cpp | 130 ++ > pgadmin/dd/dditems/tools/ddColumnTextTool.cpp | 84 + > pgadmin/dd/dditems/tools/module.mk | 17 + > .../dditems/utilities/ddPrecisionScaleDialog.cpp | 204 +++ > .../dd/dditems/utilities/ddSelectKindFksDialog.cpp | 299 ++++ > pgadmin/dd/dditems/utilities/ddTableNameDialog.cpp | 229 +++ > pgadmin/dd/dditems/utilities/module.mk | 17 + > pgadmin/dd/ddmodel/ddDatabaseDesign.cpp | 197 +++ > pgadmin/dd/ddmodel/ddDrawingEditor.cpp | 78 + > pgadmin/dd/ddmodel/ddDrawingView.cpp | 131 ++ > pgadmin/dd/ddmodel/ddTextEditor.cpp | 64 + > pgadmin/dd/ddmodel/module.mk | 19 + > pgadmin/dd/module.mk | 18 + > pgadmin/dd/wxhotdraw/connectors/module.mk | 19 + > .../wxhotdraw/connectors/wxhdChopBoxConnector.cpp | 81 + > pgadmin/dd/wxhotdraw/connectors/wxhdIConnector.cpp | 66 + > .../wxhotdraw/connectors/wxhdLocatorConnector.cpp | 60 + > .../connectors/wxhdStickyRectangleConnector.cpp | 72 + > .../wxhotdraw/figures/defaultAttributes/module.mk | 19 + > .../defaultAttributes/wxhdFillAttribute.cpp | 45 + > .../defaultAttributes/wxhdFontAttribute.cpp | 43 + > .../defaultAttributes/wxhdFontColorAttribute.cpp | 38 + > .../defaultAttributes/wxhdLineAttribute.cpp | 43 + > pgadmin/dd/wxhotdraw/figures/module.mk | 30 + > .../dd/wxhotdraw/figures/wxhdAbstractFigure.cpp | 134 ++ > .../wxhotdraw/figures/wxhdAbstractMenuFigure.cpp | 59 + > pgadmin/dd/wxhotdraw/figures/wxhdAttribute.cpp | 34 + > .../dd/wxhotdraw/figures/wxhdAttributeFigure.cpp | 95 + > pgadmin/dd/wxhotdraw/figures/wxhdBitmapFigure.cpp | 61 + > .../dd/wxhotdraw/figures/wxhdCompositeFigure.cpp | 229 +++ > .../dd/wxhotdraw/figures/wxhdIConnectionFigure.cpp | 23 + > pgadmin/dd/wxhotdraw/figures/wxhdIFigure.cpp | 171 ++ > .../dd/wxhotdraw/figures/wxhdLineConnection.cpp | 270 +++ > pgadmin/dd/wxhotdraw/figures/wxhdLineTerminal.cpp | 59 + > .../dd/wxhotdraw/figures/wxhdPolyLineFigure.cpp | 355 ++++ > .../dd/wxhotdraw/figures/wxhdRectangleFigure.cpp | 52 + > .../dd/wxhotdraw/figures/wxhdSimpleTextFigure.cpp | 138 ++ > pgadmin/dd/wxhotdraw/handles/module.mk | 23 + > pgadmin/dd/wxhotdraw/handles/wxhdButtonHandle.cpp | 72 + > .../handles/wxhdChangeConnectionEndHandle.cpp | 65 + > .../handles/wxhdChangeConnectionHandle.cpp | 111 ++ > .../handles/wxhdChangeConnectionStartHandle.cpp | 65 + > pgadmin/dd/wxhotdraw/handles/wxhdIHandle.cpp | 47 + > .../wxhotdraw/handles/wxhdLineConnectionHandle.cpp | 45 + > pgadmin/dd/wxhotdraw/handles/wxhdLocatorHandle.cpp | 53 + > .../dd/wxhotdraw/handles/wxhdPolyLineHandle.cpp | 77 + > pgadmin/dd/wxhotdraw/locators/module.mk | 17 + > pgadmin/dd/wxhotdraw/locators/wxhdILocator.cpp | 27 + > .../dd/wxhotdraw/locators/wxhdPolyLineLocator.cpp | 49 + > pgadmin/dd/wxhotdraw/main/module.mk | 18 + > pgadmin/dd/wxhotdraw/main/wxhdDrawing.cpp | 142 ++ > pgadmin/dd/wxhotdraw/main/wxhdDrawingEditor.cpp | 87 + > pgadmin/dd/wxhotdraw/main/wxhdDrawingView.cpp | 541 ++++++ > pgadmin/dd/wxhotdraw/module.mk | 21 + > pgadmin/dd/wxhotdraw/tools/module.mk | 30 + > pgadmin/dd/wxhotdraw/tools/wxhdAbstractTool.cpp | 66 + > pgadmin/dd/wxhotdraw/tools/wxhdCanvasMenuTool.cpp | 83 + > .../dd/wxhotdraw/tools/wxhdCompositeFigureTool.cpp | 121 ++ > .../wxhotdraw/tools/wxhdConnectionCreationTool.cpp | 137 ++ > pgadmin/dd/wxhotdraw/tools/wxhdCreationTool.cpp | 70 + > .../dd/wxhotdraw/tools/wxhdDragCreationTool.cpp | 35 + > pgadmin/dd/wxhotdraw/tools/wxhdDragTrackerTool.cpp | 101 ++ > pgadmin/dd/wxhotdraw/tools/wxhdFigureTool.cpp | 101 ++ > .../dd/wxhotdraw/tools/wxhdHandleTrackerTool.cpp | 46 + > pgadmin/dd/wxhotdraw/tools/wxhdITool.cpp | 94 + > pgadmin/dd/wxhotdraw/tools/wxhdMenuTool.cpp | 75 + > .../dd/wxhotdraw/tools/wxhdPolyLineFigureTool.cpp | 53 + > pgadmin/dd/wxhotdraw/tools/wxhdSelectAreaTool.cpp | 124 ++ > pgadmin/dd/wxhotdraw/tools/wxhdSelectionTool.cpp | 160 ++ > pgadmin/dd/wxhotdraw/tools/wxhdSimpleTextTool.cpp | 140 ++ > pgadmin/dd/wxhotdraw/utilities/module.mk | 22 + > .../dd/wxhotdraw/utilities/wxhdArrayCollection.cpp | 221 +++ > pgadmin/dd/wxhotdraw/utilities/wxhdCollection.cpp | 111 ++ > pgadmin/dd/wxhotdraw/utilities/wxhdGeometry.cpp | 180 ++ > pgadmin/dd/wxhotdraw/utilities/wxhdKeyEvent.cpp | 36 + > pgadmin/dd/wxhotdraw/utilities/wxhdMouseEvent.cpp | 99 ++ > pgadmin/dd/wxhotdraw/utilities/wxhdPoint.cpp | 38 + > pgadmin/dd/wxhotdraw/utilities/wxhdRect.cpp | 83 + > pgadmin/dlg/dlgForeignDataWrapper.cpp | 2 +- > pgadmin/dlg/dlgForeignServer.cpp | 2 +- > pgadmin/dlg/dlgUserMapping.cpp | 2 +- > pgadmin/frm/frmDatabaseDesigner.cpp | 298 ++++ > pgadmin/frm/frmMain.cpp | 3 + > pgadmin/frm/module.mk | 1 + > pgadmin/include/ctl/xh_ctlcolourpicker.h | 2 +- > .../include/dd/dditems/figures/ddColumnFigure.h | 91 + > .../include/dd/dditems/figures/ddColumnKindIcon.h | 70 + > .../dd/dditems/figures/ddColumnOptionIcon.h | 54 + > .../dd/dditems/figures/ddRelationshipFigure.h | 105 ++ > .../dd/dditems/figures/ddRelationshipItem.h | 46 + > .../dd/dditems/figures/ddRelationshipTerminal.h | 34 + > pgadmin/include/dd/dditems/figures/ddTableFigure.h | 121 ++ > .../dd/dditems/figures/ddTextTableItemFigure.h | 84 + > pgadmin/include/dd/dditems/figures/module.mk | 22 + > .../dd/dditems/handles/ddAddColButtonHandle.h | 33 + > .../dd/dditems/handles/ddAddFkButtonHandle.h | 33 + > .../dd/dditems/handles/ddMinMaxTableButtonHandle.h | 35 + > .../dd/dditems/handles/ddRemoveTableButtonHandle.h | 33 + > .../include/dd/dditems/handles/ddScrollBarHandle.h | 46 + > .../dd/dditems/handles/ddSouthTableSizeHandle.h | 36 + > pgadmin/include/dd/dditems/handles/module.mk | 21 + > .../include/dd/dditems/locators/ddAddColLocator.h | 30 + > .../include/dd/dditems/locators/ddAddFkLocator.h | 30 + > .../dd/dditems/locators/ddMinMaxTableLocator.h | 30 + > .../dd/dditems/locators/ddRemoveTableLocator.h | 30 + > .../dd/dditems/locators/ddScrollBarTableLocator.h | 31 + > .../dd/dditems/locators/ddTableBottomLocator.h | 31 + > pgadmin/include/dd/dditems/locators/module.mk | 21 + > pgadmin/include/dd/dditems/module.mk | 19 + > .../include/dd/dditems/tools/ddColumnFigureTool.h | 34 + > .../include/dd/dditems/tools/ddColumnTextTool.h | 33 + > pgadmin/include/dd/dditems/tools/module.mk | 17 + > pgadmin/include/dd/dditems/utilities/ddDataType.h | 61 + > .../dd/dditems/utilities/ddPrecisionScaleDialog.h | 91 + > .../dd/dditems/utilities/ddSelectKindFksDialog.h | 98 + > .../dd/dditems/utilities/ddTableNameDialog.h | 102 ++ > pgadmin/include/dd/dditems/utilities/module.mk | 19 + > pgadmin/include/dd/ddmodel/ddDatabaseDesign.h | 44 + > pgadmin/include/dd/ddmodel/ddDrawingEditor.h | 36 + > pgadmin/include/dd/ddmodel/ddDrawingView.h | 25 + > pgadmin/include/dd/ddmodel/ddTextEditor.h | 35 + > pgadmin/include/dd/ddmodel/module.mk | 19 + > pgadmin/include/dd/module.mk | 18 + > pgadmin/include/dd/wxhotdraw/connectors/module.mk | 19 + > .../dd/wxhotdraw/connectors/wxhdChopBoxConnector.h | 33 + > .../dd/wxhotdraw/connectors/wxhdIConnector.h | 41 + > .../dd/wxhotdraw/connectors/wxhdLocatorConnector.h | 40 + > .../connectors/wxhdStickyRectangleConnector.h | 42 + > .../wxhotdraw/figures/defaultAttributes/module.mk | 19 + > .../figures/defaultAttributes/wxhdFillAttribute.h | 27 + > .../figures/defaultAttributes/wxhdFontAttribute.h | 27 + > .../defaultAttributes/wxhdFontColorAttribute.h | 29 + > .../figures/defaultAttributes/wxhdLineAttribute.h | 27 + > pgadmin/include/dd/wxhotdraw/figures/module.mk | 30 + > .../dd/wxhotdraw/figures/wxhdAbstractFigure.h | 50 + > .../dd/wxhotdraw/figures/wxhdAbstractMenuFigure.h | 37 + > .../include/dd/wxhotdraw/figures/wxhdAttribute.h | 23 + > .../dd/wxhotdraw/figures/wxhdAttributeFigure.h | 55 + > .../dd/wxhotdraw/figures/wxhdBitmapFigure.h | 34 + > .../dd/wxhotdraw/figures/wxhdCompositeFigure.h | 42 + > .../dd/wxhotdraw/figures/wxhdIConnectionFigure.h | 55 + > pgadmin/include/dd/wxhotdraw/figures/wxhdIFigure.h | 63 + > .../dd/wxhotdraw/figures/wxhdLineConnection.h | 62 + > .../dd/wxhotdraw/figures/wxhdLineTerminal.h | 31 + > .../dd/wxhotdraw/figures/wxhdPolyLineFigure.h | 67 + > .../dd/wxhotdraw/figures/wxhdRectangleFigure.h | 35 + > .../dd/wxhotdraw/figures/wxhdSimpleTextFigure.h | 50 + > pgadmin/include/dd/wxhotdraw/handles/module.mk | 23 + > .../dd/wxhotdraw/handles/wxhdButtonHandle.h | 41 + > .../handles/wxhdChangeConnectionEndHandle.h | 30 + > .../wxhotdraw/handles/wxhdChangeConnectionHandle.h | 44 + > .../handles/wxhdChangeConnectionStartHandle.h | 30 + > pgadmin/include/dd/wxhotdraw/handles/wxhdIHandle.h | 48 + > .../wxhotdraw/handles/wxhdLineConnectionHandle.h | 25 + > .../dd/wxhotdraw/handles/wxhdLocatorHandle.h | 39 + > .../dd/wxhotdraw/handles/wxhdPolyLineHandle.h | 40 + > pgadmin/include/dd/wxhotdraw/locators/module.mk | 17 + > .../include/dd/wxhotdraw/locators/wxhdILocator.h | 32 + > .../dd/wxhotdraw/locators/wxhdPolyLineLocator.h | 31 + > pgadmin/include/dd/wxhotdraw/main/module.mk | 19 + > pgadmin/include/dd/wxhotdraw/main/wxhdDrawing.h | 42 + > .../include/dd/wxhotdraw/main/wxhdDrawingEditor.h | 38 + > .../include/dd/wxhotdraw/main/wxhdDrawingView.h | 114 ++ > pgadmin/include/dd/wxhotdraw/main/wxhdObject.h | 19 + > pgadmin/include/dd/wxhotdraw/module.mk | 21 + > pgadmin/include/dd/wxhotdraw/tools/module.mk | 30 + > .../include/dd/wxhotdraw/tools/wxhdAbstractTool.h | 42 + > .../dd/wxhotdraw/tools/wxhdCanvasMenuTool.h | 35 + > .../dd/wxhotdraw/tools/wxhdCompositeFigureTool.h | 34 + > .../wxhotdraw/tools/wxhdConnectionCreationTool.h | 38 + > .../include/dd/wxhotdraw/tools/wxhdCreationTool.h | 36 + > .../dd/wxhotdraw/tools/wxhdDragCreationTool.h | 26 + > .../dd/wxhotdraw/tools/wxhdDragTrackerTool.h | 43 + > .../include/dd/wxhotdraw/tools/wxhdFigureTool.h | 38 + > .../dd/wxhotdraw/tools/wxhdHandleTrackerTool.h | 40 + > pgadmin/include/dd/wxhotdraw/tools/wxhdITool.h | 42 + > pgadmin/include/dd/wxhotdraw/tools/wxhdMenuTool.h | 36 + > .../dd/wxhotdraw/tools/wxhdPolyLineFigureTool.h | 27 + > .../dd/wxhotdraw/tools/wxhdSelectAreaTool.h | 38 + > .../include/dd/wxhotdraw/tools/wxhdSelectionTool.h | 37 + > .../dd/wxhotdraw/tools/wxhdSimpleTextTool.h | 43 + > pgadmin/include/dd/wxhotdraw/utilities/module.mk | 23 + > .../dd/wxhotdraw/utilities/wxhdArrayCollection.h | 74 + > .../dd/wxhotdraw/utilities/wxhdCollection.h | 43 + > .../dd/wxhotdraw/utilities/wxhdCollectionBase.h | 54 + > .../include/dd/wxhotdraw/utilities/wxhdGeometry.h | 37 + > .../include/dd/wxhotdraw/utilities/wxhdKeyEvent.h | 30 + > .../dd/wxhotdraw/utilities/wxhdMouseEvent.h | 43 + > pgadmin/include/dd/wxhotdraw/utilities/wxhdPoint.h | 23 + > pgadmin/include/dd/wxhotdraw/utilities/wxhdRect.h | 34 + > pgadmin/include/dlg/dlgForeignDataWrapper.h | 2 +- > pgadmin/include/dlg/dlgForeignServer.h | 2 +- > pgadmin/include/dlg/dlgUserMapping.h | 2 +- > pgadmin/include/frm/frmDatabaseDesigner.h | 67 + > pgadmin/include/frm/menu.h | 4 + > pgadmin/include/images/ddAddColumn.png | Bin 0 -> 165 bytes > pgadmin/include/images/ddAddColumnCursor.png | Bin 0 -> 612 bytes > pgadmin/include/images/ddAddForeignKey.png | Bin 0 -> 173 bytes > pgadmin/include/images/ddDeleteTableCursor.png | Bin 0 -> 937 bytes > pgadmin/include/images/ddDown.png | Bin 0 -> 291 bytes > pgadmin/include/images/ddMaximizeTable.png | Bin 0 -> 162 bytes > pgadmin/include/images/ddMinMaxCursor.png | Bin 0 -> 1569 bytes > pgadmin/include/images/ddMinimizeTable.png | Bin 0 -> 159 bytes > pgadmin/include/images/ddRelationshipCursor.png | Bin 0 -> 611 bytes > pgadmin/include/images/ddRemoveColumn.png | Bin 0 -> 151 bytes > pgadmin/include/images/ddRemoveColumnCursor.png | Bin 0 -> 751 bytes > pgadmin/include/images/ddRemoveTable.png | Bin 0 -> 178 bytes > pgadmin/include/images/ddRemoveTable2.png | Bin 0 -> 759 bytes > pgadmin/include/images/ddUp.png | Bin 0 -> 278 bytes > pgadmin/include/images/ddcancel.png | Bin 0 -> 485 bytes > pgadmin/include/images/ddforeignkey.png | Bin 0 -> 329 bytes > pgadmin/include/images/ddforeignkeyfromuk.png | Bin 0 -> 355 bytes > pgadmin/include/images/ddforeignkeyuniquekey.png | Bin 0 -> 361 bytes > .../include/images/ddforeignkeyuniquekeyfromuk.png | Bin 0 -> 377 bytes > pgadmin/include/images/ddmodel-32.png | Bin 0 -> 640 bytes > pgadmin/include/images/ddnotnull.png | Bin 0 -> 176 bytes > pgadmin/include/images/ddnull.png | Bin 0 -> 169 bytes > pgadmin/include/images/ddprimaryforeignkey.png | Bin 0 -> 367 bytes > .../include/images/ddprimaryforeignkeyfromuk.png | Bin 0 -> 386 bytes > pgadmin/include/images/ddprimarykey.png | Bin 0 -> 344 bytes > pgadmin/include/images/ddprimarykeyuniquekey.png | Bin 0 -> 361 bytes > pgadmin/include/images/ddunique.png | Bin 0 -> 241 bytes > pgadmin/include/images/module.mk | 14 + > pgadmin/include/ogl/module.mk | 2 +- > pgadmin/include/schema/pgForeignDataWrapper.h | 2 +- > pgadmin/include/schema/pgForeignServer.h | 2 +- > pgadmin/include/schema/pgUserMapping.h | 2 +- > pgadmin/include/utils/registry.h | 2 +- > pgadmin/ogl/module.mk | 2 +- > pgadmin/pgAdmin3.cpp | 94 +- > pgadmin/pgAdmin3.vcproj | 1850 ++++++++++++++++---- > pgadmin/schema/pgForeignDataWrapper.cpp | 2 +- > pgadmin/schema/pgForeignServer.cpp | 2 +- > pgadmin/schema/pgUserMapping.cpp | 2 +- > 259 files changed, 18089 insertions(+), 404 deletions(-) > > > -- > Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org) > To make changes to your subscription: > http://www.postgresql.org/mailpref/pgadmin-hackers > -- Magnus Hagander Me: http://www.hagander.net/ Work: http://www.redpill-linpro.com/
On Mon, 2011-06-27 at 09:21 +0200, Magnus Hagander wrote: > Did this patch randomly update a couple of copyright years to 2011, or > were those files that were somehow forgotten in a previous run? EIther > way it looked unrelated so I figured I'd ask :-) (e.g > .pgForeignServer.cpp and pgUserMapping.cpp) > I had to replace all 2010 with 2011 from Luis's files. I found that other files needed the update too, and did it in the same run. Probably not a great idea. > There also seem to be some unrealated changes in the visual studio > project? Changing the default from debug win32 to release x64, was > that intentional? (at least I think it did that - unfortunately VS > appears to have reordered the file pretty bad so the diff is hard to > read) > I added all Luis's files to the visual studio project. Other things may have been changed by this. I have not much knowledge on this. All I did was making sure that one could compile pgAdmin with Visual Studio, but I didn't check every changes on this file. If I did something wrong, can you tell me what? I'll try to remember about the default compile option. > Other than that - yay! Now I just have to pull this down and test it... > :) -- Guillaume http://blog.guillaume.lelarge.info http://www.dalibo.com
On Mon, Jun 27, 2011 at 09:29, Guillaume Lelarge <guillaume@lelarge.info> wrote: > On Mon, 2011-06-27 at 09:21 +0200, Magnus Hagander wrote: >> Did this patch randomly update a couple of copyright years to 2011, or >> were those files that were somehow forgotten in a previous run? EIther >> way it looked unrelated so I figured I'd ask :-) (e.g >> .pgForeignServer.cpp and pgUserMapping.cpp) >> > > I had to replace all 2010 with 2011 from Luis's files. I found that > other files needed the update too, and did it in the same run. Probably > not a great idea. > >> There also seem to be some unrealated changes in the visual studio >> project? Changing the default from debug win32 to release x64, was >> that intentional? (at least I think it did that - unfortunately VS >> appears to have reordered the file pretty bad so the diff is hard to >> read) >> > > I added all Luis's files to the visual studio project. Other things may > have been changed by this. I have not much knowledge on this. All I did > was making sure that one could compile pgAdmin with Visual Studio, but I > didn't check every changes on this file. > > If I did something wrong, can you tell me what? I'll try to remember > about the default compile option. I just noticed a bunch of chunks in the patch that changed Debug|Win32 to Release|x64. That just seems like an unrelated change... I'm not sure how that change happened, it oculd've been something Visual Studio did behind your back... -- Magnus Hagander Me: http://www.hagander.net/ Work: http://www.redpill-linpro.com/
On Mon, 2011-06-27 at 09:31 +0200, Magnus Hagander wrote: > On Mon, Jun 27, 2011 at 09:29, Guillaume Lelarge <guillaume@lelarge.info> wrote: > > On Mon, 2011-06-27 at 09:21 +0200, Magnus Hagander wrote: > >> Did this patch randomly update a couple of copyright years to 2011, or > >> were those files that were somehow forgotten in a previous run? EIther > >> way it looked unrelated so I figured I'd ask :-) (e.g > >> .pgForeignServer.cpp and pgUserMapping.cpp) > >> > > > > I had to replace all 2010 with 2011 from Luis's files. I found that > > other files needed the update too, and did it in the same run. Probably > > not a great idea. > > > >> There also seem to be some unrealated changes in the visual studio > >> project? Changing the default from debug win32 to release x64, was > >> that intentional? (at least I think it did that - unfortunately VS > >> appears to have reordered the file pretty bad so the diff is hard to > >> read) > >> > > > > I added all Luis's files to the visual studio project. Other things may > > have been changed by this. I have not much knowledge on this. All I did > > was making sure that one could compile pgAdmin with Visual Studio, but I > > didn't check every changes on this file. > > > > If I did something wrong, can you tell me what? I'll try to remember > > about the default compile option. > > I just noticed a bunch of chunks in the patch that changed Debug|Win32 > to Release|x64. That just seems like an unrelated change... I'm not > sure how that change happened, it oculd've been something Visual > Studio did behind your back... > That's the mode I'm using when I debug pgAdmin on Windows. I don't think I can set it back to x64. -- Guillaume http://blog.guillaume.lelarge.info http://www.dalibo.com
On Mon, Jun 27, 2011 at 8:07 AM, Guillaume Lelarge <guillaume@lelarge.info> wrote: > Database Designer (milestone 1 of GSoC 2011) > > This patch adds the database designer. This new tool helps users to create > their databases' schema. Lots of things still need to be implemented, but the > raw features are in. What's wxhotdraw, and what licence is it under? -- Dave Page Blog: http://pgsnake.blogspot.com Twitter: @pgsnake EnterpriseDB UK: http://www.enterprisedb.com The Enterprise PostgreSQL Company
On Mon, 2011-06-27 at 08:52 +0100, Dave Page wrote: > On Mon, Jun 27, 2011 at 8:07 AM, Guillaume Lelarge > <guillaume@lelarge.info> wrote: > > Database Designer (milestone 1 of GSoC 2011) > > > > This patch adds the database designer. This new tool helps users to create > > their databases' schema. Lots of things still need to be implemented, but the > > raw features are in. > > What's wxhotdraw, and what licence is it under? > It's Luis's work, part of this GSoC project. It's not an external one. -- Guillaume http://blog.guillaume.lelarge.info http://www.dalibo.com
On Mon, Jun 27, 2011 at 9:09 AM, Guillaume Lelarge <guillaume@lelarge.info> wrote: > On Mon, 2011-06-27 at 08:52 +0100, Dave Page wrote: >> On Mon, Jun 27, 2011 at 8:07 AM, Guillaume Lelarge >> <guillaume@lelarge.info> wrote: >> > Database Designer (milestone 1 of GSoC 2011) >> > >> > This patch adds the database designer. This new tool helps users to create >> > their databases' schema. Lots of things still need to be implemented, but the >> > raw features are in. >> >> What's wxhotdraw, and what licence is it under? >> > > It's Luis's work, part of this GSoC project. It's not an external one. Oh. In that case it shouldn't have a 'wx' prefix, if it's not part of wxWidgets. -- Dave Page Blog: http://pgsnake.blogspot.com Twitter: @pgsnake EnterpriseDB UK: http://www.enterprisedb.com The Enterprise PostgreSQL Company
On Mon, 2011-06-27 at 09:12 +0100, Dave Page wrote: > On Mon, Jun 27, 2011 at 9:09 AM, Guillaume Lelarge > <guillaume@lelarge.info> wrote: > > On Mon, 2011-06-27 at 08:52 +0100, Dave Page wrote: > >> On Mon, Jun 27, 2011 at 8:07 AM, Guillaume Lelarge > >> <guillaume@lelarge.info> wrote: > >> > Database Designer (milestone 1 of GSoC 2011) > >> > > >> > This patch adds the database designer. This new tool helps users to create > >> > their databases' schema. Lots of things still need to be implemented, but the > >> > raw features are in. > >> > >> What's wxhotdraw, and what licence is it under? > >> > > > > It's Luis's work, part of this GSoC project. It's not an external one. > > Oh. In that case it shouldn't have a 'wx' prefix, if it's not part of wxWidgets. > Luis, any comments on that? -- Guillaume http://blog.guillaume.lelarge.info http://www.dalibo.com
On Mon, Jun 27, 2011 at 9:12 AM, Dave Page <dpage@pgadmin.org> wrote: > On Mon, Jun 27, 2011 at 9:09 AM, Guillaume Lelarge > <guillaume@lelarge.info> wrote: >> On Mon, 2011-06-27 at 08:52 +0100, Dave Page wrote: >>> On Mon, Jun 27, 2011 at 8:07 AM, Guillaume Lelarge >>> <guillaume@lelarge.info> wrote: >>> > Database Designer (milestone 1 of GSoC 2011) >>> > >>> > This patch adds the database designer. This new tool helps users to create >>> > their databases' schema. Lots of things still need to be implemented, but the >>> > raw features are in. >>> >>> What's wxhotdraw, and what licence is it under? >>> >> >> It's Luis's work, part of this GSoC project. It's not an external one. > > Oh. In that case it shouldn't have a 'wx' prefix, if it's not part of wxWidgets. I also notice that the patch failed to update precomp.h, or any of the docs. -- Dave Page Blog: http://pgsnake.blogspot.com Twitter: @pgsnake EnterpriseDB UK: http://www.enterprisedb.com The Enterprise PostgreSQL Company
Well, I really don't have any objections about change library name, but in fact I wrote to my mentor informing about this change a few weeks ago.
I choose wxhotdraw because is a wxwidgets (wx) implementation of a hotdraw like framework (http://portal.acm.org/citation.cfm?id=157803), like jhotdraw for java or monohotdraw for mono (C#) or gohotdraw for go programming language and so.
Other reason is this library right now was created from a generic point of view and used for the database designer, and this means that can be a used for other projects that uses wxwidgets, and I probably continue their development after gsoc too, from a generic point of view not just for database designer but mantaining compatibility always, just like ogl but following the hotdraw like software patterns.
Now, I can change it name, just tell me, what to do, and I'll do it.
Regards, Luis
I choose wxhotdraw because is a wxwidgets (wx) implementation of a hotdraw like framework (http://portal.acm.org/citation.cfm?id=157803), like jhotdraw for java or monohotdraw for mono (C#) or gohotdraw for go programming language and so.
Other reason is this library right now was created from a generic point of view and used for the database designer, and this means that can be a used for other projects that uses wxwidgets, and I probably continue their development after gsoc too, from a generic point of view not just for database designer but mantaining compatibility always, just like ogl but following the hotdraw like software patterns.
Now, I can change it name, just tell me, what to do, and I'll do it.
Regards, Luis
On Mon, Jun 27, 2011 at 11:42 AM, Guillaume Lelarge <guillaume@lelarge.info> wrote:
On Mon, 2011-06-27 at 09:12 +0100, Dave Page wrote:Luis, any comments on that?
> On Mon, Jun 27, 2011 at 9:09 AM, Guillaume Lelarge
> <guillaume@lelarge.info> wrote:
> > On Mon, 2011-06-27 at 08:52 +0100, Dave Page wrote:
> >> On Mon, Jun 27, 2011 at 8:07 AM, Guillaume Lelarge
> >> <guillaume@lelarge.info> wrote:
> >> > Database Designer (milestone 1 of GSoC 2011)
> >> >
> >> > This patch adds the database designer. This new tool helps users to create
> >> > their databases' schema. Lots of things still need to be implemented, but the
> >> > raw features are in.
> >>
> >> What's wxhotdraw, and what licence is it under?
> >>
> >
> > It's Luis's work, part of this GSoC project. It's not an external one.
>
> Oh. In that case it shouldn't have a 'wx' prefix, if it's not part of wxWidgets.
>
On Tue, Jun 28, 2011 at 7:01 PM, Luis Ochoa <ziul1979@gmail.com> wrote: > Well, I really don't have any objections about change library name, but in > fact I wrote to my mentor informing about this change a few weeks ago. > > I choose wxhotdraw because is a wxwidgets (wx) implementation of a hotdraw > like framework (http://portal.acm.org/citation.cfm?id=157803), like jhotdraw > for java or monohotdraw for mono (C#) or gohotdraw for go programming > language and so. > > Other reason is this library right now was created from a generic point of > view and used for the database designer, and this means that can be a used > for other projects that uses wxwidgets, and I probably continue their > development after gsoc too, from a generic point of view not just for > database designer but mantaining compatibility always, just like ogl but > following the hotdraw like software patterns. > > Now, I can change it name, just tell me, what to do, and I'll do it. I would like it to be changed please. I find it annoying enough that long ago we created a couple of controls with wx prefixes (eg. wxTimeSpinCtrl and wxCalendarBox) - I've found myself looking for the documentation for those on www.wxwidgets.org on more than one occasion before remembering they're not in wxWidgets. Also, if this is intended as a general use library as you describe, then it really shouldn't be tucked away in the pgadmin/dd/hotdraw directory. pgadmin/hotdraw would be more appropriate I think. Quick question (and I'm not going to ask for this to be changed) - but why didn't you use OGL, which we already use elsewhere? -- Dave Page Blog: http://pgsnake.blogspot.com Twitter: @pgsnake EnterpriseDB UK: http://www.enterprisedb.com The Enterprise PostgreSQL Company
On Tue, 2011-06-28 at 19:24 +0100, Dave Page wrote: > On Tue, Jun 28, 2011 at 7:01 PM, Luis Ochoa <ziul1979@gmail.com> wrote: > > Well, I really don't have any objections about change library name, but in > > fact I wrote to my mentor informing about this change a few weeks ago. > > > > I choose wxhotdraw because is a wxwidgets (wx) implementation of a hotdraw > > like framework (http://portal.acm.org/citation.cfm?id=157803), like jhotdraw > > for java or monohotdraw for mono (C#) or gohotdraw for go programming > > language and so. > > > > Other reason is this library right now was created from a generic point of > > view and used for the database designer, and this means that can be a used > > for other projects that uses wxwidgets, and I probably continue their > > development after gsoc too, from a generic point of view not just for > > database designer but mantaining compatibility always, just like ogl but > > following the hotdraw like software patterns. > > > > Now, I can change it name, just tell me, what to do, and I'll do it. > > I would like it to be changed please. I find it annoying enough that > long ago we created a couple of controls with wx prefixes (eg. > wxTimeSpinCtrl and wxCalendarBox) - I've found myself looking for the > documentation for those on www.wxwidgets.org on more than one occasion > before remembering they're not in wxWidgets. > > Also, if this is intended as a general use library as you describe, > then it really shouldn't be tucked away in the pgadmin/dd/hotdraw > directory. pgadmin/hotdraw would be more appropriate I think. > Yeah, that would be better. I didn't think about the issue with the wx prefix. -- Guillaume http://blog.guillaume.lelarge.info http://www.dalibo.com
On Tue, 2011-06-28 at 14:56 +0100, Dave Page wrote: > On Mon, Jun 27, 2011 at 9:12 AM, Dave Page <dpage@pgadmin.org> wrote: > > On Mon, Jun 27, 2011 at 9:09 AM, Guillaume Lelarge > > <guillaume@lelarge.info> wrote: > >> On Mon, 2011-06-27 at 08:52 +0100, Dave Page wrote: > >>> On Mon, Jun 27, 2011 at 8:07 AM, Guillaume Lelarge > >>> <guillaume@lelarge.info> wrote: > >>> > Database Designer (milestone 1 of GSoC 2011) > >>> > > >>> > This patch adds the database designer. This new tool helps users to create > >>> > their databases' schema. Lots of things still need to be implemented, but the > >>> > raw features are in. > >>> > >>> What's wxhotdraw, and what licence is it under? > >>> > >> > >> It's Luis's work, part of this GSoC project. It's not an external one. > > > > Oh. In that case it shouldn't have a 'wx' prefix, if it's not part of wxWidgets. > > I also notice that the patch failed to update precomp.h, or any of the docs. > Well, docs will be done at the end. I actually still hope we'll have another documentation system for next release, so docs will have to be reviewed completely. And precomp.h, yeah, good catch. Forgot this one. Luis, can you update this file? Thanks. -- Guillaume http://blog.guillaume.lelarge.info http://www.dalibo.com
On Wed, Jun 29, 2011 at 3:16 AM, Luis Ochoa <ziul1979@gmail.com> wrote: > > Well, I can change that class name, but when should I do that, now or > later? > which name can be used? Now would be better - I prefer not to leave the tree in a state where we know major restructuring is required for too long. Name-wise, I'd call the module "hotdraw", and prefix the class naes with "hd". >> Well, docs will be done at the end. End of what? If this is a milestone commit, then it presumably (I hope) encompasses some completed functionality - which really isn't complete until the docs are done. With the best will in the world, things left to the end of GSoC projects often don't get completed as planned, and I'd rather not see us end up with another cool, but undocumented feature. >> I actually still hope we'll have >> another documentation system for next release, so docs will have to be >> reviewed completely. Yeah, I meant to ask you about that. I'd like to get that patch in early this cycle, as I want to spend some time on the docs myself. They're in dire need of an overhaul, and I'd rather not do it all in HTML. Yes, I am on a mission to sort out our crappy documentation. >> And precomp.h, yeah, good catch. Forgot this one. Luis, can you update >> this file? Thanks. >> > > I'll do that and send you the patch. Thanks. -- Dave Page Blog: http://pgsnake.blogspot.com Twitter: @pgsnake EnterpriseDB UK: http://www.enterprisedb.com The Enterprise PostgreSQL Company
On Wed, Jun 29, 2011 at 3:51 AM, Dave Page <dpage@pgadmin.org> wrote:
Well, I think "hotdraw" name standalone can be a problem because this is the name of the original implementation, and that could lead to confuse developers who work with source the code in the future, I suggest then something hd only and the prefix will be hd too. What do you think about this?
Well I didn't write that sentence (following the thread) or anything about writing docs at my project/proposal (or before), because I never got a petition of doing that kind of things now or before, and they aren't included at my schedule. But I can do that if someone tell me what Should I do?.
Regards, Luis.
On Wed, Jun 29, 2011 at 3:16 AM, Luis Ochoa <ziul1979@gmail.com> wrote:Now would be better - I prefer not to leave the tree in a state where
>
> Well, I can change that class name, but when should I do that, now or
> later?
> which name can be used?
we know major restructuring is required for too long. Name-wise, I'd
call the module "hotdraw", and prefix the class naes with "hd".
Well, I think "hotdraw" name standalone can be a problem because this is the name of the original implementation, and that could lead to confuse developers who work with source the code in the future, I suggest then something hd only and the prefix will be hd too. What do you think about this?
End of what? If this is a milestone commit, then it presumably (I
>> Well, docs will be done at the end.
hope) encompasses some completed functionality - which really isn't
complete until the docs are done. With the best will in the world,
things left to the end of GSoC projects often don't get completed as
planned, and I'd rather not see us end up with another cool, but
undocumented feature.
Well I didn't write that sentence (following the thread) or anything about writing docs at my project/proposal (or before), because I never got a petition of doing that kind of things now or before, and they aren't included at my schedule. But I can do that if someone tell me what Should I do?.
>> I actually still hope we'll haveYeah, I meant to ask you about that. I'd like to get that patch in
>> another documentation system for next release, so docs will have to be
>> reviewed completely.
early this cycle, as I want to spend some time on the docs myself.
They're in dire need of an overhaul, and I'd rather not do it all in
HTML. Yes, I am on a mission to sort out our crappy documentation.
>> And precomp.h, yeah, good catch. Forgot this one. Luis, can you update
>> this file? Thanks.
>>
>
> I'll do that and send you the patch.
Regards, Luis.
On Wednesday, June 29, 2011, Luis Ochoa <ziul1979@gmail.com> wrote: > On Wed, Jun 29, 2011 at 3:51 AM, Dave Page <dpage@pgadmin.org> wrote: > > > > On Wed, Jun 29, 2011 at 3:16 AM, Luis Ochoa <ziul1979@gmail.com> wrote: >> >> Well, I can change that class name, but when should I do that, now or >> later? >> which name can be used? > > Now would be better - I prefer not to leave the tree in a state where > we know major restructuring is required for too long. Name-wise, I'd > call the module "hotdraw", and prefix the class naes with "hd". > > Well, I think "hotdraw" name standalone can be a problem because this is the name of the original implementation, and thatcould lead to confuse developers who work with source the code in the future, I suggest then something hd only and theprefix will be hd too. What do you think about this? > hd works for me. >>> Well, docs will be done at the end. > > End of what? If this is a milestone commit, then it presumably (I > hope) encompasses some completed functionality - which really isn't > complete until the docs are done. With the best will in the world, > things left to the end of GSoC projects often don't get completed as > planned, and I'd rather not see us end up with another cool, but > undocumented feature. > > Well I didn't write that sentence (following the thread) or anything about writing docs at my project/proposal (or before),because I never got a petition of doing that kind of things now or before, and they aren't included at my schedule.But I can do that if someone tell me what Should I do?. > No sorry - that was directed at Guillaume. I don't want to throw your GSoC schedule into turmoil, so I'm not going to insist on docs now (though I would expect them by the end of the project), but the project has always had an unwritten rule that any new features should include the docs - we've just been lax about enforcing it. That cannot continue though - we really need to become more disciplined. -- Dave Page Blog: http://pgsnake.blogspot.com Twitter: @pgsnake EnterpriseDB UK: http://www.enterprisedb.com The Enterprise PostgreSQL Company
On Wed, 2011-06-29 at 20:08 +0100, Dave Page wrote: > On Wednesday, June 29, 2011, Luis Ochoa <ziul1979@gmail.com> wrote: > > On Wed, Jun 29, 2011 at 3:51 AM, Dave Page <dpage@pgadmin.org> wrote: > > > > > > > > On Wed, Jun 29, 2011 at 3:16 AM, Luis Ochoa <ziul1979@gmail.com> wrote: > >> > >> Well, I can change that class name, but when should I do that, now or > >> later? > >> which name can be used? > > > > Now would be better - I prefer not to leave the tree in a state where > > we know major restructuring is required for too long. Name-wise, I'd > > call the module "hotdraw", and prefix the class naes with "hd". > > > > Well, I think "hotdraw" name standalone can be a problem because this is the name of the original implementation, andthat could lead to confuse developers who work with source the code in the future, I suggest then something hd only andthe prefix will be hd too. What do you think about this? > > > > hd works for me. > What would hotdraw confuse people, and hd wouldn't? I don't get it. I see a hd directory, I wonder what it is (high definition would be my first guess honestly). While we are renaming it, we should move it to the root directory. AFAICT, it could be used for the GQB. > >>> Well, docs will be done at the end. > > > > End of what? If this is a milestone commit, then it presumably (I > > hope) encompasses some completed functionality - which really isn't > > complete until the docs are done. With the best will in the world, > > things left to the end of GSoC projects often don't get completed as > > planned, and I'd rather not see us end up with another cool, but > > undocumented feature. > > Well, you already know what I think of our current documentation. It won't be difficult to have the same kind of documentation for the DD once the GSoC is done. We'll still have 10 months to write it. I know it would be better to add it when we add the feature (to get a complete commit), but with our current documentation, that doesn't seem a big deal to me. If you really want it now, I can write something this week-end. > > Well I didn't write that sentence (following the thread) or anything about writing docs at my project/proposal (or before),because I never got a petition of doing that kind of things now or before, and they aren't included at my schedule.But I can do that if someone tell me what Should I do?. > > > > No sorry - that was directed at Guillaume. > > I don't want to throw your GSoC schedule into turmoil, so I'm not > going to insist on docs now (though I would expect them by the end of > the project), but the project has always had an unwritten rule that > any new features should include the docs - we've just been lax about > enforcing it. That cannot continue though - we really need to become > more disciplined. > I agree on this. -- Guillaume http://blog.guillaume.lelarge.info http://www.dalibo.com
On Wed, 2011-06-29 at 09:21 +0100, Dave Page wrote: > On Wed, Jun 29, 2011 at 3:16 AM, Luis Ochoa <ziul1979@gmail.com> wrote: > > > > Well, I can change that class name, but when should I do that, now or > > later? > > which name can be used? > > Now would be better - I prefer not to leave the tree in a state where > we know major restructuring is required for too long. Name-wise, I'd > call the module "hotdraw", and prefix the class naes with "hd". > +1 > >> Well, docs will be done at the end. > > End of what? If this is a milestone commit, then it presumably (I > hope) encompasses some completed functionality - which really isn't > complete until the docs are done. With the best will in the world, > things left to the end of GSoC projects often don't get completed as > planned, and I'd rather not see us end up with another cool, but > undocumented feature. > > >> I actually still hope we'll have > >> another documentation system for next release, so docs will have to be > >> reviewed completely. > > Yeah, I meant to ask you about that. I'd like to get that patch in > early this cycle, as I want to spend some time on the docs myself. So do I. > They're in dire need of an overhaul, and I'd rather not do it all in > HTML. Yes, I am on a mission to sort out our crappy documentation. > Completely agree. Could be the next thing I do. Last time we talked about it, I had done some work on sphynx. IIRC, I had two main things to do: * try to build on Windows, and Mac * change the build chain so that it buils automatically the manual Did I forgot something? -- Guillaume http://blog.guillaume.lelarge.info http://www.dalibo.com
On Thu, Jun 30, 2011 at 9:08 AM, Guillaume Lelarge <guillaume@lelarge.info> wrote: > > Could be the next thing I do. Last time we talked about it, I had done > some work on sphynx. IIRC, I had two main things to do: > > * try to build on Windows, and Mac > * change the build chain so that it buils automatically the manual > > Did I forgot something? No, I think that's it. -- Dave Page Blog: http://pgsnake.blogspot.com Twitter: @pgsnake EnterpriseDB UK: http://www.enterprisedb.com The Enterprise PostgreSQL Company
On Thu, 2011-06-30 at 09:32 +0100, Dave Page wrote: > On Thu, Jun 30, 2011 at 9:08 AM, Guillaume Lelarge > <guillaume@lelarge.info> wrote: > > > > Could be the next thing I do. Last time we talked about it, I had done > > some work on sphynx. IIRC, I had two main things to do: > > > > * try to build on Windows, and Mac > > * change the build chain so that it buils automatically the manual > > > > Did I forgot something? > > No, I think that's it. > OK, I've done some work on this. Linux prep steps * install Python (with your distro package manager) * install the python easy_install module * install Sphinx (should be as easy as "easy_install -U Sphinx) Windows prop steps * download http://www.python.org/ftp/python/2.7.2/python-2.7.2.msi * install python-2.7.2.msi * download http://pypi.python.org/packages/2.7/s/setuptools/setuptools-0.6c11.win32-py2.7.exe#md5=57e1e64f6b7c7f1d2eddfc9746bbaf20 * install setuptools-0.6c11.win32-py2.7.exe * include C:\Python27\Scripts in %path% * in cmd, type "easy_install.exe -U Sphinx" Mac OS X prep steps I already had Python and the easy_install module, so I just had to install Sphinx with the usual command ("easy_install -U Sphinx") Windows Visual Studio project changes It should be quite simple. We simply need to change the Docs project so that it launches the "make html" command instead of the "builddocs.bat". We'll also have to add all the rst files in this project. Linux, and Mac OS X Makefile This should also be quite simple. We only need to change the Makefile so that it calls the Make in the docs directory. If it seems good enough for you, I'll update the rst filess with the new changes. I'll update the build system. And creates one big patch for all of this. OK? The remaining question is: what style do we want? do we keep the default theme? should we code one? any idea on what that should be? -- Guillaume http://blog.guillaume.lelarge.info http://www.dalibo.com
On Sat, Jul 2, 2011 at 2:09 PM, Guillaume Lelarge <guillaume@lelarge.info> wrote: > On Thu, 2011-06-30 at 09:32 +0100, Dave Page wrote: >> On Thu, Jun 30, 2011 at 9:08 AM, Guillaume Lelarge >> <guillaume@lelarge.info> wrote: >> > >> > Could be the next thing I do. Last time we talked about it, I had done >> > some work on sphynx. IIRC, I had two main things to do: >> > >> > * try to build on Windows, and Mac >> > * change the build chain so that it buils automatically the manual >> > >> > Did I forgot something? >> >> No, I think that's it. >> > > OK, I've done some work on this. > > Linux prep steps > > * install Python (with your distro package manager) > * install the python easy_install module > * install Sphinx (should be as easy as "easy_install -U Sphinx) > > Windows prop steps > > * download http://www.python.org/ftp/python/2.7.2/python-2.7.2.msi > * install python-2.7.2.msi > * download > http://pypi.python.org/packages/2.7/s/setuptools/setuptools-0.6c11.win32-py2.7.exe#md5=57e1e64f6b7c7f1d2eddfc9746bbaf20 > * install setuptools-0.6c11.win32-py2.7.exe > * include C:\Python27\Scripts in %path% > * in cmd, type "easy_install.exe -U Sphinx" > > Mac OS X prep steps > > I already had Python and the easy_install module, so I just had to > install Sphinx with the usual command ("easy_install -U Sphinx") > > Windows Visual Studio project changes > > It should be quite simple. We simply need to change the Docs project so > that it launches the "make html" command instead of the "builddocs.bat". > We'll also have to add all the rst files in this project. > > Linux, and Mac OS X Makefile > > This should also be quite simple. We only need to change the Makefile so > that it calls the Make in the docs directory. > > If it seems good enough for you, I'll update the rst filess with the new > changes. I'll update the build system. And creates one big patch for all > of this. OK? OK. > The remaining question is: what style do we want? do we keep the default > theme? should we code one? any idea on what that should be? If we code one, it should probably roughly follow the websites style. Speaking of which, we'd need to figure out how we'd automate the publishing of the docs on the website.... -- Dave Page Blog: http://pgsnake.blogspot.com Twitter: @pgsnake EnterpriseDB UK: http://www.enterprisedb.com The Enterprise PostgreSQL Company
On Sun, 2011-07-03 at 09:15 +0100, Dave Page wrote: > On Sat, Jul 2, 2011 at 2:09 PM, Guillaume Lelarge > <guillaume@lelarge.info> wrote: > > On Thu, 2011-06-30 at 09:32 +0100, Dave Page wrote: > >> On Thu, Jun 30, 2011 at 9:08 AM, Guillaume Lelarge > >> <guillaume@lelarge.info> wrote: > >> > > >> > Could be the next thing I do. Last time we talked about it, I had done > >> > some work on sphynx. IIRC, I had two main things to do: > >> > > >> > * try to build on Windows, and Mac > >> > * change the build chain so that it buils automatically the manual > >> > > >> > Did I forgot something? > >> > >> No, I think that's it. > >> > > > > OK, I've done some work on this. > > > > Linux prep steps > > > > * install Python (with your distro package manager) > > * install the python easy_install module > > * install Sphinx (should be as easy as "easy_install -U Sphinx) > > > > Windows prop steps > > > > * download http://www.python.org/ftp/python/2.7.2/python-2.7.2.msi > > * install python-2.7.2.msi > > * download > > http://pypi.python.org/packages/2.7/s/setuptools/setuptools-0.6c11.win32-py2.7.exe#md5=57e1e64f6b7c7f1d2eddfc9746bbaf20 > > * install setuptools-0.6c11.win32-py2.7.exe > > * include C:\Python27\Scripts in %path% > > * in cmd, type "easy_install.exe -U Sphinx" > > > > Mac OS X prep steps > > > > I already had Python and the easy_install module, so I just had to > > install Sphinx with the usual command ("easy_install -U Sphinx") > > > > Windows Visual Studio project changes > > > > It should be quite simple. We simply need to change the Docs project so > > that it launches the "make html" command instead of the "builddocs.bat". > > We'll also have to add all the rst files in this project. > > > > Linux, and Mac OS X Makefile > > > > This should also be quite simple. We only need to change the Makefile so > > that it calls the Make in the docs directory. > > > > If it seems good enough for you, I'll update the rst filess with the new > > changes. I'll update the build system. And creates one big patch for all > > of this. OK? > > OK. > Update on the files done. You can find that preliminary work on https://github.com/gleu/pgadmin3/tree/docs (branch name is docs). I still need to work on the build system. > > The remaining question is: what style do we want? do we keep the default > > theme? should we code one? any idea on what that should be? > > If we code one, it should probably roughly follow the websites style. > > Speaking of which, we'd need to figure out how we'd automate the > publishing of the docs on the website.... > Oh yes, good point: grab the GIT, enter the subdirectory (for example, docs/en_US), launch "make html", grab all _build/html and put that on the website. -- Guillaume http://blog.guillaume.lelarge.info http://www.dalibo.com
On Thu, 2011-07-14 at 14:46 +0200, Guillaume Lelarge wrote: > On Sun, 2011-07-03 at 09:15 +0100, Dave Page wrote: > > On Sat, Jul 2, 2011 at 2:09 PM, Guillaume Lelarge > > <guillaume@lelarge.info> wrote: > > > On Thu, 2011-06-30 at 09:32 +0100, Dave Page wrote: > > >> On Thu, Jun 30, 2011 at 9:08 AM, Guillaume Lelarge > > >> <guillaume@lelarge.info> wrote: > > >> > > > >> > Could be the next thing I do. Last time we talked about it, I had done > > >> > some work on sphynx. IIRC, I had two main things to do: > > >> > > > >> > * try to build on Windows, and Mac > > >> > * change the build chain so that it buils automatically the manual > > >> > > > >> > Did I forgot something? > > >> > > >> No, I think that's it. > > >> > > > > > > OK, I've done some work on this. > > > > > > Linux prep steps > > > > > > * install Python (with your distro package manager) > > > * install the python easy_install module > > > * install Sphinx (should be as easy as "easy_install -U Sphinx) > > > > > > Windows prop steps > > > > > > * download http://www.python.org/ftp/python/2.7.2/python-2.7.2.msi > > > * install python-2.7.2.msi > > > * download > > > http://pypi.python.org/packages/2.7/s/setuptools/setuptools-0.6c11.win32-py2.7.exe#md5=57e1e64f6b7c7f1d2eddfc9746bbaf20 > > > * install setuptools-0.6c11.win32-py2.7.exe > > > * include C:\Python27\Scripts in %path% > > > * in cmd, type "easy_install.exe -U Sphinx" > > > > > > Mac OS X prep steps > > > > > > I already had Python and the easy_install module, so I just had to > > > install Sphinx with the usual command ("easy_install -U Sphinx") > > > > > > Windows Visual Studio project changes > > > > > > It should be quite simple. We simply need to change the Docs project so > > > that it launches the "make html" command instead of the "builddocs.bat". > > > We'll also have to add all the rst files in this project. > > > > > > Linux, and Mac OS X Makefile > > > > > > This should also be quite simple. We only need to change the Makefile so > > > that it calls the Make in the docs directory. > > > > > > If it seems good enough for you, I'll update the rst filess with the new > > > changes. I'll update the build system. And creates one big patch for all > > > of this. OK? > > > > OK. > > > > Update on the files done. You can find that preliminary work on > https://github.com/gleu/pgadmin3/tree/docs (branch name is docs). > > I still need to work on the build system. > OK. Instead of working on the build system, I worked a bit on the template system. We should be able to do what we want. I'm not sure we really need to do this now, as ideas and needs will come during the writing of the manual. But I still have to work on the build system. I'll try to change the Windows build system this evening. BTW, I tried to build a PDF file. And it looks great. If you want to take a look, it's available here: http://lelarge.info/~guillaume/pgAdminIII.pdf . And you only need "make latexpdf" to get it. Just amazing :) -- Guillaume http://blog.guillaume.lelarge.info http://www.dalibo.com
On Thu, 2011-07-14 at 19:34 +0200, Guillaume Lelarge wrote: > On Thu, 2011-07-14 at 14:46 +0200, Guillaume Lelarge wrote: > > On Sun, 2011-07-03 at 09:15 +0100, Dave Page wrote: > > > On Sat, Jul 2, 2011 at 2:09 PM, Guillaume Lelarge > > > <guillaume@lelarge.info> wrote: > > > > On Thu, 2011-06-30 at 09:32 +0100, Dave Page wrote: > > > >> On Thu, Jun 30, 2011 at 9:08 AM, Guillaume Lelarge > > > >> <guillaume@lelarge.info> wrote: > > > >> > > > > >> > Could be the next thing I do. Last time we talked about it, I had done > > > >> > some work on sphynx. IIRC, I had two main things to do: > > > >> > > > > >> > * try to build on Windows, and Mac > > > >> > * change the build chain so that it buils automatically the manual > > > >> > > > > >> > Did I forgot something? > > > >> > > > >> No, I think that's it. > > > >> > > > > > > > > OK, I've done some work on this. > > > > > > > > Linux prep steps > > > > > > > > * install Python (with your distro package manager) > > > > * install the python easy_install module > > > > * install Sphinx (should be as easy as "easy_install -U Sphinx) > > > > > > > > Windows prop steps > > > > > > > > * download http://www.python.org/ftp/python/2.7.2/python-2.7.2.msi > > > > * install python-2.7.2.msi > > > > * download > > > > http://pypi.python.org/packages/2.7/s/setuptools/setuptools-0.6c11.win32-py2.7.exe#md5=57e1e64f6b7c7f1d2eddfc9746bbaf20 > > > > * install setuptools-0.6c11.win32-py2.7.exe > > > > * include C:\Python27\Scripts in %path% > > > > * in cmd, type "easy_install.exe -U Sphinx" > > > > > > > > Mac OS X prep steps > > > > > > > > I already had Python and the easy_install module, so I just had to > > > > install Sphinx with the usual command ("easy_install -U Sphinx") > > > > > > > > Windows Visual Studio project changes > > > > > > > > It should be quite simple. We simply need to change the Docs project so > > > > that it launches the "make html" command instead of the "builddocs.bat". > > > > We'll also have to add all the rst files in this project. > > > > > > > > Linux, and Mac OS X Makefile > > > > > > > > This should also be quite simple. We only need to change the Makefile so > > > > that it calls the Make in the docs directory. > > > > > > > > If it seems good enough for you, I'll update the rst filess with the new > > > > changes. I'll update the build system. And creates one big patch for all > > > > of this. OK? > > > > > > OK. > > > > > > > Update on the files done. You can find that preliminary work on > > https://github.com/gleu/pgadmin3/tree/docs (branch name is docs). > > > > I still need to work on the build system. > > > > OK. Instead of working on the build system, I worked a bit on the > template system. We should be able to do what we want. I'm not sure we > really need to do this now, as ideas and needs will come during the > writing of the manual. > > But I still have to work on the build system. I'll try to change the > Windows build system this evening. > OK, so here is the patch I have now. And I have a big issue with it. Once "make.bat htmlhelp" is done, builddocs.bat stops. No error, no nothing. Everything seems fine, even if it didn't execute the rest of the batch file. It happens when I launch it from Visual Studio and when I launch it from the console. Same behaviour. I have absolutely no idea why this is happening. Any idea on the error I made? -- Guillaume http://blog.guillaume.lelarge.info http://www.dalibo.com
Attachment
Hi Guilliaume,
On Fri, Jul 15, 2011 at 2:22 AM, Guillaume Lelarge <guillaume@lelarge.info> wrote:
OK, so here is the patch I have now. And I have a big issue with it.On Thu, 2011-07-14 at 19:34 +0200, Guillaume Lelarge wrote:
> On Thu, 2011-07-14 at 14:46 +0200, Guillaume Lelarge wrote:
> > On Sun, 2011-07-03 at 09:15 +0100, Dave Page wrote:
> > > On Sat, Jul 2, 2011 at 2:09 PM, Guillaume Lelarge
> > > <guillaume@lelarge.info> wrote:
> > > > On Thu, 2011-06-30 at 09:32 +0100, Dave Page wrote:
> > > >> On Thu, Jun 30, 2011 at 9:08 AM, Guillaume Lelarge
> > > >> <guillaume@lelarge.info> wrote:
> > > >> >
> > > >> > Could be the next thing I do. Last time we talked about it, I had done
> > > >> > some work on sphynx. IIRC, I had two main things to do:
> > > >> >
> > > >> > * try to build on Windows, and Mac
> > > >> > * change the build chain so that it buils automatically the manual
> > > >> >
> > > >> > Did I forgot something?
> > > >>
> > > >> No, I think that's it.
> > > >>
> > > >
> > > > OK, I've done some work on this.
> > > >
> > > > Linux prep steps
> > > >
> > > > * install Python (with your distro package manager)
> > > > * install the python easy_install module
> > > > * install Sphinx (should be as easy as "easy_install -U Sphinx)
> > > >
> > > > Windows prop steps
> > > >
> > > > * download http://www.python.org/ftp/python/2.7.2/python-2.7.2.msi
> > > > * install python-2.7.2.msi
> > > > * download
> > > > http://pypi.python.org/packages/2.7/s/setuptools/setuptools-0.6c11.win32-py2.7.exe#md5=57e1e64f6b7c7f1d2eddfc9746bbaf20
> > > > * install setuptools-0.6c11.win32-py2.7.exe
> > > > * include C:\Python27\Scripts in %path%
> > > > * in cmd, type "easy_install.exe -U Sphinx"
> > > >
> > > > Mac OS X prep steps
> > > >
> > > > I already had Python and the easy_install module, so I just had to
> > > > install Sphinx with the usual command ("easy_install -U Sphinx")
> > > >
> > > > Windows Visual Studio project changes
> > > >
> > > > It should be quite simple. We simply need to change the Docs project so
> > > > that it launches the "make html" command instead of the "builddocs.bat".
> > > > We'll also have to add all the rst files in this project.
> > > >
> > > > Linux, and Mac OS X Makefile
> > > >
> > > > This should also be quite simple. We only need to change the Makefile so
> > > > that it calls the Make in the docs directory.
> > > >
> > > > If it seems good enough for you, I'll update the rst filess with the new
> > > > changes. I'll update the build system. And creates one big patch for all
> > > > of this. OK?
> > >
> > > OK.
> > >
> >
> > Update on the files done. You can find that preliminary work on
> > https://github.com/gleu/pgadmin3/tree/docs (branch name is docs).
> >
> > I still need to work on the build system.
> >
>
> OK. Instead of working on the build system, I worked a bit on the
> template system. We should be able to do what we want. I'm not sure we
> really need to do this now, as ideas and needs will come during the
> writing of the manual.
>
> But I still have to work on the build system. I'll try to change the
> Windows build system this evening.
>
Once "make.bat htmlhelp" is done, builddocs.bat stops. No error, no
nothing. Everything seems fine, even if it didn't execute the rest of
the batch file. It happens when I launch it from Visual Studio and when
I launch it from the console. Same behaviour. I have absolutely no idea
why this is happening. Any idea on the error I made?
By any chance, Did you forgot to add doc/en_US/make.bat file in the patch?
I can't see that file anywhere in the pgadmin3 directory.
--
Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgadmin-hackers
On Fri, 2011-07-15 at 10:59 +0530, Ashesh Vashi wrote: > Hi Guilliaume, > > On Fri, Jul 15, 2011 at 2:22 AM, Guillaume Lelarge > <guillaume@lelarge.info> wrote: > > On Thu, 2011-07-14 at 19:34 +0200, Guillaume Lelarge wrote: > > On Thu, 2011-07-14 at 14:46 +0200, Guillaume Lelarge wrote: > > > On Sun, 2011-07-03 at 09:15 +0100, Dave Page wrote: > > > > On Sat, Jul 2, 2011 at 2:09 PM, Guillaume Lelarge > > > > <guillaume@lelarge.info> wrote: > > > > > On Thu, 2011-06-30 at 09:32 +0100, Dave Page wrote: > > > > >> On Thu, Jun 30, 2011 at 9:08 AM, Guillaume Lelarge > > > > >> <guillaume@lelarge.info> wrote: > > > > >> > > > > > >> > Could be the next thing I do. Last time we talked > about it, I had done > > > > >> > some work on sphynx. IIRC, I had two main things to > do: > > > > >> > > > > > >> > * try to build on Windows, and Mac > > > > >> > * change the build chain so that it buils > automatically the manual > > > > >> > > > > > >> > Did I forgot something? > > > > >> > > > > >> No, I think that's it. > > > > >> > > > > > > > > > > OK, I've done some work on this. > > > > > > > > > > Linux prep steps > > > > > > > > > > * install Python (with your distro package manager) > > > > > * install the python easy_install module > > > > > * install Sphinx (should be as easy as "easy_install > -U Sphinx) > > > > > > > > > > Windows prop steps > > > > > > > > > > * download > http://www.python.org/ftp/python/2.7.2/python-2.7.2.msi > > > > > * install python-2.7.2.msi > > > > > * download > > > > > > http://pypi.python.org/packages/2.7/s/setuptools/setuptools-0.6c11.win32-py2.7.exe#md5=57e1e64f6b7c7f1d2eddfc9746bbaf20 > > > > > * install setuptools-0.6c11.win32-py2.7.exe > > > > > * include C:\Python27\Scripts in %path% > > > > > * in cmd, type "easy_install.exe -U Sphinx" > > > > > > > > > > Mac OS X prep steps > > > > > > > > > > I already had Python and the easy_install module, so I > just had to > > > > > install Sphinx with the usual command ("easy_install > -U Sphinx") > > > > > > > > > > Windows Visual Studio project changes > > > > > > > > > > It should be quite simple. We simply need to change > the Docs project so > > > > > that it launches the "make html" command instead of > the "builddocs.bat". > > > > > We'll also have to add all the rst files in this > project. > > > > > > > > > > Linux, and Mac OS X Makefile > > > > > > > > > > This should also be quite simple. We only need to > change the Makefile so > > > > > that it calls the Make in the docs directory. > > > > > > > > > > If it seems good enough for you, I'll update the rst > filess with the new > > > > > changes. I'll update the build system. And creates one > big patch for all > > > > > of this. OK? > > > > > > > > OK. > > > > > > > > > > Update on the files done. You can find that preliminary > work on > > > https://github.com/gleu/pgadmin3/tree/docs (branch name is > docs). > > > > > > I still need to work on the build system. > > > > > > > OK. Instead of working on the build system, I worked a bit > on the > > template system. We should be able to do what we want. I'm > not sure we > > really need to do this now, as ideas and needs will come > during the > > writing of the manual. > > > > But I still have to work on the build system. I'll try to > change the > > Windows build system this evening. > > > > > OK, so here is the patch I have now. And I have a big issue > with it. > Once "make.bat htmlhelp" is done, builddocs.bat stops. No > error, no > nothing. Everything seems fine, even if it didn't execute the > rest of > the batch file. It happens when I launch it from Visual Studio > and when > I launch it from the console. Same behaviour. I have > absolutely no idea > why this is happening. Any idea on the error I made? > By any chance, Did you forgot to add doc/en_US/make.bat file in the > patch? > I can't see that file anywhere in the pgadmin3 directory. > It's already in the docs branch of my git repository: https://github.com/gleu/pgadmin3/blob/docs/docs/en_US/make.bat It hasn't changed since. -- Guillaume http://blog.guillaume.lelarge.info http://www.dalibo.com
On Fri, Jul 15, 2011 at 11:28 AM, Guillaume Lelarge <guillaume@lelarge.info> wrote:
It's already in the docs branch of my git repository:On Fri, 2011-07-15 at 10:59 +0530, Ashesh Vashi wrote:
> Hi Guilliaume,
>
> On Fri, Jul 15, 2011 at 2:22 AM, Guillaume Lelarge
> <guillaume@lelarge.info> wrote:
>
> On Thu, 2011-07-14 at 19:34 +0200, Guillaume Lelarge wrote:
> > On Thu, 2011-07-14 at 14:46 +0200, Guillaume Lelarge wrote:
> > > On Sun, 2011-07-03 at 09:15 +0100, Dave Page wrote:
> > > > On Sat, Jul 2, 2011 at 2:09 PM, Guillaume Lelarge
> > > > <guillaume@lelarge.info> wrote:
> > > > > On Thu, 2011-06-30 at 09:32 +0100, Dave Page wrote:
> > > > >> On Thu, Jun 30, 2011 at 9:08 AM, Guillaume Lelarge
> > > > >> <guillaume@lelarge.info> wrote:
> > > > >> >
> > > > >> > Could be the next thing I do. Last time we talked
> about it, I had done
> > > > >> > some work on sphynx. IIRC, I had two main things to
> do:
> > > > >> >
> > > > >> > * try to build on Windows, and Mac
> > > > >> > * change the build chain so that it buils
> automatically the manual
> > > > >> >
> > > > >> > Did I forgot something?
> > > > >>
> > > > >> No, I think that's it.
> > > > >>
> > > > >
> > > > > OK, I've done some work on this.
> > > > >
> > > > > Linux prep steps
> > > > >
> > > > > * install Python (with your distro package manager)
> > > > > * install the python easy_install module
> > > > > * install Sphinx (should be as easy as "easy_install
> -U Sphinx)
> > > > >
> > > > > Windows prop steps
> > > > >
> > > > > * download
> http://www.python.org/ftp/python/2.7.2/python-2.7.2.msi
> > > > > * install python-2.7.2.msi
> > > > > * download
> > > > >
> http://pypi.python.org/packages/2.7/s/setuptools/setuptools-0.6c11.win32-py2.7.exe#md5=57e1e64f6b7c7f1d2eddfc9746bbaf20
> > > > > * install setuptools-0.6c11.win32-py2.7.exe
> > > > > * include C:\Python27\Scripts in %path%
> > > > > * in cmd, type "easy_install.exe -U Sphinx"
> > > > >
> > > > > Mac OS X prep steps
> > > > >
> > > > > I already had Python and the easy_install module, so I
> just had to
> > > > > install Sphinx with the usual command ("easy_install
> -U Sphinx")
> > > > >
> > > > > Windows Visual Studio project changes
> > > > >
> > > > > It should be quite simple. We simply need to change
> the Docs project so
> > > > > that it launches the "make html" command instead of
> the "builddocs.bat".
> > > > > We'll also have to add all the rst files in this
> project.
> > > > >
> > > > > Linux, and Mac OS X Makefile
> > > > >
> > > > > This should also be quite simple. We only need to
> change the Makefile so
> > > > > that it calls the Make in the docs directory.
> > > > >
> > > > > If it seems good enough for you, I'll update the rst
> filess with the new
> > > > > changes. I'll update the build system. And creates one
> big patch for all
> > > > > of this. OK?
> > > >
> > > > OK.
> > > >
> > >
> > > Update on the files done. You can find that preliminary
> work on
> > > https://github.com/gleu/pgadmin3/tree/docs (branch name is
> docs).
> > >
> > > I still need to work on the build system.
> > >
> >
> > OK. Instead of working on the build system, I worked a bit
> on the
> > template system. We should be able to do what we want. I'm
> not sure we
> > really need to do this now, as ideas and needs will come
> during the
> > writing of the manual.
> >
> > But I still have to work on the build system. I'll try to
> change the
> > Windows build system this evening.
> >
>
>
> OK, so here is the patch I have now. And I have a big issue
> with it.
> Once "make.bat htmlhelp" is done, builddocs.bat stops. No
> error, no
> nothing. Everything seems fine, even if it didn't execute the
> rest of
> the batch file. It happens when I launch it from Visual Studio
> and when
> I launch it from the console. Same behaviour. I have
> absolutely no idea
> why this is happening. Any idea on the error I made?
> By any chance, Did you forgot to add doc/en_US/make.bat file in the
> patch?
> I can't see that file anywhere in the pgadmin3 directory.
>
https://github.com/gleu/pgadmin3/blob/docs/docs/en_US/make.bat
It hasn't changed since.
Sorry - I was checking master, did not follow the complete mail.
What happens, if you change the following line?
%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
to
CALL %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
--
On Fri, 2011-07-15 at 11:41 +0530, Ashesh Vashi wrote: > > On Fri, Jul 15, 2011 at 11:28 AM, Guillaume Lelarge > <guillaume@lelarge.info> wrote: > > On Fri, 2011-07-15 at 10:59 +0530, Ashesh Vashi wrote: > > Hi Guilliaume, > > > > On Fri, Jul 15, 2011 at 2:22 AM, Guillaume Lelarge > > <guillaume@lelarge.info> wrote: > > > > On Thu, 2011-07-14 at 19:34 +0200, Guillaume Lelarge > wrote: > > > On Thu, 2011-07-14 at 14:46 +0200, Guillaume > Lelarge wrote: > > > > On Sun, 2011-07-03 at 09:15 +0100, Dave Page > wrote: > > > > > On Sat, Jul 2, 2011 at 2:09 PM, Guillaume > Lelarge > > > > > <guillaume@lelarge.info> wrote: > > > > > > On Thu, 2011-06-30 at 09:32 +0100, Dave Page > wrote: > > > > > >> On Thu, Jun 30, 2011 at 9:08 AM, Guillaume > Lelarge > > > > > >> <guillaume@lelarge.info> wrote: > > > > > >> > > > > > > >> > Could be the next thing I do. Last time > we talked > > about it, I had done > > > > > >> > some work on sphynx. IIRC, I had two main > things to > > do: > > > > > >> > > > > > > >> > * try to build on Windows, and Mac > > > > > >> > * change the build chain so that it > buils > > automatically the manual > > > > > >> > > > > > > >> > Did I forgot something? > > > > > >> > > > > > >> No, I think that's it. > > > > > >> > > > > > > > > > > > > OK, I've done some work on this. > > > > > > > > > > > > Linux prep steps > > > > > > > > > > > > * install Python (with your distro package > manager) > > > > > > * install the python easy_install module > > > > > > * install Sphinx (should be as easy as > "easy_install > > -U Sphinx) > > > > > > > > > > > > Windows prop steps > > > > > > > > > > > > * download > > > http://www.python.org/ftp/python/2.7.2/python-2.7.2.msi > > > > > > * install python-2.7.2.msi > > > > > > * download > > > > > > > > > http://pypi.python.org/packages/2.7/s/setuptools/setuptools-0.6c11.win32-py2.7.exe#md5=57e1e64f6b7c7f1d2eddfc9746bbaf20 > > > > > > * install setuptools-0.6c11.win32-py2.7.exe > > > > > > * include C:\Python27\Scripts in %path% > > > > > > * in cmd, type "easy_install.exe -U Sphinx" > > > > > > > > > > > > Mac OS X prep steps > > > > > > > > > > > > I already had Python and the easy_install > module, so I > > just had to > > > > > > install Sphinx with the usual command > ("easy_install > > -U Sphinx") > > > > > > > > > > > > Windows Visual Studio project changes > > > > > > > > > > > > It should be quite simple. We simply need to > change > > the Docs project so > > > > > > that it launches the "make html" command > instead of > > the "builddocs.bat". > > > > > > We'll also have to add all the rst files in > this > > project. > > > > > > > > > > > > Linux, and Mac OS X Makefile > > > > > > > > > > > > This should also be quite simple. We only > need to > > change the Makefile so > > > > > > that it calls the Make in the docs > directory. > > > > > > > > > > > > If it seems good enough for you, I'll update > the rst > > filess with the new > > > > > > changes. I'll update the build system. And > creates one > > big patch for all > > > > > > of this. OK? > > > > > > > > > > OK. > > > > > > > > > > > > > Update on the files done. You can find that > preliminary > > work on > > > > https://github.com/gleu/pgadmin3/tree/docs > (branch name is > > docs). > > > > > > > > I still need to work on the build system. > > > > > > > > > > OK. Instead of working on the build system, I > worked a bit > > on the > > > template system. We should be able to do what we > want. I'm > > not sure we > > > really need to do this now, as ideas and needs > will come > > during the > > > writing of the manual. > > > > > > But I still have to work on the build system. I'll > try to > > change the > > > Windows build system this evening. > > > > > > > > > OK, so here is the patch I have now. And I have a > big issue > > with it. > > Once "make.bat htmlhelp" is done, builddocs.bat > stops. No > > error, no > > nothing. Everything seems fine, even if it didn't > execute the > > rest of > > the batch file. It happens when I launch it from > Visual Studio > > and when > > I launch it from the console. Same behaviour. I have > > absolutely no idea > > why this is happening. Any idea on the error I made? > > By any chance, Did you forgot to add doc/en_US/make.bat file > in the > > patch? > > I can't see that file anywhere in the pgadmin3 directory. > > > > > It's already in the docs branch of my git repository: > > https://github.com/gleu/pgadmin3/blob/docs/docs/en_US/make.bat > > It hasn't changed since. > Sorry - I was checking master, did not follow the complete mail. > What happens, if you change the following line? > %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html > to > CALL %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html > It didn't work. But I tried a "CALL make.bat htmlhelp, and it worked great. I'll push the windows build on my branch. Thanks, Ashesh! Now on the unix build. -- Guillaume http://blog.guillaume.lelarge.info http://www.dalibo.com
On Fri, 2011-07-15 at 21:43 +0200, Guillaume Lelarge wrote: > On Fri, 2011-07-15 at 11:41 +0530, Ashesh Vashi wrote: > > Sorry - I was checking master, did not follow the complete mail. > > What happens, if you change the following line? > > %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html > > to > > CALL %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html > > > > It didn't work. But I tried a "CALL make.bat htmlhelp, and it worked > great. I'll push the windows build on my branch. Thanks, Ashesh! > > Now on the unix build. > OK, did something to build it. But, really, I have no idea where to install the stuff. Dave can you take a look at the branch, and tell me if I need to do other things? or if I did something wrong? because I'm not at ease right now, I have no idea how to deal with it. Thanks. -- Guillaume http://blog.guillaume.lelarge.info http://www.dalibo.com
A lot of time a function call 'exit' from the called batch file results into exit from the caller batch file too.
--
To avoid this time of immature exit, I usually use 'call'.
--
Thanks & Regards,
Ashesh Vashi
EnterpriseDB INDIA: Enterprise PostgreSQL Company
On Sat, Jul 16, 2011 at 1:13 AM, Guillaume Lelarge <guillaume@lelarge.info> wrote:
It didn't work. But I tried a "CALL make.bat htmlhelp, and it workedOn Fri, 2011-07-15 at 11:41 +0530, Ashesh Vashi wrote:
>
> On Fri, Jul 15, 2011 at 11:28 AM, Guillaume Lelarge
> <guillaume@lelarge.info> wrote:
>
> On Fri, 2011-07-15 at 10:59 +0530, Ashesh Vashi wrote:
> > Hi Guilliaume,
> >
> > On Fri, Jul 15, 2011 at 2:22 AM, Guillaume Lelarge
> > <guillaume@lelarge.info> wrote:
> >
> > On Thu, 2011-07-14 at 19:34 +0200, Guillaume Lelarge
> wrote:
> > > On Thu, 2011-07-14 at 14:46 +0200, Guillaume
> Lelarge wrote:
> > > > On Sun, 2011-07-03 at 09:15 +0100, Dave Page
> wrote:
> > > > > On Sat, Jul 2, 2011 at 2:09 PM, Guillaume
> Lelarge
> > > > > <guillaume@lelarge.info> wrote:
> > > > > > On Thu, 2011-06-30 at 09:32 +0100, Dave Page
> wrote:
> > > > > >> On Thu, Jun 30, 2011 at 9:08 AM, Guillaume
> Lelarge
> > > > > >> <guillaume@lelarge.info> wrote:
> > > > > >> >
> > > > > >> > Could be the next thing I do. Last time
> we talked
> > about it, I had done
> > > > > >> > some work on sphynx. IIRC, I had two main
> things to
> > do:
> > > > > >> >
> > > > > >> > * try to build on Windows, and Mac
> > > > > >> > * change the build chain so that it
> buils
> > automatically the manual
> > > > > >> >
> > > > > >> > Did I forgot something?
> > > > > >>
> > > > > >> No, I think that's it.
> > > > > >>
> > > > > >
> > > > > > OK, I've done some work on this.
> > > > > >
> > > > > > Linux prep steps
> > > > > >
> > > > > > * install Python (with your distro package
> manager)
> > > > > > * install the python easy_install module
> > > > > > * install Sphinx (should be as easy as
> "easy_install
> > -U Sphinx)
> > > > > >
> > > > > > Windows prop steps
> > > > > >
> > > > > > * download
> >
> http://www.python.org/ftp/python/2.7.2/python-2.7.2.msi
> > > > > > * install python-2.7.2.msi
> > > > > > * download
> > > > > >
> >
> http://pypi.python.org/packages/2.7/s/setuptools/setuptools-0.6c11.win32-py2.7.exe#md5=57e1e64f6b7c7f1d2eddfc9746bbaf20
> > > > > > * install setuptools-0.6c11.win32-py2.7.exe
> > > > > > * include C:\Python27\Scripts in %path%
> > > > > > * in cmd, type "easy_install.exe -U Sphinx"
> > > > > >
> > > > > > Mac OS X prep steps
> > > > > >
> > > > > > I already had Python and the easy_install
> module, so I
> > just had to
> > > > > > install Sphinx with the usual command
> ("easy_install
> > -U Sphinx")
> > > > > >
> > > > > > Windows Visual Studio project changes
> > > > > >
> > > > > > It should be quite simple. We simply need to
> change
> > the Docs project so
> > > > > > that it launches the "make html" command
> instead of
> > the "builddocs.bat".
> > > > > > We'll also have to add all the rst files in
> this
> > project.
> > > > > >
> > > > > > Linux, and Mac OS X Makefile
> > > > > >
> > > > > > This should also be quite simple. We only
> need to
> > change the Makefile so
> > > > > > that it calls the Make in the docs
> directory.
> > > > > >
> > > > > > If it seems good enough for you, I'll update
> the rst
> > filess with the new
> > > > > > changes. I'll update the build system. And
> creates one
> > big patch for all
> > > > > > of this. OK?
> > > > >
> > > > > OK.
> > > > >
> > > >
> > > > Update on the files done. You can find that
> preliminary
> > work on
> > > > https://github.com/gleu/pgadmin3/tree/docs
> (branch name is
> > docs).
> > > >
> > > > I still need to work on the build system.
> > > >
> > >
> > > OK. Instead of working on the build system, I
> worked a bit
> > on the
> > > template system. We should be able to do what we
> want. I'm
> > not sure we
> > > really need to do this now, as ideas and needs
> will come
> > during the
> > > writing of the manual.
> > >
> > > But I still have to work on the build system. I'll
> try to
> > change the
> > > Windows build system this evening.
> > >
> >
> >
> > OK, so here is the patch I have now. And I have a
> big issue
> > with it.
> > Once "make.bat htmlhelp" is done, builddocs.bat
> stops. No
> > error, no
> > nothing. Everything seems fine, even if it didn't
> execute the
> > rest of
> > the batch file. It happens when I launch it from
> Visual Studio
> > and when
> > I launch it from the console. Same behaviour. I have
> > absolutely no idea
> > why this is happening. Any idea on the error I made?
> > By any chance, Did you forgot to add doc/en_US/make.bat file
> in the
> > patch?
> > I can't see that file anywhere in the pgadmin3 directory.
> >
>
>
> It's already in the docs branch of my git repository:
>
> https://github.com/gleu/pgadmin3/blob/docs/docs/en_US/make.bat
>
> It hasn't changed since.
> Sorry - I was checking master, did not follow the complete mail.
> What happens, if you change the following line?
> %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
> to
> CALL %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
>
great. I'll push the windows build on my branch. Thanks, Ashesh!
Now on the unix build.
--
On Fri, Jul 15, 2011 at 10:41 PM, Guillaume Lelarge <guillaume@lelarge.info> wrote: > On Fri, 2011-07-15 at 21:43 +0200, Guillaume Lelarge wrote: >> On Fri, 2011-07-15 at 11:41 +0530, Ashesh Vashi wrote: > >> > Sorry - I was checking master, did not follow the complete mail. >> > What happens, if you change the following line? >> > %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html >> > to >> > CALL %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html >> > >> >> It didn't work. But I tried a "CALL make.bat htmlhelp, and it worked >> great. I'll push the windows build on my branch. Thanks, Ashesh! >> >> Now on the unix build. >> > > OK, did something to build it. But, really, I have no idea where to > install the stuff. > > Dave can you take a look at the branch, and tell me if I need to do > other things? or if I did something wrong? because I'm not at ease right > now, I have no idea how to deal with it. Thanks. Should there be a Makefile in docs/en_US to complement make.bat? If not, what commands are you using to build the HTML Help? Also, do the images have to go in _static? That seems pretty ugly. -- Dave Page Blog: http://pgsnake.blogspot.com Twitter: @pgsnake EnterpriseDB UK: http://www.enterprisedb.com The Enterprise PostgreSQL Company
On Tue, 2011-07-19 at 10:51 +0100, Dave Page wrote: > On Fri, Jul 15, 2011 at 10:41 PM, Guillaume Lelarge > <guillaume@lelarge.info> wrote: > > On Fri, 2011-07-15 at 21:43 +0200, Guillaume Lelarge wrote: > >> On Fri, 2011-07-15 at 11:41 +0530, Ashesh Vashi wrote: > > > >> > Sorry - I was checking master, did not follow the complete mail. > >> > What happens, if you change the following line? > >> > %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html > >> > to > >> > CALL %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html > >> > > >> > >> It didn't work. But I tried a "CALL make.bat htmlhelp, and it worked > >> great. I'll push the windows build on my branch. Thanks, Ashesh! > >> > >> Now on the unix build. > >> > > > > OK, did something to build it. But, really, I have no idea where to > > install the stuff. > > > > Dave can you take a look at the branch, and tell me if I need to do > > other things? or if I did something wrong? because I'm not at ease right > > now, I have no idea how to deal with it. Thanks. > > Should there be a Makefile in docs/en_US to complement make.bat? There is a Makefile file, to be used on Unix. And a make.bat to be used on Windows. > If > not, what commands are you using to build the HTML Help? > make.bat htmlhelp (or make htmlhelp) > Also, do the images have to go in _static? That seems pretty ugly. > Nope, it depends on the html_static_path variable in conf.py. We could set it to images, but in this case, we would need to put the CSS file there too. -- Guillaume http://blog.guillaume.lelarge.info http://www.dalibo.com
On Tue, Jul 19, 2011 at 7:50 PM, Guillaume Lelarge <guillaume@lelarge.info> wrote: > On Tue, 2011-07-19 at 10:51 +0100, Dave Page wrote: >> On Fri, Jul 15, 2011 at 10:41 PM, Guillaume Lelarge >> <guillaume@lelarge.info> wrote: >> > On Fri, 2011-07-15 at 21:43 +0200, Guillaume Lelarge wrote: >> >> On Fri, 2011-07-15 at 11:41 +0530, Ashesh Vashi wrote: >> > >> >> > Sorry - I was checking master, did not follow the complete mail. >> >> > What happens, if you change the following line? >> >> > %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html >> >> > to >> >> > CALL %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html >> >> > >> >> >> >> It didn't work. But I tried a "CALL make.bat htmlhelp, and it worked >> >> great. I'll push the windows build on my branch. Thanks, Ashesh! >> >> >> >> Now on the unix build. >> >> >> > >> > OK, did something to build it. But, really, I have no idea where to >> > install the stuff. >> > >> > Dave can you take a look at the branch, and tell me if I need to do >> > other things? or if I did something wrong? because I'm not at ease right >> > now, I have no idea how to deal with it. Thanks. >> >> Should there be a Makefile in docs/en_US to complement make.bat? > > There is a Makefile file, to be used on Unix. And a make.bat to be used > on Windows. There's no Makefile there. Did you forget to check it in? -- Dave Page Blog: http://pgsnake.blogspot.com Twitter: @pgsnake EnterpriseDB UK: http://www.enterprisedb.com The Enterprise PostgreSQL Company
On Tue, 2011-07-19 at 20:00 +0100, Dave Page wrote: > On Tue, Jul 19, 2011 at 7:50 PM, Guillaume Lelarge > <guillaume@lelarge.info> wrote: > > On Tue, 2011-07-19 at 10:51 +0100, Dave Page wrote: > >> On Fri, Jul 15, 2011 at 10:41 PM, Guillaume Lelarge > >> <guillaume@lelarge.info> wrote: > >> > On Fri, 2011-07-15 at 21:43 +0200, Guillaume Lelarge wrote: > >> >> On Fri, 2011-07-15 at 11:41 +0530, Ashesh Vashi wrote: > >> > > >> >> > Sorry - I was checking master, did not follow the complete mail. > >> >> > What happens, if you change the following line? > >> >> > %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html > >> >> > to > >> >> > CALL %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html > >> >> > > >> >> > >> >> It didn't work. But I tried a "CALL make.bat htmlhelp, and it worked > >> >> great. I'll push the windows build on my branch. Thanks, Ashesh! > >> >> > >> >> Now on the unix build. > >> >> > >> > > >> > OK, did something to build it. But, really, I have no idea where to > >> > install the stuff. > >> > > >> > Dave can you take a look at the branch, and tell me if I need to do > >> > other things? or if I did something wrong? because I'm not at ease right > >> > now, I have no idea how to deal with it. Thanks. > >> > >> Should there be a Makefile in docs/en_US to complement make.bat? > > > > There is a Makefile file, to be used on Unix. And a make.bat to be used > > on Windows. > > There's no Makefile there. Did you forget to check it in? > > Oops, forgot this one. The fact that Makefile is in the .gitignore file didn't help. -- Guillaume http://blog.guillaume.lelarge.info http://www.dalibo.com
On Tue, Jul 19, 2011 at 8:06 PM, Guillaume Lelarge
<guillaume@lelarge.info> wrote:
>> There's no Makefile there. Did you forget to check it in?
>>
>>
>
> Oops, forgot this one. The fact that Makefile is in the .gitignore file
> didn't help.
So I'm thinking we should probably check that in as "Makefile.sphinx",
and then add a "docs" target to the top level Makefile that does
something like:
cd docs/en_US && make -f Makefile.sphinx htmlhelp SPHINXBUILD="${sphinx}"
where ${sphinx} is set to the path & filename of the sphinx
executable, from a configure option.
Thoughts?
Oh, and when I try to build, I get an error (another file to be
checked in I guess):
raptor:en_US dpage$ make htmlhelp SPHINXBUILD=sphinx-build-2.7
sphinx-build-2.7 -b htmlhelp -d _build/doctrees . _build/htmlhelp
Making output directory...
Running Sphinx v1.0.7
loading pickled environment... not yet created
building [htmlhelp]: targets for 54 source files that are out of date
updating environment: 54 added, 0 changed, 0 removed
reading sources... [100%] using
looking for now-outdated files... none found
pickling environment... done
checking consistency...
/Users/dpage/GIT-Trees/pgadmin3-docs/docs/en_US/connect-error.rst::
WARNING: document isn't included in any toctree
/Users/dpage/GIT-Trees/pgadmin3-docs/docs/en_US/gqb.rst:: WARNING:
document isn't included in any toctree
/Users/dpage/GIT-Trees/pgadmin3-docs/docs/en_US/gridopts.rst::
WARNING: document isn't included in any toctree
/Users/dpage/GIT-Trees/pgadmin3-docs/docs/en_US/kerberos.rst::
WARNING: document isn't included in any toctree
/Users/dpage/GIT-Trees/pgadmin3-docs/docs/en_US/macros.rst:: WARNING:
document isn't included in any toctree
/Users/dpage/GIT-Trees/pgadmin3-docs/docs/en_US/openssl.rst:: WARNING:
document isn't included in any toctree
/Users/dpage/GIT-Trees/pgadmin3-docs/docs/en_US/pgscript.rst::
WARNING: document isn't included in any toctree
/Users/dpage/GIT-Trees/pgadmin3-docs/docs/en_US/search.rst:: WARNING:
document isn't included in any toctree
done
preparing documents... done
writing output... [100%] using
writing additional files... genindex
copying images... [100%] _static/main.png
copying static files...
Exception occurred:
File "/opt/local/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/shutil.py",
line 81, in copyfile
with open(src, 'rb') as fsrc:
IOError: [Errno 2] No such file or directory:
'/Users/dpage/GIT-Trees/pgadmin3-docs/docs/en_US/logo-ltr.jpg'
The full traceback has been saved in
/var/folders/w3/w3pWkaA1HXu6YdlU06kyuU+++TI/-Tmp-/sphinx-err-zJDLDY.log,
if you want to report the issue to the developers.
Please also report this if it was a user error, so that a better error
message can be provided next time.
Either send bugs to the mailing list at
<http://groups.google.com/group/sphinx-dev/>,
or report them in the tracker at
<http://bitbucket.org/birkenfeld/sphinx/issues/>. Thanks!
make: *** [htmlhelp] Error 1
--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake
EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company
On Tue, 2011-07-19 at 21:44 +0100, Dave Page wrote:
> On Tue, Jul 19, 2011 at 8:06 PM, Guillaume Lelarge
> <guillaume@lelarge.info> wrote:
> >> There's no Makefile there. Did you forget to check it in?
> >>
> >>
> >
> > Oops, forgot this one. The fact that Makefile is in the .gitignore file
> > didn't help.
>
> So I'm thinking we should probably check that in as "Makefile.sphinx",
> and then add a "docs" target to the top level Makefile that does
> something like:
>
> cd docs/en_US && make -f Makefile.sphinx htmlhelp SPHINXBUILD="${sphinx}"
>
> where ${sphinx} is set to the path & filename of the sphinx
> executable, from a configure option.
>
> Thoughts?
>
Yes, that would work. I don't really understand why you want to build
htmlhelp files on Unix. It would only create the .hhp project file, but
not the CHM.
> Oh, and when I try to build, I get an error (another file to be
> checked in I guess):
>
> raptor:en_US dpage$ make htmlhelp SPHINXBUILD=sphinx-build-2.7
> sphinx-build-2.7 -b htmlhelp -d _build/doctrees . _build/htmlhelp
> Making output directory...
> Running Sphinx v1.0.7
> loading pickled environment... not yet created
> building [htmlhelp]: targets for 54 source files that are out of date
> updating environment: 54 added, 0 changed, 0 removed
> reading sources... [100%] using
> looking for now-outdated files... none found
> pickling environment... done
> checking consistency...
> /Users/dpage/GIT-Trees/pgadmin3-docs/docs/en_US/connect-error.rst::
> WARNING: document isn't included in any toctree
> /Users/dpage/GIT-Trees/pgadmin3-docs/docs/en_US/gqb.rst:: WARNING:
> document isn't included in any toctree
> /Users/dpage/GIT-Trees/pgadmin3-docs/docs/en_US/gridopts.rst::
> WARNING: document isn't included in any toctree
> /Users/dpage/GIT-Trees/pgadmin3-docs/docs/en_US/kerberos.rst::
> WARNING: document isn't included in any toctree
> /Users/dpage/GIT-Trees/pgadmin3-docs/docs/en_US/macros.rst:: WARNING:
> document isn't included in any toctree
> /Users/dpage/GIT-Trees/pgadmin3-docs/docs/en_US/openssl.rst:: WARNING:
> document isn't included in any toctree
> /Users/dpage/GIT-Trees/pgadmin3-docs/docs/en_US/pgscript.rst::
> WARNING: document isn't included in any toctree
> /Users/dpage/GIT-Trees/pgadmin3-docs/docs/en_US/search.rst:: WARNING:
> document isn't included in any toctree
> done
> preparing documents... done
> writing output... [100%] using
> writing additional files... genindex
> copying images... [100%] _static/main.png
> copying static files...
> Exception occurred:
> File "/opt/local/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/shutil.py",
> line 81, in copyfile
> with open(src, 'rb') as fsrc:
> IOError: [Errno 2] No such file or directory:
> '/Users/dpage/GIT-Trees/pgadmin3-docs/docs/en_US/logo-ltr.jpg'
> The full traceback has been saved in
> /var/folders/w3/w3pWkaA1HXu6YdlU06kyuU+++TI/-Tmp-/sphinx-err-zJDLDY.log,
> if you want to report the issue to the developers.
> Please also report this if it was a user error, so that a better error
> message can be provided next time.
> Either send bugs to the mailing list at
> <http://groups.google.com/group/sphinx-dev/>,
> or report them in the tracker at
> <http://bitbucket.org/birkenfeld/sphinx/issues/>. Thanks!
> make: *** [htmlhelp] Error 1
>
That's just me trying things, and commiting unwanted changes. Sorry
about this. This is now fixed in the docs branch, with the rename of the
Makefile.
--
Guillaume
http://blog.guillaume.lelarge.info
http://www.dalibo.com
On Tuesday, July 19, 2011, Guillaume Lelarge <guillaume@lelarge.info> wrote:
> On Tue, 2011-07-19 at 21:44 +0100, Dave Page wrote:
>> On Tue, Jul 19, 2011 at 8:06 PM, Guillaume Lelarge
>> <guillaume@lelarge.info> wrote:
>> >> There's no Makefile there. Did you forget to check it in?
>> >>
>> >>
>> >
>> > Oops, forgot this one. The fact that Makefile is in the .gitignore file
>> > didn't help.
>>
>> So I'm thinking we should probably check that in as "Makefile.sphinx",
>> and then add a "docs" target to the top level Makefile that does
>> something like:
>>
>> cd docs/en_US && make -f Makefile.sphinx htmlhelp SPHINXBUILD="${sphinx}"
>>
>> where ${sphinx} is set to the path & filename of the sphinx
>> executable, from a configure option.
>>
>> Thoughts?
>>
>
> Yes, that would work. I don't really understand why you want to build
> htmlhelp files on Unix. It would only create the .hhp project file, but
> not the CHM.
Because that's what the wxWidget help viewer displays - the difference
is that it uses the htmlhelp project files and html files directly,
not a chm file.
--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake
EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company
On Tue, 2011-07-19 at 22:32 +0100, Dave Page wrote:
> On Tuesday, July 19, 2011, Guillaume Lelarge <guillaume@lelarge.info> wrote:
> > On Tue, 2011-07-19 at 21:44 +0100, Dave Page wrote:
> >> On Tue, Jul 19, 2011 at 8:06 PM, Guillaume Lelarge
> >> <guillaume@lelarge.info> wrote:
> >> >> There's no Makefile there. Did you forget to check it in?
> >> >>
> >> >>
> >> >
> >> > Oops, forgot this one. The fact that Makefile is in the .gitignore file
> >> > didn't help.
> >>
> >> So I'm thinking we should probably check that in as "Makefile.sphinx",
> >> and then add a "docs" target to the top level Makefile that does
> >> something like:
> >>
> >> cd docs/en_US && make -f Makefile.sphinx htmlhelp SPHINXBUILD="${sphinx}"
> >>
> >> where ${sphinx} is set to the path & filename of the sphinx
> >> executable, from a configure option.
> >>
> >> Thoughts?
> >>
> >
> > Yes, that would work. I don't really understand why you want to build
> > htmlhelp files on Unix. It would only create the .hhp project file, but
> > not the CHM.
>
> Because that's what the wxWidget help viewer displays - the difference
> is that it uses the htmlhelp project files and html files directly,
> not a chm file.
>
Oh OK, I didn't get that. Interesting, thanks.
--
Guillaume
http://blog.guillaume.lelarge.info
http://www.dalibo.com
On Tue, 2011-07-19 at 21:44 +0100, Dave Page wrote:
> On Tue, Jul 19, 2011 at 8:06 PM, Guillaume Lelarge
> <guillaume@lelarge.info> wrote:
> >> There's no Makefile there. Did you forget to check it in?
> >>
> >>
> >
> > Oops, forgot this one. The fact that Makefile is in the .gitignore file
> > didn't help.
>
> So I'm thinking we should probably check that in as "Makefile.sphinx",
> and then add a "docs" target to the top level Makefile that does
> something like:
>
> cd docs/en_US && make -f Makefile.sphinx htmlhelp SPHINXBUILD="${sphinx}"
>
> where ${sphinx} is set to the path & filename of the sphinx
> executable, from a configure option.
>
To get back on this, Makefile is now Makefile.sphinx. Unfortunately, i
have no idea how to do the docs target. I would really like to have some
guidance here, or, much better, a patch that deals with it :)
--
Guillaume
http://blog.guillaume.lelarge.info
http://www.dalibo.com
On Mon, Jul 25, 2011 at 8:52 AM, Guillaume Lelarge
<guillaume@lelarge.info> wrote:
> On Tue, 2011-07-19 at 21:44 +0100, Dave Page wrote:
>> On Tue, Jul 19, 2011 at 8:06 PM, Guillaume Lelarge
>> <guillaume@lelarge.info> wrote:
>> >> There's no Makefile there. Did you forget to check it in?
>> >>
>> >>
>> >
>> > Oops, forgot this one. The fact that Makefile is in the .gitignore file
>> > didn't help.
>>
>> So I'm thinking we should probably check that in as "Makefile.sphinx",
>> and then add a "docs" target to the top level Makefile that does
>> something like:
>>
>> cd docs/en_US && make -f Makefile.sphinx htmlhelp SPHINXBUILD="${sphinx}"
>>
>> where ${sphinx} is set to the path & filename of the sphinx
>> executable, from a configure option.
>>
>
> To get back on this, Makefile is now Makefile.sphinx. Unfortunately, i
> have no idea how to do the docs target. I would really like to have some
> guidance here, or, much better, a patch that deals with it :)
Something like the attached? (lightly tested!)
--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake
EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company
Attachment
On Mon, 2011-07-25 at 16:20 +0100, Dave Page wrote:
> On Mon, Jul 25, 2011 at 8:52 AM, Guillaume Lelarge
> <guillaume@lelarge.info> wrote:
> > On Tue, 2011-07-19 at 21:44 +0100, Dave Page wrote:
> >> On Tue, Jul 19, 2011 at 8:06 PM, Guillaume Lelarge
> >> <guillaume@lelarge.info> wrote:
> >> >> There's no Makefile there. Did you forget to check it in?
> >> >>
> >> >>
> >> >
> >> > Oops, forgot this one. The fact that Makefile is in the .gitignore file
> >> > didn't help.
> >>
> >> So I'm thinking we should probably check that in as "Makefile.sphinx",
> >> and then add a "docs" target to the top level Makefile that does
> >> something like:
> >>
> >> cd docs/en_US && make -f Makefile.sphinx htmlhelp SPHINXBUILD="${sphinx}"
> >>
> >> where ${sphinx} is set to the path & filename of the sphinx
> >> executable, from a configure option.
> >>
> >
> > To get back on this, Makefile is now Makefile.sphinx. Unfortunately, i
> > have no idea how to do the docs target. I would really like to have some
> > guidance here, or, much better, a patch that deals with it :)
>
> Something like the attached? (lightly tested!)
>
Oh yeah, thanks, it works right out of the box for me.
So I guess we have it all? or is there anything missing?
And if we have it all, should I commit it ASAP? how are we going to
organize the work on the documentation?
--
Guillaume
http://blog.guillaume.lelarge.info
http://www.dalibo.com
On Mon, Jul 25, 2011 at 8:33 PM, Guillaume Lelarge <guillaume@lelarge.info> wrote: >> Something like the attached? (lightly tested!) >> > > Oh yeah, thanks, it works right out of the box for me. Sweet :-) > So I guess we have it all? or is there anything missing? You need to change _static to images I think. Plus, the top-level Makefile.am needs to be updated to include the new/renamed files. > And if we have it all, should I commit it ASAP? Sure - it seems to be good now :-). Don't forget to update the build instructions. > how are we going to > organize the work on the documentation? I think we need to draw up a standard, and then just start working on it as and when we can. -- Dave Page Blog: http://pgsnake.blogspot.com Twitter: @pgsnake EnterpriseDB UK: http://www.enterprisedb.com The Enterprise PostgreSQL Company
On Mon, 2011-07-25 at 20:39 +0100, Dave Page wrote:
> On Mon, Jul 25, 2011 at 8:33 PM, Guillaume Lelarge
> <guillaume@lelarge.info> wrote:
> >> Something like the attached? (lightly tested!)
> >>
> >
> > Oh yeah, thanks, it works right out of the box for me.
>
> Sweet :-)
>
> > So I guess we have it all? or is there anything missing?
>
> You need to change _static to images I think.
Done, and pushed.
> Plus, the top-level
> Makefile.am needs to be updated to include the new/renamed files.
>
You mean something like this?
diff --git a/Makefile.am b/Makefile.am
index 677ec5c..d1d19f3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,7 +34,8 @@ EXTRA_DIST = \
TMP_docs = \
$(top_srcdir)/docs/en_US/*.css \
- $(top_srcdir)/docs/en_US/*.html \
+ $(top_srcdir)/docs/en_US/*.rst \
+ $(top_srcdir)/docs/en_US/conf.py \
$(top_srcdir)/docs/en_US/pgadmin3.hh* \
$(top_srcdir)/docs/en_US/hints/*.html \
$(top_srcdir)/docs/en_US/images/*.png \
> > And if we have it all, should I commit it ASAP?
>
> Sure - it seems to be good now :-).
>
> Don't forget to update the build instructions.
>
In the INSTALL file, right? or is there another file I should care
about?
> > how are we going to
> > organize the work on the documentation?
>
> I think we need to draw up a standard, and then just start working on
> it as and when we can.
>
>
OK.
--
Guillaume
http://blog.guillaume.lelarge.info
http://www.dalibo.com
On Mon, Jul 25, 2011 at 8:59 PM, Guillaume Lelarge <guillaume@lelarge.info> wrote: > You mean something like this? > > diff --git a/Makefile.am b/Makefile.am > index 677ec5c..d1d19f3 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -34,7 +34,8 @@ EXTRA_DIST = \ > > TMP_docs = \ > $(top_srcdir)/docs/en_US/*.css \ > - $(top_srcdir)/docs/en_US/*.html \ > + $(top_srcdir)/docs/en_US/*.rst \ > + $(top_srcdir)/docs/en_US/conf.py \ > $(top_srcdir)/docs/en_US/pgadmin3.hh* \ > $(top_srcdir)/docs/en_US/hints/*.html \ > $(top_srcdir)/docs/en_US/images/*.png \ Yes. >> Don't forget to update the build instructions. >> > > In the INSTALL file, right? or is there another file I should care > about? Yep, the INSTALL file. -- Dave Page Blog: http://pgsnake.blogspot.com Twitter: @pgsnake EnterpriseDB UK: http://www.enterprisedb.com The Enterprise PostgreSQL Company
On Mon, 2011-07-25 at 21:01 +0100, Dave Page wrote: > On Mon, Jul 25, 2011 at 8:59 PM, Guillaume Lelarge > <guillaume@lelarge.info> wrote: > > You mean something like this? > > > > diff --git a/Makefile.am b/Makefile.am > > index 677ec5c..d1d19f3 100644 > > --- a/Makefile.am > > +++ b/Makefile.am > > @@ -34,7 +34,8 @@ EXTRA_DIST = \ > > > > TMP_docs = \ > > $(top_srcdir)/docs/en_US/*.css \ > > - $(top_srcdir)/docs/en_US/*.html \ > > + $(top_srcdir)/docs/en_US/*.rst \ > > + $(top_srcdir)/docs/en_US/conf.py \ > > $(top_srcdir)/docs/en_US/pgadmin3.hh* \ > > $(top_srcdir)/docs/en_US/hints/*.html \ > > $(top_srcdir)/docs/en_US/images/*.png \ > > Yes. > > >> Don't forget to update the build instructions. > >> > > > > In the INSTALL file, right? or is there another file I should care > > about? > > Yep, the INSTALL file. > Done, and pushed. Thank you. -- Guillaume http://blog.guillaume.lelarge.info http://www.dalibo.com