mirror of
https://github.com/keymanapp/keyman.git
synced 2026-08-08 18:05:32 +00:00
chore(developer): fixup setup build
This commit is contained in:
Marc Durdin
parent
40eedd86d3
commit
261ffca37f
4 changed files with 42 additions and 74 deletions
|
|
@ -1,32 +0,0 @@
|
|||
#include "../../global/inc/keymanversion.h"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION KV_FILEVERSION
|
||||
PRODUCTVERSION KV_PRODUCTVERSION
|
||||
FILEFLAGSMASK 0x3fL
|
||||
FILEFLAGS 0x0L
|
||||
FILEOS 0x4L
|
||||
FILETYPE 0x2L
|
||||
FILESUBTYPE 0x0L
|
||||
BEGIN
|
||||
BLOCK "StringFileInfo"
|
||||
BEGIN
|
||||
BLOCK "0C0904E4"
|
||||
BEGIN
|
||||
VALUE "CompanyName", KV_COMPANY_NAME
|
||||
VALUE "FileDescription", "Keyman KMN Debug Library\0"
|
||||
VALUE "FileVersion", KV_VERSION_STRING
|
||||
VALUE "InternalName", "KMNDEBUG\0"
|
||||
VALUE "LegalCopyright", KV_LEGAL_COPYRIGHT
|
||||
VALUE "LegalTrademarks", KV_LEGAL_TRADEMARKS
|
||||
VALUE "OriginalFilename", "KMNDEBUG.DLL\0"
|
||||
VALUE "ProductName", "Keyman Developer\0"
|
||||
VALUE "ProductVersion", KV_VERSION_STRING
|
||||
VALUE "Comments", "\0"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
BEGIN
|
||||
VALUE "Translation", 0xc09, 1252
|
||||
END
|
||||
END
|
||||
|
|
@ -2,14 +2,14 @@
|
|||
# Setup Makefile
|
||||
#
|
||||
|
||||
!include ..\..\Defines.mak
|
||||
!include ..\Defines.mak
|
||||
|
||||
build: version.res manifest.res icons
|
||||
$(DELPHI_MSBUILD) setup.dproj "/p:Platform=Win32"
|
||||
$(SENTRYTOOL_DELPHIPREP) $(WIN32_TARGET_PATH)\setup.exe -dpr setup.dpr
|
||||
$(TDS2DBG) $(WIN32_TARGET_PATH)\setup.exe
|
||||
$(COPY) $(WIN32_TARGET_PATH)\setup.exe $(PROGRAM)\developer
|
||||
if exist $(WIN32_TARGET_PATH)\setup.dbg $(COPY) $(WIN32_TARGET_PATH)\setup.dbg $(DEBUGPATH)\developer\devsetup.dbg
|
||||
$(COPY) $(WIN32_TARGET_PATH)\setup.exe $(DEVELOPER_PROGRAM)
|
||||
if exist $(WIN32_TARGET_PATH)\setup.dbg $(COPY) $(WIN32_TARGET_PATH)\setup.dbg $(DEVELOPER_DEBUGPATH)\devsetup.dbg
|
||||
-del $(WIN32_TARGET_PATH)\devsetup.dbg
|
||||
if exist $(WIN32_TARGET_PATH)\setup.dbg ren $(WIN32_TARGET_PATH)\setup.dbg devsetup.dbg
|
||||
|
||||
|
|
@ -23,20 +23,20 @@ clean: def-clean
|
|||
rem if exist icons\icons.res del icons\icons.res
|
||||
|
||||
signcode:
|
||||
rem SIGNCODE /d "Keyman Developer Setup" $(PROGRAM)\developer\setup.exe
|
||||
rem SIGNCODE /d "Keyman Developer Setup" $(DEVELOPER_PROGRAM)\setup.exe
|
||||
|
||||
wrap-symbols:
|
||||
# This is slightly non-standard due to renamed devsetup.dbg above
|
||||
# we should be able to clean this up in the future when we remove the
|
||||
# zipped debug symbols
|
||||
$(SYMSTORE) $(PROGRAM)\developer\setup.exe /t keyman-developer
|
||||
$(SYMSTORE) $(ROOT)\src\developer\setup\setup.dbg /t keyman-developer
|
||||
$(SYMSTORE) $(DEVELOPER_PROGRAM)\setup.exe /t keyman-developer
|
||||
$(SYMSTORE) $(ROOT)\src\setup\setup.dbg /t keyman-developer
|
||||
|
||||
test-manifest:
|
||||
# test that (a) linked manifest exists and correct, and (b) has uiAccess=true
|
||||
$(MT) -nologo -inputresource:$(PROGRAM)\developer\setup.exe -validate_manifest
|
||||
$(MT) -nologo -inputresource:$(DEVELOPER_PROGRAM)\setup.exe -validate_manifest
|
||||
|
||||
install:
|
||||
@rem
|
||||
|
||||
!include ..\..\Target.mak
|
||||
!include ..\Target.mak
|
||||
|
|
|
|||
|
|
@ -5,28 +5,28 @@ uses
|
|||
UfrmDownloadProgress in 'UfrmDownloadProgress.pas',
|
||||
UfrmRun in 'UfrmRun.pas',
|
||||
CommonControls in 'CommonControls.pas',
|
||||
VersionInfo in '..\..\global\delphi\general\VersionInfo.pas',
|
||||
httpuploader in '..\..\global\delphi\general\httpuploader.pas',
|
||||
RegistryKeys in '..\..\global\delphi\general\RegistryKeys.pas',
|
||||
klog in '..\..\global\delphi\general\klog.pas',
|
||||
Upload_Settings in '..\..\global\delphi\general\Upload_Settings.pas',
|
||||
DebugPaths in '..\..\global\delphi\general\DebugPaths.pas',
|
||||
GetOsVersion in '..\..\global\delphi\general\GetOsVersion.pas',
|
||||
VersionInfo in '..\..\..\windows\src\global\delphi\general\VersionInfo.pas',
|
||||
httpuploader in '..\..\..\windows\src\global\delphi\general\httpuploader.pas',
|
||||
RegistryKeys in '..\..\..\windows\src\global\delphi\general\RegistryKeys.pas',
|
||||
klog in '..\..\..\windows\src\global\delphi\general\klog.pas',
|
||||
Upload_Settings in '..\..\..\windows\src\global\delphi\general\Upload_Settings.pas',
|
||||
DebugPaths in '..\..\..\windows\src\global\delphi\general\DebugPaths.pas',
|
||||
GetOsVersion in '..\..\..\windows\src\global\delphi\general\GetOsVersion.pas',
|
||||
TntDialogHelp in 'TntDialogHelp.pas',
|
||||
httpuploader_messageprocessor_windows in 'httpuploader_messageprocessor_windows.pas',
|
||||
SetupForm in 'SetupForm.pas',
|
||||
resource in 'resource.pas',
|
||||
SetupStrings in 'SetupStrings.pas',
|
||||
utilsystem in '..\..\global\delphi\general\utilsystem.pas',
|
||||
wininet5 in '..\..\global\delphi\general\wininet5.pas',
|
||||
GlobalProxySettings in '..\..\global\delphi\general\GlobalProxySettings.pas',
|
||||
OnlineConstants in '..\..\global\delphi\productactivation\OnlineConstants.pas',
|
||||
ErrorControlledRegistry in '..\..\global\delphi\vcl\ErrorControlledRegistry.pas',
|
||||
Unicode in '..\..\global\delphi\general\Unicode.pas',
|
||||
utilexecute in '..\..\global\delphi\general\utilexecute.pas',
|
||||
KeymanVersion in '..\..\global\delphi\general\KeymanVersion.pas',
|
||||
SFX in '..\..\global\delphi\setup\SFX.pas',
|
||||
Keyman.System.UpdateCheckResponse in '..\..\global\delphi\general\Keyman.System.UpdateCheckResponse.pas';
|
||||
utilsystem in '..\..\..\windows\src\global\delphi\general\utilsystem.pas',
|
||||
wininet5 in '..\..\..\windows\src\global\delphi\general\wininet5.pas',
|
||||
GlobalProxySettings in '..\..\..\windows\src\global\delphi\general\GlobalProxySettings.pas',
|
||||
OnlineConstants in '..\..\..\windows\src\global\delphi\productactivation\OnlineConstants.pas',
|
||||
ErrorControlledRegistry in '..\..\..\windows\src\global\delphi\vcl\ErrorControlledRegistry.pas',
|
||||
Unicode in '..\..\..\windows\src\global\delphi\general\Unicode.pas',
|
||||
utilexecute in '..\..\..\windows\src\global\delphi\general\utilexecute.pas',
|
||||
KeymanVersion in '..\..\..\windows\src\global\delphi\general\KeymanVersion.pas',
|
||||
SFX in '..\..\..\windows\src\global\delphi\setup\SFX.pas',
|
||||
Keyman.System.UpdateCheckResponse in '..\..\..\windows\src\global\delphi\general\Keyman.System.UpdateCheckResponse.pas';
|
||||
|
||||
{$R icons.res}
|
||||
{$R version.res}
|
||||
|
|
|
|||
|
|
@ -103,28 +103,28 @@
|
|||
<DCCReference Include="UfrmDownloadProgress.pas"/>
|
||||
<DCCReference Include="UfrmRun.pas"/>
|
||||
<DCCReference Include="CommonControls.pas"/>
|
||||
<DCCReference Include="..\..\global\delphi\general\VersionInfo.pas"/>
|
||||
<DCCReference Include="..\..\global\delphi\general\httpuploader.pas"/>
|
||||
<DCCReference Include="..\..\global\delphi\general\RegistryKeys.pas"/>
|
||||
<DCCReference Include="..\..\global\delphi\general\klog.pas"/>
|
||||
<DCCReference Include="..\..\global\delphi\general\Upload_Settings.pas"/>
|
||||
<DCCReference Include="..\..\global\delphi\general\DebugPaths.pas"/>
|
||||
<DCCReference Include="..\..\global\delphi\general\GetOsVersion.pas"/>
|
||||
<DCCReference Include="..\..\..\windows\src\global\delphi\general\VersionInfo.pas"/>
|
||||
<DCCReference Include="..\..\..\windows\src\global\delphi\general\httpuploader.pas"/>
|
||||
<DCCReference Include="..\..\..\windows\src\global\delphi\general\RegistryKeys.pas"/>
|
||||
<DCCReference Include="..\..\..\windows\src\global\delphi\general\klog.pas"/>
|
||||
<DCCReference Include="..\..\..\windows\src\global\delphi\general\Upload_Settings.pas"/>
|
||||
<DCCReference Include="..\..\..\windows\src\global\delphi\general\DebugPaths.pas"/>
|
||||
<DCCReference Include="..\..\..\windows\src\global\delphi\general\GetOsVersion.pas"/>
|
||||
<DCCReference Include="TntDialogHelp.pas"/>
|
||||
<DCCReference Include="httpuploader_messageprocessor_windows.pas"/>
|
||||
<DCCReference Include="SetupForm.pas"/>
|
||||
<DCCReference Include="resource.pas"/>
|
||||
<DCCReference Include="SetupStrings.pas"/>
|
||||
<DCCReference Include="..\..\global\delphi\general\utilsystem.pas"/>
|
||||
<DCCReference Include="..\..\global\delphi\general\wininet5.pas"/>
|
||||
<DCCReference Include="..\..\global\delphi\general\GlobalProxySettings.pas"/>
|
||||
<DCCReference Include="..\..\global\delphi\productactivation\OnlineConstants.pas"/>
|
||||
<DCCReference Include="..\..\global\delphi\vcl\ErrorControlledRegistry.pas"/>
|
||||
<DCCReference Include="..\..\global\delphi\general\Unicode.pas"/>
|
||||
<DCCReference Include="..\..\global\delphi\general\utilexecute.pas"/>
|
||||
<DCCReference Include="..\..\global\delphi\general\KeymanVersion.pas"/>
|
||||
<DCCReference Include="..\..\global\delphi\setup\SFX.pas"/>
|
||||
<DCCReference Include="..\..\global\delphi\general\Keyman.System.UpdateCheckResponse.pas"/>
|
||||
<DCCReference Include="..\..\..\windows\src\global\delphi\general\utilsystem.pas"/>
|
||||
<DCCReference Include="..\..\..\windows\src\global\delphi\general\wininet5.pas"/>
|
||||
<DCCReference Include="..\..\..\windows\src\global\delphi\general\GlobalProxySettings.pas"/>
|
||||
<DCCReference Include="..\..\..\windows\src\global\delphi\productactivation\OnlineConstants.pas"/>
|
||||
<DCCReference Include="..\..\..\windows\src\global\delphi\vcl\ErrorControlledRegistry.pas"/>
|
||||
<DCCReference Include="..\..\..\windows\src\global\delphi\general\Unicode.pas"/>
|
||||
<DCCReference Include="..\..\..\windows\src\global\delphi\general\utilexecute.pas"/>
|
||||
<DCCReference Include="..\..\..\windows\src\global\delphi\general\KeymanVersion.pas"/>
|
||||
<DCCReference Include="..\..\..\windows\src\global\delphi\setup\SFX.pas"/>
|
||||
<DCCReference Include="..\..\..\windows\src\global\delphi\general\Keyman.System.UpdateCheckResponse.pas"/>
|
||||
<BuildConfiguration Include="Debug">
|
||||
<Key>Cfg_2</Key>
|
||||
<CfgParent>Base</CfgParent>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue