Skip to content

Commit

Permalink
Several clean ups in the source code root. Removed unused files.
Browse files Browse the repository at this point in the history
The subproject libutils was renamed to pgmutils and now resides on libs/

The subproject libparsers was renamed to pgmparsers and now resides on
libs/

The subproject libpgmodeler was renamed to pgmcore and now resides on
libs/

The subproject libpgmodeler_ui was renamed to pgmui and now resides on
libs/

The subproject libobjrenderer was renamed to pgmcanvas and now resides
on libs/

The subproject libparsers was renamed to pgmparsers and now resides on
libs/

The main executable subproject was renamed to gui and now resides on
apps/

The main-cli executable subproject was renamed to cli and now resides on
apps/

The crashhandler subproject was moved to apps/

Created a subfolder called assets and it contains all deployed files
that aren't libraries or executables: conf, lang, schemas, samples, etc

Refactored all .pro/.pri files in order to reference pgModeler libraries
from variables $$PGM[LIBNAME] instead of relative paths.
  • Loading branch information
rkhaotix committed May 27, 2021
1 parent d8a5e3f commit 2a222e5
Show file tree
Hide file tree
Showing 1,186 changed files with 330 additions and 650 deletions.
40 changes: 40 additions & 0 deletions apps/cli/cli.pro
@@ -0,0 +1,40 @@
include(../../pgmodeler.pri)

CONFIG += console
TEMPLATE = app
TARGET = pgmodeler-cli
INCLUDEPATH += ../gui/src

windows:RC_FILE=../gui/res/windows_ico.qrc
windows: RCC_DIR=src/
windows: DESTDIR = $$PWD

SOURCES += src/main.cpp \
src/pgmodelercliapp.cpp

HEADERS += src/pgmodelercliapp.h

unix|windows: LIBS += $$PGMUI_LIB \
$$PGMCANVAS_LIB \
$$PGMCONNECTOR_LIB \
$$PGMCORE_LIB \
$$PGMPARSERS_LIB \
$$PGMUTILS_LIB

INCLUDEPATH += $$PGMUI_INC \
$$PGMCANVAS_INC \
$$PGMCONNECTOR_INC \
$$PGMCORE_INC \
$$PGMPARSERS_INC \
$$PGMUTILS_INC

DEPENDPATH += $$PGMUI_ROOT \
$$PGMCANVAS_ROOT \
$$PGMCONNECTOR_ROOT \
$$PGMCORE_ROOT \
$$PGMPARSERS_ROOT \
$$PGMUTILS_ROOT

# Deployment settings
target.path = $$BINDIR
INSTALLS = target
File renamed without changes.
File renamed without changes.
File renamed without changes.
37 changes: 37 additions & 0 deletions apps/crashhandler/crashhandler.pro
@@ -0,0 +1,37 @@
include(../../pgmodeler.pri)

TEMPLATE = app
TARGET = pgmodeler-ch

windows:RC_FILE=res/windows_ico.qrc
windows:RCC_DIR=src/

SOURCES += src/main.cpp \
src/crashhandlerform.cpp

HEADERS += src/crashhandlerform.h

unix|windows: LIBS += $$PGMUI_LIB \
$$PGMCANVAS_LIB \
$$PGMCONNECTOR_LIB \
$$PGMCORE_LIB \
$$PGMPARSERS_LIB \
$$PGMUTILS_LIB

INCLUDEPATH += $$PGMUI_INC \
$$PGMCANVAS_INC \
$$PGMCONNECTOR_INC \
$$PGMCORE_INC \
$$PGMPARSERS_INC \
$$PGMUTILS_INC

DEPENDPATH += $$PGMUI_ROOT \
$$PGMCANVAS_ROOT \
$$PGMCONNECTOR_ROOT \
$$PGMCORE_ROOT \
$$PGMPARSERS_ROOT \
$$PGMUTILS_ROOT

# Deployment settings
target.path = $$PRIVATEBINDIR
INSTALLS = target
File renamed without changes.
File renamed without changes.
File renamed without changes.
51 changes: 51 additions & 0 deletions apps/gui/gui.pro
@@ -0,0 +1,51 @@
include(../../pgmodeler.pri)

TEMPLATE = app
TARGET = pgmodeler

windows:RC_FILE=res/windows_ico.qrc
windows:RCC_DIR=src/
windows: DESTDIR = $$PWD

HEADERS += src/pgmodelerapp.h

SOURCES += src/main.cpp \
src/pgmodelerapp.cpp

unix|windows: LIBS += $$PGMUI_LIB \
$$PGMCANVAS_LIB \
$$PGMCONNECTOR_LIB \
$$PGMCORE_LIB \
$$PGMPARSERS_LIB \
$$PGMUTILS_LIB

INCLUDEPATH += $$PGMUI_INC \
$$PGMCANVAS_INC \
$$PGMCONNECTOR_INC \
$$PGMCORE_INC \
$$PGMPARSERS_INC \
$$PGMUTILS_INC

DEPENDPATH += $$PGMUI_ROOT \
$$PGMCANVAS_ROOT \
$$PGMCONNECTOR_ROOT \
$$PGMCORE_ROOT \
$$PGMPARSERS_ROOT \
$$PGMUTILS_ROOT

# Deployment settings
target.path = $$BINDIR
INSTALLS = target

macx {
macdeps.files = $$PWD/res/Resources $$PWD/res/Info.plist $$PWD/res/PkgInfo
macdeps.path = $$PREFIX

macscript.files = $$PWD/res/startapp
macscript.path = $$BINDIR

INSTALLS += macdeps macscript
}

# Print the current build settins (see pgmodeler.pri)
printBuildDetails()
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 2a222e5

Please sign in to comment.