swisskyrepo
/
ashirt
mirror of https://github.com/swisskyrepo/ashirt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish Windows Install (#131) 

* Clean up Global Hotkeys

* Prevent Windows Shortcut AutoRepeat

* Univeral OSX Binary

* Add Extra windows info

Co-authored-by: Chris Rizzitello <crizzitello@ics.com>
main
crizzitello 2022-04-14 14:57:42 -04:00 committed by GitHub
parent 705b74aa11
commit a3572bf6e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 62 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -151,7 +151,8 @@ if(APPLE)
set_source_files_properties(${ASHIRT_PLATFORM_EX_SRC} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
elseif(WIN32)
set(CMAKE_PREFIX_PATH $ENV{QTDIR})
set(ASHIRT_PLATFORM_EX_SRC ${CMAKE_SOURCE_DIR}/deploy/ashirt.rc)
configure_file(${CMAKE_SOURCE_DIR}/deploy/ashirt.rc.in ${CMAKE_CURRENT_BINARY_DIR}/deploy/ashirt.rc @ONLY)
set(ASHIRT_PLATFORM_EX_SRC ${CMAKE_CURRENT_BINARY_DIR}/deploy/ashirt.rc)
endif()
#MACOSX_BUNDLE Make it a bundle on Mac OS

7
deploy/CMakeLists.txt
View File

@ -1,5 +1,9 @@
if(APPLE OR WIN32)
if(WIN32)
install(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION . RENAME LICENSE.txt)
install(FILES ${CMAKE_SOURCE_DIR}/README.md DESTINATION . RENAME README.txt)
elseif(APPLE)
install(FILES ${CMAKE_SOURCE_DIR}/README.md DESTINATION .)
elseif(UNIX AND NOT APPLE)
install(DIRECTORY hicolor DESTINATION share/icons)
@ -19,6 +23,7 @@ set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
endif()
if(CMAKE_SYSTEM_NAME MATCHES "Windows")
STRING(APPEND CPACK_PACKAGE_FILE_NAME "-Windows")
set(CPACK_PACKAGE_VENDOR "Yahoo")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "ashirt")
set(CPACK_NSIS_DISPLAY_NAME ${CMAKE_PACKAGE_NAME})
set(CPACK_NSIS_COMPRESSOR lzma)

1
deploy/ashirt.rc
View File

@ -1 +0,0 @@
IDI_ICON1 ICON "ashirt.ico"

54
deploy/ashirt.rc.in Normal file
View File

@ -0,0 +1,54 @@
IDI_ICON1 ICON "ashirt.ico"
#include <windows.h>
#define VER_FILEVERSION @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,@PROJECT_VERSION_PATCH@,0
#define VER_FILEVERSION_STR "@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@\0"
#define VER_PRODUCTVERSION @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,@PROJECT_VERSION_PATCH@,0
#define VER_PRODUCTVERSION_STR "@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@\0"
#ifndef DEBUG
#define VER_DEBUG 0
#else
#define VER_DEBUG VS_FF_DEBUG
#endif
VS_VERSION_INFO VERSIONINFO
FILEVERSION VER_FILEVERSION
PRODUCTVERSION VER_PRODUCTVERSION
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS 0x0L
FILEOS VOS__WINDOWS32
FILETYPE VFT_APP
FILESUBTYPE VFT2_UNKNOWN
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904E4"
BEGIN
VALUE "CompanyName", "Yahoo"
VALUE "FileDescription", "@PROJECT_DESCRIPTION@"
VALUE "FileVersion", VER_FILEVERSION_STR
VALUE "InternalName", "ashirt"
VALUE "LegalCopyright", "(C) Yahoo"
VALUE "OriginalFilename", "ashirt.exe"
VALUE "ProductName", "ashirt"
VALUE "ProductVersion", VER_PRODUCTVERSION_STR
END
END
BLOCK "VarFileInfo"
BEGIN
/* The following line should only be modified for localized versions. */
/* It consists of any number of WORD,WORD pairs, with each pair */
/* describing a language,codepage combination supported by the file. */
/* */
/* For example, a file might have values "0x409,1252" indicating that it */
/* supports English language (0x409) in the Windows ANSI codepage (1252). */
VALUE "Translation", 0x409, 1252
END
END