diff --git a/INSTALL.txt b/INSTALL.txt index f68e6b4..9716eca 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -21,8 +21,8 @@ cmake --build . --config Release --target all -j 3 -- Его можно взять в исходниках Postgresql 15 и положить в include/parser/ Могут быть проблемы с компиляцией JSON парсера. -Его можно исключить (как и эксперементальную часть с Git) заменой по всем исходникам wxUSE_WEBREQUEST -на что бессмысленное например wxUSE_WEBREQUEST5 . +Его можно исключить (как и эксперементальную часть с Git) заменой по всем исходникам NO_WXJSON_GIT +на что бессмысленное например NO_WXJSON_GIT. ОС для сборки использовал «Альт Рабочая станция» 10 diff --git a/INSTALL_EN.txt b/INSTALL_EN.txt new file mode 100644 index 0000000..e2aca96 --- /dev/null +++ b/INSTALL_EN.txt @@ -0,0 +1,36 @@ +Dependencies +------------- +cmake 3.2 +gcc10-c++ + +wxWidgets 3.2, build from source (https://www.wxwidgets.org/downloads/): + tar -xf wxWidgets-3.2.2.1.tar.bz2 + cd wxWidgets-3.2.2.1 + ./configure --with-gtk --enable-unicode + make + sudo make install + +PostgreSQL 15.1 +libxml2 +libxslt + +Compile under Linux +------- +mkdir build +cd build +CXXFLAGS="-DNO_WXJSON_GIT" cmake .. +cmake --build . --config Release --target all -j 3 -- + +The resulting pgAdmin3 executable should be placed in the directory of the original pgadmin3 + +There may be problems with the missing kwlist.h file +It can be taken from the Postgresql 15 sources and put in include/parser/ + +There may be problems compiling the JSON parser. +It can be eliminated (as well as the experimental part with Git) by defining NO_WXJSON_GIT as done above through CXXFLAGS. + + +OS for assembly used "Alt Workstation" 10 +https://www.basealt.ru/alt-workstation/download#c1211 + +Edited and compiled on Visual Studio code \ No newline at end of file diff --git a/ctl/ctlGitPanel.cpp b/ctl/ctlGitPanel.cpp index 99f4c6b..6fc9aa4 100644 --- a/ctl/ctlGitPanel.cpp +++ b/ctl/ctlGitPanel.cpp @@ -28,7 +28,7 @@ enum { MARGIN_LINE_NUMBERS }; -#if wxUSE_WEBREQUEST +#if !defined(NO_WXJSON_GIT) class SourceViewDialog : public wxFrame diff --git a/frm/frmMain.cpp b/frm/frmMain.cpp index fed407c..1e76b83 100644 --- a/frm/frmMain.cpp +++ b/frm/frmMain.cpp @@ -171,7 +171,7 @@ frmMain::frmMain(const wxString &title) statistics = new ctlListView(listViews, CTL_STATVIEW, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER); dependencies = new ctlListView(listViews, CTL_DEPVIEW, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER); dependents = new ctlListView(listViews, CTL_REFVIEW, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER); -#if wxUSE_WEBREQUEST +#if !defined(NO_WXJSON_GIT) git = NULL; wxJSONValue cfg=ctlGitPanel::GetConfig(); @@ -188,7 +188,7 @@ frmMain::frmMain(const wxString &title) listViews->AddPage(statistics, _("Statistics")); // NBP_STATISTICS listViews->AddPage(dependencies, _("Dependencies")); // NBP_DEPENDENCIES listViews->AddPage(dependents, _("Dependents")); // NBP_DEPENDENTS -#if wxUSE_WEBREQUEST +#if !defined(NO_WXJSON_GIT) if (git) { listViews->AddPage(git, _("Git")); // @@ -827,7 +827,7 @@ void frmMain::ShowObjStatistics(pgObject *data, wxWindow *ctrl) data->ShowDependents(this, dependents); dependents->Thaw(); } -#if wxUSE_WEBREQUEST +#if !defined(NO_WXJSON_GIT) if ((!ctrl && git && git->IsShownOnScreen()) || ctrl == git) { diff --git a/include/ctl/ctlGitPanel.h b/include/ctl/ctlGitPanel.h index 567b5cb..78abb1e 100644 --- a/include/ctl/ctlGitPanel.h +++ b/include/ctl/ctlGitPanel.h @@ -1,5 +1,5 @@ #pragma once -#if wxUSE_WEBREQUEST +#if !defined(NO_WXJSON_GIT) #ifndef _WX_ctlGitPanel_H_ #define _WX_ctlGitPanel_H_ diff --git a/include/frm/frmMain.h b/include/frm/frmMain.h index 7fdb35c..8016a6e 100644 --- a/include/frm/frmMain.h +++ b/include/frm/frmMain.h @@ -207,7 +207,7 @@ private: ctlListView *properties; ctlListView *statistics; ctlListView *dependents, *dependencies; -#if wxUSE_WEBREQUEST +#if !defined(NO_WXJSON_GIT) ctlGitPanel* git; #endif ctlAuiNotebook *listViews; diff --git a/include/utils/json/json_defs.h b/include/utils/json/json_defs.h index 3031f33..9b2585d 100644 --- a/include/utils/json/json_defs.h +++ b/include/utils/json/json_defs.h @@ -7,7 +7,7 @@ // Copyright: (c) 2007 Luciano Cattani // Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// -#if wxUSE_WEBREQUEST +#if !defined(NO_WXJSON_GIT) #ifndef _WX_JSON_DEFS_H_ #define _WX_JSON_DEFS_H_ diff --git a/include/utils/json/jsonreader.h b/include/utils/json/jsonreader.h index 4954d9b..4e2371d 100644 --- a/include/utils/json/jsonreader.h +++ b/include/utils/json/jsonreader.h @@ -7,7 +7,7 @@ // Copyright: (c) 2007 Luciano Cattani // Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// -#if wxUSE_WEBREQUEST +#if !defined(NO_WXJSON_GIT) #include "pgAdmin3.h" diff --git a/include/utils/json/jsonval.h b/include/utils/json/jsonval.h index 7b59ba4..4eca663 100644 --- a/include/utils/json/jsonval.h +++ b/include/utils/json/jsonval.h @@ -7,7 +7,7 @@ // Copyright: (c) 2007 Luciano Cattani // Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// -#if wxUSE_WEBREQUEST +#if !defined(NO_WXJSON_GIT) #if !defined( _WX_JSONVAL_H ) #define _WX_JSONVAL_H diff --git a/include/utils/json/jsonwriter.h b/include/utils/json/jsonwriter.h index 9db57c3..35cfc1a 100644 --- a/include/utils/json/jsonwriter.h +++ b/include/utils/json/jsonwriter.h @@ -7,7 +7,7 @@ // Copyright: (c) 2007 Luciano Cattani // Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// -#if wxUSE_WEBREQUEST +#if !defined(NO_WXJSON_GIT) #include "pgAdmin3.h" diff --git a/utils/json/jsonreader.cpp b/utils/json/jsonreader.cpp index 854fa5c..d1f1e1c 100644 --- a/utils/json/jsonreader.cpp +++ b/utils/json/jsonreader.cpp @@ -13,7 +13,7 @@ #endif #include "pgAdmin3.h" -#if wxUSE_WEBREQUEST +#if !defined(NO_WXJSON_GIT) #include #include diff --git a/utils/json/jsonval.cpp b/utils/json/jsonval.cpp index 3ac320b..c580d2e 100644 --- a/utils/json/jsonval.cpp +++ b/utils/json/jsonval.cpp @@ -12,7 +12,7 @@ #endif #include "pgAdmin3.h" -#if wxUSE_WEBREQUEST +#if !defined(NO_WXJSON_GIT) // For compilers that support precompilation, includes "wx.h". diff --git a/utils/json/jsonwriter.cpp b/utils/json/jsonwriter.cpp index 32d8b8f..766c0b2 100644 --- a/utils/json/jsonwriter.cpp +++ b/utils/json/jsonwriter.cpp @@ -13,7 +13,7 @@ #include "pgAdmin3.h" -#if wxUSE_WEBREQUEST +#if !defined(NO_WXJSON_GIT) #include #include