alenka/ponyprog
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

create_exe bugfixes

Browse Source 
(cherry picked from commit 77dd24d058cbb9887ac7cc8ef655e4845ac89304)
This commit is contained in:
Eduard Kalinowski 2017-09-20 21:45:48 +02:00 committed by lancos
parent d68c53ad8b
commit 5f003b8671
9 changed files with 78 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
create_exe_binary.bat
View File

@ -1,10 +1,16 @@
CLS
REM Configure.
@echo off
ECHO "Configure."
ECHO %path%
SET QTDIR=C:/Qt/Qt5.9.1
ECHO %qtdir%
REM PATH=c:/Program Files/CMake/bin;c:/Qt/Qt5.9.1/Tools/mingw530_32/bin/;%PATH%
setlocal
SET myCmakePath=c:/Program Files/CMake/bin/
SET myMinGWPath=c:/Qt/Qt5.9.1/Tools/mingw530_32/bin/
SET myQtPath=C:/Qt/Qt5.9.1
PATH=%myCmakePath%;%myMinGWPath%;%PATH%
rd /s /q "build"
mkdir "build"
@ -12,8 +18,8 @@ mkdir "build"
cd build
cmake -G "MinGW Makefiles" ^
-DCMAKE_PREFIX_PATH="%QTDIR%/5.9.1/mingw53_32/;%QTDIR%/5.9.1/mingw53_32/lib/;%QTDIR%/Tools/mingw530_32/i686-w64-mingw32/lib/" ^
-DCMAKE_MODULE_PATH="%QTDIR%/5.9.1/mingw53_32/lib/cmake/;" ^
-DCMAKE_PREFIX_PATH="%myQtPath%/5.9.1/mingw53_32/;%myQtPath%/5.9.1/mingw53_32/lib/;%myQtPath%/Tools/mingw530_32/i686-w64-mingw32/lib/" ^
-DCMAKE_MODULE_PATH="%myQtPath%/5.9.1/mingw53_32/lib/cmake/;" ^
-DCMAKE_C_COMPILER="gcc" ^
-DCMAKE_CXX_COMPILER="c++" ^
-DCMAKE_MAKE_PROGRAM="mingw32-make" ^

24
create_inno_package.bat
View File

@ -1,19 +1,25 @@
CLS
REM Configure.
@echo off
ECHO "Configure."
ECHO %path%
SET QTDIR=C:/Qt/Qt5.9.1
ECHO %qtdir%
REM PATH=c:/Program Files/CMake/bin;c:/Qt/Qt5.9.1/Tools/mingw530_32/bin/;%PATH%
rd /s /q "build-inno"
mkdir "build-inno"
setlocal
cd "build-inno"
SET myCmakePath=c:/Program Files/CMake/bin/
SET myMinGWPath=c:/Qt/Qt5.9.1/Tools/mingw530_32/bin/
SET myQtPath=C:/Qt/Qt5.9.1
PATH=%myCmakePath%;%myMinGWPath%;%PATH%
rd /s /q "build-win"
mkdir "build-win"
cd "build-win"
cmake -G "MinGW Makefiles" ^
-DCMAKE_PREFIX_PATH="%QTDIR%/5.9.1/mingw53_32/;%QTDIR%/5.9.1/mingw53_32/lib/;%QTDIR%/Tools/mingw530_32/i686-w64-mingw32/lib/" ^
-DCMAKE_MODULE_PATH="%QTDIR%/5.9.1/mingw53_32/lib/cmake/;" ^
-DCMAKE_PREFIX_PATH="%myQtPath%/5.9.1/mingw53_32/;%myQtPath%/5.9.1/mingw53_32/lib/;%myQtPath%/Tools/mingw530_32/i686-w64-mingw32/lib/" ^
-DCMAKE_MODULE_PATH="%myQtPath%/5.9.1/mingw53_32/lib/cmake/;" ^
-DCMAKE_C_COMPILER="gcc" ^
-DCMAKE_CXX_COMPILER="c++" ^
-DCMAKE_MAKE_PROGRAM="mingw32-make" ^

0
debian/postinst vendored Normal file → Executable file
View File

2
distribution/CMakeLists.txt
View File

@ -1,5 +1,5 @@
# Setup automatic generation of the changelog
MESSAGE(STATUS "CPack for Linux configuration..." )
MESSAGE(STATUS "Generate installation variables..." )
SET( CPACK_SOURCE_PACKAGE_FILE_NAME "ponyprog-${APP_VERSION}" )
SET( CPACK_SOURCE_IGNORE_FILES

0
distribution/posix/postinst.in Normal file → Executable file
View File

1
distribution/win32/CMakeLists.txt
View File

@ -1,4 +1,5 @@
# add the inno subdir
ADD_SUBDIRECTORY(inno)
ADD_SUBDIRECTORY(nsis)

40
distribution/win32/inno/package-binary-inno.cpack.in
View File

@ -1,20 +1,20 @@
SET(CPACK_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
SET(CPACK_GENERATOR "INNOSETUP")
SET(CPACK_INSTALL_CMAKE_PROJECTS "@PONYPROG_CPACK_INSTALL_CMAKE_PROJECTS@")
SET(CPACK_INNO_HELP_LINK "http://ponyprog.sourceforge.net/")
SET(CPACK_INNO_INSTALLED_ICON_NAME "bin\\\\ponyprog.exe")
SET(CPACK_INNO_MENU_LINKS "http://ponyprog.sourceforge.net/" "Ponyprog Help")
SET(CPACK_INNO_MUI_ICON "@share_SOURCE_DIR@/icons\\\\ponyprog.ico")
SET(CPACK_PACKAGE_DESCRIPTION "@PONYPROG_CPACK_PACKAGE_DESCRIPTION@")
SET(CPACK_PACKAGE_EXECUTABLES "ponyprog" "Ponyprog @APP_VERSION@")
SET(CPACK_PACKAGE_FILE_NAME "@PONYPROG_CPACK_PACKAGE_FILE_NAME@")
SET(CPACK_PACKAGE_ICON "@CMAKE_CURRENT_SOURCE_DIR@\\\\headerimage.bmp")
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "Ponyprog @APP_VERSION@")
SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "Ponyprog @APP_VERSION@")
SET(CPACK_PACKAGE_NAME "@PONYPROG_CPACK_PACKAGE_NAME@")
SET(CPACK_INNO_PACKAGE_NAME "Ponyprog")
SET(CPACK_PACKAGE_VENDOR "http://ponyprog.sourceforge.net/")
SET(CPACK_PACKAGE_VERSION "@PONYPROG_CPACK_PACKAGE_VERSION@")
SET(CPACK_RESOURCE_FILE_LICENSE "@PONYPROG_CPACK_RESOURCE_FILE_LICENSE@")
SET(CPACK_INNO_MODIFY_PATH "ON")
#SET(CPACK_INNO_EXTRA_INSTALL_COMMANDS "@CPACK_INNO_EXTRA_INSTALL_COMMANDS@")
SET(CPACK_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
SET(CPACK_GENERATOR "INNOSETUP")
SET(CPACK_INSTALL_CMAKE_PROJECTS "@PONYPROG_CPACK_INSTALL_CMAKE_PROJECTS@")
SET(CPACK_INNO_HELP_LINK "http://ponyprog.sourceforge.net/")
SET(CPACK_INNO_INSTALLED_ICON_NAME "bin\\\\ponyprog.exe")
SET(CPACK_INNO_MENU_LINKS "http://ponyprog.sourceforge.net/" "Ponyprog Help")
SET(CPACK_INNO_MUI_ICON "@share_SOURCE_DIR@/icons\\\\ponyprog.ico")
SET(CPACK_PACKAGE_DESCRIPTION "@PONYPROG_CPACK_PACKAGE_DESCRIPTION@")
SET(CPACK_PACKAGE_EXECUTABLES "ponyprog" "Ponyprog @APP_VERSION@")
SET(CPACK_PACKAGE_FILE_NAME "@PONYPROG_CPACK_PACKAGE_FILE_NAME@")
SET(CPACK_PACKAGE_ICON "@CMAKE_CURRENT_SOURCE_DIR@\\\\headerimage.bmp")
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "Ponyprog @APP_VERSION@")
SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "Ponyprog @APP_VERSION@")
SET(CPACK_PACKAGE_NAME "@PONYPROG_CPACK_PACKAGE_NAME@")
SET(CPACK_INNO_PACKAGE_NAME "Ponyprog")
SET(CPACK_PACKAGE_VENDOR "http://ponyprog.sourceforge.net/")
SET(CPACK_PACKAGE_VERSION "@PONYPROG_CPACK_PACKAGE_VERSION@")
SET(CPACK_RESOURCE_FILE_LICENSE "@PONYPROG_CPACK_RESOURCE_FILE_LICENSE@")
SET(CPACK_INNO_MODIFY_PATH "ON")
#SET(CPACK_INNO_EXTRA_INSTALL_COMMANDS "@CPACK_INNO_EXTRA_INSTALL_COMMANDS@")

14
distribution/win32/nsis/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Generate NSIS installer
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/package-binary-nsis.cpack.in ${CMAKE_CURRENT_BINARY_DIR}/package-binary-nsis.cpack)
ADD_CUSTOM_TARGET(package-binary-nsis
${CMAKE_CPACK_COMMAND}
--config ${CMAKE_CURRENT_BINARY_DIR}/package-binary-nsis.cpack
)
# Generate NSIS installer
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/package-binary-nsis.cpack.in ${CMAKE_CURRENT_BINARY_DIR}/package-binary-nsis.cpack)
ADD_CUSTOM_TARGET(package-binary-nsis
${CMAKE_CPACK_COMMAND}
--config ${CMAKE_CURRENT_BINARY_DIR}/package-binary-nsis.cpack
)

42
distribution/win32/nsis/package-binary-nsis.cpack.in
View File

@ -1,20 +1,22 @@
SET(CPACK_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
SET(CPACK_GENERATOR "NSIS")
SET(CPACK_INSTALL_CMAKE_PROJECTS "@PONYPROG_CPACK_INSTALL_CMAKE_PROJECTS@")
SET(CPACK_NSIS_HELP_LINK "http://ponyprog.sourceforge.net/")
SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\ponyprog.exe")
SET(CPACK_NSIS_MENU_LINKS "http://ponyprog.sourceforge.net/" "Ponyprog Help")
SET(CPACK_NSIS_MUI_ICON "@share_SOURCE_DIR@/icons\\\\ponyprog.ico")
SET(CPACK_PACKAGE_DESCRIPTION "@PONYPROG_CPACK_PACKAGE_DESCRIPTION@")
SET(CPACK_PACKAGE_EXECUTABLES "ponyprog" "Ponyprog @APP_VERSION@")
SET(CPACK_PACKAGE_FILE_NAME "@PONYPROG_CPACK_PACKAGE_FILE_NAME@")
SET(CPACK_PACKAGE_ICON "@CMAKE_CURRENT_SOURCE_DIR@\\\\headerimage.bmp")
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "Ponyprog @APP_VERSION@")
SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "Ponyprog @APP_VERSION@")
SET(CPACK_PACKAGE_NAME "@PONYPROG_CPACK_PACKAGE_NAME@")
SET(CPACK_NSIS_PACKAGE_NAME "Ponyprog")
SET(CPACK_PACKAGE_VENDOR "http://ponyprog.sourceforge.net/")
SET(CPACK_PACKAGE_VERSION "@PONYPROG_CPACK_PACKAGE_VERSION@")
SET(CPACK_RESOURCE_FILE_LICENSE "@PONYPROG_CPACK_RESOURCE_FILE_LICENSE@")
SET(CPACK_NSIS_MODIFY_PATH "ON")
SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "@CPACK_NSIS_EXTRA_INSTALL_COMMANDS@")
SET(CPACK_STRIP_FILES TRUE)
SET(CPACK_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
SET(CPACK_GENERATOR "NSIS")
SET(CPACK_INSTALL_CMAKE_PROJECTS "@PONYPROG_CPACK_INSTALL_CMAKE_PROJECTS@")
SET(CPACK_NSIS_HELP_LINK "http://ponyprog.sourceforge.net/")
SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\ponyprog.exe")
SET(CPACK_NSIS_MENU_LINKS "http://ponyprog.sourceforge.net/" "Ponyprog Help")
SET(CPACK_NSIS_MUI_ICON "@PROJECT_SOURCE_DIR@/icons\\\\ponyprog.ico")
SET(CPACK_PACKAGE_DESCRIPTION "@PONYPROG_CPACK_PACKAGE_DESCRIPTION@")
SET(CPACK_PACKAGE_EXECUTABLES "ponyprog" "Ponyprog @APP_VERSION@")
SET(CPACK_PACKAGE_FILE_NAME "@PONYPROG_CPACK_PACKAGE_FILE_NAME@")
SET(CPACK_PACKAGE_ICON "@CMAKE_CURRENT_SOURCE_DIR@\\\\headerimage.bmp")
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "Ponyprog @APP_VERSION@")
SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "Ponyprog @APP_VERSION@")
SET(CPACK_PACKAGE_NAME "@PONYPROG_CPACK_PACKAGE_NAME@")
SET(CPACK_NSIS_PACKAGE_NAME "Ponyprog")
SET(CPACK_PACKAGE_VENDOR "http://ponyprog.sourceforge.net/")
SET(CPACK_PACKAGE_VERSION "@PONYPROG_CPACK_PACKAGE_VERSION@")
SET(CPACK_RESOURCE_FILE_LICENSE "@PONYPROG_CPACK_RESOURCE_FILE_LICENSE@")
SET(CPACK_NSIS_MODIFY_PATH "ON")
SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "@CPACK_NSIS_EXTRA_INSTALL_COMMANDS@")