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

Minor fixes

Browse Source
This commit is contained in:
Dave Page
2018-05-22 15:41:10 +01:00
parent 0b5912b09c
commit 81a5e1ffd3
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Make.bat
View File

@@ -289,11 +289,11 @@ REM Main build sequence Ends
ECHO Staging VC++ runtime... ECHO Staging VC++ runtime...
MKDIR "%PGBUILDPATH%\installer" || EXIT /B 1 MKDIR "%PGBUILDPATH%\installer" || EXIT /B 1
copy "%VCREDIST%" "%PGBUILDPATH%\installer" > nul || EXIT /B 1 COPY "%VCREDIST%" "%PGBUILDPATH%\installer" > nul || EXIT /B 1
CD %WD% CD %WD%
EXIT /B 0 EXIT /B 0
:CREATE_PYTHON_ENV :CREATE_PYTHON_ENV
ECHO Staging Python... ECHO Staging Python...
@@ -328,7 +328,7 @@ REM Main build sequence Ends
"%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage1" "-o" "%WD%\pkg\win32\installer.iss.in_stage2" "-s" MYAPP_FULLVERSION -r """%APP_VERSION%""" "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage1" "-o" "%WD%\pkg\win32\installer.iss.in_stage2" "-s" MYAPP_FULLVERSION -r """%APP_VERSION%"""
"%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage2" "-o" "%WD%\pkg\win32\installer.iss.in_stage3" "-s" MYAPP_VERSION -r """v%APP_MAJOR%""" "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage2" "-o" "%WD%\pkg\win32\installer.iss.in_stage3" "-s" MYAPP_VERSION -r """v%APP_MAJOR%"""
set ARCMODE= SET ARCMODE=
IF "%ARCHITECTURE%"=="amd64" ( IF "%ARCHITECTURE%"=="amd64" (
set ARCMODE="x64" set ARCMODE="x64"
) )
@@ -364,6 +364,7 @@ REM Main build sequence Ends
EXIT /B 0 EXIT /B 0
:CLEANUP_ENV :CLEANUP_ENV
ECHO Cleaning the build environment... ECHO Cleaning the build environment...
RD "%PGBUILDPATH%\%VIRTUALENV%\Include" /S /Q 1> nul 2>&1 RD "%PGBUILDPATH%\%VIRTUALENV%\Include" /S /Q 1> nul 2>&1