Update Amebis URL
This commit is contained in:
parent
613241d5ab
commit
c7677d4a90
@ -1 +1 @@
|
|||||||
Subproject commit d0dcb3d357022dcdde74141bd8c6fd5d16a7bab9
|
Subproject commit b90f3d76971a044c2318f2bd9605ab8194028438
|
2
Makefile
2
Makefile
@ -110,7 +110,7 @@ Publish :: "MSI\MSIBuild\Version\Version.mak"
|
|||||||
!INCLUDE "include\MSIBuildCfg.mak"
|
!INCLUDE "include\MSIBuildCfg.mak"
|
||||||
|
|
||||||
PUBLISH_PACKAGE_DIR=$(PUBLISH_DIR)\$(MSIBUILD_VERSION_STR)
|
PUBLISH_PACKAGE_DIR=$(PUBLISH_DIR)\$(MSIBUILD_VERSION_STR)
|
||||||
PUBLISH_PACKAGE_URL=http://www.amebis.si/prenos/ZRCola/$(MSIBUILD_VERSION_STR)
|
PUBLISH_PACKAGE_URL=https://www.amebis.si/prenos/ZRCola/$(MSIBUILD_VERSION_STR)
|
||||||
|
|
||||||
######################################################################
|
######################################################################
|
||||||
# Main targets
|
# Main targets
|
||||||
|
@ -79,7 +79,7 @@ extern "C" void WinMainCRTStartup()
|
|||||||
};
|
};
|
||||||
FormatMessage(
|
FormatMessage(
|
||||||
FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_ARGUMENT_ARRAY | FORMAT_MESSAGE_FROM_STRING,
|
FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_ARGUMENT_ARRAY | FORMAT_MESSAGE_FROM_STRING,
|
||||||
TEXT("/i \"http://www.amebis.si/prenos/ZRCola/_latest/ZRCola%1%2.msi\" /l* \"%3ZRCola%1%2.log\""),
|
TEXT("/i \"https://www.amebis.si/prenos/ZRCola/_latest/ZRCola%1%2.msi\" /l* \"%3ZRCola%1%2.log\""),
|
||||||
0,
|
0,
|
||||||
0,
|
0,
|
||||||
(LPTSTR)&pszParams,
|
(LPTSTR)&pszParams,
|
||||||
|
@ -41,13 +41,13 @@
|
|||||||
<ItemGroup />
|
<ItemGroup />
|
||||||
<Target Name="Sign" Condition="'$(ManifestCertificateThumbprint)' != '' and ('$(ConfigurationType)' == 'Application' or '$(ConfigurationType)' == 'DynamicLibrary')" AfterTargets="_Manifest" BeforeTargets="RegisterOutput" Inputs="$(OutDir)$(TargetName)$(TargetExt)" Outputs="$(IntDir)$(TargetName).sign">
|
<Target Name="Sign" Condition="'$(ManifestCertificateThumbprint)' != '' and ('$(ConfigurationType)' == 'Application' or '$(ConfigurationType)' == 'DynamicLibrary')" AfterTargets="_Manifest" BeforeTargets="RegisterOutput" Inputs="$(OutDir)$(TargetName)$(TargetExt)" Outputs="$(IntDir)$(TargetName).sign">
|
||||||
<Message Text="Signing output file..." />
|
<Message Text="Signing output file..." />
|
||||||
<!--
|
<!--
|
||||||
To make Windows XP and Vista compliant signatures, the binaries have to be signed using SHA1.
|
To make Windows XP and Vista compliant signatures, the binaries have to be signed using SHA1.
|
||||||
<SignFile> switches to SHA256 if the signing certificate is SHA256.
|
<SignFile> switches to SHA256 if the signing certificate is SHA256.
|
||||||
Reverted to signtool.exe until we can drop Windows XP and Vista support.
|
Reverted to signtool.exe until we can drop Windows XP and Vista support.
|
||||||
-->
|
-->
|
||||||
<!--<SignFile CertificateThumbprint="$(ManifestCertificateThumbprint)" SigningTarget="$(OutDir)$(TargetName)$(TargetExt)" />-->
|
<!--<SignFile CertificateThumbprint="$(ManifestCertificateThumbprint)" SigningTarget="$(OutDir)$(TargetName)$(TargetExt)" />-->
|
||||||
<Exec Command="signtool.exe sign /du "http://www.amebis.si" /sha1 "%ManifestCertificateThumbprint%" /fd sha1 /q "$(TargetPath)"" />
|
<Exec Command="signtool.exe sign /du "https://www.amebis.si" /sha1 "%ManifestCertificateThumbprint%" /fd sha1 /q "$(TargetPath)"" />
|
||||||
<Touch Files="$(IntDir)$(TargetName).sign" AlwaysCreate="true" />
|
<Touch Files="$(IntDir)$(TargetName).sign" AlwaysCreate="true" />
|
||||||
</Target>
|
</Target>
|
||||||
</Project>
|
</Project>
|
@ -41,13 +41,13 @@
|
|||||||
<ItemGroup />
|
<ItemGroup />
|
||||||
<Target Name="Sign" Condition="'$(ManifestCertificateThumbprint)' != '' and ('$(ConfigurationType)' == 'Application' or '$(ConfigurationType)' == 'DynamicLibrary')" AfterTargets="_Manifest" BeforeTargets="RegisterOutput" Inputs="$(OutDir)$(TargetName)$(TargetExt)" Outputs="$(IntDir)$(TargetName).sign">
|
<Target Name="Sign" Condition="'$(ManifestCertificateThumbprint)' != '' and ('$(ConfigurationType)' == 'Application' or '$(ConfigurationType)' == 'DynamicLibrary')" AfterTargets="_Manifest" BeforeTargets="RegisterOutput" Inputs="$(OutDir)$(TargetName)$(TargetExt)" Outputs="$(IntDir)$(TargetName).sign">
|
||||||
<Message Text="Signing output file..." />
|
<Message Text="Signing output file..." />
|
||||||
<!--
|
<!--
|
||||||
To make Windows XP and Vista compliant signatures, the binaries have to be signed using SHA1.
|
To make Windows XP and Vista compliant signatures, the binaries have to be signed using SHA1.
|
||||||
<SignFile> switches to SHA256 if the signing certificate is SHA256.
|
<SignFile> switches to SHA256 if the signing certificate is SHA256.
|
||||||
Reverted to signtool.exe until we can drop Windows XP and Vista support.
|
Reverted to signtool.exe until we can drop Windows XP and Vista support.
|
||||||
-->
|
-->
|
||||||
<!--<SignFile CertificateThumbprint="$(ManifestCertificateThumbprint)" TimestampUrl="$(ManifestTimestampUrl)" SigningTarget="$(OutDir)$(TargetName)$(TargetExt)" />-->
|
<!--<SignFile CertificateThumbprint="$(ManifestCertificateThumbprint)" TimestampUrl="$(ManifestTimestampUrl)" SigningTarget="$(OutDir)$(TargetName)$(TargetExt)" />-->
|
||||||
<Exec Command="signtool.exe sign /du "http://www.amebis.si" /sha1 "%ManifestCertificateThumbprint%" /fd sha1 /t "%ManifestTimestampUrl%" /q "$(TargetPath)"" />
|
<Exec Command="signtool.exe sign /du "https://www.amebis.si" /sha1 "%ManifestCertificateThumbprint%" /fd sha1 /t "%ManifestTimestampUrl%" /q "$(TargetPath)"" />
|
||||||
<Touch Files="$(IntDir)$(TargetName).sign" AlwaysCreate="true" />
|
<Touch Files="$(IntDir)$(TargetName).sign" AlwaysCreate="true" />
|
||||||
</Target>
|
</Target>
|
||||||
</Project>
|
</Project>
|
Loading…
x
Reference in New Issue
Block a user