mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2025-02-25 18:55:31 -06:00
Cleanup Python detection in the runtime project file. Fixes #5444
This commit is contained in:
Dave Page
@@ -4,12 +4,16 @@ QMAKE_TARGET_PRODUCT = "pgAdmin 4"
|
||||
QMAKE_TARGET_DESCRIPTION = "pgAdmin 4 Desktop Runtime"
|
||||
QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2013 - 2020, The pgAdmin Development Team"
|
||||
|
||||
message(==================================)
|
||||
message(Configuring the pgAdmin 4 runtime.)
|
||||
message(==================================)
|
||||
|
||||
# Configure QT modules for the appropriate version of QT
|
||||
greaterThan(QT_MAJOR_VERSION, 4) {
|
||||
message(Building for QT5+...)
|
||||
message(Qt version: 5)
|
||||
QT += network widgets
|
||||
} else {
|
||||
message(Building for QT4...)
|
||||
message(Qt version: 4)
|
||||
QT += network
|
||||
DEFINES += Q_NULLPTR=NULL
|
||||
}
|
||||
@@ -22,91 +26,104 @@ QMAKE_CFLAGS += $$(PGADMIN_CFLAGS)
|
||||
QMAKE_CXXFLAGS += $$(PGADMIN_CXXFLAGS)
|
||||
QMAKE_LFLAGS += $$(PGADMIN_LDFLAGS)
|
||||
|
||||
# Figure out where/what Python looks like and that it's suitable
|
||||
PYTHON_DIR = $$(PGADMIN_PYTHON_DIR)
|
||||
|
||||
equals(PYTHON_DIR, "") {
|
||||
error(The PGADMIN_PYTHON_DIR environment variable is not set. Please set it to a directory path under which Python 3.4 or later has been installed and try again.)
|
||||
}
|
||||
|
||||
win32 {
|
||||
message(Building for Windows...)
|
||||
|
||||
# Read the PYTHON_HOME and PYTHON_VERSION system environment variables.
|
||||
PY_HOME = $$(PYTHON_HOME)
|
||||
PY_VERSION = $$(PYTHON_VERSION)
|
||||
|
||||
lessThan(PY_VERSION, 34) {
|
||||
error(Python 3.4 or later is required.)
|
||||
message(Platform: Windows)
|
||||
PYTHON_EXE = $${PYTHON_DIR}\python.exe
|
||||
} else {
|
||||
macx {
|
||||
message(Platform: macOS)
|
||||
} else {
|
||||
message(Platform: Linux)
|
||||
}
|
||||
PYTHON_EXE = $${PYTHON_DIR}/bin/python3
|
||||
}
|
||||
|
||||
isEmpty(PY_HOME) {
|
||||
error(Please define the PYTHON_HOME variable in the system environment.)
|
||||
}
|
||||
else {
|
||||
isEmpty(PY_VERSION) {
|
||||
error(Please define the PYTHON_VERSION variable in the system environment.)
|
||||
}
|
||||
else {
|
||||
INCLUDEPATH = $$PY_HOME\include
|
||||
LIBS += -L"$$PY_HOME\libs" -lpython$$PY_VERSION
|
||||
}
|
||||
}
|
||||
!exists($$PYTHON_EXE) {
|
||||
error(The Python executable ($$PYTHON_EXE) could not be found. Please ensure the PGADMIN_PYTHON_DIR environment variable is correctly set.)
|
||||
}
|
||||
message(Python executable: $$PYTHON_EXE)
|
||||
|
||||
PYTHON_VERSION = $$system($$PYTHON_EXE -c \"import sys; print(\'%s.%s\' % (sys.version_info[0], sys.version_info[1]))\")
|
||||
PYTHON_SHORT_VERSION = $$system($$PYTHON_EXE -c \"import sys; print(\'%s%s\' % (sys.version_info[0], sys.version_info[1]))\")
|
||||
PYTHON_MAJOR_VERSION = $$system($$PYTHON_EXE -c \"import sys; print(sys.version_info[0])\")
|
||||
message(Python version: $$PYTHON_VERSION ($$PYTHON_SHORT_VERSION))
|
||||
|
||||
lessThan(PYTHON_SHORT_VERSION, 34) {
|
||||
error(Python 3.4 or later is required to build pgAdmin.)
|
||||
}
|
||||
|
||||
# Configure for the platform
|
||||
win32 {
|
||||
INCLUDEPATH = $${PYTHON_DIR}\include
|
||||
message(Include path: $$INCLUDEPATH)
|
||||
|
||||
LIBS += -L"$${PYTHON_DIR}\libs" -lpython$${PYTHON_SHORT_VERSION}
|
||||
message(LIBS: $$LIBS)
|
||||
}
|
||||
else {
|
||||
message(Building for Linux/Mac...)
|
||||
|
||||
# Find and configure Python
|
||||
# Environment setting
|
||||
PYTHON_CONFIG = $$(PYTHON_CONFIG)
|
||||
|
||||
# Maybe Python 3?
|
||||
isEmpty(PYTHON_CONFIG) {
|
||||
PYTHON_CONFIG = $$system(which python3-config)
|
||||
# Find the best matching python-config (there may be more than one)
|
||||
exists($PYTHON_DIR/bin/python$${PYTHON_VERSION}-config) {
|
||||
PYTHON_CONFIG = $$PYTHON_DIR/bin/python$${PYTHON_VERSION}-config
|
||||
} else: exists($${PYTHON_DIR}/bin/python$${PYTHON_MAJOR_VERSION}-config) {
|
||||
PYTHON_CONFIG = $${PYTHON_DIR}/bin/python$${PYTHON_MAJOR_VERSION}-config
|
||||
} else: exists($${PYTHON_DIR}/bin/python-config) {
|
||||
PYTHON_CONFIG = $${PYTHON_DIR}/bin/python-config
|
||||
} else {
|
||||
error(No suitable python-config could be found in $${PYTHON_DIR}/bin.)
|
||||
}
|
||||
|
||||
# Argh!
|
||||
isEmpty(PYTHON_CONFIG) {
|
||||
error(The python3-config executable could not be found. Ensure Python is installed and in the system path.)
|
||||
}
|
||||
|
||||
message(Using $$PYTHON_CONFIG)
|
||||
message(Python config: $$PYTHON_CONFIG)
|
||||
|
||||
PYTHON_EMBED = $$system($$PYTHON_CONFIG --help 2>&1 | grep -o \'\\-\\-embed\')
|
||||
|
||||
QMAKE_CXXFLAGS += $$system($$PYTHON_CONFIG --includes)
|
||||
QMAKE_LFLAGS += $$system($$PYTHON_CONFIG --ldflags)
|
||||
LIBS += $$system($$PYTHON_CONFIG --libs $$PYTHON_EMBED)
|
||||
message(CXXFLAGS: $$QMAKE_CXXFLAGS)
|
||||
|
||||
contains( LIBS, -lpython2.* ) {
|
||||
error(Building with Python 2 is not supported.)
|
||||
} else {
|
||||
message(Building with Python 3.)
|
||||
}
|
||||
QMAKE_LFLAGS += $$system($$PYTHON_CONFIG --ldflags)
|
||||
message(LDFLAGS: $$QMAKE_LFLAGS)
|
||||
|
||||
LIBS += $$system($$PYTHON_CONFIG --libs $$PYTHON_EMBED)
|
||||
message(LIBS: $$LIBS)
|
||||
}
|
||||
|
||||
# Source code
|
||||
HEADERS = Server.h \
|
||||
pgAdmin4.h \
|
||||
ConfigWindow.h \
|
||||
TrayIcon.h \
|
||||
LogWindow.h \
|
||||
MenuActions.h \
|
||||
FloatingWindow.h \
|
||||
Logger.h
|
||||
SOURCES = pgAdmin4.cpp \
|
||||
Server.cpp \
|
||||
ConfigWindow.cpp \
|
||||
TrayIcon.cpp \
|
||||
LogWindow.cpp \
|
||||
MenuActions.cpp \
|
||||
FloatingWindow.cpp \
|
||||
Logger.cpp
|
||||
HEADERS = Server.h \
|
||||
pgAdmin4.h \
|
||||
ConfigWindow.h \
|
||||
TrayIcon.h \
|
||||
LogWindow.h \
|
||||
MenuActions.h \
|
||||
FloatingWindow.h \
|
||||
Logger.h
|
||||
|
||||
FORMS = ConfigWindow.ui \
|
||||
LogWindow.ui \
|
||||
FloatingWindow.ui
|
||||
ICON = pgAdmin4.icns
|
||||
QMAKE_INFO_PLIST = Info.plist
|
||||
SOURCES = pgAdmin4.cpp \
|
||||
Server.cpp \
|
||||
ConfigWindow.cpp \
|
||||
TrayIcon.cpp \
|
||||
LogWindow.cpp \
|
||||
MenuActions.cpp \
|
||||
FloatingWindow.cpp \
|
||||
Logger.cpp
|
||||
|
||||
RESOURCES += pgadmin4.qrc \
|
||||
breeze.qrc
|
||||
FORMS = ConfigWindow.ui \
|
||||
LogWindow.ui \
|
||||
FloatingWindow.ui
|
||||
|
||||
ICON = pgAdmin4.icns
|
||||
|
||||
QMAKE_INFO_PLIST = Info.plist
|
||||
|
||||
RESOURCES += pgadmin4.qrc \
|
||||
breeze.qrc
|
||||
|
||||
macx {
|
||||
HEADERS += macos.h
|
||||
OBJECTIVE_SOURCES = macos.mm
|
||||
HEADERS += macos.h
|
||||
OBJECTIVE_SOURCES = macos.mm
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user