IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix the bundling issue of dark mode runtime support for Windows and Mac.

Browse Source
This commit is contained in:
Neel Patel 2020-04-14 15:19:39 +05:30 committed by Akshay Joshi
parent 12530cd973
commit 65bc196eba
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Make.bat
View File

@ -265,6 +265,12 @@ REM Main build sequence Ends
ECHO Staging pgAdmin4.exe...
COPY "%WD%\runtime\release\pgAdmin4.exe" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
ECHO Staging dark and light theme components...
COPY "%WD%\runtime\dark.qss" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
COPY "%WD%\runtime\light.qss" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
XCOPY /S /I /E /H /Y "%WD%\runtime\dark" "%PGBUILDPATH%\runtime\dark" > nul || EXIT /B 1
XCOPY /S /I /E /H /Y "%WD%\runtime\light" "%PGBUILDPATH%\runtime\light" > nul || EXIT /B 1
ECHO Staging Qt components...
COPY "%QTDIR%\bin\Qt5Core.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
COPY "%QTDIR%\bin\Qt5Gui.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1

2
pkg/mac/build.sh
View File

@ -78,6 +78,7 @@ _get_version() {
_cleanup() {
echo "Cleaning up the old environment and app bundle"
rm -rf ${SOURCEDIR}/runtime/pgAdmin4.app
rm -rf ${SOURCEDIR}/runtime/dark ${SOURCEDIR}/runtime/light ${SOURCEDIR}/runtime/light.qss ${SOURCEDIR}/runtime/dark.qss
rm -rf ${BUILDROOT}
rm -f ${DISTROOT}/pgadmin4*.dmg
}
@ -153,6 +154,7 @@ _build_runtime() {
${QMAKE} || { echo qmake failed; exit 1; }
make || { echo make failed; exit 1; }
cp -r pgAdmin4.app "${BUILDROOT}/${APP_BUNDLE_NAME}"
cp -r dark light dark.qss light.qss "${BUILDROOT}/"
}
_build_doc() {

2
pkg/win32/installer.iss.in
View File

@ -294,6 +294,8 @@ begin
begin
DelWebfolder(ExpandConstant('{app}\web'));
DelFolder(ExpandConstant('{app}\venv'));
DelFolder(ExpandConstant('{app}\runtime\dark'));
DelFolder(ExpandConstant('{app}\runtime\light'));
end;
end;
end;