Amebis/MSIBuild
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed edutest profile from installation MSI files.

Browse Source 
Removed eduroam.si TKIP profile.

Attempt to install 32-bit MSI on 64-bit Windows quits with an error message now, as 32-bit MSI would not work on 64-bit Windows anyway.

Updated copyright information.

Minor internal reorganization: Folder eap_ext_stub moved to folder method.

Version changed to 1.0-pre2.
This commit is contained in:
Simon Rozman
2014-06-19 09:28:51 +00:00
parent d6f653c68a
commit 31546083e1
3 changed files with 73 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Core/Makefile
View File

@@ -800,6 +800,11 @@ All :: "$(LANG).$(PLAT).$(CFG).CustomAction-2.idt"
Action Type Source Target
s$(MSIBUILD_LENGTH_ID) i2 S$(MSIBUILD_LENGTH_ID) S255
1252 CustomAction Action
!IFDEF MSIBUILD_NO_WOW64
!IF "$(PLAT)" == "Win32"
caWoW64Unsupported 19 You are attempting to install the 32-bit variant of [SimpleProductName] on a 64-bit operating system. 32-bit variant will not work with your operating system. The installation of the 64-bit variant is recommended.
!ENDIF
!ENDIF
caNewerProductFound 19 A newer version of [SimpleProductName] is already installed.
caFaultyProductFound 19 This package cannot upgrade the currently installed [SimpleProductName]. Please remove the old package first and retry.
<<NOKEEP
@@ -1058,6 +1063,11 @@ Action Condition Sequence
s$(MSIBUILD_LENGTH_ID) S255 I2
InstallExecuteSequence Action
LaunchConditions NOT Installed 100
!IFDEF MSIBUILD_NO_WOW64
!IF "$(PLAT)" == "Win32"
caWoW64Unsupported VersionNT64 101
!ENDIF
!ENDIF
FindRelatedProducts 200
caNewerProductFound NEWPRODUCTFOUND 201
AppSearch 400
@@ -1136,6 +1146,11 @@ Action Condition Sequence
s$(MSIBUILD_LENGTH_ID) S255 I2
InstallUISequence Action
LaunchConditions NOT Installed 100
!IFDEF MSIBUILD_NO_WOW64
!IF "$(PLAT)" == "Win32"
caWoW64Unsupported VersionNT64 101
!ENDIF
!ENDIF
FindRelatedProducts 200
caNewerProductFound NEWPRODUCTFOUND 201
AppSearch 400